SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import issues

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-18 12:33:37 +05:30
parent 2e4648c648
commit e492632e16
4 changed files with 199 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/purchaseorder.php
View File

@ -1306,7 +1306,9 @@ function addNewImportPurchaseOrder()
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s'); $createddt = $dt->format('Y-m-d H:i:s');
$Exchangerate=$this->input->post('ExchangeRate'); $Exchangerate=$this->input->post('ExchangeRate');
$ExchangeRateCalculatedon=$this->input->post('Exchangerateon'); $Edt=$this->input->post('Exchangerateon');
$ExchangeRateCalculatedon=$this->getDateformat($Edt);
$CurrencyType=$this->input->post('currencytype'); $CurrencyType=$this->input->post('currencytype');
$PaymentTerms=$this->input->post('PaymentTerms'); $PaymentTerms=$this->input->post('PaymentTerms');

124
application/views/editImportAmendPO.php
View File

@ -125,8 +125,11 @@ if(!empty($POMaster))
$PONO = $Req->PONO; $PONO = $Req->PONO;
$ServiceDescription = $Req->ServiceDescription; $ServiceDescription = $Req->ServiceDescription;
$ExchangeRate=number_format(($Req->ExchangeRate),2); $ExchangeRate=number_format(($Req->ExchangeRate),2);
$EDt = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateCalculatedon = $EDt->format('d-m-Y');
$ExchangeRateCalculatedon=$Req->ExchangeRateCalculatedon; // $ExchangeRateCalculatedon=$Req->ExchangeRateCalculatedon;
$PaymentTerms=$Req->PaymentTerms; $PaymentTerms=$Req->PaymentTerms;
// $PayableAT=$Req->PayableAT; // $PayableAT=$Req->PayableAT;
// $PaymentDays=$Req->PaymentDays; // $PaymentDays=$Req->PaymentDays;
@ -224,7 +227,7 @@ if(!empty($RequistionDetails))
$("#PODate").datepicker({ $("#PODate").datepicker({
minDate : d, minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
@ -236,13 +239,13 @@ if(!empty($RequistionDetails))
$("#Requeston").datepicker({ $("#Requeston").datepicker({
//minDate : d, //minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
$("#Exchangerateon").datepicker({ $("#Exchangerateon").datepicker({
minDate : m, minDate : m,
//maxDate : 'now', //maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
}); });
@ -2061,7 +2064,7 @@ $('#TotalExp').val('');
//var result=(txtlanding*txtbasicprice/100); //var result=(txtlanding*txtbasicprice/100);
var result= <?php echo LOADING_CHARGE;?>; var result= <?php echo LOADING_CHARGE;?>;
$('#AfterLandingCharge').val(parseFloat(Math.round(result))); $('#AfterLandingCharge').val(result.toFixed(2));
CalculateHighseassalescharge(); CalculateHighseassalescharge();
//alert(); //alert();
@ -2080,7 +2083,7 @@ $('#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(parseFloat(Math.round(result))); $('#EditAfterLandingCharge').val(result.toFixed(2));
EditCalculateHighseassalescharge(); EditCalculateHighseassalescharge();
//alert(); //alert();
} }
@ -2108,7 +2111,7 @@ function CalculateHighseassalescharge()
$('#AfterHighseas').val(''); $('#AfterHighseas').val('');
} }
else{ else{
$('#AfterHighseas').val(parseFloat(Math.round(txtAfterhighsess))); $('#AfterHighseas').val(txtAfterhighsess.toFixed(2));
} }
CalculateCustomduty(); CalculateCustomduty();
@ -2136,7 +2139,7 @@ function EditCalculateHighseassalescharge()
$('#EditAfterHighseas').val(''); $('#EditAfterHighseas').val('');
} }
else{ else{
$('#EditAfterHighseas').val(parseFloat(Math.round(txthighsess))); $('#EditAfterHighseas').val(txthighsess.toFixed(2));
} }
EditCalculateCustomduty(); EditCalculateCustomduty();
} }
@ -2160,7 +2163,7 @@ function CalculateCustomduty()
$('#AfterCustomduty').val(''); $('#AfterCustomduty').val('');
} }
else{ else{
$('#AfterCustomduty').val(parseFloat(Math.round(txtcustomduty))); $('#AfterCustomduty').val(txtcustomduty.toFixed(2));
} }
CalculateExciseDuty() ; CalculateExciseDuty() ;
@ -2205,7 +2208,7 @@ function EditCalculateCustomduty()
$('#EditAfterCustomduty').val(''); $('#EditAfterCustomduty').val('');
} }
else{ else{
$('#EditAfterCustomduty').val(parseFloat(Math.round(txtcustomduty))); $('#EditAfterCustomduty').val(txtcustomduty.toFixed(2));
} }
EditCalculateExciseDuty() ; EditCalculateExciseDuty() ;
@ -2237,7 +2240,7 @@ function CalculateExciseDuty()
} }
//var totalexcise=txtcustomduty+Exciseduty; //var totalexcise=txtcustomduty+Exciseduty;
else{ else{
$('#AfterExcisedutyTax').val(parseFloat(Math.round(totalexcise))); $('#AfterExcisedutyTax').val(totalexcise.toFixed(2));
} }
CalculateExciseED1(); CalculateExciseED1();
} }
@ -2269,7 +2272,7 @@ function EditCalculateExciseDuty()
else else
{ {
//var totalexcise=txtcustomduty+Exciseduty; //var totalexcise=txtcustomduty+Exciseduty;
$('#EditAfterExcisedutyTax').val(parseFloat(Math.round(totalexcise))); $('#EditAfterExcisedutyTax').val(totalexcise.toFixed(2));
} }
EditCalculateExciseED1(); EditCalculateExciseED1();
} }
@ -2291,7 +2294,7 @@ function CalculateExciseED1()
} }
else else
{ {
$('#AfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot))); $('#AfterExcisedutyEDcess').val(txtexcisetot.toFixed(2));
} }
CalculateexciseSHcess(); CalculateexciseSHcess();
@ -2315,7 +2318,7 @@ function EditCalculateExciseED1()
} }
else else
{ {
$('#EditAfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot))); $('#EditAfterExcisedutyEDcess').val(txtexcisetot.toFixed(2));
} }
EditCalculateexciseSHcess(); EditCalculateexciseSHcess();
@ -2337,7 +2340,7 @@ function CalculateexciseSHcess()
} }
else else
{ {
$('#AfterExcisedutySHcess').val(parseFloat(Math.round(exciseshcesstot))); $('#AfterExcisedutySHcess').val(exciseshcesstot.toFixed(2));
//$('#AfterExcisedutySHcess').val(''); //$('#AfterExcisedutySHcess').val('');
} }
CalculateCustomEdcess(); CalculateCustomEdcess();
@ -2362,7 +2365,7 @@ function CalculateexciseSHcess()
} }
else else
{ {
$('#EditAfterExcisedutySHcess').val(parseFloat(Math.round(exciseshcesstot))); $('#EditAfterExcisedutySHcess').val(exciseshcesstot.toFixed(2));
} }
EditCalculateCustomEdcess(); EditCalculateCustomEdcess();
@ -2403,7 +2406,7 @@ function CalculateexciseSHcess()
} }
else else
{ {
$('#AfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess))); $('#AfterCustomEDcess').val(txtcustomedsess.toFixed(2));
} }
CalculateCustomSHcess(); CalculateCustomSHcess();
@ -2440,7 +2443,7 @@ function EditCalculateCustomEdcess()
} }
else else
{ {
$('#EditAfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess))); $('#EditAfterCustomEDcess').val(txtcustomedsess.toFixed(2));
} }
EditCalculateCustomSHcess(); EditCalculateCustomSHcess();
@ -2481,7 +2484,7 @@ function EditCalculateCustomEdcess()
} }
else else
{ {
$('#AfterCustomSHcess').val(parseFloat(Math.round(totresult))); $('#AfterCustomSHcess').val(totresult.toFixed(2));
} }
CalculateaddlExciseDuty(); CalculateaddlExciseDuty();
@ -2520,7 +2523,7 @@ function EditCalculateCustomEdcess()
} }
else else
{ {
$('#EditAfterCustomSHcess').val(parseFloat(Math.round(totresult))); $('#EditAfterCustomSHcess').val(totresult.toFixed(2));
} }
EditCalculateaddlExciseDuty(); EditCalculateaddlExciseDuty();
@ -2563,7 +2566,7 @@ function CalculateaddlExciseDuty()
} }
else else
{ {
$('#AfterAdditionalExciseduty').val(parseFloat(Math.round(txtaddtnexciseduty))); $('#AfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2));
} }
//var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty; //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
@ -2573,7 +2576,7 @@ function CalculateaddlExciseDuty()
$('#Grossdutypayable').val(''); $('#Grossdutypayable').val('');
} }
else{ else{
$('#Grossdutypayable').val(parseFloat(Math.round(txtgrossduty))); $('#Grossdutypayable').val(txtgrossduty.toFixed(2));
} }
CalculateAvlModvat(); CalculateAvlModvat();
@ -2618,7 +2621,7 @@ function EditCalculateaddlExciseDuty()
} }
else else
{ {
$('#EditAfterAdditionalExciseduty').val(Math.round(txtaddtnexciseduty)); $('#EditAfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2));
} }
//var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty; //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
@ -2629,7 +2632,7 @@ function EditCalculateaddlExciseDuty()
} }
else else
{ {
$('#EditGrossdutypayable').val(parseFloat(Math.round(txtgrossduty))); $('#EditGrossdutypayable').val(txtgrossduty.toFixed(2));
} }
EditCalculateAvlModvat(); EditCalculateAvlModvat();
@ -2657,7 +2660,7 @@ function CalculateAvlModvat()
} }
else else
{ {
$('#AvailableModvat').val(parseFloat(Math.round(totavlmodvat))); $('#AvailableModvat').val(totavlmodvat.toFixed(2));
} }
CalculateGrossExpense(); CalculateGrossExpense();
@ -2688,7 +2691,7 @@ function EditCalculateAvlModvat()
} }
else else
{ {
$('#EditAvailableModvat').val(parseFloat(Math.round(totavlmodvat))); $('#EditAvailableModvat').val(totavlmodvat.toFixed(2));
} }
EditCalculateGrossExpense(); EditCalculateGrossExpense();
} }
@ -2713,7 +2716,7 @@ function CalculateGrossExpense()
} }
else else
{ {
$('#Grossexpenses').val(parseFloat(Math.round(grossexp))); $('#Grossexpenses').val(grossexp.toFixed(2));
} }
CalculateCtable(); CalculateCtable();
@ -2740,7 +2743,7 @@ function EditCalculateGrossExpense()
} }
else else
{ {
$('#EditGrossexpenses').val(parseFloat(Math.round(grossexp))); $('#EditGrossexpenses').val(grossexp.toFixed(2));
} }
EditCalculateCtable() EditCalculateCtable()
@ -2784,7 +2787,7 @@ function CalculateCtable()
} }
else else
{ {
$('#CustomDutyExpenses').val(Math.round(txtcustomdutyexp)); $('#CustomDutyExpenses').val(txtcustomdutyexp.toFixed(2));
} }
//txtrmc=txtpurchaserate+txtcustomdutyexp; //txtrmc=txtpurchaserate+txtcustomdutyexp;
txtrmc=<?php echo RMC_CAL;?>; txtrmc=<?php echo RMC_CAL;?>;
@ -2794,7 +2797,7 @@ function CalculateCtable()
} }
else else
{ {
$('#RMCIncludingCustomers').val(Math.round(txtrmc)); $('#RMCIncludingCustomers').val(txtrmc.toFixed(2));
} }
total=<?php echo CALCULATE_TOTAL;?>; total=<?php echo CALCULATE_TOTAL;?>;
@ -2816,25 +2819,72 @@ function EditCalculateCtable()
var txtrmc=0; var txtrmc=0;
var total=0; var total=0;
var basicprice=0; var basicprice=0;
basicprice=parseFloat($('#EdittxtBasicValue').val()); //basicprice=parseFloat($('#EdittxtBasicValue').val());
basicprice = $('#EdittxtBasicValue').val() == '' ? '0.00' : $('#EdittxtBasicValue').val();
$('#EditTotalExp').val(basicprice); $('#EditTotalExp').val(basicprice);
var a=parseFloat($('#EditTotalExp').val()); var a=parseFloat($('#EditTotalExp').val());
//console.log(a); //console.log(a);
//alert(basicamt); //alert(basicamt);
quantity=parseFloat($('#EditPurQuantity').val()); //quantity=parseFloat($('#EditPurQuantity').val());
txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
quantity = $('#EditPurQuantity').val() == '' ? '0.00' : $('#EditPurQuantity').val();
// txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
txtbasicinrprice = $('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#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 if (isFinite(txtpurchaserate))
{
$('#Editpurchaserate').val(txtpurchaserate.toFixed(2));
}
else{
//$('#Editpurchaserate').val(txtpurchaserate);
$('#Editpurchaserate').val(0);
}
// $('#Editpurchaserate').val(txtpurchaserate);
//CustomDutyExpenses //CustomDutyExpenses
//RMCIncludingCustomers //RMCIncludingCustomers
txtgrossexp=parseFloat($('#EditGrossexpenses').val()); //txtgrossexp=parseFloat($('#EditGrossexpenses').val());
txtgrossexp = $('#EditGrossexpenses').val() == '' ? '0.00' : $('#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;?>;
$('#EditRMCIncludingCustomers').val(txtrmc);
if(isNaN(txtrmc))
{
$('#EditRMCIncludingCustomers').val(0);
}
else{
$('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2));
}
/// $('#EditRMCIncludingCustomers').val(txtrmc);
total=<?php echo CALCULATE_TOTAL;?>; total=<?php echo CALCULATE_TOTAL;?>;
$('#EditTotalExp').val(basicprice); $('#EditTotalExp').val(basicprice);

150
application/views/editimportpo.php
View File

@ -29,7 +29,7 @@ foreach ($PaymentTerms as $TER)
} }
//echo $Terms; //echo $Terms;
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('d-m-y'); $CurrentDate = $dt->format('d-m-Y');
$MaxPoDate = ''; $MaxPoDate = '';
if(!empty($MaxPODate)) if(!empty($MaxPODate))
@ -129,7 +129,9 @@ if(!empty($POMaster))
$ServiceDescription = $Req->ServiceDescription; $ServiceDescription = $Req->ServiceDescription;
$ExchangeRate=number_format(($Req->ExchangeRate),2); $ExchangeRate=number_format(($Req->ExchangeRate),2);
//echo "$ExchangeRate"; //echo "$ExchangeRate";
$ExchangeRateCalculatedon=$Req->ExchangeRateCalculatedon; $EDt = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateCalculatedon = $EDt->format('d-m-Y');
$PaymentTerms=$Req->PaymentTerms; $PaymentTerms=$Req->PaymentTerms;
// $PayableAT=$Req->PayableAT; // $PayableAT=$Req->PayableAT;
// $PaymentDays=$Req->PaymentDays; // $PaymentDays=$Req->PaymentDays;
@ -221,7 +223,7 @@ if(!empty($RequistionDetails))
$("#PODate").datepicker({ $("#PODate").datepicker({
minDate : d, minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
// $("#PayableAT").datepicker({ // $("#PayableAT").datepicker({
@ -243,7 +245,7 @@ if(!empty($RequistionDetails))
$("#Exchangerateon").datepicker({ $("#Exchangerateon").datepicker({
minDate : m, minDate : m,
//maxDate : 'now', //maxDate : 'now',
dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
}); });
@ -425,7 +427,7 @@ if(!empty($RequistionDetails))
<label>PO Date</label> <label>PO Date</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -501,7 +503,7 @@ if(!empty($RequistionDetails))
<label>Exchange Rate On</label> <label>Exchange Rate On</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Exchangerateon','value' => set_value('Exchangerateon',$CurrentDate),'id'=>'Exchangerateon', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;'); $data = array('name' => 'Exchangerateon','value' => set_value('Exchangerateon',$ExchangeRateCalculatedon),'id'=>'Exchangerateon', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -3028,8 +3030,11 @@ function USRate()
function EditRatechange() function EditRatechange()
{ {
var txteditQuantity=parseFloat($('#EditQuantity').val()); //var txteditQuantity=parseFloat($('#EditQuantity').val());
var txteditUnitPrice=parseFloat($('#EditRate').val()); var txteditQuantity = $('#EditQuantity').val() == '' ? '0.00' : $('#EditQuantity').val()
//var txteditUnitPrice=parseFloat($('#EditRate').val());
var txteditUnitPrice = $('#EditRate').val() == '' ? '0.00' : $('#EditRate').val()
var editTot=txteditQuantity*txteditUnitPrice var editTot=txteditQuantity*txteditUnitPrice
$('#EdittxtBasicValue').val(editTot); $('#EdittxtBasicValue').val(editTot);
$(EditimBasicPrice).val(editTot); $(EditimBasicPrice).val(editTot);
@ -3068,8 +3073,10 @@ function Ratechange(){
if($('#Quantity').val() != '' && $('#Rate').val() != '') if($('#Quantity').val() != '' && $('#Rate').val() != '')
{ {
var txtQuantity = parseFloat( $('#Quantity').val()); // var txtQuantity = parseFloat( $('#Quantity').val());
var txtUnitPrice = parseFloat($('#Rate').val()); var txtQuantity = $('#Quantity').val() == '' ? '0.00' : $('#Quantity').val()
//var txtUnitPrice = parseFloat($('#Rate').val());
var txtUnitPrice = $('#Rate').val() == '' ? '0.00' : $('#Rate').val()
var Tot = txtQuantity * txtUnitPrice var Tot = txtQuantity * txtUnitPrice
$('#txtBasicValue').val(Tot); $('#txtBasicValue').val(Tot);
@ -3128,7 +3135,7 @@ $('#TotalExp').val('');
//var result=(txtlanding*txtbasicprice/100); //var result=(txtlanding*txtbasicprice/100);
var result= <?php echo LOADING_CHARGE;?>; var result= <?php echo LOADING_CHARGE;?>;
$('#AfterLandingCharge').val(parseFloat(Math.round(result))); $('#AfterLandingCharge').val(result.toFixed(2));
CalculateHighseassalescharge(); CalculateHighseassalescharge();
//alert(); //alert();
@ -3147,7 +3154,7 @@ $('#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(parseFloat(Math.round(result))); $('#EditAfterLandingCharge').val(result.toFixed(2));
EditCalculateHighseassalescharge(); EditCalculateHighseassalescharge();
//alert(); //alert();
} }
@ -3175,7 +3182,7 @@ function CalculateHighseassalescharge()
$('#AfterHighseas').val(''); $('#AfterHighseas').val('');
} }
else{ else{
$('#AfterHighseas').val(parseFloat(Math.round(txtAfterhighsess))); $('#AfterHighseas').val(txtAfterhighsess.toFixed(2));
} }
CalculateCustomduty(); CalculateCustomduty();
@ -3203,7 +3210,7 @@ function EditCalculateHighseassalescharge()
$('#EditAfterHighseas').val(''); $('#EditAfterHighseas').val('');
} }
else{ else{
$('#EditAfterHighseas').val(parseFloat(Math.round(txthighsess))); $('#EditAfterHighseas').val(txthighsess.toFixed(2));
} }
EditCalculateCustomduty(); EditCalculateCustomduty();
} }
@ -3227,7 +3234,7 @@ function CalculateCustomduty()
$('#AfterCustomduty').val(''); $('#AfterCustomduty').val('');
} }
else{ else{
$('#AfterCustomduty').val(parseFloat(Math.round(txtcustomduty))); $('#AfterCustomduty').val(txtcustomduty.toFixed(2));
} }
CalculateExciseDuty() ; CalculateExciseDuty() ;
@ -3272,7 +3279,7 @@ function EditCalculateCustomduty()
$('#EditAfterCustomduty').val(''); $('#EditAfterCustomduty').val('');
} }
else{ else{
$('#EditAfterCustomduty').val(parseFloat(Math.round(txtcustomduty))); $('#EditAfterCustomduty').val(txtcustomduty.toFixed(2));
} }
EditCalculateExciseDuty() ; EditCalculateExciseDuty() ;
@ -3304,7 +3311,7 @@ function CalculateExciseDuty()
} }
//var totalexcise=txtcustomduty+Exciseduty; //var totalexcise=txtcustomduty+Exciseduty;
else{ else{
$('#AfterExcisedutyTax').val(parseFloat(Math.round(totalexcise))); $('#AfterExcisedutyTax').val(totalexcise.toFixed(2));
} }
CalculateExciseED1(); CalculateExciseED1();
} }
@ -3336,7 +3343,7 @@ function EditCalculateExciseDuty()
else else
{ {
//var totalexcise=txtcustomduty+Exciseduty; //var totalexcise=txtcustomduty+Exciseduty;
$('#EditAfterExcisedutyTax').val(parseFloat(Math.round(totalexcise))); $('#EditAfterExcisedutyTax').val(totalexcise.toFixed(2));
} }
EditCalculateExciseED1(); EditCalculateExciseED1();
} }
@ -3474,7 +3481,7 @@ function CalculateexciseSHcess()
} }
else else
{ {
$('#AfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess))); $('#AfterCustomEDcess').val(txtcustomedsess.toFixed(2));
} }
CalculateCustomSHcess(); CalculateCustomSHcess();
@ -3511,7 +3518,7 @@ function EditCalculateCustomEdcess()
} }
else else
{ {
$('#EditAfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess))); $('#EditAfterCustomEDcess').val(txtcustomedsess.toFixed(2));
} }
EditCalculateCustomSHcess(); EditCalculateCustomSHcess();
@ -3552,7 +3559,7 @@ function EditCalculateCustomEdcess()
} }
else else
{ {
$('#AfterCustomSHcess').val(parseFloat(Math.round(totresult))); $('#AfterCustomSHcess').val(totresult.toFixed(2));
} }
CalculateaddlExciseDuty(); CalculateaddlExciseDuty();
@ -3591,7 +3598,7 @@ function EditCalculateCustomEdcess()
} }
else else
{ {
$('#EditAfterCustomSHcess').val(parseFloat(Math.round(totresult))); $('#EditAfterCustomSHcess').val(totresult.toFixed(2));
} }
EditCalculateaddlExciseDuty(); EditCalculateaddlExciseDuty();
@ -3634,7 +3641,7 @@ function CalculateaddlExciseDuty()
} }
else else
{ {
$('#AfterAdditionalExciseduty').val(parseFloat(Math.round(txtaddtnexciseduty))); $('#AfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2));
} }
//var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty; //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
@ -3644,7 +3651,7 @@ function CalculateaddlExciseDuty()
$('#Grossdutypayable').val(''); $('#Grossdutypayable').val('');
} }
else{ else{
$('#Grossdutypayable').val(parseFloat(Math.round(txtgrossduty))); $('#Grossdutypayable').val(txtgrossduty.toFixed(2));
} }
CalculateAvlModvat(); CalculateAvlModvat();
@ -3689,7 +3696,7 @@ function EditCalculateaddlExciseDuty()
} }
else else
{ {
$('#EditAfterAdditionalExciseduty').val(Math.round(txtaddtnexciseduty)); $('#EditAfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2));
} }
//var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty; //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
@ -3700,7 +3707,7 @@ function EditCalculateaddlExciseDuty()
} }
else else
{ {
$('#EditGrossdutypayable').val(parseFloat(Math.round(txtgrossduty))); $('#EditGrossdutypayable').val(txtgrossduty.toFixed(2));
} }
EditCalculateAvlModvat(); EditCalculateAvlModvat();
@ -3728,7 +3735,7 @@ function CalculateAvlModvat()
} }
else else
{ {
$('#AvailableModvat').val(parseFloat(Math.round(totavlmodvat))); $('#AvailableModvat').val(totavlmodvat.toFixed(2));
} }
CalculateGrossExpense(); CalculateGrossExpense();
@ -3759,7 +3766,7 @@ function EditCalculateAvlModvat()
} }
else else
{ {
$('#EditAvailableModvat').val(parseFloat(Math.round(totavlmodvat))); $('#EditAvailableModvat').val(totavlmodvat.toFixed(2));
} }
EditCalculateGrossExpense(); EditCalculateGrossExpense();
} }
@ -3784,7 +3791,7 @@ function CalculateGrossExpense()
} }
else else
{ {
$('#Grossexpenses').val(parseFloat(Math.round(grossexp))); $('#Grossexpenses').val(grossexp.toFixed(2));
} }
CalculateCtable(); CalculateCtable();
@ -3811,7 +3818,7 @@ function EditCalculateGrossExpense()
} }
else else
{ {
$('#EditGrossexpenses').val(parseFloat(Math.round(grossexp))); $('#EditGrossexpenses').val(grossexp.toFixed(2));
} }
EditCalculateCtable() EditCalculateCtable()
@ -3830,10 +3837,14 @@ function CalculateCtable()
var txtrmc=0; var txtrmc=0;
var total=0; var total=0;
var basicamt=0; var basicamt=0;
basicprice=parseFloat($('#txtBasicValue').val()); // basicprice=parseFloat($('#txtBasicValue').val());
basicprice = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val()
// console.log(basicprice); // console.log(basicprice);
quantity=parseFloat($('#PurQuantity').val()); //quantity=parseFloat($('#PurQuantity').val());
txtbasicinrprice=parseFloat($('#AfterBasicPriceTax').val()); quantity = $('#PurQuantity').val() == '' ? '0.00' : $('#PurQuantity').val()
// txtbasicinrprice=parseFloat($('#AfterBasicPriceTax').val());
txtbasicinrprice = $('#AfterBasicPriceTax').val() == '' ? '0.00' : $('#AfterBasicPriceTax').val()
//txtpurchaserate=txtbasicinrprice/txtCtablequantity; //txtpurchaserate=txtbasicinrprice/txtCtablequantity;
txtpurchaserate=<?php echo PURCHASE_RATE;?>; txtpurchaserate=<?php echo PURCHASE_RATE;?>;
//console.log(txtpurchaserate); //console.log(txtpurchaserate);
@ -3841,13 +3852,24 @@ function CalculateCtable()
{ {
$('#purchaserate').val(''); $('#purchaserate').val('');
} }
else if (isFinite(txtpurchaserate))
{
$('#purchaserate').val(txtpurchaserate.toFixed(2));
}
else else
{ {
$('#purchaserate').val(txtpurchaserate); $('#purchaserate').val(0);
} }
//CustomDutyExpenses //CustomDutyExpenses
//RMCIncludingCustomers //RMCIncludingCustomers
txtgrossexp=parseFloat($('#Grossexpenses').val()); //txtgrossexp=parseFloat($('#Grossexpenses').val());
txtgrossexp = $('#Grossexpenses').val() == '' ? '0.00' : $('#Grossexpenses').val()
//txtcustomdutyexp=txtgrossexp/txtCtablequantity; //txtcustomdutyexp=txtgrossexp/txtCtablequantity;
txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>; txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
if(isNaN(txtcustomdutyexp)) if(isNaN(txtcustomdutyexp))
@ -3856,7 +3878,7 @@ function CalculateCtable()
} }
else else
{ {
$('#CustomDutyExpenses').val(Math.round(txtcustomdutyexp)); $('#CustomDutyExpenses').val(txtcustomdutyexp.toFixed(2));
} }
//txtrmc=txtpurchaserate+txtcustomdutyexp; //txtrmc=txtpurchaserate+txtcustomdutyexp;
txtrmc=<?php echo RMC_CAL;?>; txtrmc=<?php echo RMC_CAL;?>;
@ -3866,7 +3888,7 @@ function CalculateCtable()
} }
else else
{ {
$('#RMCIncludingCustomers').val(Math.round(txtrmc)); $('#RMCIncludingCustomers').val(txtrmc.toFixed(2));
} }
//total=<?php echo CALCULATE_TOTAL;?>; //total=<?php echo CALCULATE_TOTAL;?>;
@ -3889,25 +3911,65 @@ function EditCalculateCtable()
var txtrmc=0; var txtrmc=0;
var total=0; var total=0;
var basicprice=0; var basicprice=0;
basicprice=parseFloat($('#EdittxtBasicValue').val()); //basicprice=parseFloat($('#EdittxtBasicValue').val());
basicprice = $('#EdittxtBasicValue').val() == '' ? '0.00' : $('#EdittxtBasicValue').val();
$('#EditTotalExp').val(basicprice); $('#EditTotalExp').val(basicprice);
var a=parseFloat($('#EditTotalExp').val()); var a=parseFloat($('#EditTotalExp').val());
//console.log(a); //console.log(a);
//alert(basicamt); //alert(basicamt);
quantity=parseFloat($('#EditPurQuantity').val()); //quantity=parseFloat($('#EditPurQuantity').val());
txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
quantity = $('#EditPurQuantity').val() == '' ? '0.00' : $('#EditPurQuantity').val();
//txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
txtbasicinrprice = $('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#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 if (isFinite(txtpurchaserate))
{
$('#Editpurchaserate').val(txtpurchaserate.toFixed(2));
}
else{
//$('#Editpurchaserate').val(txtpurchaserate);
$('#Editpurchaserate').val(0);
}
//CustomDutyExpenses //CustomDutyExpenses
//RMCIncludingCustomers //RMCIncludingCustomers
txtgrossexp=parseFloat($('#EditGrossexpenses').val()); //txtgrossexp=parseFloat($('#EditGrossexpenses').val());
txtgrossexp = $('#EditGrossexpenses').val() == '' ? '0.00' : $('#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));
}
//txtrmc=txtpurchaserate+txtcustomdutyexp; //txtrmc=txtpurchaserate+txtcustomdutyexp;
txtrmc=<?php echo RMC_CAL;?>; txtrmc=<?php echo RMC_CAL;?>;
$('#EditRMCIncludingCustomers').val(txtrmc);
if(isNaN(txtrmc))
{
$('#EditRMCIncludingCustomers').val(0);
}
else{
$('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2));
}
total=<?php echo CALCULATE_TOTAL;?>; total=<?php echo CALCULATE_TOTAL;?>;
$('#EditTotalExp').val(basicprice); $('#EditTotalExp').val(basicprice);

6
application/views/importpo.php
View File

@ -2345,7 +2345,7 @@ $('#TotalExp').val('');
$('#AfterLandingCharge').val(''); $('#AfterLandingCharge').val('');
} }
else{ else{
$('#AfterLandingCharge').val(parseFloat(Math.round(result))); $('#AfterLandingCharge').val(result.toFixed(2));
} }
@ -2368,7 +2368,7 @@ $('#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(parseFloat(Math.round(result))); $('#EditAfterLandingCharge').val(result.toFixed(2));
EditCalculateHighseassalescharge(); EditCalculateHighseassalescharge();
//alert(); //alert();
} }
@ -2396,7 +2396,7 @@ $('#TotalExp').val('');
$('#AfterHighseas').val(''); $('#AfterHighseas').val('');
} }
else{ else{
$('#AfterHighseas').val(parseFloat(Math.round(txtAfterhighsess))); $('#AfterHighseas').val(txtAfterhighsess.toFixed(2));
} }
CalculateCustomduty(); CalculateCustomduty();