diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php
index f76c7713..7ce2b9ee 100755
--- a/application/views/editCapitalAmendPO.php
+++ b/application/views/editCapitalAmendPO.php
@@ -2303,7 +2303,16 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
 
     purchaserate = <?php echo Capital_purchaserate_Charge; ?>;
 
-    return parseFloat(purchaserate).toFixed(2);
+     if (isFinite(purchaserate))
+     {
+             
+      return parseFloat(purchaserate).toFixed(2);
+    }
+
+    else
+        return(0);
+
+    //return parseFloat(purchaserate).toFixed(2);
 
     }
     /*
@@ -2318,7 +2327,25 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
 
     CustomDutyExpenses = <?php echo Capital_CustomDutyExpenses_Charge; ?>;
 
-    return parseFloat(CustomDutyExpenses).toFixed(2);
+    //return parseFloat(CustomDutyExpenses).toFixed(2);
+
+    if(isNaN(CustomDutyExpenses))
+    {
+        return(0);
+    }
+
+    else if (isFinite(CustomDutyExpenses))
+     {
+             return parseFloat(CustomDutyExpenses).toFixed(2);
+     }
+
+
+    else
+    {
+    
+      return(0);
+    //return parseFloat(CustomDutyExpenses).toFixed(2);
+    }
 
     }
     /*
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index db223427..ca60d7ce 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -3588,8 +3588,16 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
 
 
     purchaserate = <?php echo Capital_purchaserate_Charge; ?>;
+     if (isFinite(purchaserate))
+     {
+             
+      return parseFloat(purchaserate).toFixed(2);
+    }
 
-    return parseFloat(purchaserate).toFixed(2);
+    else
+        return(0);
+
+    //return parseFloat(purchaserate).toFixed(2);
 
     }
     /*
@@ -3604,7 +3612,24 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
 
     CustomDutyExpenses = <?php echo Capital_CustomDutyExpenses_Charge; ?>;
 
-    return parseFloat(CustomDutyExpenses).toFixed(2);
+    //return parseFloat(CustomDutyExpenses).toFixed(2);
+    if(isNaN(CustomDutyExpenses))
+    {
+        return(0);
+    }
+
+
+     else if (isFinite(CustomDutyExpenses))
+     {
+             return parseFloat(CustomDutyExpenses).toFixed(2);
+     }
+
+
+    else
+    
+    return(0);
+
+    //return parseFloat(CustomDutyExpenses).toFixed(2);
 
     }
     /*
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index db0190bd..802bdac6 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -140,12 +140,15 @@ if(!empty($POMaster))
         $DeliverySchedule=$Req->DeliverySchedule;
         $ServiceDescription=$Req->ServiceDescription;
         $DeliveryOption=$Req->DeliveryOption;
+         $Orderedsum=$Req->TotalOrderValue;
 
     }
 }
-
-
-
+//$AvilableBudget=0;
+$SavedSum=$Orderedsum*$ExchangeRate;
+//echo $SavedSum;
+$AvilableBudget=$SavedSum+$AvlAmount;
+//echo $AvilableBudget;
 
 if(!empty($RequistionDetails))
 {
@@ -1738,7 +1741,8 @@ var NilType = '<?php echo NILTYPE;?>';
 
 var AvlBudAmt = '<?php echo $AvlAmount ?>';
 //alert(AvlBudAmt);
- $('#EditAvlBud').val(AvlBudAmt); 
+ //$('#EditAvlBud').val(AvlBudAmt); 
+ $('#EditAvlBud').val(<?php echo $AvilableBudget?>); 
 
 
 //$('#EditAvlBudAmt').val(<?php echo $AvlAmount; ?>);
@@ -3235,6 +3239,8 @@ $('.EditImport').click(function(){
 
 
 var avalbudAmte=  <?php echo json_encode($AvlAmount, JSON_PRETTY_PRINT) ?>;
+var Sum=<?php echo json_encode($SavedSum, JSON_PRETTY_PRINT) ?>;
+var totavlbud=avalbudAmte+Sum;
 function validateEditExceedLimit()
  {
      //var avalbudAmt = parseFloat($('#EditAvlBudAmt').val());
@@ -3245,7 +3251,7 @@ function validateEditExceedLimit()
      exp=basicAmountRate*exchangerate;
      //console.log(exp); 
      
-     if(exp > avalbudAmte || totalAmount > avalbudAmte)
+     if(exp > totavlbud || totalAmount > totavlbud)
      {
          alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
          $('#EditRate').focus();
@@ -3375,6 +3381,28 @@ TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Total);
 
 
 
+function Budgetcheck()
+{
+   //alert();
+     var totalorderedamount=parseFloat($('#txttot').val());
+     var Exchange=parseFloat($('#ExchangeRate').val());
+     //console.log(Exchange);
+     var totordring=totalorderedamount*Exchange;
+     var TotalSum=totavlbud;
+    //console.log(TotalSum);
+     if(totordring>TotalSum)
+     {
+         alert('You are Exceeding The Budget Amount');
+         return false;
+     }
+
+     else
+     {
+        return true;
+     }
+
+}
+
 
 
 function Save(status)
@@ -3390,7 +3418,7 @@ var txtRowCount = $('#txtRowCount').val();
 var txtDeletedRow = $('#txtDeletedRow').val();
 
 
-if(validate())
+if(validate()&&Budgetcheck())
 {
 	
  if(document.getElementById('ImportTax').rows.length <= 0)
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index cadf472e..fdb2d7ab 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -151,6 +151,8 @@ if(!empty($POMaster))
 //echo $ServiceDescription;
 $SavedSum=$Orderedsum*$ExchangeRate;
 //echo $SavedSum;
+$AvilableBudget=$SavedSum+$AvlAmount;
+//echo $AvilableBudget;
 
 
 if(!empty($RequistionDetails))
@@ -2270,7 +2272,7 @@ if($PONOStatus == PO_RELEASED)
                                                    <label id=labelViewTotalAmount>Total Amount</label>             
                                                             </div>
                                                            <div class="col-md-4">
-                                                                <div class="form-group">
+                                                                <div class="form-group" style="display:none;">
                                                                     <?php
                                                                     $data = array('name' => 'ViewTotalExp','value' => set_value('ViewTotalExp'),'id'=>'ViewTotalExp',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
                                                                     echo form_input($data);
@@ -2743,6 +2745,7 @@ $(document).ready(function () {
             });
 
 var viewAvlBudAmt='<?php echo $AvlAmount?>';
+//var viewAvlBudAmt='<?php echo $AvilableBudget?>';
 $('#ViewAvlBudAmt').val(viewAvlBudAmt);
 
  var SelectedMaterialCode = [];
@@ -2779,7 +2782,7 @@ $('#Schedulediv').hide();
 
 // $('#ExchangeRate').val(<?php echo $ExchangeRate;?>);
 $('#EditAvlBudAmt').val(<?php echo $AvlAmount; ?>);
-
+$('#EditAvlBudAmt').val(<?php echo $AvilableBudget; ?>);
 //var a=$('#ExchangeRate').val();
 //alert(a);
 
@@ -2903,7 +2906,8 @@ $("#txtBasicValue").val('');
           
             var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
            // console.log(Material);
-            var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
+            //var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
+            var AvlBudAmt = '<?php echo $AvilableBudget ?>';
              //alert(JSON.stringify(Material));
             
             
@@ -4019,10 +4023,11 @@ return true;
 
 var avalbudAmte=  <?php echo json_encode($AvlAmount, JSON_PRETTY_PRINT) ?>;
 var Sum=<?php echo json_encode($SavedSum, JSON_PRETTY_PRINT) ?>;
-// console.log(Sum)
+//console.log(Sum)
+//console.log(avalbudAmte);
 
 var totavlbud=avalbudAmte+Sum;
-console.log(totavlbud);
+//console.log(totavlbud);
 function validateEditExceedLimit()
  {
      //var avalbudAmt = parseFloat($('#EditAvlBudAmt').val());
@@ -4055,6 +4060,11 @@ function validateEditExceedLimit()
 
 
 var avalbudAmt=  <?php echo json_encode($AvlAmount, JSON_PRETTY_PRINT) ?>;
+//var avalbudAmte=  <?php echo json_encode($AvlAmount, JSON_PRETTY_PRINT) ?>;
+var Sum=<?php echo json_encode($SavedSum, JSON_PRETTY_PRINT) ?>;
+// console.log(Sum)
+
+var totavlbud=avalbudAmt+Sum;
  function validateExceedLimit()
  {
 
@@ -4068,7 +4078,7 @@ var avalbudAmt=  <?php echo json_encode($AvlAmount, JSON_PRETTY_PRINT) ?>;
      exp=basicAmountRate*exchangerate;
      //console.log(exp); 
      
-     if(exp > avalbudAmt || totalAmount > avalbudAmt)
+     if(exp > totavlbud || totalAmount > totavlbud)
      {
          alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
          $('#Rate').focus();
@@ -5156,6 +5166,27 @@ TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp);
 
 }
 
+function Budgetcheck()
+{
+   //alert();
+    var totalorderedamount=parseFloat($('#txttot').val());
+    var Exchange=parseFloat($('#ExchangeRate').val());
+    //console.log(Exchange);
+    var totordring=totalorderedamount*Exchange;
+    var TotalSum=totavlbud;
+    //console.log(TotalSum);
+    if(totordring>TotalSum)
+    {
+        alert('You are Exceeding The Budget');
+        return false;
+    }
+
+    else
+    {
+       return true;
+    }
+
+}
 
 
 
@@ -5194,7 +5225,7 @@ var txtDeletedRow = $('#txtDeletedRow').val();
 //var TotalOrder=$('#txtToatlOrder').val();
 //alert(TotalOrder);
 //exit();
-if(validate())
+if(validate()&&Budgetcheck())
 {  //alert();
  if(document.getElementById('ImportTax').rows.length <= 0)
    {