diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index df5aafb0..8b4676d5 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -500,6 +500,7 @@ if (!empty($getlogpodtl)) {
 							$("#ItemName").val(obj.MaterialName);
 							$("#UOM").val(obj.UOM);
 							$("#Quantity").val(obj.Quantity);
+							$("#Rate").val(obj.material_rate);
 							RequistQuantity = obj.Quantity;
 
 							var materialn = obj.MaterialName;
@@ -510,6 +511,10 @@ if (!empty($getlogpodtl)) {
 								$('#OtheritemDescription').val(obj.MaterialDescription);
 							}
 
+							if(obj.material_rate != 0){
+								Ratechange();
+							}
+
 
 						}
 					});
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index 9991086e..cd22d284 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -3935,6 +3935,7 @@ if (!empty($getlogpodtl)) {
       $("#CPUOM").val('');
       $("#CPQuantity").val('');
       $("#CPTotalAmount").val('');
+      $("#CPRate").val('');
       RequistQuantity = '';
       clearTaxField();
       if (id != '0') {
@@ -3946,12 +3947,16 @@ if (!empty($getlogpodtl)) {
               $("#CapitalItemName").val(obj.MaterialName);
               $("#CPUOM").val(obj.UOM);
               $("#CPQuantity").val(obj.Quantity);
+              $("#CPRate").val(obj.material_rate);
               RequistQuantity = obj.Quantity;
 
               var CPUOMDisplay = obj.UOM;
 
               $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
               $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
+              if(obj.material_rate != 0){
+                Ratechange();calculateFreight(3);calculateFreightlocaddper();
+              }
 
 
 
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 2bcfd617..c68ab4c3 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -541,6 +541,10 @@ if (!empty($getlogpodtl)) {
 							$("#ItemName").val(obj.MaterialName);
 							$("#UOM").val(obj.UOM);
 							$("#Quantity").val(obj.Quantity);
+							$("#Rate").val(obj.material_rate);
+							if(obj.material_rate != 0){
+								change();
+							}
 							RequistQuantity = obj.Quantity;
 						}
 					});
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 4856b6e6..08252d8c 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -3375,6 +3375,12 @@ if (!empty($getlogpodtl)) {
                         $("#ItemName").val(obj.MaterialName);
                         $("#UOM").val(obj.UOM);
                         $("#Quantity").val(obj.Quantity).trigger('change');
+                        $("#Rate").val(obj.material_rate);
+                        if(obj.material_rate != 0){
+                            Ratechange();
+                            validateExceedLimit();
+                            calculateFreight(0);
+                        }
                         RequistQuantity = obj.Quantity;
                         reqq = RequistQuantity;
                         //RequistQuantity=parseFloat($('#Quantity').val());
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index 88d6e852..c4ee6fde 100755
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -1052,7 +1052,7 @@ if (!empty($INRSYMBOL)) {
 							</div><!-- 6. form-row div closed here -->
 							<div class="form-row">
 								<div class="table-responsive" style="padding-bottom: 30px;">
-								    <table id="serviceTax" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
+								    <table id="ServiceTable" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
 										<thead>
 											<tr>
 												<th style="white-space: nowrap !important;">SNo</th>
@@ -1071,7 +1071,7 @@ if (!empty($INRSYMBOL)) {
 										</thead>
 										<tbody id='ServiceAppend'>
 										</tbody>
-									</table><!-- serviceTax table closed here -->
+									</table><!-- ServiceTable table closed here -->
 								</div>
 							</div><!-- 7. form-row div closed here -->
 
@@ -2101,7 +2101,7 @@ if (!empty($INRSYMBOL)) {
 
 	function populateValueMainFormForEditServiceTax() {
 
-		var rows = $('#serviceTax tbody tr').length;
+		var rows = $('#ServiceTable tbody tr').length;
 
 		var TotCgst = 0;
 		var TotSgst = 0;
diff --git a/public/assets/js/CreatePOValidation.js b/public/assets/js/CreatePOValidation.js
index 92e8ab86..559e8828 100755
--- a/public/assets/js/CreatePOValidation.js
+++ b/public/assets/js/CreatePOValidation.js
@@ -145,7 +145,7 @@ function serviceValidate(){
         alert('Please Select Budget Type');
         $('#BudgetType').focus();
         return false;
-    }else if ($('#serviceTax tbody tr').length < 1) {
+    }else if ($('#ServiceTable tbody tr').length < 1) {
 		alert('Atleast One Line needed');
 		return false;
 	} else if ($('#descofpo').val().trim() == '') {