From 216e4a9cc6b7afb0b12b3678c51d109f4f47d9ee Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 22 Sep 2017 10:37:13 +0530
Subject: [PATCH] done capital po issues fixed

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

diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 6b453074..979c4c87 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -3493,13 +3493,14 @@ var purchaseRate =  $('#purchaserate').val();
 
              var avalbudAmt = parseFloat($('#CapitalbudAmt').val());
              var basicAmountRate = parseFloat($('#CPTotalAmount').val()); 
+             var discountRate = parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val());
              var totalAmount =  parseFloat($('#txtTotalOrderValue').val()); 
              var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
           if(capitalType!='Domestic'){
             basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
             }
             else{
-            basicAmountRate=parseFloat($('#txtTotalOrderValue').val());
+            basicAmountRate=parseFloat(basicAmountRate) - parseFloat(discountRate);
                 }
              if(basicAmountRate > avalbudAmt)
              {
@@ -4840,6 +4841,8 @@ function validateEditCapitalTax()
 
              var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val());
              var basicAmountRate = parseFloat($('#EditCPTotalAmount').val()); 
+
+              var discountRate = parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()); 
              var totalAmount =  parseFloat($('#EdittxtTotalOrderValue').val()); 
             
             var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
@@ -4847,7 +4850,7 @@ function validateEditCapitalTax()
             basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
             }
             else{
-            basicAmountRate=parseFloat($('#EdittxtTotalOrderValue').val());
+            basicAmountRate=parseFloat(basicAmountRate)- parseFloat(discountRate);
                 }
              if(basicAmountRate > avalbudAmt)
              {
@@ -5732,3 +5735,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){
 
 
 
+
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index d403802f..d96538c4 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -4553,14 +4553,15 @@ var purchaseRate =  $('#purchaserate').val();
      {
 
              var avalbudAmt = parseFloat($('#CapitalbudAmt').val());
-             var basicAmountRate = parseFloat($('#CPTotalAmount').val()); 
+             var basicAmountRate = parseFloat($('#CPTotalAmount').val());
+             var discountRate = parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val());
              var totalAmount =  parseFloat($('#txtTotalOrderValue').val()); 
                var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
           if(capitalType!='Domestic'){
             basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
             }
             else{
-            basicAmountRate=parseFloat($('#txtTotalOrderValue').val());
+            basicAmountRate=parseFloat(basicAmountRate) - parseFloat(discountRate);
                 }
              if(basicAmountRate > avalbudAmt)
              {
@@ -6102,13 +6103,14 @@ function validateEditCapitalTax()
 
              var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val());
              var basicAmountRate = parseFloat($('#EditCPTotalAmount').val()); 
+              var discountRate = parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()); 
              var totalAmount =  parseFloat($('#EdittxtTotalOrderValue').val()); 
               var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
           if(capitalType!='Domestic'){
             basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
             }
             else{
-            basicAmountRate=parseFloat($('#EdittxtTotalOrderValue').val());
+            basicAmountRate=parseFloat(basicAmountRate)- parseFloat(discountRate);
                 }
              if(basicAmountRate > avalbudAmt)
              {
@@ -7096,3 +7098,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){
 
 
 
+