From 7b31c5c271b431c2b597179386d35f16ca7616a3 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 14 Sep 2017 14:13:00 +0530
Subject: [PATCH] done capital po issue

---
 application/views/capitalpurchaseorder.php | 8 ++++----
 application/views/editCapitalPo.php        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 873a264a..dca9b1f0 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -2773,7 +2773,7 @@ EditRatechange();
           var Tot =  txtQuantity * RatePerTon;
            if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0')
 			 {
-              $('#txtAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#DiscountType").val()));
+              $('#txtAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#DiscountType").val(),$('#txtDiscount').val()));
 		}
          var discountedValue =  parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()).toFixed(2);
          
@@ -4291,7 +4291,7 @@ function clearAfterAddLineItemAdd(){
           var Tot =  txtQuantity * RatePerTon;
              if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
 			 {
-              $('#txtEditAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#EditDiscountType").val()));
+              $('#txtEditAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#EditDiscountType").val(),$('#txtEditDiscount').val()));
 		}
          var discountedValue =  parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()).toFixed(2);
            
@@ -5572,14 +5572,14 @@ function calculateDiscount(isEdit)
                               	
 	}
  }
-function updateDiscountValuesChange(totAmt,disType){
+function updateDiscountValuesChange(totAmt,disType,disAmt){
 
 			 var basicValue = totAmt;
 			 var DiscountType =disType;
 			
 			
 			 var AfterDiscount = 0.0;
-			  var Discountval = parseFloat($('#txtEditDiscount').val());
+			  var Discountval = parseFloat(disAmt);
 			 if(DiscountType == '<?php echo PERCENTAGE;?>')
 			 {
 				
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index f7cb4cd3..adef76a4 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -3782,7 +3782,7 @@ EditRatechange();
          var Tot =  txtQuantity * RatePerTon;
           if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0')
 			 {
-              $('#txtAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#DiscountType").val()));
+              $('#txtAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#DiscountType").val(),$('#txtDiscount').val()));
 		}
          var discountedValue =  parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()).toFixed(2);
             
@@ -5503,7 +5503,7 @@ function clearAfterAddLineItemAdd(){
             var Tot =  txtQuantity * RatePerTon;
              if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
 			 {
-              $('#txtEditAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#EditDiscountType").val()));
+              $('#txtEditAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#EditDiscountType").val(),$('#txtEditDiscount').val()));
 		}	
             
          var discountedValue =  parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()).toFixed(2);
@@ -6857,14 +6857,14 @@ function calculateDiscount(isEdit)
 	}
  }
 
-function updateDiscountValuesChange(totAmt,disType){
+function updateDiscountValuesChange(totAmt,disType,disAmt){
 
 			 var basicValue = totAmt;
 			 var DiscountType =disType;
 			
 			
 			 var AfterDiscount = 0.0;
-			  var Discountval = parseFloat($('#txtEditDiscount').val());
+			  var Discountval = parseFloat(disAmt);
 			 if(DiscountType == '<?php echo PERCENTAGE;?>')
 			 {