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

done capital po issue

Browse Source
This commit is contained in:
gandhimathi 2017-09-14 14:13:00 +05:30
parent f08f62a0e7
commit 7b31c5c271
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/views/capitalpurchaseorder.php
View File

@ -2773,7 +2773,7 @@ EditRatechange();
var Tot = txtQuantity * RatePerTon; var Tot = txtQuantity * RatePerTon;
if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0') 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); var discountedValue = parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()).toFixed(2);
@ -4291,7 +4291,7 @@ function clearAfterAddLineItemAdd(){
var Tot = txtQuantity * RatePerTon; var Tot = txtQuantity * RatePerTon;
if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0') 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); 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 basicValue = totAmt;
var DiscountType =disType; var DiscountType =disType;
var AfterDiscount = 0.0; var AfterDiscount = 0.0;
var Discountval = parseFloat($('#txtEditDiscount').val()); var Discountval = parseFloat(disAmt);
if(DiscountType == '<?php echo PERCENTAGE;?>') if(DiscountType == '<?php echo PERCENTAGE;?>')
{ {

8
application/views/editCapitalPo.php
View File

@ -3782,7 +3782,7 @@ EditRatechange();
var Tot = txtQuantity * RatePerTon; var Tot = txtQuantity * RatePerTon;
if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0') 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); var discountedValue = parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()).toFixed(2);
@ -5503,7 +5503,7 @@ function clearAfterAddLineItemAdd(){
var Tot = txtQuantity * RatePerTon; var Tot = txtQuantity * RatePerTon;
if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0') 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); 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 basicValue = totAmt;
var DiscountType =disType; var DiscountType =disType;
var AfterDiscount = 0.0; var AfterDiscount = 0.0;
var Discountval = parseFloat($('#txtEditDiscount').val()); var Discountval = parseFloat(disAmt);
if(DiscountType == '<?php echo PERCENTAGE;?>') if(DiscountType == '<?php echo PERCENTAGE;?>')
{ {