diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php index a110e829..313e255b 100755 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -3033,27 +3033,34 @@ EditRatechange(); var BasicInINR=''; var RatePerTon = parseFloat( $('#CPRate').val()); //var txtUnitPrice = parseFloat($('#Rate').val()); - if(capitalType=='International'){ + if(capitalType=='International') + + { txtExchangeRate = parseFloat( $('#ExchangeRtModal').val()); var Tot = txtQuantity * RatePerTon; BasicInINR=Tot * txtExchangeRate; } - else{ - var Tot = txtQuantity * RatePerTon; - if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0') - { - $('#txtAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#DiscountType").val(),$('#txtDiscount').val())); - } - var discountedValue = parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()).toFixed(2); + else + + + { + var Tot = txtQuantity * RatePerTon; + if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0') + { + $('#txtAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#DiscountType").val(),$('#txtDiscount').val())); + } + + + var discountedValue = parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()).toFixed(2); - var Freight=parseFloat($('#txtAfterFreightloc').val() == '' ? '0.00' : $('#txtAfterFreightloc').val()).toFixed(2); + var Freight=parseFloat($('#txtAfterFreightloc').val() == '' ? '0.00' : $('#txtAfterFreightloc').val()).toFixed(2); txtExchangeRate = 1; BasicInINR=(Tot * txtExchangeRate - discountedValue); - } + } var CPtotal=parseFloat(BasicInINR)+parseFloat(Freight); @@ -3061,7 +3068,7 @@ EditRatechange(); $('#CPTotalAmount').val(parseFloat(Tot).toFixed(2)); - $('#AfterBasicPriceTax').val(parseFloat(BasicInINR).toFixed(2)); + $('#AfterBasicPriceTax').val(parseFloat(BasicInINR).toFixed(2)); // var a=$('#AfterBasicPriceTax').val(); // console.log(a); @@ -3106,13 +3113,20 @@ EditRatechange(); $('#AvailableModvat').val(calculateAvailableModvatCharge($('#AfterExcisedutyTax').val(),$('#AfterExcisedutyEDcess').val(),$('#AfterExcisedutySHcess').val(),$('#AfterAdditionalExciseduty').val())); $('#Grossexpenses').val(calculateGrossexpensesCharge($('#Grossdutypayable').val(),$('#AvailableModvat').val())); - if($('#PurQuantity').val()!='' && $('#PurQuantity').val()!='0'){ + + + + if($('#PurQuantity').val()!='' && $('#PurQuantity').val()!='0') + { $('#purchaserate').val(calculatepurchaserate($('#AfterBasicPriceTax').val(),$('#PurQuantity').val())); $('#CustomDutyExpenses').val(calculateCustomDutyExpenses($('#Grossexpenses').val(),$('#PurQuantity').val())); $('#RMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#purchaserate').val(),$('#CustomDutyExpenses').val())); var Rmc = $('#RMCIncludingCustomers').val(); var Quanty =$('#CPQuantity').val(); var BasicAmt = $('#CPTotalAmount').val(); + + + var perKg = parseFloat(BasicAmt).toFixed(2); @@ -3128,6 +3142,7 @@ EditRatechange(); var BasicAmt = $('#CPTotalAmount').val(); var perKg = parseFloat(BasicAmt).toFixed(2); + alert('dfg'); $('#txtTotalOrderValue').val(perKg); @@ -3629,7 +3644,7 @@ var purchaseRate = $('#purchaserate').val(); // console.log(AfterFreightAmountloc); - var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)).toFixed(2); + var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)+parseFloat(AfterFreightAmountloc)).toFixed(2); var TotalOrderValuePerkg = $("#txtTotalOrderValue").val(); @@ -3837,6 +3852,10 @@ var purchaseRate = $('#purchaserate').val(); var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val(); var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val(); var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val(); + + var Freight=parseFloat($('#txtAfterFreightloc').val() == '' ? '0.00' : $('#txtAfterFreightloc').val()).toFixed(2); + + var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val(); var ServiceTaxAmount = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val(); var EduCessTaxAmount = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val(); @@ -3858,7 +3877,7 @@ var purchaseRate = $('#purchaserate').val(); var purchaseRate = $('#purchaserate').val() == '' ? '0.00' : $('#purchaserate').val(); var CustomDutyExpenses = $('#CustomDutyExpenses').val() == '' ? '0.00' : $('#CustomDutyExpenses').val(); var RMCIncludingCustomers = $('#RMCIncludingCustomers').val() == '' ? '0.00' : $('#RMCIncludingCustomers').val(); - var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2); + var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)+parseFloat(Freight)).toFixed(2); var tot = parseFloat(totvalue).toFixed(2); $('#txtTotalOrderValue').val(tot); @@ -3925,7 +3944,7 @@ var purchaseRate = $('#purchaserate').val(); var AfterFreight = $('#txtAfterFreightloc').val() == '' ? '0.00' : $('#txtAfterFreightloc').val(); // var totvalue = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val(); - var totvalue = (parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)).toFixed(2); + var totvalue = (parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(AfterFreight)).toFixed(2); var TotalOrderValueSummary = $('#txtToatlOrder').val() == '' ? '0.00' : $('#txtToatlOrder').val(); @@ -3987,7 +4006,7 @@ var purchaseRate = $('#purchaserate').val(); $('#txtTotalFreight').val((parseFloat(totFreightAmt) + parseFloat(Freight)).toFixed(2)); $('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary) + parseFloat(totvalue)).toFixed(2) ); - $('#CapitalToatlOrder').val((parseFloat(TotalCapitalOrder) + parseFloat(BasicVal) + parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2) ); + $('#CapitalToatlOrder').val((parseFloat(TotalCapitalOrder) + parseFloat(BasicVal) + parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(OtherAmt)+parseFloat(AfterFreight)).toFixed(2) ); $('#CapitalBasicOrder').val((parseFloat(TotalBasicOrder) + parseFloat(BasicVal) + parseFloat(disRate)).toFixed(2)); @@ -4935,7 +4954,7 @@ function clearAfterAddLineItemAdd(){ var DisVal = $("#txtEditDiscount").val(); var AfterDisVal = $("#txtEditAfterDiscount").val(); - var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)).toFixed(2); + var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)+parseFloat(FreightRateAmountloc)).toFixed(2); @@ -5098,6 +5117,9 @@ function validateEditCapitalTax() var AfterSgst = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val(); var AfterIgst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); var OtherAmt = $('#EditOtherAllowances').val() == '' ? '0.00' : $('#EditOtherAllowances').val(); + +var Freight=parseFloat($('#txtAfterFreightlocedit').val() == '' ? '0.00' : $('#txtAfterFreightlocedit').val()).toFixed(2); + var ServiceTaxAmount = $('#EditAfterServiceTax').val() == '' ? '0.00' : $('#EditAfterServiceTax').val(); var EduCessTaxAmount = $('#EditAfterEduCess').val() == '' ? '0.00' : $('#EditAfterEduCess').val(); var SecHighTaxAmount = $('#EditAfterSecHighTax').val() == '' ? '0.00' : $('#EditAfterSecHighTax').val(); @@ -5118,7 +5140,7 @@ function validateEditCapitalTax() var purchaseRate = $('#Editpurchaserate').val() == '' ? '0.00' : $('#Editpurchaserate').val(); var CustomDutyExpenses = $('#EditCustomDutyExpenses').val() == '' ? '0.00' : $('#EditCustomDutyExpenses').val(); var RMCIncludingCustomers = $('#EditRMCIncludingCustomers').val() == '' ? '0.00' : $('#EditRMCIncludingCustomers').val(); - var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2); + var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)+parseFloat(Freight)).toFixed(2); var tot = parseFloat(totvalue).toFixed(2); @@ -5272,7 +5294,7 @@ function validateEditCapitalTax() TotGrossexpense = parseFloat(TotGrossexpense) + parseFloat(TotGrossexpenseI); TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI); - CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI) + parseFloat(TotalCgstI) + parseFloat(TotalSgstI) + parseFloat(TotalIgstI) + parseFloat(TotOtherI); + CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI) + parseFloat(TotalCgstI) + parseFloat(TotalSgstI) + parseFloat(TotalIgstI) + parseFloat(TotOtherI)+parseFloat(TotalFreight); TotBasicAmt=parseFloat(TotBasicAmt) + parseFloat(TotBasicAmtI); TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); @@ -6226,7 +6248,7 @@ var Calculation = document.querySelector('input[name = "optPackaging"]:checked') $('#txtAfterFreightloc').val(txtAfterFreightloc); } - +Ratechange(); } diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php index d825615c..cbf80c02 100755 --- a/application/views/editCapitalAmendPO.php +++ b/application/views/editCapitalAmendPO.php @@ -44,6 +44,8 @@ $exchangeRate = $ExchangeRate; $ConfigValue=''; + $tt=0.0; + $TotalLanding=0; $tothighseas=0; $totcustom=0; @@ -950,9 +952,12 @@ document.getElementById('dispatchinternational').style.display = 'block'; Rate ?> Rate * $record->Quantity,2,'.',''); ?> ServiceTaxamount;}else if($CapitalRange=='0'){echo "0.0"; }?> + - TotalValue; ?> + + TotalValue+$record->Afvalue; ?> + Rate * $record->Quantity),2,'.',''); ?> After_SGST; $TotalCGST = $TotalCGST+$record->After_CGST; $TotalIGST = $TotalIGST+$record->After_IGST; - $FinalTotalBasic = $FinalTotalBasic + ($record->Rate * $record->Quantity); + $FinalTotalBasic = $FinalTotalBasic + ($record->Rate * $record->Quantity); + + $f=($record->Rate * $record->Quantity); + + $Totalotherallowances = $Totalotherallowances+$record->otherallowance; $TotalDiscountedAmt = $TotalDiscountedAmt+ $record->Afterdiscountval; $TotalSummary = $TotalSummary+$record->ServiceTaxamount;//tax //echo 'TAx' . $TotalSummary; - $TotalBasicAmount = $TotalBasicAmount+((($record->Rate * $record->Quantity)+($TotalSummary)+($Totalotherallowances))-(($TotalDiscountedAmt)));//basic - $TotalFreightvalue=$TotalFreightvalue+$record->Afvalue; + + + // $TotalBasicAmount = $TotalBasicAmount+((($record->Rate * $record->Quantity)+($TotalSummary)+($Totalotherallowances))-(($TotalDiscountedAmt)));//basic + + // $TotalBasicAmount =$TotalBasicAmount+ (($record->Rate * $record->Quantity) +($record->After_CGST) + ($record->After_SGST) + ($record->After_IGST) + ($record->otherallowance)+($record->Afvalue))- $record->Afterdiscountval; + + $TotalBasicAmount=$TotalBasicAmount+$record->TotalValue; + + // echo $TotalBasicAmount; + + + + + + // echo $totalCapitalOrder; + + + //echo $record->TotalValue; + //echo 'ALL' . $TotalBasicAmount; //$ServiceDescription = $ServiceDescription; } @@ -1162,7 +1188,7 @@ document.getElementById('dispatchinternational').style.display = 'block'; if($CapitalRange=='1'){ $totalCapitalOrder = $totalCapitalOrder+$TotalBasicAmount; - // echo 'FNAL' . $totalCapitalOrder; + //echo 'FNAL' . $totalCapitalOrder; } else if($CapitalRange=='0') @@ -2043,7 +2069,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
- + 'Totalservicesummary','value' => set_value('Totalservicesummary',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'Totalservicesummary', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -3132,9 +3158,10 @@ $('#PurQuantity').val(''); $('#EditIgst').val($('#IGST'+userid).val()); $('#EditAfterIgst').val($('#afterIGST'+userid).val()); $('#EditOtherAllowances').val($('#otherallowance'+userid).val()); - $('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val()); - + //$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val()); + $('#Editservicetotalordervaue').val(cellval[8].innerHTML); + $('#drpFreighteditloc').val($('#Ftype'+userid).val()); $('#NOOfTripslocedit').val($('#NoTrip'+userid).val()); @@ -3520,7 +3547,11 @@ EditRatechange(); $('#EditAfterIgst').val(calculateServiceIGST(editCPtotal,$("#EditIgst").val()== '' ? "0.00" : $('#EditIgst').val())); - var tempEditservicetotalordervaue=(parseFloat($('#EditCPTotalAmount').val())+parseFloat($('#EditAfterCgst').val())+parseFloat($('#EditAfterSgst').val())+parseFloat($('#EditAfterIgst').val())+parseFloat($('#EditOtherAllowances').val()=='' ? "0.00" : $('#EditOtherAllowances').val())) - parseFloat($('#txtEditAfterDiscount').val()=='' ? "0.00" : $('#txtEditAfterDiscount').val()); + var tempEditservicetotalordervaue=(parseFloat($('#EditCPTotalAmount').val())+parseFloat($('#EditAfterCgst').val())+parseFloat($('#EditAfterSgst').val())+parseFloat($('#EditAfterIgst').val())+parseFloat($('#EditOtherAllowances').val()=='' ? "0.00" : $('#EditOtherAllowances').val())+parseFloat($('#txtAfterFreightlocedit').val()=='' ? "0.00" : $('#txtAfterFreightlocedit').val())) - parseFloat($('#txtEditAfterDiscount').val()=='' ? "0.00" : $('#txtEditAfterDiscount').val()); + + //console.log(tempEditservicetotalordervaue); + + $('#Editservicetotalordervaue').val(parseFloat(tempEditservicetotalordervaue).toFixed(2)); @@ -3701,6 +3732,8 @@ EditRatechange(); var totalservicevalue = $("#Editservicetotalordervaue").val(); + + //console.log(totalservicevalue); //var totalservicevalue = $("#EditCPTotalAmount").val(); var Totaltaxamount = (parseFloat(AfterCGST)+parseFloat(AfterSGST)+parseFloat(AfterIGST)+parseFloat(otherallowance)); //alert(totalservicevalue+"-"+Total); @@ -3993,6 +4026,10 @@ function validateEditCapitalTax() var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val(); //alert('Current Item'+ discountedRateValue); var TotalOrderValueSummaryI = $('#totalservicevalue'+i).val() == '' ? '0.00' : $('#totalservicevalue'+i).val();//FOr Domestic total value + + + //console.log(TotalOrderValueSummaryI); + TotalOrderValueSummaryI=TotalOrderValueSummaryI;//-discountedRateValue; var TotalCGSTTaxI = $('#afterCGST'+i).val() == '' ? '0.00' : $('#afterCGST'+i).val(); var TotalSGSTTaxI = $('#afterSGST'+i).val() == '' ? '0.00' : $('#afterSGST'+i).val(); diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php index c99d03c8..b795db51 100755 --- a/application/views/editCapitalPo.php +++ b/application/views/editCapitalPo.php @@ -29,6 +29,7 @@ $Import_DispatchDetails=''; $Import_PlaceofOrgin=''; $CapitalRange=''; + $tt=0.0; $Deliverydt=''; $DeliverSchedule=''; @@ -1047,7 +1048,7 @@ $("#PaymentMethod").select2(); Rate * $record->Quantity, 2, '.', '') ?> ServiceTaxamount;?> - Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance - $record->Afterdiscountval, 2, '.', '') ?> + Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance+ $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?> @@ -1201,12 +1202,18 @@ $("#PaymentMethod").select2(); $TotalSummary = $TotalSummary+$record->ServiceTaxamount; + $TotalDiscountedAmt = $record->Afterdiscountval; + $ExitDiscountedAmt=$ExitDiscountedAmt+$record->Afterdiscountval; - $totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance - $TotalDiscountedAmt; + + $totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance+$record->Afvalue - $TotalDiscountedAmt; + } $TotalBasicAmount = $TotalBasicAmount+$record->BasicValue; $ServiceDescription = $ServiceDescription; + + if($CapitalRange=='0'){ $TotalLanding = $TotalLanding + $record->AfterLandingCharge; $tothighseas = $tothighseas + $record->AfterHighSeasSalesCharge; @@ -4864,7 +4871,7 @@ var purchaseRate = $('#purchaserate').val(); - var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)).toFixed(2); + var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)+parseFloat(AfterFreightAmountloc)).toFixed(2); var TotalOrderValuePerkg = $("#txtTotalOrderValue").val(); @@ -5054,6 +5061,8 @@ var purchaseRate = $('#purchaserate').val(); return true; } } + + function calculateTotalValue() { var BasicVal = $('#CPTotalAmount').val() == '' ? '0.00' : $('#CPTotalAmount').val(); @@ -5063,6 +5072,10 @@ var purchaseRate = $('#purchaserate').val(); var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val(); var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val(); var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val(); + + var Freight=parseFloat($('#txtAfterFreightloc').val() == '' ? '0.00' : $('#txtAfterFreightloc').val()).toFixed(2); + + var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val(); var ServiceTaxAmount = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val(); var EduCessTaxAmount = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val(); @@ -5084,7 +5097,7 @@ var purchaseRate = $('#purchaserate').val(); var purchaseRate = $('#purchaserate').val() == '' ? '0.00' : $('#purchaserate').val(); var CustomDutyExpenses = $('#CustomDutyExpenses').val() == '' ? '0.00' : $('#CustomDutyExpenses').val(); var RMCIncludingCustomers = $('#RMCIncludingCustomers').val() == '' ? '0.00' : $('#RMCIncludingCustomers').val(); - var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2); + var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)+parseFloat(Freight)).toFixed(2); var tot = parseFloat(totvalue).toFixed(2); $('#txtTotalOrderValue').val(tot); @@ -5215,7 +5228,7 @@ var AfterFreight = $('#txtAfterFreightloc').val() == '' ? '0.00' : $('#txtAfterF $('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary) + parseFloat(totvalue)).toFixed(2) ); - $('#CapitalToatlOrder').val((parseFloat(TotalCapitalOrder) + parseFloat(BasicVal) + parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2) ); + $('#CapitalToatlOrder').val((parseFloat(TotalCapitalOrder) + parseFloat(BasicVal) + parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(OtherAmt)+parseFloat(AfterFreight)).toFixed(2) ); $('#CapitalBasicOrder').val((parseFloat(TotalBasicOrder) + parseFloat(BasicVal) + parseFloat(disRate)).toFixed(2)); @@ -6427,7 +6440,7 @@ var Freight=parseFloat($('#txtAfterFreightlocview').val() == '' ? '0.00' : $('#t - var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)).toFixed(2); + var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)+parseFloat(FreightRateAmountloc)).toFixed(2); @@ -6612,6 +6625,11 @@ function validateEditCapitalTax() var AfterSgst = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val(); var AfterIgst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); var OtherAmt = $('#EditOtherAllowances').val() == '' ? '0.00' : $('#EditOtherAllowances').val(); + +var Freight=parseFloat($('#txtAfterFreightlocedit').val() == '' ? '0.00' : $('#txtAfterFreightlocedit').val()).toFixed(2); + + + var ServiceTaxAmount = $('#EditAfterServiceTax').val() == '' ? '0.00' : $('#EditAfterServiceTax').val(); var EduCessTaxAmount = $('#EditAfterEduCess').val() == '' ? '0.00' : $('#EditAfterEduCess').val(); var SecHighTaxAmount = $('#EditAfterSecHighTax').val() == '' ? '0.00' : $('#EditAfterSecHighTax').val(); @@ -6632,7 +6650,7 @@ function validateEditCapitalTax() var purchaseRate = $('#Editpurchaserate').val() == '' ? '0.00' : $('#Editpurchaserate').val(); var CustomDutyExpenses = $('#EditCustomDutyExpenses').val() == '' ? '0.00' : $('#EditCustomDutyExpenses').val(); var RMCIncludingCustomers = $('#EditRMCIncludingCustomers').val() == '' ? '0.00' : $('#EditRMCIncludingCustomers').val(); - var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2); + var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)+parseFloat(Freight)).toFixed(2); var tot = parseFloat(totvalue).toFixed(2); @@ -6788,7 +6806,8 @@ function validateEditCapitalTax() TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI); - CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI) + parseFloat(TotalCgstI) + parseFloat(TotalSgstI) + parseFloat(TotalIgstI) + parseFloat(TotOtherI); + CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI) + parseFloat(TotalCgstI) + parseFloat(TotalSgstI) + parseFloat(TotalIgstI) + parseFloat(TotOtherI)+parseFloat(TotalFreight); + TotBasicAmt=parseFloat(TotBasicAmt) + parseFloat(TotBasicAmtI); TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); TotDiscount =parseFloat(TotDiscount) + parseFloat(TotDiscountI);