SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

service and revenue po bug fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-07-26 16:25:24 +05:30
parent 119c3bbc8c
commit bf2ff73220
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/EditservicePurchaseorder.php
View File

@ -1793,7 +1793,7 @@ $(document).ready(function () {
$TotalSummary = $TotalSummary + $record->TotalValue; $TotalSummary = $TotalSummary + $record->TotalValue;
$TotalBasicAmount = $TotalBasicAmount + $record->BasicValue; $TotalBasicAmount = $TotalBasicAmount + $record->BasicValue * $FrequencyNo;
} }
?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index;?>"> ?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index;?>">

1
application/views/alterpurchaseorder.php
View File

@ -1582,6 +1582,7 @@ function SetExciseCalculationCancel()
if ($("#PackagingType").val()!=0) { if ($("#PackagingType").val()!=0) {
calculatePackaging(isEdit); calculatePackaging(isEdit);
} }
if($("#RevenueCgst").val()!=''){ if($("#RevenueCgst").val()!=''){
$('#RevenueAfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$('#RevenueCgst').val())); $('#RevenueAfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$('#RevenueCgst').val()));

18
application/views/editRevenuepurchaseorder.php
View File

@ -1480,7 +1480,10 @@ function calculatePackaging(isEdit)
else if(FreightType == '<?php echo PERTRIP;?>') else if(FreightType == '<?php echo PERTRIP;?>')
{ {
AfterFreight = <?php echo FREIGHT_PERTRIP;?>; AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
} }
else {
AfterFreight = $("#txtFreight").val();
}
var AfterFreightval = parseFloat(AfterFreight).toFixed(2); var AfterFreightval = parseFloat(AfterFreight).toFixed(2);
$('#txtAfterFreight').val(AfterFreightval); $('#txtAfterFreight').val(AfterFreightval);
@ -1543,7 +1546,10 @@ function calculatePackaging(isEdit)
else if(FreightType == '<?php echo PERTRIP;?>') else if(FreightType == '<?php echo PERTRIP;?>')
{ {
AfterFreight = <?php echo FREIGHT_PERTRIP;?>; AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
} }
else {
AfterFreight = $("#txtEditFreight").val();
}
var AfterFreightval = parseFloat(AfterFreight).toFixed(2); var AfterFreightval = parseFloat(AfterFreight).toFixed(2);
$('#txtEditAfterFreight').val(AfterFreightval); $('#txtEditAfterFreight').val(AfterFreightval);
@ -1725,6 +1731,9 @@ SetVatorCST();
$('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val())); $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val()));
} }
calculateDiscount(1);
calculatePackaging(1);
calculateFreight(1);
calculateEditTotalValue($('#isEdit').val()); calculateEditTotalValue($('#isEdit').val());
} }
@ -4315,6 +4324,11 @@ function change(){
$('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val())); $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val()));
} }
calculateDiscount(0);
calculatePackaging(0);
calculateFreight(0);
calculateTotalValue(); calculateTotalValue();
} }

12
application/views/purchaseorder.php
View File

@ -1769,6 +1769,10 @@ return true;
$('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val())); $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val()));
} }
calculateDiscount(1);
calculatePackaging(1);
calculateFreight(1);
calculateEditTotalValue($('#isEdit').val()); calculateEditTotalValue($('#isEdit').val());
} }
@ -3694,6 +3698,7 @@ $('#Scheduleby').change(function(){
}); });
function change(){ function change(){
ExceedQuantityCheck(); ExceedQuantityCheck();
if($('#Quantity').val() != '' && $('#Rate').val() != '') if($('#Quantity').val() != '' && $('#Rate').val() != '')
{ {
@ -3714,7 +3719,14 @@ function change(){
$('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val())); $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val()));
} }
calculateDiscount(0);
calculatePackaging(0);
calculateFreight(0);
calculateTotalValue(); calculateTotalValue();
} }