diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php
index 86406d99..70787293 100755
--- a/app/Controllers/Amendmentpurchaseorder.php
+++ b/app/Controllers/Amendmentpurchaseorder.php
@@ -231,6 +231,7 @@ class Amendmentpurchaseorder extends BaseController
   {
     $NewPO = '';
     $MAD = '';
+    $changeStatus = $this->request->getPost('changeStatus');
     $PONO = $this->request->getPost('txtPONO');
     $POdt = $this->request->getPost('PODate');
     $PODate =  get_date_time_format($POdt);
@@ -306,7 +307,7 @@ class Amendmentpurchaseorder extends BaseController
     }
     $AmendmentNewPoNo = generate_amendment_po_number($PONO);
 
-    $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);
+    $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $PoRange, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus == 1 ? PO_RELEASED : PO_DRAFT, '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);
     $file = $this->request->getFile('POFile');
     $requestfilename = $file->getName();
     $PrePOFile = $this->request->getPost('PrePOFile');
@@ -329,9 +330,12 @@ class Amendmentpurchaseorder extends BaseController
     } else {
       $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
     }
-    // print_r($POMaster);die;
 
-    $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
+    //  print_r($POMaster);
+    //  echo 'end';
+    //  die;
+
+     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
 
     if(!empty($LastPO)){
       if (count($LastPO) > 0) {
@@ -578,6 +582,7 @@ class Amendmentpurchaseorder extends BaseController
 
 
     echo 'Purchase Order Amended Successfully! PO Number Is: ' . $PONO . '- New PO Number is' . $NewPO;
+    
   }
 
   /**
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index a923975d..a42302c3 100755
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -1,7 +1,7 @@
 <?php $ReqType = '';
 $CompanyAddress = '';
 $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-$CurrentDate =  $dt->format('d-m-Y');
+$CurrentDate = $dt->format('d-m-Y');
 $MaxPoDate = '';
 $AvlAmount = 0;
 $DeliverSchedule = '';
@@ -37,20 +37,20 @@ $Address = '';
 $PODate = '';
 $Deliverydt = '';
 $DeliveryAddress = '';
-$POStatus	 = 	'';
-$PONO =  	'';
-$totBasicAmt  = 0;
-$totDiscountAmt  = 0.0;
-$totPackagingAmt  = 0.0;
-$totExciseAmt  = 0.0;
-$totVATAmt  = 0.0; //FOR SGST
-$totCSTAmt  = 0.0; //FOR CGST
-$totGSTAmt  = 0.0; //FOR IGST
+$POStatus = '';
+$PONO = '';
+$totBasicAmt = 0;
+$totDiscountAmt = 0.0;
+$totPackagingAmt = 0.0;
+$totExciseAmt = 0.0;
+$totVATAmt = 0.0; //FOR SGST
+$totCSTAmt = 0.0; //FOR CGST
+$totGSTAmt = 0.0; //FOR IGST
 
-$totOtherTaxAmt   = 0.0;
-$totFreightAmt   = 0.0;
-$totInsuranceAmt   = 0.0;
-$totOrderSummaryAmt   = 0.0;
+$totOtherTaxAmt = 0.0;
+$totFreightAmt = 0.0;
+$totInsuranceAmt = 0.0;
+$totOrderSummaryAmt = 0.0;
 $PaymentOtherDescription = '';
 $ServiceDescription = '';
 $taxrange = "";
@@ -74,19 +74,19 @@ if (!empty($POMaster)) {
 		$SupName = $Req->SupplierName;
 		$Address = $Req->MSME ? "MSME : " . $Req->MSME . "\n" . $Req->Address : $Req->Address;
 
-		$Pdt =	new DateTime($Req->PODate);
-		$PODate =  $Pdt->format('d-m-Y');
+		$Pdt = new DateTime($Req->PODate);
+		$PODate = $Pdt->format('d-m-Y');
 		$DeliverOption = $Req->DeliveryOption;
 		$DeliverSchedule = $Req->DeliverySchedule;
-		$Ddt =	new DateTime($Req->DeliveryDate);
+		$Ddt = new DateTime($Req->DeliveryDate);
 		//echo $Req->DeliveryDate."<br>";
-		$Deliverydt =  $Ddt->format('d-m-Y');
+		$Deliverydt = $Ddt->format('d-m-Y');
 		//echo $Deliverydt;
 		$PaymentOtherDescription = $Req->PaymentOtherDescription;
 		//echo $PaymentOtherDescription;
 		$DeliveryAddress = $Req->DeliveryAddress;
-		$POStatus	 = 	$Req->StatusName;
-		$PONO = 	$Req->PONO;
+		$POStatus = $Req->StatusName;
+		$PONO = $Req->PONO;
 		$taxrange = $Req->PORange;
 		//echo $taxrange . "t";
 		$ServiceDescription = $Req->ServiceDescription;
@@ -131,14 +131,17 @@ if (!empty($INRSYMBOL)) {
 <!-- Latest compiled and minified CSS -->
 
 <style>
-	.modal { overflow: auto !important; }
-	.text-right {
-    text-align: right !important;
+	.modal {
+		overflow: auto !important;
 	}
+
+	.text-right {
+		text-align: right !important;
+	}
+
 	.text-center {
 		text-align: center !important;
 	}
-
 </style>
 
 <script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
@@ -169,7 +172,7 @@ if (!empty($INRSYMBOL)) {
 	var DelDt = '<?php echo $Deliverydt; ?>';
 	var insurancestatus = '<?php echo $insurencestatus; ?>';
 	var InsuranceNumber = '<?php echo $insurenceno; ?>';
-	$(document).ready(function() {
+	$(document).ready(function () {
 
 		// $('#RequistionNo').attr("style", "pointer-events: none;");
 		$('#drpSupplier').attr("style", "pointer-events: none;");
@@ -233,7 +236,7 @@ if (!empty($INRSYMBOL)) {
 		Mat: []
 	};
 	// alert(new Date(year,month,day));
-	$(function() {
+	$(function () {
 
 		$("#PODate").datepicker({
 			minDate: d,
@@ -255,7 +258,7 @@ if (!empty($INRSYMBOL)) {
 			maxDate : 'now',
 			dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
 		}); */
-		$('#drpSupplier').change(function() {
+		$('#drpSupplier').change(function () {
 			var cd = $("#drpSupplier option:selected").text();
 			//alert(cd);
 			$("#changeSup").val(cd);
@@ -265,7 +268,7 @@ if (!empty($INRSYMBOL)) {
 
 			if (id != '0') {
 				var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
-				$.each(y, function(idx, obj) {
+				$.each(y, function (idx, obj) {
 					if (obj.SupplierID === id) {
 						if (obj.MSME) {
 							$("#SupAddress").val("MSME : " + obj.MSME + "\n" + obj.Address);
@@ -282,7 +285,7 @@ if (!empty($INRSYMBOL)) {
 
 		});
 
-		$('#EditDiscountType').change(function() {
+		$('#EditDiscountType').change(function () {
 			selValue = $("#EditDiscountType").val();
 			$('#txtEditDiscount').val('');
 			$('#txtEditAfterDiscount').val('');
@@ -303,7 +306,7 @@ if (!empty($INRSYMBOL)) {
 		});
 
 
-		$('#EditPackagingType').change(function() {
+		$('#EditPackagingType').change(function () {
 			$('#txtEditPackaging').val('');
 			$('#txtEditAfterPackaging').val('');
 			selValue = $("#EditPackagingType").val();
@@ -328,16 +331,16 @@ if (!empty($INRSYMBOL)) {
 
 
 
-		$('#drpEditFreight').change(function() {
+		$('#drpEditFreight').change(function () {
 
 			var FreightType = $("#drpEditFreight").val();
 
 			if (FreightType == "PER TRIP") {
 				$('#EditTripsValue').show();
-				
+
 			} else {
 				$('#EditTripsValue').hide();
-				
+
 			}
 			selValue = $("#drpEditFreight").val();
 			$('#txtEditFreight').val('');
@@ -345,12 +348,12 @@ if (!empty($INRSYMBOL)) {
 			if (selValue == PercentageType) {
 				var PackagingCalculation = '';
 
-					$('#freightmodel').modal('show');
-					$('#freightmodel').modal({
-					backdrop: true, 
-					keyboard: true  
-					});
-				
+				$('#freightmodel').modal('show');
+				$('#freightmodel').modal({
+					backdrop: true,
+					keyboard: true
+				});
+
 
 				$('#txtEditFreight').removeAttr('readonly', 'true');
 			} else if (selValue == NilType) {
@@ -684,9 +687,7 @@ if (!empty($INRSYMBOL)) {
 						//alert((FreightValue/100) * (basicValue-AfterDiscount));
 						//alert(((FreightValue/100) * basicValue));
 						//alert(FreightCalculation);
-						if (FreightCalculation == 0)
-
-						{
+						if (FreightCalculation == 0) {
 							AfterFreight = <?php echo FREIGHT_PERCENTAGE; ?>;
 						} else {
 							AfterFreight = <?php echo FREIGHT_PERCENTAGE_AFTER; ?>;
@@ -752,7 +753,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');
-		
+
 		// $('#EDITREVENUE').modal('show');
 		calculateFreight();
 	}
@@ -847,30 +848,30 @@ if (!empty($INRSYMBOL)) {
 		//alert('tot:'+tot);		
 		return tot;
 	}
-	$(document).ready(function() {
+	$(document).ready(function () {
 		$("#PaymentTerms").select2();
 
-		$('#Date').click(function() {
+		$('#Date').click(function () {
 			//for Date range selection
 			$('#Schedulediv').hide();
 			$('#Deliverydtdiv').show();
 		});
-		$('#Schedule').click(function() {
+		$('#Schedule').click(function () {
 			//for schedule range selection
 			$('#Deliverydtdiv').hide();
 			$('#Schedulediv').show();
 		});
 		SetVatorCST();
 	});
-	$(document).ready(function() {
-		$('#Local').click(function() {
+	$(document).ready(function () {
+		$('#Local').click(function () {
 			//for Date range selection
 			$('#IGSTShow').hide();
 			$('#SGSTShow').show();
 			$('#SGSTModel').show(); // SGST Fields in Modal Show
 			$('#IGSTModel').hide(); // IGST Fields in Modal Hide
 		});
-		$('#Inter_state').click(function() {
+		$('#Inter_state').click(function () {
 			//for schedule range selection
 			$('#SGSTShow').hide();
 			$('#IGSTShow').show();
@@ -931,7 +932,8 @@ if (!empty($INRSYMBOL)) {
 				<div class="col-12">
 					<div class="page-title-box page-title-box-alt">
 						<h4><?= "Amendment Revenue Purchase Order - $PONO "; ?></h4>
-						<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
+						<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back"
+							value="Back">Back</a>
 					</div>
 				</div>
 			</div>
@@ -942,7 +944,7 @@ if (!empty($INRSYMBOL)) {
 					<div class="card">
 						<div class="card-body">
 							<?php
-							$attributes = array('class' => 'form-label-left CreatePO ', 'name'  => 'CreatePO', 'id'  => 'CreatePO');
+							$attributes = array('class' => 'form-label-left CreatePO ', 'name' => 'CreatePO', 'id' => 'CreatePO');
 							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes);
 							?>
 
@@ -952,10 +954,10 @@ if (!empty($INRSYMBOL)) {
 									<?php
 									$options = array("0" => 'Selected Requisition Numbers');
 									if (!empty($ReqList)) {
-										foreach ($ReqList as $SID) :
+										foreach ($ReqList as $SID):
 
 											$options[$SID->ReqNo] = $SID->ReqNo;
-										//$ReqType = $SID->ReqType;
+											//$ReqType = $SID->ReqType;
 										endforeach;
 									}
 									echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
@@ -964,7 +966,7 @@ if (!empty($INRSYMBOL)) {
 								<div class="form-group col-md-3">
 									<label>Purchase Order Type</label>
 									<?php
-									$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+									$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
@@ -973,9 +975,9 @@ if (!empty($INRSYMBOL)) {
 									<?php
 									$options = array("0" => 'Select Supplier');
 									//print_r(  $options);
-
+									
 									if (!empty($Suplist)) {
-										foreach ($Suplist as $SID) :
+										foreach ($Suplist as $SID):
 											$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
 										endforeach;
 									}
@@ -988,7 +990,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Supplier Address</label>
 									<div>
 										<?php
-										$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
+										$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
 										echo Form_textarea($data);
 										?>
 									</div>
@@ -1021,16 +1023,17 @@ if (!empty($INRSYMBOL)) {
 									<label>Delivery Date<span class="text-danger">*</span></label>
 									<div>
 										<?php
-										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;', 'min' => date('d-m-Y'),);
+										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;', 'min' => date('d-m-Y'), );
 										echo form_input($data);
 										?>
 									</div>
 								</div>
 								<div class="form-group col-md-3" id="Schedulediv" style="display:none;">
-									<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule; ?>">
+									<input type="hidden" name="beforeScheduleby"
+										value="<?php echo $DeliverSchedule; ?>">
 									<label>Schedule By<span class="text-danger">*</span></label>
 									<?php
-									$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+									$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
 									echo Form_textarea($data);
 									?>
 								</div>
@@ -1038,9 +1041,10 @@ if (!empty($INRSYMBOL)) {
 									<label>Delivery Address</label>
 									<div>
 										<?php
-										$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
+										$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
 										echo Form_textarea($data);
-										?> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>">
+										?> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"
+											value="<?php echo $DeliveryAddress; ?>">
 									</div>
 								</div>
 							</div>
@@ -1048,7 +1052,7 @@ if (!empty($INRSYMBOL)) {
 								<div class="form-group col-md-3">
 									<label>Purchase Order Date</label>
 									<?php
-									$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;', 'readonly' => 'true');
+									$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
@@ -1057,7 +1061,7 @@ if (!empty($INRSYMBOL)) {
 									<div>
 
 										<?php
-										$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $modeofshipment), 'id' => 'addmodeofshipment',  'class' => 'form-control', 'readonly' => 'readonly');
+										$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $modeofshipment), 'id' => 'addmodeofshipment', 'class' => 'form-control', 'readonly' => 'readonly');
 										echo form_input($data);
 										?>
 									</div>
@@ -1070,7 +1074,7 @@ if (!empty($INRSYMBOL)) {
 									<div>
 
 										<?php
-										$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $supplierref), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'readonly' => 'readonly', 'maxlength' => '40');
+										$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $supplierref), 'id' => 'amendsupplierreference', 'class' => 'form-control', 'readonly' => 'readonly', 'maxlength' => '40');
 										echo form_input($data);
 										?>
 									</div>
@@ -1080,7 +1084,7 @@ if (!empty($INRSYMBOL)) {
 									<div>
 
 										<?php
-										$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $suppofferno), 'id' => 'amendsupplierofferno',  'class' => 'form-control', 'readonly' => 'readonly');
+										$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $suppofferno), 'id' => 'amendsupplierofferno', 'class' => 'form-control', 'readonly' => 'readonly');
 										echo form_input($data);
 										?>
 									</div>
@@ -1093,7 +1097,7 @@ if (!empty($INRSYMBOL)) {
 									<div>
 
 										<?php
-										$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $otherref), 'id' => 'amendotherreference',  'class' => 'form-control', 'readonly' => 'readonly');
+										$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $otherref), 'id' => 'amendotherreference', 'class' => 'form-control', 'readonly' => 'readonly');
 										echo form_input($data);
 										?>
 									</div>
@@ -1105,13 +1109,13 @@ if (!empty($INRSYMBOL)) {
 										<?php
 
 										//$optionsWork = array("0"=>'Select Work Status');     
-
+										
 
 										if (!empty($PoTypeOptions)) {
-											foreach ($PoTypeOptions as $POpt) :
+											foreach ($PoTypeOptions as $POpt):
 
 
-												$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+												$optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue;
 
 											endforeach;
 										}
@@ -1142,19 +1146,20 @@ if (!empty($INRSYMBOL)) {
 											if ($Terms == $pay2->PaymentID) {
 												//echo "$Terms";
 												//echo "$pay2->PaymentTerms";
+									
+												?>
+												<input type="hidden" name="beforePaymentTermsText"
+													value="<?php echo $pay2->PaymentTerms ?>">
+												<?php
 
-									?>
-											<input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms ?>">
-									<?php
-
-												$optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
+												$optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms;
 											}
 
-										foreach ($Payment as $pay1) :
+										foreach ($Payment as $pay1):
 
 											if ($Terms != $pay1->PaymentID) {
 
-												$optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
+												$optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms;
 											}
 										endforeach;
 									}
@@ -1168,7 +1173,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Description of Payable Terms<span class="text-danger">*</span></label>
 									<?php
 
-									$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+									$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
 									echo form_input($data);
 									?>
 								</div>
@@ -1185,7 +1190,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
 									<div>
 										<?php
-										$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
+										$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true');
 										echo form_input($data);
 										?>
 									</div>
@@ -1214,7 +1219,8 @@ if (!empty($INRSYMBOL)) {
 							<br>
 							<div class="form-row">
 								<div class="table-responsive">
-									<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
+									<table id="revenueTax" class="table table-striped table-hover mb-0"
+										style="font-size:12px;">
 										<thead>
 
 											<tr>
@@ -1239,7 +1245,7 @@ if (!empty($INRSYMBOL)) {
 												foreach ($POItem as $record) {
 													//print_r($POItem);
 													$index = $index + 1;
-											?>
+													?>
 													<tr id="<?php echo $index; ?>">
 														<td align="left"><?php echo $index; ?></td>
 														<td><?php echo $record->ReqNo ?></td>
@@ -1248,94 +1254,203 @@ if (!empty($INRSYMBOL)) {
 														<td><?php echo $record->UOM ?></td>
 														<td align="right"><?php echo $record->Rate ?></td>
 
-														<td align="right"><?php echo number_format($record->BasicValue, 2, '.', '') ?></td>
+														<td align="right">
+															<?php echo number_format($record->BasicValue, 2, '.', '') ?></td>
 
 														<td align="right"><?php echo $record->Taxamount ?></td>
 														<td align="right"><?php echo $record->TotalValue ?></td>
-														<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
-														<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
-														<input type="hidden" name="<?php echo 'AvlAmount' . $index ?>" id="<?php echo 'AvlAmount' . $index ?>" value="<?php echo $AvlAmount; ?>" />
-														<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
-														<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
-														<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
-														<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo $record->MaterialName; ?>" />
-														<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
-														<input type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+														<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>"
+															id="<?php echo 'Reqnumber' . $index ?>"
+															value="<?php echo $record->ReqNo; ?>" />
+														<input type="hidden" name="<?php echo 'departmentName' . $index ?>"
+															id="<?php echo 'departmentName' . $index ?>"
+															value="<?php echo $record->DepartmentName; ?>" />
+														<input type="hidden" name="<?php echo 'AvlAmount' . $index ?>"
+															id="<?php echo 'AvlAmount' . $index ?>"
+															value="<?php echo $AvlAmount; ?>" />
+														<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>"
+															id="<?php echo 'LineItemNo' . $index ?>"
+															value="<?php echo $record->LineItemNo; ?>" />
+														<input type="hidden" name="<?php echo 'costCode' . $index ?>"
+															id="<?php echo 'costCode' . $index ?>"
+															value="<?php echo $record->CostCenterCode; ?>" />
+														<input type="hidden" name="<?php echo 'materialCode' . $index ?>"
+															id="<?php echo 'materialCode' . $index ?>"
+															value="<?php echo $record->MaterialCode; ?>" />
+														<input type="hidden" name="<?php echo 'materialName' . $index ?>"
+															id="<?php echo 'materialName' . $index ?>"
+															value="<?php echo $record->MaterialName; ?>" />
+														<input type="hidden" name="<?php echo 'uom' . $index ?>"
+															id="<?php echo 'uom' . $index ?>"
+															value="<?php echo $record->UOM; ?>" />
+														<input type="hidden" name="<?php echo 'quantity' . $index ?>"
+															id="<?php echo 'quantity' . $index ?>"
+															value="<?php echo $record->Quantity; ?>" />
 
-														<input type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-														<input type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
-														<input type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+														<input type="hidden" name="<?php echo 'itemRate' . $index ?>"
+															id="<?php echo 'itemRate' . $index ?>"
+															value="<?php echo $record->Rate; ?>" />
+														<input type="hidden" name="<?php echo 'per' . $index ?>"
+															id="<?php echo 'per' . $index ?>"
+															value="<?php echo $record->Per; ?>" />
+														<input type="hidden" name="<?php echo 'service_description' . $index ?>"
+															id="<?php echo 'service_description' . $index ?>"
+															value="<?php echo $record->ServiceMaterialDescription; ?>" />
 
-														<input type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-														<input type="hidden" name="<?php echo 'beforeDisType' . $index ?>" id="<?php echo 'beforeDisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-														<input type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-														<input type="hidden" name="<?php echo 'beforeDisVal' . $index ?>" id="<?php echo 'beforeDisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-														<input type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-														<input type="hidden" name="<?php echo 'beforeAfterDisVal' . $index ?>" id="<?php echo 'beforeAfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-														<input type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
-														<input type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-														<input type="hidden" name="<?php echo 'beforePackType' . $index ?>" id="<?php echo 'beforePackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-														<input type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-														<input type="hidden" name="<?php echo 'beforePackVal' . $index ?>" id="<?php echo 'beforePackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-														<input type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-														<input type="hidden" name="<?php echo 'beforeAfterPackVal' . $index ?>" id="<?php echo 'beforeAfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-														<input type="hidden" name="<?php echo 'VatOption' . $index ?>" id="<?php echo 'VatOption' . $index ?>" value="<?php echo isset($record->VatCalulatedOn) ? $record->VatCalulatedOn : ''; ?>" />
-														<input type="hidden" name="<?php echo 'VatVal' . $index ?>" id="<?php echo 'VatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /> <!-- SGST-->
-														<input type="hidden" name="<?php echo 'beforeVatVal' . $index ?>" id="<?php echo 'beforeVatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /><!-- SGST-->
-														<input type="hidden" name="<?php echo 'AfterVatVal' . $index ?>" id="<?php echo 'AfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
-														<input type="hidden" name="<?php echo 'beforeAfterVatVal' . $index ?>" id="<?php echo 'beforeAfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
-														<input type="hidden" name="<?php echo 'GSTVal' . $index ?>" id="<?php echo 'GSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
-														<input type="hidden" name="<?php echo 'beforeGSTVal' . $index ?>" id="<?php echo 'beforeGSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
-														<input type="hidden" name="<?php echo 'AfterGSTVal' . $index ?>" id="<?php echo 'AfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
-														<input type="hidden" name="<?php echo 'beforeAfterGSTVal' . $index ?>" id="<?php echo 'beforeAfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
-														<input type="hidden" name="<?php echo 'OtherTaxVal' . $index ?>" id="<?php echo 'OtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
-														<input type="hidden" name="<?php echo 'beforeOtherTaxVal' . $index ?>" id="<?php echo 'beforeOtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
-														<input type="hidden" name="<?php echo 'AfterOtherTaxVal' . $index ?>" id="<?php echo 'AfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
-														<input type="hidden" name="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" id="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
+														<input type="hidden" name="<?php echo 'DisType' . $index ?>"
+															id="<?php echo 'DisType' . $index ?>"
+															value="<?php echo $record->DiscountType; ?>" />
+														<input type="hidden" name="<?php echo 'beforeDisType' . $index ?>"
+															id="<?php echo 'beforeDisType' . $index ?>"
+															value="<?php echo $record->DiscountType; ?>" />
+														<input type="hidden" name="<?php echo 'DisVal' . $index ?>"
+															id="<?php echo 'DisVal' . $index ?>"
+															value="<?php echo $record->DiscountValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeDisVal' . $index ?>"
+															id="<?php echo 'beforeDisVal' . $index ?>"
+															value="<?php echo $record->DiscountValue; ?>" />
+														<input type="hidden" name="<?php echo 'AfterDisVal' . $index ?>"
+															id="<?php echo 'AfterDisVal' . $index ?>"
+															value="<?php echo $record->AfterDiscount; ?>" />
+														<input type="hidden" name="<?php echo 'beforeAfterDisVal' . $index ?>"
+															id="<?php echo 'beforeAfterDisVal' . $index ?>"
+															value="<?php echo $record->AfterDiscount; ?>" />
+														<input type="hidden" name="<?php echo 'PackOption' . $index ?>"
+															id="<?php echo 'PackOption' . $index ?>"
+															value="<?php echo $record->PackagingCalulatedOn; ?>" />
+														<input type="hidden" name="<?php echo 'PackType' . $index ?>"
+															id="<?php echo 'PackType' . $index ?>"
+															value="<?php echo $record->PackagingType; ?>" />
+														<input type="hidden" name="<?php echo 'beforePackType' . $index ?>"
+															id="<?php echo 'beforePackType' . $index ?>"
+															value="<?php echo $record->PackagingType; ?>" />
+														<input type="hidden" name="<?php echo 'PackVal' . $index ?>"
+															id="<?php echo 'PackVal' . $index ?>"
+															value="<?php echo $record->PackagingValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforePackVal' . $index ?>"
+															id="<?php echo 'beforePackVal' . $index ?>"
+															value="<?php echo $record->PackagingValue; ?>" />
+														<input type="hidden" name="<?php echo 'AfterPackVal' . $index ?>"
+															id="<?php echo 'AfterPackVal' . $index ?>"
+															value="<?php echo $record->AfterPackagingValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeAfterPackVal' . $index ?>"
+															id="<?php echo 'beforeAfterPackVal' . $index ?>"
+															value="<?php echo $record->AfterPackagingValue; ?>" />
+														<input type="hidden" name="<?php echo 'VatOption' . $index ?>"
+															id="<?php echo 'VatOption' . $index ?>"
+															value="<?php echo isset($record->VatCalulatedOn) ? $record->VatCalulatedOn : ''; ?>" />
+														<input type="hidden" name="<?php echo 'VatVal' . $index ?>"
+															id="<?php echo 'VatVal' . $index ?>"
+															value="<?php echo $record->SGST; ?>" /> <!-- SGST-->
+														<input type="hidden" name="<?php echo 'beforeVatVal' . $index ?>"
+															id="<?php echo 'beforeVatVal' . $index ?>"
+															value="<?php echo $record->SGST; ?>" /><!-- SGST-->
+														<input type="hidden" name="<?php echo 'AfterVatVal' . $index ?>"
+															id="<?php echo 'AfterVatVal' . $index ?>"
+															value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
+														<input type="hidden" name="<?php echo 'beforeAfterVatVal' . $index ?>"
+															id="<?php echo 'beforeAfterVatVal' . $index ?>"
+															value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
+														<input type="hidden" name="<?php echo 'GSTVal' . $index ?>"
+															id="<?php echo 'GSTVal' . $index ?>"
+															value="<?php echo $record->CGST; ?>" /><!-- CGST-->
+														<input type="hidden" name="<?php echo 'beforeGSTVal' . $index ?>"
+															id="<?php echo 'beforeGSTVal' . $index ?>"
+															value="<?php echo $record->CGST; ?>" /><!-- CGST-->
+														<input type="hidden" name="<?php echo 'AfterGSTVal' . $index ?>"
+															id="<?php echo 'AfterGSTVal' . $index ?>"
+															value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
+														<input type="hidden" name="<?php echo 'beforeAfterGSTVal' . $index ?>"
+															id="<?php echo 'beforeAfterGSTVal' . $index ?>"
+															value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
+														<input type="hidden" name="<?php echo 'OtherTaxVal' . $index ?>"
+															id="<?php echo 'OtherTaxVal' . $index ?>"
+															value="<?php echo $record->IGST; ?>" /><!-- IGST-->
+														<input type="hidden" name="<?php echo 'beforeOtherTaxVal' . $index ?>"
+															id="<?php echo 'beforeOtherTaxVal' . $index ?>"
+															value="<?php echo $record->IGST; ?>" /><!-- IGST-->
+														<input type="hidden" name="<?php echo 'AfterOtherTaxVal' . $index ?>"
+															id="<?php echo 'AfterOtherTaxVal' . $index ?>"
+															value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
+														<input type="hidden"
+															name="<?php echo 'beforeAfterOtherTaxVal' . $index ?>"
+															id="<?php echo 'beforeAfterOtherTaxVal' . $index ?>"
+															value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
 														<!-- <input type="hidden" name="<?php echo 'FreightOption' . $index ?>" id="<?php echo 'FreightOption' . $index ?>" value="<?php echo isset($record->FreightCalulatedOn) ? $record->FreightCalulatedOn : ''; ?>" /> -->
-														<input type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-														<input type="hidden" name="<?php echo 'beforeFreightType' . $index ?>" id="<?php echo 'beforeFreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-														<input type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-														<input type="hidden" name="<?php echo 'beforeFreightVal' . $index ?>" id="<?php echo 'beforeFreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-														<input type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-														<input type="hidden" name="<?php echo 'beforeAfterFreightVal' . $index ?>" id="<?php echo 'before-AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-														<input type="hidden" name="<?php echo 'Nooftrips' . $index ?>" id="<?php echo 'Nooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-														<input type="hidden" name="<?php echo 'beforeNooftrips' . $index ?>" id="<?php echo 'beforeNooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-														<input type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
-														<input type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-														<input type="hidden" name="<?php echo 'beforeInsval' . $index ?>" id="<?php echo 'beforeInsval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-														<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
-														<input type="hidden" name="<?php echo 'beforeqty' . $index ?>" id="<?php echo 'beforeqty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-														<input type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+														<input type="hidden" name="<?php echo 'FreightType' . $index ?>"
+															id="<?php echo 'FreightType' . $index ?>"
+															value="<?php echo $record->FreightType; ?>" />
+														<input type="hidden" name="<?php echo 'beforeFreightType' . $index ?>"
+															id="<?php echo 'beforeFreightType' . $index ?>"
+															value="<?php echo $record->FreightType; ?>" />
+														<input type="hidden" name="<?php echo 'FreightVal' . $index ?>"
+															id="<?php echo 'FreightVal' . $index ?>"
+															value="<?php echo $record->FreightValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeFreightVal' . $index ?>"
+															id="<?php echo 'beforeFreightVal' . $index ?>"
+															value="<?php echo $record->FreightValue; ?>" />
+														<input type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>"
+															id="<?php echo 'AfterFreightVal' . $index ?>"
+															value="<?php echo $record->AfterFreightValue; ?>" />
+														<input type="hidden"
+															name="<?php echo 'beforeAfterFreightVal' . $index ?>"
+															id="<?php echo 'before-AfterFreightVal' . $index ?>"
+															value="<?php echo $record->AfterFreightValue; ?>" />
+														<input type="hidden" name="<?php echo 'Nooftrips' . $index ?>"
+															id="<?php echo 'Nooftrips' . $index ?>"
+															value="<?php echo $record->NoOfTrip; ?>" />
+														<input type="hidden" name="<?php echo 'beforeNooftrips' . $index ?>"
+															id="<?php echo 'beforeNooftrips' . $index ?>"
+															value="<?php echo $record->NoOfTrip; ?>" />
+														<input type="hidden" name="<?php echo 'basicval' . $index ?>"
+															id="<?php echo 'basicval' . $index ?>"
+															value="<?php echo $record->BasicValue; ?>" />
+														<input type="hidden" name="<?php echo 'Insval' . $index ?>"
+															id="<?php echo 'Insval' . $index ?>"
+															value="<?php echo $record->Insurance; ?>" />
+														<input type="hidden" name="<?php echo 'beforeInsval' . $index ?>"
+															id="<?php echo 'beforeInsval' . $index ?>"
+															value="<?php echo $record->Insurance; ?>" />
+														<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>"
+															id="<?php echo 'TotalOrderValue' . $index ?>"
+															value="<?php echo $record->TotalValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeqty' . $index ?>"
+															id="<?php echo 'beforeqty' . $index ?>"
+															value="<?php echo $record->Quantity; ?>" />
+														<input type="hidden" name="<?php echo 'beforeitemRate' . $index ?>"
+															id="<?php echo 'beforeitemRate' . $index ?>"
+															value="<?php echo $record->Rate; ?>" />
 
 
 
-														<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
+														<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>"
+																data-userid="<?php echo $index; ?>" data-toggle="modal"
+																href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
 
 															<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="ri-pencil-fill" data-toggle="tooltip" title="<?php //echo $record->ReqNo; 
-																																											?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  -->
+																	?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  -->
 
 														</td>
 													</tr>
-												<?php
+													<?php
 
 
-													$totBasicAmt  = $totBasicAmt + $record->BasicValue;
-													$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
-													$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
-													$totExciseAmt  = isset($record->AfterExciseDuty) ? $totExciseAmt + $record->AfterExciseDuty : "";
-													$totVATAmt  = $totVATAmt + $record->AfterSGST;
+													$totBasicAmt = $totBasicAmt + $record->BasicValue;
+													$totDiscountAmt = $totDiscountAmt + $record->AfterDiscount;
+													$totPackagingAmt = $totPackagingAmt + $record->AfterPackagingValue;
+													$totExciseAmt = isset($record->AfterExciseDuty) ? $totExciseAmt + $record->AfterExciseDuty : "";
+													$totVATAmt = $totVATAmt + $record->AfterSGST;
 													//$totCSTAmt  = $totCSTAmt + $record->AfterCST;
-													$totGSTAmt  = $totGSTAmt + $record->AfterCGST;
+													$totGSTAmt = $totGSTAmt + $record->AfterCGST;
 
-													$totOtherTaxAmt   = $totOtherTaxAmt + $record->AfterIGST;
-													$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
-													$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
-													$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
+													$totOtherTaxAmt = $totOtherTaxAmt + $record->AfterIGST;
+													$totFreightAmt = $totFreightAmt + $record->AfterFreightValue;
+													$totInsuranceAmt = $totInsuranceAmt + $record->Insurance;
+													$totOrderSummaryAmt = $totOrderSummaryAmt + $record->TotalValue;
 												}
 												?>
-											<?php
-												$RowCount =   $index;
+												<?php
+												$RowCount = $index;
 											}
 											?>
 										</tbody>
@@ -1348,7 +1463,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Basic Amount <?php echo "($INRSYM)" ?> </label>
 
 									<?php
-									$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($totBasicAmt, 2, '.', '')), 'id' => 'txtTotBasicAmount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($totBasicAmt, 2, '.', '')), 'id' => 'txtTotBasicAmount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 
@@ -1358,7 +1473,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Total Discount Amount <?php echo "($INRSYM)" ?> </label>
 
 									<?php
-									$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($totDiscountAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($totDiscountAmt, 2, '.', '')), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 
@@ -1367,7 +1482,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Total SGST Amount <?php echo "($INRSYM)" ?></label>
 
 									<?php
-									$data = array('name' => 'txtTotalVat', 'value' => set_value('txtTotalVat', number_format($totVATAmt, 2, '.', '')), 'id' => 'txtTotalVat',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtTotalVat', 'value' => set_value('txtTotalVat', number_format($totVATAmt, 2, '.', '')), 'id' => 'txtTotalVat', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 
@@ -1376,7 +1491,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Total IGST Amount In INR </label>
 
 									<?php
-									$data = array('name' => 'txtTotalOtherTaxes', 'value' => set_value('txtTotalOtherTaxes', number_format($totOtherTaxAmt, 2, '.', '')), 'id' => 'txtTotalOtherTaxes',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtTotalOtherTaxes', 'value' => set_value('txtTotalOtherTaxes', number_format($totOtherTaxAmt, 2, '.', '')), 'id' => 'txtTotalOtherTaxes', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 
@@ -1385,7 +1500,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Total CGST Amount <?php echo "($INRSYM)" ?> </label>
 
 									<?php
-									$data = array('name' => 'txtTotalGST', 'value' => set_value('txtTotalGST', number_format($totGSTAmt, 2, '.', '')), 'id' => 'txtTotalGST', 'readonly' => 'true',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(0);');
+									$data = array('name' => 'txtTotalGST', 'value' => set_value('txtTotalGST', number_format($totGSTAmt, 2, '.', '')), 'id' => 'txtTotalGST', 'readonly' => 'true', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(0);');
 									echo form_input($data);
 									?>
 
@@ -1396,7 +1511,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Total Packaging Amount <?php echo "($INRSYM)" ?></label>
 
 									<?php
-									$data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing', number_format($totPackagingAmt, 2, '.', '')), 'id' => 'txtTotalPackaing',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing', number_format($totPackagingAmt, 2, '.', '')), 'id' => 'txtTotalPackaing', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 
@@ -1405,7 +1520,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Total Insurance Amount <?php echo "($INRSYM)" ?> </label>
 
 									<?php
-									$data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance', number_format($totInsuranceAmt, 2, '.', '')), 'id' => 'txtTotalInsurance',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance', number_format($totInsuranceAmt, 2, '.', '')), 'id' => 'txtTotalInsurance', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 
@@ -1414,16 +1529,17 @@ if (!empty($INRSYMBOL)) {
 									<label>Total Freight Amount <?php echo "($INRSYM)" ?></label>
 
 									<?php
-									$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($totFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($totFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 
 								</div>
 								<div class="form-group col-md-3">
 									<label>Total Order Amount <?php echo "($INRSYM)" ?> </label>
-									<input type="hidden" name="preTotalOdervalue" value="<?php echo $totOrderSummaryAmt; ?>">
+									<input type="hidden" name="preTotalOdervalue"
+										value="<?php echo $totOrderSummaryAmt; ?>">
 									<?php
-									$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($totOrderSummaryAmt, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($totOrderSummaryAmt, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 								</div>
@@ -1431,9 +1547,9 @@ if (!empty($INRSYMBOL)) {
 							<div class="form-row">
 								<div class="form-group col-md-12">
 									<label>Special Instructions </label> <?php
-																			$data = array('name' => 'txtSpcialInstruction', 'id' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'rows' => '8', 'class' => 'form-control');
-																			echo form_textarea($data);
-																			?>
+									$data = array('name' => 'txtSpcialInstruction', 'id' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'rows' => '8', 'class' => 'form-control');
+									echo form_textarea($data);
+									?>
 									<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value=" ">
 								</div>
 							</div>
@@ -1442,21 +1558,29 @@ if (!empty($INRSYMBOL)) {
 									<div>
 										<input type="file" name="POFile" id="POFile">
 										<?php if ($PrePOFile) { ?>
-											<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
+											<label><a title="previously uploaded PO File"
+													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously
+														uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
 										<?php } ?>
-										<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+										<input type="hidden" id="PrePOFile" name="PrePOFile"
+											value="<?php echo $PrePOFile; ?>" /><br>
 									</div>
 									<div class="btn-container" style="text-align: right;">
-										<input type="button" class="btn btn-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
+
 										<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="txtRowCount" id="txtRowCount"
+											value="<?php echo $RowCount; ?>" />
 										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
 										<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 
-										<!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-										<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+										<input type="button" class="btn btn-secondary" value="Cancel"
+											onClick="window.location ='amendmentpurchaseorder';">
+										<a class="btn btn-primary Save" onclick="Save(0)">&nbsp;&nbsp;<span
+												class="bold">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>
@@ -1473,23 +1597,23 @@ if (!empty($INRSYMBOL)) {
 										<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',
-															];
+									$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";
-															}
-															?>
+									if (isset($POStatus) && !empty($POStatus)) {
+										if (isset($statusMappings[$POStatus])) {
+											echo $statusMappings[$POStatus];
+										} else {
+											echo $POStatus;
+										}
+									} else {
+										echo "Status not provided";
+									}
+									?>
 								</div>
 							</div>
 
@@ -1501,51 +1625,52 @@ if (!empty($INRSYMBOL)) {
 	</div> <!-- content -->
 </div>
 <!-- Modal for Packing Calculation -->
-<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
-	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+<div id="packagingcalmodel" 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">
 			<div class="modal-header">
 				<h4 class="modal-title">Packing Calculation On</h4>
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true">×</button>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 			</div>
 			<div class="modal-body p-4">
 				<form>
-				<div >
-					<input type="radio"  name="optPackaging" checked="checked" value="0" id="optPackagingBasicAmount"> 
-					<label for="optPackagingBasicAmount">Basic Amount</label>
-				</div>
-				
-				<div >
-					<input type="radio"  name="optPackaging" id="optPackagingAfterDiscountAmount" value="1">
-					<label for="optPackagingAfterDiscountAmount">After Discount Amount</label>
-				</div>
+					<div>
+						<input type="radio" name="optPackaging" checked="checked" value="0"
+							id="optPackagingBasicAmount">
+						<label for="optPackagingBasicAmount">Basic Amount</label>
+					</div>
+
+					<div>
+						<input type="radio" name="optPackaging" id="optPackagingAfterDiscountAmount" value="1">
+						<label for="optPackagingAfterDiscountAmount">After Discount Amount</label>
+					</div>
 
 				</form>
 			</div>
 			<div class="modal-footer">
 				<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>
+				<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();">&nbsp;&nbsp;<span
+						class="bold">Ok</span></a>
 			</div>
 		</div>
 	</div>
 </div><!-- /.modal -->
 <!-- Modal for CST Calculation -->
-<div id="CSTCalModel" class="modal fade" tabindex="-1" role="dialog"
-	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+<div id="CSTCalModel" 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">
 			<div class="modal-header">
 				<h4 class="modal-title">CST Calculation On</h4>
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true">×</button>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 			</div>
 			<div class="modal-body p-4">
 				<form>
 					<div class="radio">
-						<label><input type="radio" name="optCST" checked="checked" value="0" id="optCST">Basic Amount</label>
+						<label><input type="radio" name="optCST" checked="checked" value="0" id="optCST">Basic
+							Amount</label>
 					</div>
 					<div class="radio">
 						<label><input type="radio" name="optCST" value="1" id="optCST">Excise Duty</label>
@@ -1554,19 +1679,19 @@ if (!empty($INRSYMBOL)) {
 			</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="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+				<a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();"
+					style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
 			</div>
 		</div>
 	</div>
 </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" style="width:1060px !important ;" >
+<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" style="width:1060px !important ;">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true">×</button>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 			</div>
 			<form>
 				<div class="modal-body p-4">
@@ -1578,7 +1703,7 @@ if (!empty($INRSYMBOL)) {
 								<div>
 									<?php
 
-									$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
+									$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo', 'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 
 									?>
@@ -1589,7 +1714,7 @@ if (!empty($INRSYMBOL)) {
 								<label>Department Name</label>
 								<div>
 									<?php
-									$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+									$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName', 'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
@@ -1598,7 +1723,7 @@ if (!empty($INRSYMBOL)) {
 								<label>Cost Center Code</label>
 								<div>
 									<?php
-									$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+									$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 
 									?>
@@ -1608,7 +1733,7 @@ if (!empty($INRSYMBOL)) {
 								<label>Avl Bud Amt</label>
 								<div>
 									<?php
-									$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+									$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
@@ -1620,7 +1745,7 @@ if (!empty($INRSYMBOL)) {
 								<div>
 									<?php
 
-									$data = array('name' => 'EditMaterialCode', 'value' => set_value('EditMaterialCode'), 'id' => 'EditMaterialCode',  'class' => 'form-control', 'readonly' => 'true');
+									$data = array('name' => 'EditMaterialCode', 'value' => set_value('EditMaterialCode'), 'id' => 'EditMaterialCode', 'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 
 
@@ -1634,7 +1759,7 @@ if (!empty($INRSYMBOL)) {
 								<label>Item Name</label>
 								<div>
 									<?php
-									$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+									$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName', 'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
@@ -1643,54 +1768,54 @@ if (!empty($INRSYMBOL)) {
 								<label>UOM</label>
 								<div>
 									<?php
-									$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
+									$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
 							</div>
 							<div class="form-group col-md-3">
-										<label>Quantity<span class="text-danger">*</span></label>
-										<div>
-											<?php
-											$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
-											echo form_input($data);
-											?>
+								<label>Quantity<span class="text-danger">*</span></label>
+								<div>
+									<?php
+									$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+							</div>
 
-										</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>
-											<?php
-											$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Per</label> <?php
-															$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer',  'class' => 'form-control');
-															echo form_input($data); ?>
-									</div>
-									<div class="form-group col-md-3" style="padding-left: 0px;">
-										<label>Basic Amt <?php echo "($INRSYM)" ?></label>
-										<div>
-											<?php
-											$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
+							<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>
+									<?php
+									$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-3">
+								<label>Per</label> <?php
+								$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer', 'class' => 'form-control');
+								echo form_input($data); ?>
+							</div>
+							<div class="form-group col-md-3" style="padding-left: 0px;">
+								<label>Basic Amt <?php echo "($INRSYM)" ?></label>
+								<div>
+									<?php
+									$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
 						</div>
 
-					
+
 						<div class="form-row">
 							<div class="form-group col-md-3"></div>
 							<div class="form-group col-md-3">
@@ -1699,12 +1824,12 @@ if (!empty($INRSYMBOL)) {
 								<?php
 								$options = array("0" => 'Select Discount Type');
 								//print_r(  $options);
-
+								
 								if (!empty($TaxType)) {
-									foreach ($TaxType as $SID) :
+									foreach ($TaxType as $SID):
 
 
-										$options[$SID->ConfigValue] =  $SID->ConfigValue;
+										$options[$SID->ConfigValue] = $SID->ConfigValue;
 
 									endforeach;
 								}
@@ -1717,7 +1842,7 @@ if (!empty($INRSYMBOL)) {
 								<label>Discount Rate </label>
 
 								<?php
-								$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;');
+								$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 
@@ -1726,7 +1851,7 @@ if (!empty($INRSYMBOL)) {
 								<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
 
 								<?php
-								$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 
@@ -1740,8 +1865,8 @@ if (!empty($INRSYMBOL)) {
 								<?php
 								$options = array("0" => 'Select Freight Type');
 								if (!empty($FreightType)) {
-									foreach ($FreightType as $SID) :
-										$options[$SID->ConfigValue] =  $SID->ConfigValue;
+									foreach ($FreightType as $SID):
+										$options[$SID->ConfigValue] = $SID->ConfigValue;
 									endforeach;
 								}
 								echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "');
@@ -1750,14 +1875,14 @@ if (!empty($INRSYMBOL)) {
 							<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;');
+								$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-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;');
+								$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 							</div>
@@ -1765,10 +1890,10 @@ if (!empty($INRSYMBOL)) {
 
 						<div class="form-row">
 							<div class="form-group col-md-9"></div>
-						    <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
+							<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();');
+								$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight();');
 								echo form_input($data);
 								?>
 							</div>
@@ -1782,12 +1907,12 @@ if (!empty($INRSYMBOL)) {
 									<?php
 									$options = array("0" => 'Select Packaging Type');
 									//print_r(  $options);
-
+									
 									if (!empty($TaxType)) {
-										foreach ($TaxType as $SID) :
+										foreach ($TaxType as $SID):
 
 
-											$options[$SID->ConfigValue] =  $SID->ConfigValue;
+											$options[$SID->ConfigValue] = $SID->ConfigValue;
 
 										endforeach;
 									}
@@ -1801,7 +1926,7 @@ if (!empty($INRSYMBOL)) {
 								<label>Packaging Rate </label>
 								<div>
 									<?php
-									$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging();', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging();', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 								</div>
@@ -1809,7 +1934,7 @@ if (!empty($INRSYMBOL)) {
 							<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;');
+								$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 							</div>
@@ -1821,14 +1946,14 @@ if (!empty($INRSYMBOL)) {
 								<label>CGST in %</label>
 
 								<?php
-								$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
+								$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 							</div>
 							<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;');
+								$data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 							</div>
@@ -1839,14 +1964,14 @@ if (!empty($INRSYMBOL)) {
 								<label>SGST in %</label>
 
 								<?php
-								$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat',  'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
+								$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat', 'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 							</div>
 							<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;');
+								$data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat', 'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 							</div>
@@ -1857,7 +1982,7 @@ if (!empty($INRSYMBOL)) {
 								<label>IGST in %</label>
 								<div>
 									<?php
-									$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 								</div>
@@ -1866,7 +1991,7 @@ if (!empty($INRSYMBOL)) {
 								<label>IGST Amt <?php echo "($INRSYM)" ?></label>
 								<div>
 									<?php
-									$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 								</div>
@@ -1881,7 +2006,7 @@ if (!empty($INRSYMBOL)) {
 								<label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label>
 								<div>
 									<?php
-									$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
+									$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
 									echo form_input($data);
 									?>
 								</div>
@@ -1892,7 +2017,7 @@ if (!empty($INRSYMBOL)) {
 							<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;');
+								$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 							</div>
@@ -1902,8 +2027,9 @@ if (!empty($INRSYMBOL)) {
 
 								<label><?php echo "Revenue Description"; ?></label>
 								<?php
-								$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-								echo form_textarea($data);;
+								$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+								echo form_textarea($data);
+								;
 								?>
 
 							</div>
@@ -1912,7 +2038,8 @@ if (!empty($INRSYMBOL)) {
 				</div>
 				<div class="modal-footer">
 					<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
-					<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
+					<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit
+							Revenue</span></a>
 				</div>
 			</form>
 		</div>
@@ -1927,23 +2054,25 @@ if (!empty($INRSYMBOL)) {
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Freight Calculation On</h4>
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true">×</button>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 			</div>
 			<div class="modal-body p-4">
 				<form>
 
 					<div>
-						<label><input type="radio" name="optfreight" checked="checked" value='0' id="optFreight"> Basic Amount</label>
+						<label><input type="radio" name="optfreight" checked="checked" value='0' id="optFreight"> Basic
+							Amount</label>
 					</div>
 					<div>
-						<label><input type="radio" name="optfreight" id="optFreight" value='1'> After Discount Amount</label>
+						<label><input type="radio" name="optfreight" id="optFreight" value='1'> After Discount
+							Amount</label>
 					</div>
 				</form>
 			</div>
 			<div class="modal-footer">
-				<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>
+				<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>
@@ -1952,55 +2081,60 @@ if (!empty($INRSYMBOL)) {
 
 <!-- Modal for Excise Duty Calculation-->
 
-<div id="ExciseDutyCalModel" class="modal fade" tabindex="-1" role="dialog"
-	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+<div id="ExciseDutyCalModel" 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">
 			<div class="modal-header">
 				<h4 class="modal-title">Excise Duty Calculation On</h4>
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true">×</button>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 			</div>
 			<div class="modal-body p-4">
 				<form>
 					<div class="radio">
-						<label><input type="radio" name="optExcise" checked="checked" value="0" id="optExcise">From Basic Amount</label>
+						<label><input type="radio" name="optExcise" checked="checked" value="0" id="optExcise">From
+							Basic Amount</label>
 					</div>
 					<div class="radio">
-						<label><input type="radio" name="optExcise" value="1" id="optExcise">Basic Amount - Discount Amount</label>
+						<label><input type="radio" name="optExcise" value="1" id="optExcise">Basic Amount - Discount
+							Amount</label>
 					</div>
 					<div class="radio">
-						<label><input type="radio" name="optExcise" value="2" id="optExcise">(Basic Amount - Discount Amount ) + Packing Cost</label>
+						<label><input type="radio" name="optExcise" value="2" id="optExcise">(Basic Amount - Discount
+							Amount ) + Packing Cost</label>
 					</div>
 					<div class="radio">
-						<label><input type="radio" name="optExcise" value="3" id="optExcise">Basic Amount + Packing Cost</label>
+						<label><input type="radio" name="optExcise" value="3" id="optExcise">Basic Amount + Packing
+							Cost</label>
 					</div>
 
 				</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-ligh" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+				<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-ligh" ID="ExciseOption" onclick="SetExciseCalculation();"
+					style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
 			</div>
 		</div>
 	</div>
 </div><!-- /.modal -->
 <!-- Modal for Vat Calculation -->
 
-<div id="VatCalModel" class="modal fade" tabindex="-1" role="dialog"
-	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+<div id="VatCalModel" 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">
 			<div class="modal-header">
 				<h4 class="modal-title">Vat Calculation On</h4>
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true">×</button>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 			</div>
 			<div class="modal-body p-4">
 				<form>
 
 					<div class="radio">
-						<label><input type="radio" name="optVat" checked="checked" value="0" id="optVat">Basic Amount</label>
+						<label><input type="radio" name="optVat" checked="checked" value="0" id="optVat">Basic
+							Amount</label>
 					</div>
 					<div class="radio">
 						<label><input type="radio" name="optVat" value="1" id="optVat">Excise Duty</label>
@@ -2009,7 +2143,8 @@ if (!empty($INRSYMBOL)) {
 			</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="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+				<a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();"
+					style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
 
 			</div>
 		</div>
@@ -2037,11 +2172,11 @@ if (!empty($INRSYMBOL)) {
 	</tr>
 </script> -->
 <script>
-	$(document).ready(function() {
+	$(document).ready(function () {
 		var tempUserId = 0;
 		var index = '1';
 		var userid = '';
-		$("#EDITREVENUE").on("shown.bs.modal", function(e) {
+		$("#EDITREVENUE").on("shown.bs.modal", function (e) {
 
 			var AvlBudAmt = '<?php echo $AvlAmount ?>';
 
@@ -2099,9 +2234,9 @@ if (!empty($INRSYMBOL)) {
 				$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
 				var isAdded = "0";
 				for (i = 0; i < Material.length; i++) {
-					$.each(Material[i], function(idx, obj) {
+					$.each(Material[i], function (idx, obj) {
 						if (obj.ReqNo === id) {
-							$.each(SelectedMaterialList.Mat, function(idx1, el) {
+							$.each(SelectedMaterialList.Mat, function (idx1, el) {
 								if (id == el.ReqNo) {
 									if (el.materialCode == obj.MaterialCode) {
 										isAdded = "1";
@@ -2134,7 +2269,7 @@ if (!empty($INRSYMBOL)) {
 		});
 		$('#BudgetType').attr("style", "pointer-events: none;");
 
-		$('#EditRevenue').click(function() {
+		$('#EditRevenue').click(function () {
 			tinyMCE.triggerSave();
 			if (validateEditRevenueTax() && validateEditExceedLimit()) {
 				var CostCode = $("#EditCostCenter").val();
@@ -2364,7 +2499,7 @@ if (!empty($INRSYMBOL)) {
 				},
 				type: "POST",
 				url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
-				success: function(data) {
+				success: function (data) {
 					$('#loader').hide();
 					if (data) {
 						avalbudAmt = parseFloat(data);
@@ -2430,6 +2565,13 @@ if (!empty($INRSYMBOL)) {
 				//alert('final else for store data');	
 				// $('.content').loader('show');
 				var formData = new FormData($('.CreatePO')[0]);
+
+				if (status == 0) { // for draft
+                  formData.append('changeStatus','STO14');
+				};
+				if (status == 1) { // for approve
+					formData.append('changeStatus','STO26');
+				};
 				$('#loader').show();
 				$.ajax({
 					// data:$('.CreatePO').serialize(),
@@ -2438,8 +2580,8 @@ if (!empty($INRSYMBOL)) {
 					data: formData,
 					processData: false,
 					contentType: false,
-					success: function(data) {
-						// console.log(data);
+					success: function (data) {
+						console.log(data);
 						if (data) {
 							$('#loader').hide();
 							$('#txtRowCount').val('');
@@ -2447,13 +2589,20 @@ if (!empty($INRSYMBOL)) {
 							$('#txtStatus').val('');
 							$('#SpcialInstruction').val('');
 							$('#txtDeliveryAddress').val('')
-							window.location = "amendmentpurchaseorder";
+
+							 window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing";
 
 						} else {
 							$('#loader').hide();
-							alert("Error");
 						}
 
+					},
+					error : function(error){
+                       console.error("error occured" + error);
+					},
+					complete : function (){
+						$('#loader').hide();
+						console.log("ajax call is completed ..!!")
 					}
 
 				});
@@ -2461,8 +2610,10 @@ if (!empty($INRSYMBOL)) {
 
 		}
 	}
+
+
 	// this function is used to clear data changing schedule option
-	$('#Scheduleby').change(function() {
+	$('#Scheduleby').change(function () {
 
 		$("#Deliverydt").datepicker({
 			minDate: 'now',
@@ -2473,13 +2624,13 @@ if (!empty($INRSYMBOL)) {
 		});
 
 	});
-	$('#Deliverydt').change(function() {
+	$('#Deliverydt').change(function () {
 
 		$('#Scheduleby').val('');
 
 	});
 	//  < !--script for table, It works uned the datatable plugin-- >
-	$(function() {
+	$(function () {
 
 		// $('#revenueTax').DataTable({
 		// 	"paging": false,
@@ -2492,7 +2643,7 @@ if (!empty($INRSYMBOL)) {
 		// });
 	});
 	//If others is the payment terms , display mandatory field
-	$("#PaymentTerms").change(function() {
+	$("#PaymentTerms").change(function () {
 		if ($('#PaymentTerms').val().trim() == 'PT08') {
 			$('#otheroptiondiv').show();
 		} else {
@@ -2501,7 +2652,7 @@ if (!empty($INRSYMBOL)) {
 	});
 </script>
 <script>
-	$('#insurancestatus').change(function() {
+	$('#insurancestatus').change(function () {
 		var ans = $("#insurancestatus").val();
 		//alert(ans);
 		if (ans == 0) {
@@ -2517,41 +2668,41 @@ if (!empty($INRSYMBOL)) {
 
 
 <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);
-        });
+	$(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
-        });
-    });
+		// 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);
-        });
+	$(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
-        });
-    });
+		// 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/userListing.php b/app/Views/userListing.php
index a8fa1371..97f1f6f6 100755
--- a/app/Views/userListing.php
+++ b/app/Views/userListing.php
@@ -139,7 +139,7 @@
                                                 } else {
                                                     $cdate =  date('d-m-Y', strtotime($record->createdDtm));
                                                 } ?>
-                                                <td><?php echo $cdate; ?> </td>
+                                                <td><?php echo $cdate; ?></td>
                                                 <!-- <td><?php echo $record->userId ?></td> -->
                                                 <td><?php echo $record->FirstName ?></td>
                                                 <td><?php echo $record->EmailId ?></td>