PAYROLL DATE ISSUE AND AMEND CAPITAL DISCOUNT AND FRIEGHT ISSUE
This commit is contained in:
velz2020
parent
fbcce4da42
commit
1149550b7e
@ -1015,6 +1015,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
|
||||
<!-- <td> <a data-target='#VIEWCAPITAL' data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the <?php echo $record->ReqNo ; ?> Requisition details"></i> </a> </td> -->
|
||||
|
||||
</tr> <?php
|
||||
$TotalFrieght = 0;
|
||||
if($CapitalRange=='1'){
|
||||
$TotalSGST =$TotalSGST+$record->After_SGST;
|
||||
$TotalCGST = $TotalCGST+$record->After_CGST;
|
||||
@ -1039,7 +1040,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
|
||||
$totaddtnlexcise= $totaddtnlexcise + $record->AfterAddlExciseDuty;
|
||||
$totgrossduty = $totgrossduty + $record->Grossdutypayable;
|
||||
$totavlmodvat = $totavlmodvat +$record->AvailableModvat;
|
||||
|
||||
$TotalFrieght = $TotalFrieght + $record->AfterFreightValue;
|
||||
|
||||
$totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
|
||||
$ExchangeRate=$record->ExchangeRate;
|
||||
@ -1798,7 +1799,15 @@ document.getElementById('dispatchinternational').style.display = 'block';
|
||||
|
||||
<br/>
|
||||
</table>
|
||||
<div class="col-md-12" style="border: 1px solid;" id="CAPdiv" >
|
||||
<div class="col-md-12" style="border: 1px solid;" id="CAPdiv" >
|
||||
|
||||
<div class="col-md-3">
|
||||
<label>Discount In INR</label>
|
||||
<?php
|
||||
$data = array('name' => 'txtTotalDiscount','value' => set_value('txtTotalDiscount',number_format($TotalDiscountedAmt, 2, '.', '')),'id'=>'txtTotalDiscount', 'class' => 'form-control num' ,'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>CGST In INR</label>
|
||||
<?php
|
||||
@ -1823,7 +1832,9 @@ document.getElementById('dispatchinternational').style.display = 'block';
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3" style="padding: 0px;">
|
||||
<label >Other Allowances In INR </label>
|
||||
<?php
|
||||
$data = array('name' => 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances',number_format($Totalotherallowances, 2, '.', '')),'id'=>'TotalOtherAllowances', 'class' => 'form-control num' ,'readonly' => 'true');
|
||||
@ -1831,15 +1842,14 @@ document.getElementById('dispatchinternational').style.display = 'block';
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3" style="padding: 0px;">
|
||||
<div class="col-md-3" >
|
||||
<label >Total Order Value In INR </label>
|
||||
<input type="hidden" name="preServiceTotalorderValue" value="<?php echo $totalCapitalOrder?>">
|
||||
<?php
|
||||
$data = array('name' => 'Totalservicesummary','value' => set_value('Totalservicesummary',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'Totalservicesummary', 'class' => 'form-control num' ,'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div> </div>
|
||||
</div></br> </div>
|
||||
</br>
|
||||
<br>
|
||||
</div>
|
||||
@ -1851,6 +1861,14 @@ document.getElementById('dispatchinternational').style.display = 'block';
|
||||
<div class="col-md-12" style="border: 1px solid;padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
|
||||
|
||||
<div class="col-md-4">
|
||||
<label >Total Frieght Charge <?php echo "($INR)"?></label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'txttotalfrieght','value' => set_value('txttotalfrieght',$TotalFrieght),'id'=>'txttotalfrieght', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label >Total Landing Charge <?php echo "($INR)"?></label>
|
||||
|
||||
<?php
|
||||
@ -3553,7 +3571,7 @@ EditRatechange();
|
||||
* This function is used for Edit Capital
|
||||
*/
|
||||
$('.EditCapital').click(function(){
|
||||
|
||||
//alert('EDIT CAPITAL');
|
||||
tinyMCE.triggerSave();
|
||||
if( validateEditCapitalTax() && validateEditExceedLimit())
|
||||
{
|
||||
@ -3841,10 +3859,11 @@ function validateEditCapitalTax()
|
||||
var TotalCGSTTax = 0;
|
||||
var TotalSGSTTax = 0;
|
||||
var TotalIGSTTax = 0;
|
||||
|
||||
var TotalDiscount = 0;
|
||||
//alert('Initial' + TotalDiscount);
|
||||
var Totalotherallowance = 0;
|
||||
|
||||
|
||||
|
||||
|
||||
var TotLanding = 0;
|
||||
var TotHighseas = 0;
|
||||
var TotCustom = 0;
|
||||
@ -3856,6 +3875,8 @@ function validateEditCapitalTax()
|
||||
var TotAdditionalExciseduty = 0;
|
||||
var TotGrossduty = 0;
|
||||
var TotAvlmodvat = 0;
|
||||
var Totalfrieght = 0;
|
||||
//alert('INITIAL'+ Totalfrieght);
|
||||
|
||||
var TotGrossexpense = 0;
|
||||
|
||||
@ -3863,6 +3884,7 @@ function validateEditCapitalTax()
|
||||
|
||||
for (var i = 1; i < rows; i++) {
|
||||
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
|
||||
TotalOrderValueSummaryI=TotalOrderValueSummaryI-discountedRateValue;
|
||||
var TotalCGSTTaxI = $('#afterCGST'+i).val() == '' ? '0.00' : $('#afterCGST'+i).val();
|
||||
@ -3883,15 +3905,19 @@ function validateEditCapitalTax()
|
||||
var TotAdditionalExcisedutyI = $('#AdditionalExciseDuty'+i).val() == '' ? '0.00' : $('#AdditionalExciseDuty'+i).val();
|
||||
var TotGrossdutyI = $('#GrossDutyPayable'+i).val() == '' ? '0.00' : $('#GrossDutyPayable'+i).val();
|
||||
var TotAvlmodvatI = $('#AvailableModvat'+i).val() == '' ? '0.00' : $('#AvailableModvat'+i).val();
|
||||
|
||||
var totoalfrieghti = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
|
||||
//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
|
||||
CapitalToatlOrderI = CapitalToatlOrderI - discountedRateValue;
|
||||
TotalCGSTTax = parseFloat(TotalCGSTTax) + parseFloat(TotalCGSTTaxI);
|
||||
TotalSGSTTax = parseFloat(TotalSGSTTax) + parseFloat(TotalSGSTTaxI);
|
||||
TotalIGSTTax = parseFloat(TotalIGSTTax) + parseFloat(TotalIGSTTaxI);
|
||||
|
||||
TotalDiscount = parseFloat(TotalDiscount) + parseFloat(discountedRateValue);
|
||||
//alert('After Add' + TotalDiscount);
|
||||
Totalotherallowance = parseFloat(Totalotherallowance) + parseFloat(TotalotherallowanceI);
|
||||
Totalfrieght = Totalfrieght + totoalfrieghti;
|
||||
// alert('AFTER ADD'+ Totalfrieght);
|
||||
|
||||
|
||||
TotLanding = parseFloat(TotLanding) + parseFloat(TotLandingI);
|
||||
@ -3916,8 +3942,9 @@ function validateEditCapitalTax()
|
||||
$('#txtTotSgst').val((parseFloat(TotalSGSTTax)).toFixed(2) );
|
||||
$('#txtTotIgst').val((parseFloat(TotalIGSTTax)).toFixed(2) );
|
||||
$('#TotalOtherAllowances').val((parseFloat(Totalotherallowance) ).toFixed(2) );
|
||||
|
||||
|
||||
$('#txtTotalDiscount').val((parseFloat(TotalDiscount)).toFixed(2) );
|
||||
$('#txttotalfrieght').val((parseFloat(Totalfrieght)).toFixed(2) );
|
||||
|
||||
$('#txttotallanding').val((parseFloat(TotLanding) ).toFixed(2) );
|
||||
$('#txttotalhighseas').val((parseFloat(TotHighseas) ).toFixed(2) );
|
||||
$('#txttotalcustom').val((parseFloat(TotCustom)).toFixed(2) );
|
||||
|
||||
@ -33,6 +33,8 @@ if (loan == paid)
|
||||
$("#no_of_due").val(0);
|
||||
$("#remaining_due").val(0);
|
||||
$("#paid_due").val(0);
|
||||
$("#loan_issued_date").val("");
|
||||
$("#due_started").val("");
|
||||
|
||||
}else
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user