import fixes
This commit is contained in:
parent
98d7bc2ce4
commit
273d13dde1
@ -155,7 +155,7 @@ $SavedSum=$Orderedsum*$ExchangeRate;
|
|||||||
//echo $SavedSum;
|
//echo $SavedSum;
|
||||||
$AvilableBudget=$SavedSum+$AvlAmount;
|
$AvilableBudget=$SavedSum+$AvlAmount;
|
||||||
//echo $AvilableBudget;
|
//echo $AvilableBudget;
|
||||||
|
//echo $PaymentTermsCode;
|
||||||
|
|
||||||
if(!empty($RequistionDetails))
|
if(!empty($RequistionDetails))
|
||||||
{
|
{
|
||||||
@ -2770,10 +2770,12 @@ var NilType = '<?php echo NILTYPE;?>';
|
|||||||
|
|
||||||
|
|
||||||
var paymentoption=<?php echo json_encode($PaymentTerms,JSON_PRETTY_PRINT)?>;
|
var paymentoption=<?php echo json_encode($PaymentTerms,JSON_PRETTY_PRINT)?>;
|
||||||
//alert(paymentoption);
|
var payvalue=<?php echo json_encode($PaymentTermsCode,JSON_PRETTY_PRINT)?>;
|
||||||
|
//alert(payvalue);
|
||||||
if(paymentoption=='PT08')
|
if(paymentoption=='PT08')
|
||||||
{
|
{
|
||||||
$('#otheroptiondiv').show();
|
$('#otheroptiondiv').show();
|
||||||
|
$('#Otherpayment').val(payvalue);
|
||||||
}
|
}
|
||||||
|
|
||||||
var delivery=<?php echo json_encode($DeliveryOption,JSON_PRETTY_PRINT)?>;
|
var delivery=<?php echo json_encode($DeliveryOption,JSON_PRETTY_PRINT)?>;
|
||||||
|
|||||||
@ -2245,13 +2245,53 @@ function EditRatechange()
|
|||||||
var txteditQuantity=parseFloat($('#EditQuantity').val());
|
var txteditQuantity=parseFloat($('#EditQuantity').val());
|
||||||
var txteditUnitPrice=parseFloat($('#EditRate').val());
|
var txteditUnitPrice=parseFloat($('#EditRate').val());
|
||||||
var editTot=txteditQuantity*txteditUnitPrice
|
var editTot=txteditQuantity*txteditUnitPrice
|
||||||
$('#EdittxtBasicValue').val(editTot);
|
|
||||||
$('#EditimBasicPrice').val(editTot);
|
if(isNaN(editTot))
|
||||||
|
{
|
||||||
|
$('#EdittxtBasicValue').val('');
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$('#EdittxtBasicValue').val(parseFloat(editTot).toFixed(2));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if(isNaN(editTot))
|
||||||
|
{
|
||||||
|
$('#EditimBasicPrice').val('');
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$('#EditimBasicPrice').val(parseFloat(editTot).toFixed(2));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//$('#EdittxtBasicValue').val(editTot);
|
||||||
|
//$('#EditimBasicPrice').val(editTot);
|
||||||
var exchangerate=parseFloat($('#EditExchangeRt').val());
|
var exchangerate=parseFloat($('#EditExchangeRt').val());
|
||||||
var txtINR=editTot*exchangerate;
|
var txtINR=editTot*exchangerate;
|
||||||
$('#EditINRBasicvalue').val(txtINR);
|
|
||||||
|
if(isNaN(txtINR))
|
||||||
|
{
|
||||||
|
$('#EditINRBasicvalue').val('');
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$('#EditINRBasicvalue').val(parseFloat(txtINR).toFixed(2));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(isNaN(txtINR))
|
||||||
|
{
|
||||||
|
$('#EditAfterBasicPriceTax').val('');
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$('#EditAfterBasicPriceTax').val(parseFloat(txtINR).toFixed(2));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//$('#EditINRBasicvalue').val(txtINR);
|
||||||
$('#EditBasicPriceTax').val(txtINR);
|
$('#EditBasicPriceTax').val(txtINR);
|
||||||
$('#EditAfterBasicPriceTax').val(txtINR);
|
//$('#EditAfterBasicPriceTax').val(txtINR);
|
||||||
EditCalculateloadingcharge();
|
EditCalculateloadingcharge();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2368,7 +2408,16 @@ $('#TotalExp').val('');
|
|||||||
txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
|
txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
|
||||||
//var result=(txtlanding*txtbasicprice/100);
|
//var result=(txtlanding*txtbasicprice/100);
|
||||||
var result= <?php echo LOADING_CHARGE;?>;
|
var result= <?php echo LOADING_CHARGE;?>;
|
||||||
$('#EditAfterLandingCharge').val(result.toFixed(2));
|
|
||||||
|
|
||||||
|
if(isNaN(result))
|
||||||
|
{
|
||||||
|
$('#EditAfterLandingCharge').val('');
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$('#EditAfterLandingCharge').val(parseFloat(result).toFixed(2));
|
||||||
|
}
|
||||||
|
// $('#EditAfterLandingCharge').val(result.toFixed(2));
|
||||||
EditCalculateHighseassalescharge();
|
EditCalculateHighseassalescharge();
|
||||||
//alert();
|
//alert();
|
||||||
}
|
}
|
||||||
@ -3143,17 +3192,44 @@ function EditCalculateCtable()
|
|||||||
txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
|
txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
|
||||||
//txtpurchaserate=txtbasicinrprice/txtCtablequantity;
|
//txtpurchaserate=txtbasicinrprice/txtCtablequantity;
|
||||||
txtpurchaserate=<?php echo PURCHASE_RATE;?>;
|
txtpurchaserate=<?php echo PURCHASE_RATE;?>;
|
||||||
$('#Editpurchaserate').val(txtpurchaserate);
|
|
||||||
|
if(isNaN(txtpurchaserate))
|
||||||
|
{
|
||||||
|
$('#Editpurchaserate').val(0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$('#Editpurchaserate').val(txtpurchaserate.toFixed(2));
|
||||||
|
}
|
||||||
|
//$('#Editpurchaserate').val(txtpurchaserate);
|
||||||
//CustomDutyExpenses
|
//CustomDutyExpenses
|
||||||
//RMCIncludingCustomers
|
//RMCIncludingCustomers
|
||||||
txtgrossexp=parseFloat($('#EditGrossexpenses').val());
|
txtgrossexp=parseFloat($('#EditGrossexpenses').val());
|
||||||
//txtcustomdutyexp=txtgrossexp/txtCtablequantity;
|
//txtcustomdutyexp=txtgrossexp/txtCtablequantity;
|
||||||
txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
|
txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
|
||||||
$('#EditCustomDutyExpenses').val(txtcustomdutyexp);
|
|
||||||
|
if(isNaN(txtcustomdutyexp))
|
||||||
|
{
|
||||||
|
$('#EditCustomDutyExpenses').val(0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$('#EditCustomDutyExpenses').val(txtcustomdutyexp.toFixed(2));
|
||||||
|
}
|
||||||
|
//$('#EditCustomDutyExpenses').val(txtcustomdutyexp);
|
||||||
//txtrmc=txtpurchaserate+txtcustomdutyexp;
|
//txtrmc=txtpurchaserate+txtcustomdutyexp;
|
||||||
txtrmc=<?php echo RMC_CAL;?>;
|
txtrmc=<?php echo RMC_CAL;?>;
|
||||||
|
|
||||||
|
if(isNaN(txtrmc))
|
||||||
|
{
|
||||||
|
$('#EditRMCIncludingCustomers').val(0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2));
|
||||||
|
}
|
||||||
purquantity=parseFloat($('#PurQuantity').val());
|
purquantity=parseFloat($('#PurQuantity').val());
|
||||||
$('#EditRMCIncludingCustomers').val(txtrmc);
|
//$('#EditRMCIncludingCustomers').val(txtrmc);
|
||||||
total=<?php echo CALCULATE_TOTAL;?>;
|
total=<?php echo CALCULATE_TOTAL;?>;
|
||||||
$('#EditTotalExp').val(basicamt);
|
$('#EditTotalExp').val(basicamt);
|
||||||
|
|
||||||
@ -3913,18 +3989,23 @@ function Budgetcheck()
|
|||||||
//alert();
|
//alert();
|
||||||
//die();
|
//die();
|
||||||
var totalorderedamount=parseFloat($('#txtToatlOrder').val());
|
var totalorderedamount=parseFloat($('#txtToatlOrder').val());
|
||||||
// console.log(totalorderedamount) var Exchange=parseFloat($('#ExchangeRate').val());
|
// console.log(totalorderedamount)
|
||||||
|
var Exchange=parseFloat($('#ExchangeRate').val());
|
||||||
//console.log(Exchange);
|
//console.log(Exchange);
|
||||||
|
|
||||||
var totordring=totalorderedamount*Exchange;
|
var totordring=totalorderedamount*Exchange;
|
||||||
var TotalSum=avalbudAmte; if(totordring>TotalSum)
|
var TotalSum=avalbudAmte;
|
||||||
|
if(totordring>TotalSum)
|
||||||
{
|
{
|
||||||
alert('You are Exceeding The Budget');
|
alert('You are Exceeding The Budget');
|
||||||
return false;
|
return false;
|
||||||
} else
|
}
|
||||||
|
|
||||||
|
else
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user