SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

done capital po issues fixed

Browse Source
This commit is contained in:
gandhimathi 2017-09-22 10:37:13 +05:30
parent 68467bddc5
commit 216e4a9cc6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/views/capitalpurchaseorder.php
View File

@ -3493,13 +3493,14 @@ var purchaseRate = $('#purchaserate').val();
var avalbudAmt = parseFloat($('#CapitalbudAmt').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 totalAmount = parseFloat($('#txtTotalOrderValue').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){ if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
} }
else{ else{
basicAmountRate=parseFloat($('#txtTotalOrderValue').val()); basicAmountRate=parseFloat(basicAmountRate) - parseFloat(discountRate);
} }
if(basicAmountRate > avalbudAmt) if(basicAmountRate > avalbudAmt)
{ {
@ -4840,6 +4841,8 @@ function validateEditCapitalTax()
var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val()); var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val());
var basicAmountRate = parseFloat($('#EditCPTotalAmount').val()); var basicAmountRate = parseFloat($('#EditCPTotalAmount').val());
var discountRate = parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val());
var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val()); var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
@ -4847,7 +4850,7 @@ function validateEditCapitalTax()
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
} }
else{ else{
basicAmountRate=parseFloat($('#EdittxtTotalOrderValue').val()); basicAmountRate=parseFloat(basicAmountRate)- parseFloat(discountRate);
} }
if(basicAmountRate > avalbudAmt) if(basicAmountRate > avalbudAmt)
{ {
@ -5732,3 +5735,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){

9
application/views/editCapitalPo.php
View File

@ -4553,14 +4553,15 @@ var purchaseRate = $('#purchaserate').val();
{ {
var avalbudAmt = parseFloat($('#CapitalbudAmt').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 totalAmount = parseFloat($('#txtTotalOrderValue').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){ if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
} }
else{ else{
basicAmountRate=parseFloat($('#txtTotalOrderValue').val()); basicAmountRate=parseFloat(basicAmountRate) - parseFloat(discountRate);
} }
if(basicAmountRate > avalbudAmt) if(basicAmountRate > avalbudAmt)
{ {
@ -6102,13 +6103,14 @@ function validateEditCapitalTax()
var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val()); var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val());
var basicAmountRate = parseFloat($('#EditCPTotalAmount').val()); var basicAmountRate = parseFloat($('#EditCPTotalAmount').val());
var discountRate = parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val());
var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val()); var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){ if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
} }
else{ else{
basicAmountRate=parseFloat($('#EdittxtTotalOrderValue').val()); basicAmountRate=parseFloat(basicAmountRate)- parseFloat(discountRate);
} }
if(basicAmountRate > avalbudAmt) if(basicAmountRate > avalbudAmt)
{ {
@ -7096,3 +7098,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){