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

capital amendment issue fix

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-10-28 16:37:36 +05:30
parent c127bd824a
commit 85efd2da75
1 changed files with 138 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
application/views/editCapitalAmendPO.php
View File

@ -960,7 +960,10 @@ document.getElementById('dispatchinternational').style.display = 'block';
<?php if($CapitalRange=='1'){?> <?php if($CapitalRange=='1'){?>
<td style="text-align:right"><?php echo $record->TotalValue+$record->Afvalue; ?></td> <!-- <td style="text-align:right"><?php echo $record->TotalValue+$record->Afvalue; ?></td> -->
<td><?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance+ $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?></td>
<?php }else if($CapitalRange=='0'){?> <?php }else if($CapitalRange=='0'){?>
<td style="text-align:right"><?php echo number_format(($record->Rate * $record->Quantity),2,'.',''); ?></td> <td style="text-align:right"><?php echo number_format(($record->Rate * $record->Quantity),2,'.',''); ?></td>
@ -1108,7 +1111,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
<input type="hidden" name="<?php echo 'beforeIGSTvalue'.$index ?>" id="<?php echo 'aftebeforeIGSTvaluerIGST'.$index ?>" value="<?php echo $record->After_IGST ; ?>" /> <input type="hidden" name="<?php echo 'beforeIGSTvalue'.$index ?>" id="<?php echo 'aftebeforeIGSTvaluerIGST'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
<input type="hidden" name="<?php echo 'otherallowance'.$index ?>" id="<?php echo 'otherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" /> <input type="hidden" name="<?php echo 'otherallowance'.$index ?>" id="<?php echo 'otherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
<input type="hidden" name="<?php echo 'beforeotherallowance'.$index ?>" id="<?php echo 'beforeotherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" /> <input type="hidden" name="<?php echo 'beforeotherallowance'.$index ?>" id="<?php echo 'beforeotherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
<input type="hidden" name="<?php echo 'totalservicevalue'.$index ?>" id="<?php echo 'totalservicevalue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" /> <input type="hidden" name="<?php echo 'totalservicevalue'.$index ?>" id="<?php echo 'totalservicevalue'.$index ?>" value="<?php echo $record->TotalValue+$record->Afvalue ; ?>" />
<input align="right" type="hidden" name="<?php echo 'DisType'.$index ?>" id="<?php echo 'DisType'.$index ?>" value="<?php echo $record->discount ; ?>" /> <input align="right" type="hidden" name="<?php echo 'DisType'.$index ?>" id="<?php echo 'DisType'.$index ?>" value="<?php echo $record->discount ; ?>" />
<input align="right" type="hidden" name="<?php echo 'DisVal'.$index ?>" id="<?php echo 'DisVal'.$index ?>" value="<?php echo $record->discountval ; ?>" /> <input align="right" type="hidden" name="<?php echo 'DisVal'.$index ?>" id="<?php echo 'DisVal'.$index ?>" value="<?php echo $record->discountval ; ?>" />
<input align="right" type="hidden" name="<?php echo 'AfterDisVal'.$index ?>" id="<?php echo 'AfterDisVal'.$index ?>" value="<?php echo $record->Afterdiscountval ; ?>" /> <input align="right" type="hidden" name="<?php echo 'AfterDisVal'.$index ?>" id="<?php echo 'AfterDisVal'.$index ?>" value="<?php echo $record->Afterdiscountval ; ?>" />
@ -1193,12 +1196,13 @@ document.getElementById('dispatchinternational').style.display = 'block';
//echo 'TAx' . $TotalSummary; //echo 'TAx' . $TotalSummary;
$TotalFreightvalue=$TotalFreightvalue+$record->Afvalue; $TotalFreightvalue=$TotalFreightvalue+$record->Afvalue;
// echo $TotalFreightvalue;
// $totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance+ $record->Afvalue - $TotalDiscountedAmt;
// $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; $totalCapitalOrder=$totalCapitalOrder+ $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 $TotalBasicAmount;
@ -1206,14 +1210,18 @@ document.getElementById('dispatchinternational').style.display = 'block';
// echo $totalCapitalOrder; // echo $totalCapitalOrder;
//echo $record->TotalValue; //echo $record->TotalValue;
//echo 'ALL' . $TotalBasicAmount; //echo 'ALL' . $TotalBasicAmount;
//$ServiceDescription = $ServiceDescription; //$ServiceDescription = $ServiceDescription;
} }
$TotalBasicAmount=$TotalBasicAmount+$record->TotalValue;
if($CapitalRange=='0'){ if($CapitalRange=='0'){
$TotalBasicAmount = $TotalBasicAmount+($record->Rate * $record->Quantity);//basic $TotalBasicAmount = $TotalBasicAmount+($record->Rate * $record->Quantity);//basic
$TotalLanding = $TotalLanding + $record->AfterLandingCharge; $TotalLanding = $TotalLanding + $record->AfterLandingCharge;
@ -1248,7 +1256,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
//echo $TotalSummary; //echo $TotalSummary;
if($CapitalRange=='1'){ if($CapitalRange=='1'){
$totalCapitalOrder = $totalCapitalOrder+$TotalBasicAmount; // $totalCapitalOrder = $totalCapitalOrder+$TotalBasicAmount;
//echo 'FNAL' . $totalCapitalOrder; //echo 'FNAL' . $totalCapitalOrder;
} }
@ -3159,7 +3167,8 @@ $('#PurQuantity').val('');
//$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val()); //$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val());
$('#Editservicetotalordervaue').val(cellval[8].innerHTML); $('#Editservicetotalordervaue').val(cellval[8].innerHTML);
$('#drpFreighteditloc').val($('#Ftype'+userid).val()); $('#drpFreighteditloc').val($('#Ftype'+userid).val());
$('#NOOfTripslocedit').val($('#NoTrip'+userid).val()); $('#NOOfTripslocedit').val($('#NoTrip'+userid).val());
@ -3817,6 +3826,9 @@ EditRatechange();
$('#otherallowance'+userid).val(otherallowance); $('#otherallowance'+userid).val(otherallowance);
$('#totalservicevalue'+userid).val(totalservicevalue); $('#totalservicevalue'+userid).val(totalservicevalue);
// var a =parseFloat($('#totalservicevalue'+userid).val());
// console.log(a);
$('#ServiceMaterialDescription'+userid).val(servicedescription); $('#ServiceMaterialDescription'+userid).val(servicedescription);
@ -4010,161 +4022,181 @@ function validateEditCapitalTax()
/** /**
* This function is used to calculate the total amounts after Edit row * This function is used to calculate the total amounts after Edit row
*/ */
function populateValueMainFormForEditCapitalTax() function populateValueMainFormForEditCapitalTax()
{ {
var rows = document.getElementById('serviceTax').rows.length; var rows = document.getElementById('serviceTax').rows.length;
var TotalOrderValueSummary = 0; var TotalOrderValueSummary = 0;
var basicfordometic = 0; var basicfordometic = 0;
var qty = 0; var qty = 0;
var rateperqty = 0; var rateperqty = 0;
var TotalCGSTTax = 0;
var TotalCGSTTax = 0; var TotalSGSTTax = 0;
var TotalSGSTTax = 0; var TotalIGSTTax = 0;
var TotalIGSTTax = 0; var TotalDiscount = 0;
var TotalDiscount = 0;
//alert('Initial' + TotalDiscount); //alert('Initial' + TotalDiscount);
var Totalotherallowance = 0; var Totalotherallowance = 0;
var TotaFreight =0;
var TotLanding = 0; var TotLanding = 0;
var TotCustom = 0;
var TotCustom = 0; var TotCustomED = 0;
var TotCustomSH = 0;
var TotCustomED = 0; var TotGrossduty = 0;
var TotCustomSH = 0; var Totalfrieght = 0;
var TotGrossduty = 0;
var Totalfrieght = 0;
//alert('INITIAL'+ Totalfrieght); //alert('INITIAL'+ Totalfrieght);
var TotGrossexpense = 0;
var TotaFreight =0; var CapitalToatlOrder=0;
var TotalAssessable=0;
var TotGrossexpense = 0; var TotalSubtotal=0;
var TotalIgst=0;
var CapitalToatlOrder=0;
var TotalAssessable=0;
var TotalSubtotal=0;
var TotalIgst=0;
for (var i = 1; i < rows; i++) { for (var i = 1; i < rows; i++)
var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
{
var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
//alert('Current Item'+ discountedRateValue); //alert('Current Item'+ discountedRateValue);
var TotalOrderValueSummaryI = $('#totalservicevalue'+i).val() == '' ? '0.00' : $('#totalservicevalue'+i).val();//FOr Domestic total value var TotalOrderValueSummaryI = $('#totalservicevalue'+i).val() == '' ? '0.00' : $('#totalservicevalue'+i).val();//FOr Domestic total value
//console.log(TotalOrderValueSummaryI); //console.log(TotalOrderValueSummaryI);
TotalOrderValueSummaryI=TotalOrderValueSummaryI;//-discountedRateValue; TotalOrderValueSummaryI=TotalOrderValueSummaryI;//-discountedRateValue;
var TotalCGSTTaxI = $('#afterCGST'+i).val() == '' ? '0.00' : $('#afterCGST'+i).val(); var TotalCGSTTaxI = $('#afterCGST'+i).val() == '' ? '0.00' : $('#afterCGST'+i).val();
var TotalSGSTTaxI = $('#afterSGST'+i).val() == '' ? '0.00' : $('#afterSGST'+i).val();
var TotalIGSTTaxI = $('#afterIGST'+i).val() == '' ? '0.00' : $('#afterIGST'+i).val(); var TotalSGSTTaxI = $('#afterSGST'+i).val() == '' ? '0.00' : $('#afterSGST'+i).val();
var TotalIGSTTaxI = $('#afterIGST'+i).val() == '' ? '0.00' : $('#afterIGST'+i).val();
var TotalFreightt = $('#Afvalue'+i).val() == '' ? '0.00' : $('#Afvalue'+i).val();
//console.log(TotalFreightt);
var TotalFreight = $('#Afvalue'+i).val() == '' ? '0.00' : $('#Afvalue'+i).val();
//var tr= document.getElementById(serviceTax); //var tr= document.getElementById(serviceTax);
//var cellval = tr.cells; //var cellval = tr.cells;
qty = $('#quantity'+i).val(); qty = $('#quantity'+i).val();
rateperqty = $('#itemRate'+i).val(); rateperqty = $('#itemRate'+i).val();
basicfordometic = basicfordometic + (qty * rateperqty); basicfordometic = basicfordometic + (qty * rateperqty);
var TotalotherallowanceI = $('#otherallowance'+i).val() == '' ? '0.00' : $('#otherallowance'+i).val(); var TotalotherallowanceI = $('#otherallowance'+i).val() == '' ? '0.00' : $('#otherallowance'+i).val();
var TotLandingI = $('#landingCharge'+i).val() == '' ? '0.00' : $('#landingCharge'+i).val();
var TotLandingI = $('#landingCharge'+i).val() == '' ? '0.00' : $('#landingCharge'+i).val();
var TotCustomI = $('#CustomDuty'+i).val() == '' ? '0.00' : $('#CustomDuty'+i).val(); var TotCustomI = $('#CustomDuty'+i).val() == '' ? '0.00' : $('#CustomDuty'+i).val();
var TotCustomEDI = $('#CustomEDCess'+i).val() == '' ? '0.00' : $('#CustomEDCess'+i).val(); var TotCustomEDI = $('#CustomEDCess'+i).val() == '' ? '0.00' : $('#CustomEDCess'+i).val();
var TotCustomSHI = $('#CustomSHCess'+i).val() == '' ? '0.00' : $('#CustomSHCess'+i).val();
var TotGrossdutyI = $('#GrossDutyPayable'+i).val() == '' ? '0.00' : $('#GrossDutyPayable'+i).val(); var TotCustomSHI = $('#CustomSHCess'+i).val() == '' ? '0.00' : $('#CustomSHCess'+i).val();
var totoalfrieghti = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val(); var TotGrossdutyI = $('#GrossDutyPayable'+i).val() == '' ? '0.00' : $('#GrossDutyPayable'+i).val();
var totoalfrieghti = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
//alert('CURRENT'+totoalfrieghti); //alert('CURRENT'+totoalfrieghti);
var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
var CapitalToatlOrderI = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();//for International total value var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
var Assessable = $('#AssessableValue'+i).val() == '' ? '0.00' : $('#AssessableValue'+i).val(); var CapitalToatlOrderI = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();//for International total value
var Assessable = $('#AssessableValue'+i).val() == '' ? '0.00' : $('#AssessableValue'+i).val();
var Subtotal = $('#SubTotal'+i).val() == '' ? '0.00' : $('#SubTotal'+i).val(); var Subtotal = $('#SubTotal'+i).val() == '' ? '0.00' : $('#SubTotal'+i).val();
var IgstInt = $('#AfterIGSTInt'+i).val() == '' ? '0.00' : $('#AfterIGSTInt'+i).val(); var IgstInt = $('#AfterIGSTInt'+i).val() == '' ? '0.00' : $('#AfterIGSTInt'+i).val();
TotaFreight=parseFloat(TotaFreight)+parseFloat(TotalFreightt);
CapitalToatlOrderI = CapitalToatlOrderI - discountedRateValue; CapitalToatlOrderI = CapitalToatlOrderI - discountedRateValue;
TotalCGSTTax = parseFloat(TotalCGSTTax) + parseFloat(TotalCGSTTaxI); TotalCGSTTax = parseFloat(TotalCGSTTax) + parseFloat(TotalCGSTTaxI);
TotalSGSTTax = parseFloat(TotalSGSTTax) + parseFloat(TotalSGSTTaxI); TotalSGSTTax = parseFloat(TotalSGSTTax) + parseFloat(TotalSGSTTaxI);
TotalIGSTTax = parseFloat(TotalIGSTTax) + parseFloat(TotalIGSTTaxI);
TotalDiscount = parseFloat(TotalDiscount) + parseFloat(discountedRateValue); TotalIGSTTax = parseFloat(TotalIGSTTax) + parseFloat(TotalIGSTTaxI);
TotalDiscount = parseFloat(TotalDiscount) + parseFloat(discountedRateValue);
TotaFreight=parseFloat(TotaFreight)+parseFloat(TotalFreight);
//alert('After Add' + TotalDiscount);
Totalotherallowance = parseFloat(Totalotherallowance) + parseFloat(TotalotherallowanceI); Totalotherallowance = parseFloat(Totalotherallowance) + parseFloat(TotalotherallowanceI);
Totalfrieght = Totalfrieght + totoalfrieghti;
// alert('AFTER ADD'+ Totalfrieght); Totalfrieght = Totalfrieght + totoalfrieghti;
// TotaFreight=parseFloat(TotaFreight)+parseFloat(TotalFreightt);
// console.log(TotaFreight);
//alert('After Add' + TotalDiscount);
//alert('AFTER ADD'+ Totalfrieght);
TotalAssessable=parseFloat(TotalAssessable)+parseFloat(Assessable); TotalAssessable=parseFloat(TotalAssessable)+parseFloat(Assessable);
TotalSubtotal=parseFloat(TotalSubtotal)+parseFloat(Subtotal); TotalSubtotal=parseFloat(TotalSubtotal)+parseFloat(Subtotal);
TotalIgst=parseFloat(TotalIgst)+parseFloat(IgstInt); TotalIgst=parseFloat(TotalIgst)+parseFloat(IgstInt);
TotLanding = parseFloat(TotLanding) + parseFloat(TotLandingI);
TotLanding = parseFloat(TotLanding) + parseFloat(TotLandingI);
TotCustom = parseFloat(TotCustom) + parseFloat(TotCustomI); TotCustom = parseFloat(TotCustom) + parseFloat(TotCustomI);
TotCustomED = parseFloat(TotCustomED) + parseFloat(TotCustomEDI); TotCustomED = parseFloat(TotCustomED) + parseFloat(TotCustomEDI);
TotCustomSH = parseFloat(TotCustomSH) + parseFloat(TotCustomSHI);
TotCustomSH = parseFloat(TotCustomSH) + parseFloat(TotCustomSHI);
TotGrossduty = parseFloat(TotGrossduty) + parseFloat(TotGrossdutyI); TotGrossduty = parseFloat(TotGrossduty) + parseFloat(TotGrossdutyI);
TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI);
TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI);
CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI); CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI);
} }
$('#txtTotCgst').val((parseFloat(TotalCGSTTax)).toFixed(2) );
$('#txtTotCgst').val((parseFloat(TotalCGSTTax)).toFixed(2) );
$('#txtTotSgst').val((parseFloat(TotalSGSTTax)).toFixed(2) ); $('#txtTotSgst').val((parseFloat(TotalSGSTTax)).toFixed(2) );
$('#txtTotIgst').val((parseFloat(TotalIGSTTax)).toFixed(2) ); $('#txtTotIgst').val((parseFloat(TotalIGSTTax)).toFixed(2) );
$('#TotalOtherAllowances').val((parseFloat(Totalotherallowance) ).toFixed(2) );
$('#TotalOtherAllowances').val((parseFloat(Totalotherallowance) ).toFixed(2) );
$('#txtTotalDiscount').val((parseFloat(TotalDiscount)).toFixed(2) ); $('#txtTotalDiscount').val((parseFloat(TotalDiscount)).toFixed(2) );
$('#TotalFreight').val(parseFloat(TotaFreight).toFixed(2) ); $('#TotalFreight').val(parseFloat(TotaFreight).toFixed(2) );
$('#txttotalfrieght').val((parseFloat(Totalfrieght)).toFixed(2) );
$('#txttotalfrieght').val((parseFloat(Totalfrieght)).toFixed(2) );
$('#txttotallanding').val((parseFloat(TotLanding) ).toFixed(2) ); $('#txttotallanding').val((parseFloat(TotLanding) ).toFixed(2) );
$('#txttotalcustom').val((parseFloat(TotCustom)).toFixed(2) ); $('#txttotalcustom').val((parseFloat(TotCustom)).toFixed(2) );
$('#txttotalcustomED').val((parseFloat(TotCustomED)).toFixed(2) ); $('#txttotalcustomED').val((parseFloat(TotCustomED)).toFixed(2) );
$('#txttotalcustomSH').val((parseFloat(TotCustomSH)).toFixed(2) );
$('#txttotalgrossduty').val((parseFloat(TotGrossduty)).toFixed(2) );
$('#txttotalAssessable').val((parseFloat(TotalAssessable)).toFixed(2) );
$('#txttotalSubtotal').val((parseFloat(TotalSubtotal)).toFixed(2) );
$('#txttotalIgst').val((parseFloat(TotalIgst)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) ); $('#txttotalcustomSH').val((parseFloat(TotCustomSH)).toFixed(2) );
$('#Totalservicesummary').val((parseFloat(TotalOrderValueSummary)).toFixed(2) );
$('#txtTotalBasic').val((parseFloat(basicfordometic)).toFixed(2) ); $('#txttotalgrossduty').val((parseFloat(TotGrossduty)).toFixed(2) );
basicfordometic = 0;
$('#txttotalAssessable').val((parseFloat(TotalAssessable)).toFixed(2) );
$('#txttotalSubtotal').val((parseFloat(TotalSubtotal)).toFixed(2) );
$('#txttotalIgst').val((parseFloat(TotalIgst)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) );
$('#Totalservicesummary').val((parseFloat(TotalOrderValueSummary)).toFixed(2) );
$('#txtTotalBasic').val((parseFloat(basicfordometic)).toFixed(2) );
basicfordometic = 0;
} }
var DisplayCurrencySymbol=''; var DisplayCurrencySymbol='';
var ViewCurrencySymbol=''; var ViewCurrencySymbol='';
var currency = <?php echo json_encode($Currency, JSON_PRETTY_PRINT) ?>; var currency = <?php echo json_encode($Currency, JSON_PRETTY_PRINT) ?>;