diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php index 1c4e8bc6..a8aae2ae 100755 --- a/application/controllers/amendmentpurchaseorder.php +++ b/application/controllers/amendmentpurchaseorder.php @@ -1221,17 +1221,6 @@ function UpdateAmendServicePurchaseOrder() } - - - - // if($DeliveryOption==1){ - // $Deliverydt = ''; - // $DeliverySchedule = $this->input->post('Scheduleby'); - // } - // else{ - // $Deliverydt = $this->getDateformat($dt); - // $DeliverySchedule = ''; - // } $SpcialInstruction = $this->input->post('txtSpcialInstruction'); @@ -1281,13 +1270,6 @@ function UpdateAmendServicePurchaseOrder() $importoption=$this->input->post('Importoption'); -// addmodeofshipment -// amendsupplierreference -// amendsupplierofferno -// amendotherreference -// amendfincap - //echo $beforePaymentTerms; - //die(); if($PaymentTerms!=$beforePaymentTerms) { //$MAD=$MAD."Amended Payment Terms:". $beforePaymentTerms ."
"; @@ -1364,67 +1346,57 @@ function UpdateAmendServicePurchaseOrder() // die(); $AfterLandingCharge = $this->input->post('AfterLandingCharge'.$i); - $HighSeas = $this->input->post('HighSeasSalesCharge'.$i); - $beforeHighSeas=$this->input->post('beforeHighSeasSalesCharge'.$i); - $AfterHighSeas = $this->input->post('AfterHighSeasSalesCharge'.$i); - + $CustomDuty = $this->input->post('CustomDuty'.$i); $beforeCustomDuty=$this->input->post('beforeCustomDuty'.$i); $AfterCustomDuty = $this->input->post('AfterCustomDuty'.$i); - $ExciseDuty = $this->input->post('ExciseDuty'.$i); - $beforeExciseDuty=$this->input->post('beforeExciseDuty'.$i); - - $AfterExciseDuty = $this->input->post('AfterExciseDuty'.$i); - - $ExciseDutyEd = $this->input->post('ExciseDutyEdCess'.$i); - $beforeExciseDutyEd=$this->input->post('beforeExciseDutyEdCess'.$i); - $AfterExciseDutyEd = $this->input->post('AfterExciseDutyEdCess'.$i); - $ExciseDutySH = $this->input->post('ExciseDutySHCess'.$i); - $beforeExciseDutySH=$this->input->post('beforeExciseDutySHCess'.$i); - - $AfterExciseDutySH = $this->input->post('AfterExciseDutySHCess'.$i); - - $CustomEd= $this->input->post('CustomEdCess'.$i); + $CustomEd= $this->input->post('CustomEdCess1'.$i); $beforeCustomEd=$this->input->post('beforeCustomEdCess'.$i); - $AfterCustomEd= $this->input->post('AfterCustomEdCess'.$i); + $AfterCustomEd= $this->input->post('AfterCustomEdCess1'.$i); + + // echo $CustomEd; + // echo 're'; + // echo $AfterCustomEd; $CustomSH = $this->input->post('CustomSHCess'.$i); $beforeCustomSH=$this->input->post('beforeCustomSHCess'.$i); $AfterCustomSH = $this->input->post('AfterCustomSHCess'.$i); - $AddAdtional = $this->input->post('AddlExciseDuty'.$i); - $beforeAddAdtional=$this->input->post('beforeAddlExciseDuty'.$i); - + - $AfterAddAdtional = $this->input->post('AfterAddlExciseDuty'.$i); - - $Grossdutypayable = $this->input->post('Grossdutypayable'.$i); + $Grossdutypayable = $this->input->post('Grossdutypayable1'.$i); $beforeGrossdutypayable = $this->input->post('beforeGrossdutypayable'.$i); - $AvailableModvat = $this->input->post('AvailableModvat'.$i); - $beforeAvailableModvat = $this->input->post('beforeAvailableModvat'.$i); - - $Grossexpensesduetocustomduty = $this->input->post('Grossexpensesduetocustomduty'.$i); - $beforeGrossexpensesduetocustomduty = $this->input->post('Grossexpensesduetocustomduty'.$i); - - $purchaseratePerKG = $this->input->post('purchaseratePerKG'.$i); - $beforepurchaseratePerKG = $this->input->post('beforepurchaseratePerKG'.$i); - - $CustomDutyExpensesPerKG = $this->input->post('CustomDutyExpensesPerKG'.$i); - $beforeCustomDutyExpensesPerKG = $this->input->post('beforeCustomDutyExpensesPerKG'.$i); - - $RMCIncludingCustomersPerKG = $this->input->post('RMCIncludingCustomersPerKG'.$i); - $beforeRMCIncludingCustomersPerKG = $this->input->post('RMCIncludingCustomersPerKG'.$i); + //echo $Grossdutypayable; + $Assable=$this->input->post('AssessableValue'.$i); + $beforeAssable=$this->input->post('beforeAssessableValue'.$i); + + + $Subtotal=$this->input->post('SubTotal'.$i); + $beforeSubtotal=$this->input->post('beforeSubTotal'.$i); + + $Igst=$this->input->post('IGST'.$i); + $beforeIgst=$this->input->post('beforeIGST'.$i); + $AfterIgst=$this->input->post('AfterIGST'.$i); + + + + $CustomDutyExpensesPerKG = $this->input->post('CustomDutyExpensesPerKG'.$i); + $beforeCustomDutyExpensesPerKG = $this->input->post('beforeCustomDutyExpensesPerKG'.$i); + + + + $FreightType=$this->input->post('FreightType'.$i); $NoOfTrip=$this->input->post('NoOfTrip'.$i); @@ -1447,6 +1419,14 @@ function UpdateAmendServicePurchaseOrder() // } $QuantityKG = $this->input->post('QuantityKG'.$i); + + $ClearingCharge = $this->input->post('ClearingCharge'.$i); + + $NetValue = $this->input->post('NetValue'.$i); + + $DutyImpact=$this->input->post('DutyImpact'.$i); + + $specialinstruction=$this->input->post('Addinstruction'.$i); @@ -1481,12 +1461,7 @@ function UpdateAmendServicePurchaseOrder() $CAD=$CAD."Amended Landing percentage : ".$beforeLandingCharge ."Current Landing Percentage:".$LandingCharge.""; } - if(($HighSeas-$beforeHighSeas)!=0) - { - $rowspanvalue++; - //$CAD=$CAD."Amended Highsesas :".$beforeHighSeas ."
"; - $CAD=$CAD."Amended Highsesas : ".$beforeHighSeas ."Current Highsesas:".$HighSeas.""; - } + if(($CustomDuty-$beforeCustomDuty)!=0) @@ -1498,31 +1473,6 @@ function UpdateAmendServicePurchaseOrder() - if(($ExciseDuty-$beforeExciseDuty)!=0) - { - $rowspanvalue++; - //$CAD=$CAD."Amended ExciseDuty :".$beforeExciseDuty ."
"; - $CAD=$CAD."Amended ExciseDuty : ".$beforeExciseDuty ."Current ExciseDuty:".$ExciseDuty.""; - - } - - if($ExciseDutyEd-$beforeExciseDutyEd) - { - $rowspanvalue++; - //$CAD=$CAD."Amended ExciseDutyEd :".$beforeExciseDutyEd ."
"; - $CAD=$CAD."Amended ExciseDutyEd : ".$beforeExciseDutyEd ."Current ExciseDutyEd:".$ExciseDutyEd.""; - - } - - - if($ExciseDutySH-$beforeExciseDutySH) - { - $rowspanvalue++; - //$CAD=$CAD."Amended ExciseDutySH :".$beforeExciseDutySH ."
"; - $CAD=$CAD."Amended ExciseDutySH : ".$beforeExciseDutySH ."Current ExciseDutySH:".$ExciseDutySH.""; - - } - if($CustomEd-$beforeCustomEd) { $rowspanvalue++; @@ -1541,14 +1491,7 @@ function UpdateAmendServicePurchaseOrder() } - if($AddAdtional-$beforeAddAdtional) - { - //$CAD=$CAD."Amended Additional Excise duty :".$beforeAddAdtional ."
"; - $rowspanvalue++; - $CAD=$CAD."Amended Additional Excise duty: ".$beforeAddAdtional ."Current Additional Excise duty:".$AddAdtional.""; - } - - + if($FreightType!=$beforeFreightType) { @@ -1592,6 +1535,48 @@ function UpdateAmendServicePurchaseOrder() + + + if(($Assable-$beforeAssable)!=0) + { + //$CAD=$CAD."Amended CustomDuty :".$beforeCustomDuty ."
"; + $rowspanvalue++; + $CAD=$CAD."Amended Assessable : ".$beforeAssable ."Current CustomDuty:".$Assable.""; + } + + + + if(($Subtotal-$beforeSubtotal)!=0) + { + //$CAD=$CAD."Amended CustomDuty :".$beforeCustomDuty ."
"; + $rowspanvalue++; + $CAD=$CAD."Amended Subtotal : ".$beforeSubtotal ."Current Subtotal:".$Subtotal.""; + } + + + + if(($Igst-$beforeIgst)!=0) + { + //$CAD=$CAD."Amended CustomDuty :".$beforeCustomDuty ."
"; + $rowspanvalue++; + $CAD=$CAD."Amended IGST Percentage : ".$beforeIgst ."Current IGST Percentage:".$Igst.""; + } + + + + if(($Grossdutypayable-$beforeGrossdutypayable)!=0) + { + //$CAD=$CAD."Amended CustomDuty :".$beforeCustomDuty ."
"; + $rowspanvalue++; + $CAD=$CAD."Amended Gross Duty Payable : ".$beforeGrossdutypayable ."Current Gross Duty Payable:".$Grossdutypayable.""; + } + + + + + + + if($rowspanvalue>0) { $rowspanvalue++; @@ -1623,7 +1608,7 @@ function UpdateAmendServicePurchaseOrder() // endforeach; - $ImportTaxList = array('LineItemNo'=>$LineItemNo,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem,'FreightType'=>$FreightType,'NoOfTrip'=>$NoOfTrip,'FreightValue'=>$Freightrate,'AfterFreightValue'=>$Freightamount); + $ImportTaxList = array('LineItemNo'=>$LineItemNo,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'Grossdutypayable'=>$Grossdutypayable,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem,'FreightType'=>$FreightType,'NoOfTrip'=>$NoOfTrip,'FreightValue'=>$Freightrate,'AfterFreightValue'=>$Freightamount,'AssessableValue'=>$Assable,'SubTotal'=>$Subtotal,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'DutyImpact'=>$DutyImpact,'NetValue'=>$NetValue,'ClearingCharge'=>$ClearingCharge); // print_r($ImportTaxList); //die(); $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList); diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php index 7ef144a3..f4af13ad 100755 --- a/application/views/editImportAmendPO.php +++ b/application/views/editImportAmendPO.php @@ -7,6 +7,11 @@ $Rowcount = 0; $Value=$unicode; + $totassesable=0; + $totSubtotal=0; + $totigst=0; + + $Import_DispatchDetails=''; $Import_PlaceofOrgin=''; @@ -1073,10 +1078,10 @@ if(!empty($RequistionDetails))
- +
-
+
-
-
- - -
-
-
- 'EditExcisedutyTax','value' => set_value('EditExcisedutyTax'),'id'=>'EditExcisedutyTax', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseDuty()'); - echo form_input($data); - ?> -
-
-
-
- 'EditAfterExcisedutyTax','value' => set_value('EditAfterExcisedutyTax'),'id'=>'EditAfterExcisedutyTax', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - -
-
-
- 'EditExcisedutyEDcess','value' => set_value('EditExcisedutyEDcess'),'id'=>'EditExcisedutyEDcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseED1()'); - echo form_input($data); - ?> -
-
-
-
- 'EditAfterExcisedutyEDcess','value' => set_value('EditAfterExcisedutyEDcess'),'id'=>'EditAfterExcisedutyEDcess', 'class' => 'form-control num','readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - -
-
-
- 'EditExcisedutySHcess','value' => set_value('EditExcisedutySHcess'),'id'=>'EditExcisedutySHcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateexciseSHcess()'); - echo form_input($data); - ?> -
-
-
-
- 'EditAfterExcisedutySHcess','value' => set_value('EditAfterExcisedutySHcess'),'id'=>'EditAfterExcisedutySHcess', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
+ + +
@@ -1229,10 +1171,10 @@ if(!empty($RequistionDetails))
- +
-
+ + + + + + +
+
+ + +
+
+
+ 'EditIgst ','value' => set_value('EditIgst',0),'id'=>'EditIgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateIgst()'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterIgst','value' => set_value('EditAfterIgst',0),'id'=>'EditAfterIgst', 'class' => 'form-control num' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ + + + + + + +
@@ -1262,36 +1239,8 @@ if(!empty($RequistionDetails))
-
-
- - -
-
-
- 'EditAvailableModvat','value' => set_value('EditAvailableModvat'),'id'=>'EditAvailableModvat', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> (b + c + d + g) -
-
- -
-
- -
- - -
-
-
- 'EditGrossexpenses','value' => set_value('EditGrossexpenses'),'id'=>'EditGrossexpenses', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);'); - echo form_input($data); - ?> -
-
-
+ +
@@ -1354,12 +1303,12 @@ if(!empty($RequistionDetails))
- purchase rate () [Basic]/UOM + Duty Impact
'Editpurchaserate','value' => set_value('Editpurchaserate'),'id'=>'Editpurchaserate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true'); + $data = array('name' => 'EditDutyImpact','value' => set_value('EditDutyImpact'),'id'=>'EditDutyImpact', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true'); echo form_input($data); ?>
@@ -1379,7 +1328,7 @@ if(!empty($RequistionDetails))
- +
@@ -1394,16 +1343,37 @@ if(!empty($RequistionDetails))
- +
'EditRMCIncludingCustomers','value' => set_value('EditRMCIncludingCustomers'),'id'=>'EditRMCIncludingCustomers', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true'); + $data = array('name' => 'EditClearingCharges','value' => set_value('EditClearingCharges'),'id'=>'EditClearingCharges', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);'); echo form_input($data); ?>
+ + + +
+ + +
+
+
+ 'EditNett','value' => set_value('EditNett'),'id'=>'EditNett', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true'); + echo form_input($data); + ?> +
+
+ + + + + + @@ -1522,13 +1492,6 @@ echo form_textarea($data); - - - - - - - @@ -1539,21 +1502,6 @@ echo form_textarea($data); - - - - - - - - - - - - - - - @@ -1570,34 +1518,6 @@ echo form_textarea($data); - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1605,12 +1525,6 @@ echo form_textarea($data); - - - - - - @@ -1628,16 +1542,6 @@ echo form_textarea($data); - - - - - - - - - - @@ -1651,24 +1555,11 @@ echo form_textarea($data); - - - - - - - - - - - - - @@ -1692,37 +1583,12 @@ echo form_textarea($data); - - + - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1765,6 +1631,65 @@ echo form_textarea($data); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1801,6 +1726,11 @@ echo form_textarea($data); $totorder=$totorder+$record->BasicValue; $totfreight=$totfreight+$record->AfterFreightValue; //alert($totorder); + + + $totassesable=$totassesable+$record->AssessableValue; + $totSubtotal=$totSubtotal+$record->SubTotal; + $totigst=$totigst+$record->AfterIGST; } @@ -1809,21 +1739,26 @@ echo form_textarea($data); @@ -1843,11 +1778,11 @@ echo form_textarea($data); ?>
-
- +
+ 'txttotalhighseas','value' => set_value('txttotalhighseas',$tothighseas),'id'=>'txttotalhighseas', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + $data = array('name' => 'txttotalAssessable','value' => set_value('txttotalAssessable',$totassesable),'id'=>'txttotalAssessable', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); echo form_input($data); ?>
@@ -1861,34 +1796,27 @@ echo form_textarea($data); ?>
-
- + +
+ 'txttotalexcise','value' => set_value('txttotalexcise',$totexciseduty),'id'=>'txttotalexcise', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> -
- -
- - - 'txttotalexciseED','value' => set_value('txttotalexciseED', $totexcisedutyED),'id'=>'txttotalexciseED', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + $data = array('name' => 'txttotalSubtotal','value' => set_value('txttotalSubtotal',$totSubtotal),'id'=>'txttotalSubtotal', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); echo form_input($data); ?>
-
- +
+ 'txttotalexciseSH','value' => set_value('txttotalexciseSH',$totexciseSH),'id'=>'txttotalexciseSH', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + $data = array('name' => 'txttotalIgst','value' => set_value('txttotalIgst',$totigst),'id'=>'txttotalIgst', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); echo form_input($data); ?>
+
@@ -1907,18 +1835,8 @@ echo form_textarea($data); ?>
-
- - - 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty',$totaddtnlexcise),'id'=>'txttotalAdditionalExciseduty', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> -
- - -
- +
+ 'txttotalgrossduty','value' => set_value('txttotalgrossduty',$totgrossduty),'id'=>'txttotalgrossduty', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -1926,24 +1844,7 @@ echo form_textarea($data); ?>
-
- - - 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat',$totavlmodvat),'id'=>'txttotalavlmodvat', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> -
- - -
- - - 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense',$totgrossexpense),'id'=>'txttotalgrossexpense', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> -
+
@@ -2434,13 +2335,14 @@ function EditRatechange() if(EditQtyZerocheck()) { - //var txteditQuantity=parseFloat($('#EditQuantity').val()); - var txteditQuantity = $('#EditQuantity').val() == '' ? '0.00' : $('#EditQuantity').val() + + var txteditQuantity =parseFloat($('#EditQuantity').val() == '' ? '0.00' : $('#EditQuantity').val()); //var txteditUnitPrice=parseFloat($('#EditRate').val()); - var txteditUnitPrice = $('#EditRate').val() == '' ? '0.00' : $('#EditRate').val() + var txteditUnitPrice =parseFloat($('#EditRate').val() == '' ? '0.00' : $('#EditRate').val()); + var editTot=txteditQuantity*txteditUnitPrice $('#EdittxtBasicValue').val(parseFloat(editTot).toFixed(2)); - $('#EditimBasicPrice').val(parseFloat(editTot).toFixed(2)); + $(EditimBasicPrice).val(parseFloat(editTot).toFixed(2)); var exchangerate=parseFloat($('#EditExchangeRt').val()); var txtINR=editTot*exchangerate; $('#EditINRBasicvalue').val(parseFloat(txtINR).toFixed(2)); @@ -2524,100 +2426,33 @@ $('#TotalExp').val(''); function EditCalculateloadingcharge() { - //alert(); + var txtlanding=0; var txtbasicprice=0; + var asss=0; + txtlanding=parseFloat($('#EditLandingCharge').val() == '' ? '0.00' : $('#EditLandingCharge').val()); + //txtlanding=parseFloat($('#EditLandingCharge').val()); + //txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val()); - - txtlanding=parseFloat($('#EditLandingCharge').val()); - txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val()); - //var result=(txtlanding*txtbasicprice/100); + txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#EditAfterBasicPriceTax').val()); + // console.log(txtbasicprice); var result= ; +//console.log(result); + + asss=result; +//console.log(asss); + + + // var Assessable= ; +var Assessable=parseFloat(txtbasicprice)+parseFloat(asss); + + $('#EditAfterLandingCharge').val(result.toFixed(2)); - EditCalculateHighseassalescharge(); - //alert(); + $('#EditAfterAssessable').val(Assessable); + EditCalculateCustomduty(); } -function CalculateHighseassalescharge() - { - - //alert(); - var txtbasicprice=0; - var txtlandingcharge=0; - var totalhighsess=0; - var highsesspercentage=0; - txtbasicprice=parseFloat($('#AfterBasicPriceTax').val()); - txtlandingcharge=parseFloat($('#AfterLandingCharge').val()); - // alert(txtlandingcharge); - totalhighsess=txtbasicprice+txtlandingcharge; - highsesspercentage=parseFloat($('#Highseas').val()); - - - //var txthighsess=(totalhighsess*highsesspercentage)/100; - var txtAfterhighsess=; - if(isNaN(txtAfterhighsess)) - { - $('#AfterHighseas').val(''); - } - else{ - $('#AfterHighseas').val(txtAfterhighsess.toFixed(2)); - } - - CalculateCustomduty(); - } - - - -function EditCalculateHighseassalescharge() - { - - //alert(); - var txtbasicprice=0; - var txtlandingcharge=0; - var totalhighsess=0; - var highsesspercentage=0; - var txthighsess=0; - txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val()); - txtlandingcharge=parseFloat($('#EditAfterLandingCharge').val()); - totalhighsess=txtbasicprice+txtlandingcharge; - highsesspercentage=parseFloat($('#EditHighseas').val()); - //var txthighsess=(totalhighsess*highsesspercentage)/100; - txthighsess=; - if(isNaN(txthighsess)) - { - $('#EditAfterHighseas').val(''); - } - else{ - $('#EditAfterHighseas').val(txthighsess.toFixed(2)); - } - EditCalculateCustomduty(); - } -function CalculateCustomduty() -{ - var txtbasic=0; - var txtcustompercentage=0; - var txthighse=0; - var txtlandingch=0; - var sumcustom=0; - var txtcustomduty=0; - txtbasic=parseFloat($('#AfterBasicPriceTax').val()); - txtcustompercentage=parseFloat($('#Customduty').val()); - txthighse=parseFloat($('#AfterHighseas').val()); - txtlandingch=parseFloat($('#AfterLandingCharge').val()); - sumcustom=txthighse+txtlandingch+txtbasic; - //var txtcustomduty=(txtbasic*txtcustompercentage)/100; - txtcustomduty=; - if(isNaN(txtcustomduty)) - { - $('#AfterCustomduty').val(''); - } - else{ - $('#AfterCustomduty').val(txtcustomduty.toFixed(2)); - } - CalculateExciseDuty() ; - -} @@ -2640,232 +2475,42 @@ return true; function EditCalculateCustomduty() { + var txtbasic=0; var txtcustompercentage=0; var txthighse=0; var txtlandingch=0; var sumcustom=0; var txtcustomduty=0; - txtbasic=parseFloat($('#EditAfterBasicPriceTax').val()); - txtcustompercentage=parseFloat($('#EditCustomduty').val()); - txthighse=parseFloat($('#EditAfterHighseas').val()); - txtlandingch=parseFloat($('#EditAfterLandingCharge').val()); - sumcustom=txthighse+txtlandingch+txtbasic; - //var txtcustomduty=(txtbasic*txtcustompercentage)/100; - txtcustomduty=; + + //var accessible=parseFloat($('#EditAfterAssessable').val()); +var accessible=parseFloat($('#EditAfterAssessable').val() == '' ? '0.00' : $('#EditAfterAssessable').val()); + // var txtcustompercentage=parseFloat($('#EditCustomduty').val()); +var txtcustompercentage=parseFloat($('#EditCustomduty').val() == '' ? '0.00' : $('#EditCustomduty').val()); + //sumcustom=txthighse+txtlandingch+txtbasic; + + + txtcustomduty=; if(isNaN(txtcustomduty)) { $('#EditAfterCustomduty').val(''); } else{ - $('#EditAfterCustomduty').val(txtcustomduty.toFixed(2)); + $('#EditAfterCustomduty').val(parseFloat(txtcustomduty).toFixed(2)); } - EditCalculateExciseDuty() ; + EditCalculateCustomEdcess() ; + } -function CalculateExciseDuty() -{ - var txtcustomduty=0; - var txthighsess=0; - var txtaftrlanding=0; - var txtbasicc=0; - var txtpercentage=0; - var txtexcisesum=0; - var totalexcise=0; - txtcustomduty=parseFloat($('#AfterCustomduty').val()); - txthighsess=parseFloat($('#AfterHighseas').val()); - txtaftrlanding=parseFloat($('#AfterLandingCharge').val()); - txtbasicc=parseFloat($('#AfterBasicPriceTax').val()); - - txtpercentage=parseFloat($('#ExcisedutyTax').val()); - txtexcisesum=txtcustomduty+txthighsess+txtaftrlanding+txtbasicc; - //var Exciseduty=(txtexcisesum*txtpercentage)/100; - totalexcise=; - if(isNaN(totalexcise)) - { - $('#AfterExcisedutyTax').val(''); - } - //var totalexcise=txtcustomduty+Exciseduty; - else{ - $('#AfterExcisedutyTax').val(totalexcise.toFixed(2)); - } - CalculateExciseED1(); -} - - - -function EditCalculateExciseDuty() -{ //alert('edit'); - var txtcustomduty=0; - var txthighsess=0; - var txtaftrlanding=0; - var txtbasicc=0; - var txtpercentage=0; - var txtexcisesum=0; - var totalexcise=0; - txtcustomduty=parseFloat($('#EditAfterCustomduty').val()); - txthighsess=parseFloat($('#EditAfterHighseas').val()); - txtaftrlanding=parseFloat($('#EditAfterLandingCharge').val()); - txtbasicc=parseFloat($('#EditAfterBasicPriceTax').val()); - - txtpercentage=parseFloat($('#EditExcisedutyTax').val()); - txtexcisesum=txtcustomduty+txthighsess+txtaftrlanding+txtbasicc; - //var Exciseduty=(txtexcisesum*txtpercentage)/100; - totalexcise=; - if(isNaN(totalexcise)) - { - $('#EditAfterExcisedutyTax').val(''); - } - else - { - //var totalexcise=txtcustomduty+Exciseduty; - $('#EditAfterExcisedutyTax').val(totalexcise.toFixed(2)); - } - EditCalculateExciseED1(); -} - - - -function CalculateExciseED1() -{ - var txtexcise=0; - var txtexcisepercentage=0; - var txtexcisetot=0; - txtexcise=parseFloat($('#AfterExcisedutyTax').val()); - txtexcisepercentage=parseFloat($('#ExcisedutyEDcess').val()); - //var txtexcisetot=(txtexcise*txtexcisepercentage)/100; - txtexcisetot=; - if(isNaN(txtexcisetot)) - { - $('#AfterExcisedutyEDcess').val(''); - } - else - { - $('#AfterExcisedutyEDcess').val(txtexcisetot.toFixed(2)); - } - - CalculateexciseSHcess(); - -//AfterExcisedutyEDcess -} - - -function EditCalculateExciseED1() -{ - var txtexcise=0; - var txtexcisepercentage=0; - var txtexcisetot=0; - txtexcise=parseFloat($('#EditAfterExcisedutyTax').val()); - txtexcisepercentage=parseFloat($('#EditExcisedutyEDcess').val()); - //var txtexcisetot=(txtexcise*txtexcisepercentage)/100; - txtexcisetot=; - if(isNaN(txtexcisetot)) - { - $('#EditAfterExcisedutyEDcess').val(''); - } - else - { - $('#EditAfterExcisedutyEDcess').val(txtexcisetot.toFixed(2)); - } - EditCalculateexciseSHcess(); - -//AfterExcisedutyEDcess -} - -function CalculateexciseSHcess() - { - var excisetxt=0; - var exciseshcess=0; - var exciseshcesstot=0; - excisetxt=parseFloat($('#AfterExcisedutyTax').val()); - exciseshcess=parseFloat($('#ExcisedutySHcess').val()); - //var exciseshcesstot=(excisetxt*exciseshcess)/100; - exciseshcesstot=; - if(isNaN(exciseshcesstot)) - { - $('#AfterExcisedutySHcess').val(''); - } - else - { - $('#AfterExcisedutySHcess').val(exciseshcesstot.toFixed(2)); - //$('#AfterExcisedutySHcess').val(''); - } - CalculateCustomEdcess(); - - } - - function EditCalculateexciseSHcess() - { - //alert(); - var excisetxt=0; - var exciseshcess=0; - //var exciseshcesstot=(excisetxt*exciseshcess)/100; - var exciseshcesstot=0; - - excisetxt=parseFloat($('#EditAfterExcisedutyTax').val()); - exciseshcess=parseFloat($('#EditExcisedutySHcess').val()); - //var exciseshcesstot=(excisetxt*exciseshcess)/100; - exciseshcesstot=; - if(isNaN(exciseshcesstot)) - { - $('#EditAfterExcisedutySHcess').val(''); - } - else - { - $('#EditAfterExcisedutySHcess').val(exciseshcesstot.toFixed(2)); - } - EditCalculateCustomEdcess(); - - } - - - function CalculateCustomEdcess() - { - - var txtloading=0; - var txthighses=0; - var txtcustomduty1=0; - var txtexciseduty=0; - var txtedexciseduty=0; - var txtshexcisesess=0; - var totalval=0; - var txtedcesspercentage=0; - //var txtcustomedsess=(totalval*txtedcesspercentage)/100; - var txtcustomedsess=0; - - - - - txtloading=parseFloat($('#AfterLandingCharge').val()); - txthighses=parseFloat($('#AfterHighseas').val()); - txtcustomduty1=parseFloat($('#AfterCustomduty').val()); - txtexciseduty=parseFloat($('#AfterExcisedutyTax').val()); - txtedexciseduty=parseFloat($('#AfterExcisedutyEDcess').val()); - txtshexcisesess=parseFloat($('#AfterExcisedutySHcess').val()); - totalval=txtloading+txtcustomduty1+txtexciseduty+ txtedexciseduty+txthighses+txtshexcisesess; - txtedcesspercentage=parseFloat($('#CustomEDcess').val()); - //var txtcustomedsess=(totalval*txtedcesspercentage)/100; - txtcustomedsess=; - if(isNaN(txtcustomedsess)) - { - - $('#AfterCustomEDcess').val(''); - } - else - { - $('#AfterCustomEDcess').val(txtcustomedsess.toFixed(2)); - } - CalculateCustomSHcess(); - - } function EditCalculateCustomEdcess() { + var txtloading=0; var txthighses=0; var txtcustomduty1=0; @@ -2877,73 +2522,37 @@ function EditCalculateCustomEdcess() //var txtcustomedsess=(totalval*txtedcesspercentage)/100; var txtcustomedsess=0; - txtloading=parseFloat($('#EditAfterLandingCharge').val()); - txthighses=parseFloat($('#EditAfterHighseas').val()); - txtcustomduty1=parseFloat($('#EditAfterCustomduty').val()); - txtexciseduty=parseFloat($('#EditAfterExcisedutyTax').val()); - txtedexciseduty=parseFloat($('#EditAfterExcisedutyEDcess').val()); - txtshexcisesess=parseFloat($('#EditAfterExcisedutySHcess').val()); - totalval=txtloading+txtcustomduty1+txtexciseduty+ txtedexciseduty+txthighses+txtshexcisesess; - txtedcesspercentage=parseFloat($('#EditCustomEDcess').val()); + //txtcustomduty1=parseFloat($('#EditAfterCustomduty').val()); + + //txtedcesspercentage=parseFloat($('#EditCustomEDcess').val()); //var txtcustomedsess=(totalval*txtedcesspercentage)/100; - txtcustomedsess=; + + txtcustomduty1=parseFloat($('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val()); + + // txtedcesspercentage=parseFloat($('#CustomEDcess').val()); + txtedcesspercentage=parseFloat($('#EditCustomEDcess').val() == '' ? '0.00' : $('#EditCustomEDcess').val()); + + txtcustomedsess=; if(isNaN(txtcustomedsess)) { $('#EditAfterCustomEDcess').val(''); } else { - $('#EditAfterCustomEDcess').val(txtcustomedsess.toFixed(2)); + $('#EditAfterCustomEDcess').val(parseFloat(txtcustomedsess).toFixed(2)); } EditCalculateCustomSHcess(); } - function CalculateCustomSHcess() - {//alert(); - var landingch=0; - var highsesssalles=0; - var customch=0; - var excisech=0; - var exciseedch=0; - var exciseshch=0; - var totcustomsh=0; - - var txtshpercentage=0; - //var totresult=(totcustomsh*txtshpercentage)/100; - var totresult=0; - - - - landingch=parseFloat($('#AfterLandingCharge').val()); - highsesssalles=parseFloat($('#AfterHighseas').val()); - customch=parseFloat($('#AfterCustomduty').val()); - excisech=parseFloat($('#AfterExcisedutyTax').val()); - exciseedch=parseFloat($('#AfterExcisedutyEDcess').val()); - exciseshch=parseFloat($('#AfterExcisedutySHcess').val()); - totcustomsh=landingch+highsesssalles+customch+excisech+exciseedch+exciseshch; - - txtshpercentage=parseFloat($('#CustomSHcess').val()); - //var totresult=(totcustomsh*txtshpercentage)/100; - totresult=; - if(isNaN(totresult)) - { - $('#AfterCustomSHcess').val(''); - } - else - { - $('#AfterCustomSHcess').val(totresult.toFixed(2)); - } - CalculateaddlExciseDuty(); - - } function EditCalculateCustomSHcess() {//alert(); + var landingch=0; var highsesssalles=0; var customch=0; @@ -2956,255 +2565,111 @@ function EditCalculateCustomEdcess() //var totresult=(totcustomsh*txtshpercentage)/100; var totresult=0; - landingch=parseFloat($('#EditAfterLandingCharge').val()); - highsesssalles=parseFloat($('#EditAfterHighseas').val()); - customch=parseFloat($('#EditAfterCustomduty').val()); - excisech=parseFloat($('#EditAfterExcisedutyTax').val()); - exciseedch=parseFloat($('#EditAfterExcisedutyEDcess').val()); - exciseshch=parseFloat($('#EditAfterExcisedutySHcess').val()); + var basucprice=$('#AfterBasicPriceTax').val() == '' ? '0.00' : $('#AfterBasicPriceTax').val() + + //landingch=parseFloat($('#EditAfterLandingCharge').val()); +landingch=$('#EditAfterLandingCharge').val() == '' ? '0.00' : $('#EditAfterLandingCharge').val() + + //highsesssalles=parseFloat($('#EditAfterHighseas').val()); + + // customch=parseFloat($('#EditAfterCustomduty').val()); +customch=$('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val() + + //excisech=parseFloat($('#EditAfterExcisedutyTax').val()); + + totcustomsh=landingch+highsesssalles+customch+excisech+exciseedch+exciseshch; - txtshpercentage=parseFloat($('#EditCustomSHcess').val()); + //txtshpercentage=parseFloat($('#EditCustomSHcess').val()); + +txtshpercentage=$('#EditCustomSHcess').val() == '' ? '0.00' : $('#EditCustomSHcess').val() //var totresult=(totcustomsh*txtshpercentage)/100; - var totresult=; + var totresult=; if(isNaN(totresult)) { $('#EditAfterCustomSHcess').val(''); } else { - $('#EditAfterCustomSHcess').val(totresult.toFixed(2)); + $('#EditAfterCustomSHcess').val(parseFloat(totresult).toFixed(2)); } - EditCalculateaddlExciseDuty(); + //EditCalculateaddlExciseDuty(); + + EditCalculateIgst() } -function CalculateaddlExciseDuty() + + function EditCalculateIgst() { + + // var custom=parseFloat($('#EditAfterCustomduty').val()); + // var customsh=parseFloat($('#EditAfterCustomSHcess').val()); + // var customed=parseFloat($('#EditAfterCustomEDcess').val()); - var basic=0; - var landingcha=0; - var highsesssalless=0; - var customcha=0; - var excisecha=0; - var exciseedcha=0; - var exciseshcha=0; - var customed=0; - var customsh=0; - var totaddtnlexcise=0; - var addtnpercentage=0; - // var txtaddtnexciseduty=(totaddtnlexcise*addtnpercentage)/100; - var txtaddtnexciseduty=0; - var txtgrossduty=0; + // var assessble=parseFloat($('#EditAfterAssessable').val()); - basic=parseFloat($('#AfterBasicPriceTax').val()); - landingcha=parseFloat($('#AfterLandingCharge').val()); - highsesssalless=parseFloat($('#AfterHighseas').val()); - customcha=parseFloat($('#AfterCustomduty').val()); - excisecha=parseFloat($('#AfterExcisedutyTax').val()); - exciseedcha=parseFloat($('#AfterExcisedutyEDcess').val()); - exciseshcha=parseFloat($('#AfterExcisedutySHcess').val()); - customed=parseFloat($('#AfterCustomEDcess').val()); - customsh=parseFloat($('#AfterCustomSHcess').val()); - totaddtnlexcise=basic+landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh; - addtnpercentage=parseFloat($('#AdditionalExciseduty').val()); + var custom=parseFloat($('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val()); + var customsh=parseFloat($('#EditAfterCustomSHcess').val() == '' ? '0.00' : $('#EditAfterCustomSHcess').val()); + var customed=parseFloat($('#EditAfterCustomEDcess').val() == '' ? '0.00' : $('#EditAfterCustomEDcess').val()); + var assessble=parseFloat($('#EditAfterAssessable').val() == '' ? '0.00' : $('#EditAfterAssessable').val()); + - txtaddtnexciseduty=; - if(isNaN(txtaddtnexciseduty)) - { - $('#AfterAdditionalExciseduty').val(''); - } - else - { - $('#AfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2)); - } - //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty; + var tot=; + //console.log(tot); + //var igstpercentage=parseFloat($('#EditIgst').val()); +var igstpercentage=$('#EditIgst').val() == '' ? '0.00' : $('#EditIgst').val() + var afterigst=; - txtgrossduty=; - if(isNaN(txtgrossduty)) + + if(isNaN(tot)) { - $('#Grossdutypayable').val(''); + $('#EditSubtotal').val(''); } - else{ - $('#Grossdutypayable').val(txtgrossduty.toFixed(2)); + else + { + $('#EditSubtotal').val(parseFloat(tot).toFixed(2)); + } + + + + if(isNaN(afterigst)) + { + $('#EditAfterIgst').val(''); } - CalculateAvlModvat(); - -} + else + { + $('#EditAfterIgst').val(parseFloat(afterigst).toFixed(2)); + } -function EditCalculateaddlExciseDuty() -{ - - var basic=0; - var landingcha=0; - var highsesssalless=0; - var customcha=0; - var excisecha=0; - var exciseedcha=0; - var exciseshcha=0; - var customed=0; - var customsh=0; - var totaddtnlexcise=0; - var addtnpercentage=0; - // var txtaddtnexciseduty=(totaddtnlexcise*addtnpercentage)/100; - var txtaddtnexciseduty=0; - var txtgrossduty=0; +var grossexp=custom+customsh+customed+afterigst; +var txtgrossduty=; - basic=parseFloat($('#EditAfterBasicPriceTax').val()); - landingcha=parseFloat($('#EditAfterLandingCharge').val()); - highsesssalless=parseFloat($('#EditAfterHighseas').val()); - customcha=parseFloat($('#EditAfterCustomduty').val()); - excisecha=parseFloat($('#EditAfterExcisedutyTax').val()); - exciseedcha=parseFloat($('#EditAfterExcisedutyEDcess').val()); - exciseshcha=parseFloat($('#EditAfterExcisedutySHcess').val()); - customed=parseFloat($('#EditAfterCustomEDcess').val()); - customsh=parseFloat($('#EditAfterCustomSHcess').val()); - totaddtnlexcise=basic+landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh; - addtnpercentage=parseFloat($('#EditAdditionalExciseduty').val()); - // var txtaddtnexciseduty=(totaddtnlexcise*addtnpercentage)/100; - txtaddtnexciseduty=; - if(isNaN(txtaddtnexciseduty)) - { - $('#EditAfterAdditionalExciseduty').val(''); - } - else - { - $('#EditAfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2)); - } - //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty; - - txtgrossduty=; +; if(isNaN(txtgrossduty)) { $('#EditGrossdutypayable').val(''); } else { - $('#EditGrossdutypayable').val(txtgrossduty.toFixed(2)); + $('#EditGrossdutypayable').val(parseFloat(txtgrossduty).toFixed(2)); } - EditCalculateAvlModvat(); - -} - -function CalculateAvlModvat() -{ - - var txtexciseduty1=0; - var txtexciseedcess=0; - var txtexciseshcess=0; - var txtaddtnlexcise=0; - //var totavlmodvat=txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise; - var totavlmodvat=0; - - txtexciseduty1=parseFloat($('#AfterExcisedutyTax').val()); - txtexciseedcess=parseFloat($('#AfterExcisedutyEDcess').val()); - txtexciseshcess=parseFloat($('#AfterExcisedutySHcess').val()); - txtaddtnlexcise=parseFloat($('#AfterAdditionalExciseduty').val()); - //var totavlmodvat=txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise; - totavlmodvat=; - if(isNaN(totavlmodvat)) - { - $('#AvailableModvat').val(''); - } - else - { - $('#AvailableModvat').val(totavlmodvat.toFixed(2)); - } - CalculateGrossExpense(); +EditCalculateCtable() } -function EditCalculateAvlModvat() -{ - - - var txtexciseduty1=0; - var txtexciseedcess=0; - var txtexciseshcess=0; - var txtaddtnlexcise=0; - //var totavlmodvat=txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise; - var totavlmodvat=0; - txtexciseduty1=parseFloat($('#EditAfterExcisedutyTax').val()); - txtexciseedcess=parseFloat($('#EditAfterExcisedutyEDcess').val()); - txtexciseshcess=parseFloat($('#EditAfterExcisedutySHcess').val()); - txtaddtnlexcise=parseFloat($('#EditAfterAdditionalExciseduty').val()); - //var totavlmodvat=txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise; - totavlmodvat=; - if(isNaN(totavlmodvat)) - { - $('#EditAvailableModvat').val(''); - } - else - { - $('#EditAvailableModvat').val(totavlmodvat.toFixed(2)); - } - EditCalculateGrossExpense(); -} - - -function CalculateGrossExpense() -{ - - var txtgrossdutypayable=0; - var txtmodvat=0; - //var grossexp=(txtgrossdutypayable-txtmodvat); - var grossexp=0; - txtgrossdutypayable=parseFloat($('#Grossdutypayable').val()); - txtmodvat=parseFloat($('#AvailableModvat').val()); - //var grossexp=(txtgrossdutypayable-txtmodvat); - grossexp=; - if(isNaN(grossexp)) - { - $('#Grossexpenses').val(''); - } - else - { - $('#Grossexpenses').val(grossexp.toFixed(2)); - } - CalculateCtable(); - -} - - -function EditCalculateGrossExpense() -{ - - - var txtgrossdutypayable=0; - var txtmodvat=0; - //var grossexp=(txtgrossdutypayable-txtmodvat); - var grossexp=0; - - - txtgrossdutypayable=parseFloat($('#EditGrossdutypayable').val()); - txtmodvat=parseFloat($('#EditAvailableModvat').val()); - //var grossexp=(txtgrossdutypayable-txtmodvat); - grossexp=; - if(isNaN(grossexp)) - { - $('#EditGrossexpenses').val(''); - } - else - { - $('#EditGrossexpenses').val(grossexp.toFixed(2)); - } - EditCalculateCtable() - -} - -function CalculateCtable() +function EditCalculateCtable() { //alert(); - //purchaserate - - var txtCtablequantity=0; + + var quantity=0; var txtbasicinrprice=0; var txtpurchaserate=0; var txtgrossexp=0; @@ -3212,142 +2677,64 @@ function CalculateCtable() var txtrmc=0; var total=0; var basicamt=0; - basicamt=parseFloat($('#txtBasicValue').val()); + var qty=parseFloat($('#EditQuantity').val()); - txtCtablequantity=parseFloat($('#PurQuantity').val()); - txtbasicinrprice=parseFloat($('#AfterBasicPriceTax').val()); - //txtpurchaserate=txtbasicinrprice/txtCtablequantity; - txtpurchaserate=; - if(isNaN(txtpurchaserate)) - { - $('#purchaserate').val(''); - } - else - { - $('#purchaserate').val(txtpurchaserate); - } - //CustomDutyExpenses - //RMCIncludingCustomers - txtgrossexp=parseFloat($('#Grossexpenses').val()); - //txtcustomdutyexp=txtgrossexp/txtCtablequantity; - txtcustomdutyexp=; - if(isNaN(txtcustomdutyexp)) - { - $('#CustomDutyExpenses').val(''); - } - else - { - $('#CustomDutyExpenses').val(txtcustomdutyexp.toFixed(2)); - } - //txtrmc=txtpurchaserate+txtcustomdutyexp; - txtrmc=; - if(isNaN(txtrmc)) - { - $('#RMCIncludingCustomers').val(''); - } - else - { - $('#RMCIncludingCustomers').val(txtrmc.toFixed(2)); - } - total=; + + var igst=parseFloat($('#EditAfterIgst').val()); + var totduty=parseFloat($('#EditGrossdutypayable').val()); + + + + var txtdutyimpact=; + +// console.log(txtdutyimpact); + + if(isNaN(txtdutyimpact)) + { + $('#EditDutyImpact').val(''); + } + else + { + $('#EditDutyImpact').val(parseFloat(txtdutyimpact).toFixed(2)); + } + + quantity=parseFloat($('#EditPurQuantity').val()); + + var dutyimpact=parseFloat($('#EditDutyImpact').val()); - $('#TotalExp').val(Math.round(basicamt)); + + var peruom=; + + + if(isNaN(peruom)) + { + $('#EditCustomDutyExpenses').val(''); + } + else + { + $('#EditCustomDutyExpenses').val((peruom).toFixed(2)); + } + + var customdutyexp= $('#EditCustomDutyExpenses').val() == '' ? '0.00' : $('#EditCustomDutyExpenses').val(); + var basicqtyval= $('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#EditAfterBasicPriceTax').val(); + var qty=parseFloat($('#EditQuantity').val()); + var clearing= $('#EditClearingCharges').val() == '' ? '0.00' : $('#EditClearingCharges').val(); + var basicres=; + var clear=; + -} + var basicnett=parseFloat(basicres)+parseFloat(clear)+parseFloat(customdutyexp); -function EditCalculateCtable() -{ - //alert(); - //purchaserate - var txtCtablequantity=0; - var txtbasicinrprice=0; - var txtpurchaserate=0; - var txtgrossexp=0; - var txtcustomdutyexp=0; - var txtrmc=0; - var total=0; - var basicprice=0; - //basicprice=parseFloat($('#EdittxtBasicValue').val()); - basicprice = $('#EdittxtBasicValue').val() == '' ? '0.00' : $('#EdittxtBasicValue').val(); - $('#EditTotalExp').val(basicprice); - var a=parseFloat($('#EditTotalExp').val()); - //console.log(a); - //alert(basicamt); - //quantity=parseFloat($('#EditPurQuantity').val()); - - quantity = $('#EditPurQuantity').val() == '' ? '0.00' : $('#EditPurQuantity').val(); - // txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val()); - - txtbasicinrprice = $('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#EditAfterBasicPriceTax').val(); - //txtpurchaserate=txtbasicinrprice/txtCtablequantity; - txtpurchaserate=; - - if(isNaN(txtpurchaserate)) + if(isNaN(basicnett)) { - $('#Editpurchaserate').val(0); + $('#EditNett').val(''); } - - else if (isFinite(txtpurchaserate)) - { - $('#Editpurchaserate').val(txtpurchaserate.toFixed(2)); - } - - else{ - - //$('#Editpurchaserate').val(txtpurchaserate); - - $('#Editpurchaserate').val(0); - } - - - // $('#Editpurchaserate').val(txtpurchaserate); - //CustomDutyExpenses - //RMCIncludingCustomers - //txtgrossexp=parseFloat($('#EditGrossexpenses').val()); - txtgrossexp = $('#EditGrossexpenses').val() == '' ? '0.00' : $('#EditGrossexpenses').val(); - //txtcustomdutyexp=txtgrossexp/txtCtablequantity; - txtcustomdutyexp=; - - if(isNaN(txtcustomdutyexp)) + else { - $('#EditCustomDutyExpenses').val(0); + $('#EditNett').val((basicnett).toFixed(2)); } - - else if (isFinite(txtcustomdutyexp)) - { - $('#EditCustomDutyExpenses').val(txtpurchaserate.toFixed(2)); - } - - else - { - $('#EditCustomDutyExpenses').val(0); - } - - //$('#EditCustomDutyExpenses').val(txtcustomdutyexp); - //txtrmc=txtpurchaserate+txtcustomdutyexp; - txtrmc=; - - if(isNaN(txtrmc)) - { - $('#EditRMCIncludingCustomers').val(0); - } - - else if (isFinite(txtrmc)) - { - $('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2)); - } - - - else{ - $('#EditRMCIncludingCustomers').val(0); - } - - - /// $('#EditRMCIncludingCustomers').val(txtrmc); - total=; - $('#EditTotalExp').val(basicprice); } @@ -3415,7 +2802,7 @@ var AfterCustomduty=$('#AfterCustomduty').val()==''?'0.00':$('#AfterCustomduty') var AfterExcisedutyTax=$('#AfterExcisedutyTax').val()==''?'0.00':$('#AfterExcisedutyTax').val(); var AfterExcisedutyEDcess=$('#AfterExcisedutyEDcess').val()==''?'0.00':$('#AfterExcisedutyEDcess').val(); var AfterExciseDutySH=$("#AfterExcisedutySHcess").val()==''?'0.00':$('#AfterExcisedutySHcess').val(); -var AfterCustomEDcess=$('#AfterCustomEDcess').val()==''?'0.00':$('#AfterCustomEDcess').val(); +var AfterCustomEDcess=$('#AfterCustomEDcess1').val()==''?'0.00':$('#AfterCustomEDcess1').val(); var AfterCustomSHcess=$('#AfterCustomSHcess').val()==''?'0.00':$('#AfterCustomSHcess').val(); var AfterAdditionalExciseduty=$('#AfterAdditionalExciseduty').val()==''?'0.00':$('#AfterAdditionalExciseduty').val(); var Grossdutypayable=$('#Grossdutypayable').val()==''?'0.00':$('#Grossdutypayable').val(); @@ -3511,34 +2898,40 @@ $('#editimportpomodel').on("shown.bs.modal", function(e) { $('#EditAfterBasicPriceTax').val(parseFloat(c).toFixed(2)); $('#EditLandingCharge').val($("#LandingCharge"+userid).val()); $('#EditAfterLandingCharge').val($("#AfterLandingCharge"+userid).val()); - $('#EditHighseas').val($("#HighSeasSalesCharge"+userid).val()); - $('#EditAfterHighseas').val($("#AfterHighSeasSalesCharge"+userid).val()); + $('#EditCustomduty').val($("#CustomDuty"+userid).val()); $('#EditAfterCustomduty').val($("#AfterCustomDuty"+userid).val()); - $('#EditExcisedutyTax').val($("#ExciseDuty"+userid).val()); - $('#EditAfterExcisedutyTax').val($("#AfterExciseDuty"+userid).val()); - $('#EditExcisedutyEDcess').val($("#ExciseDutyEdCess"+userid).val()); - $('#EditAfterExcisedutyEDcess').val($("#AfterExciseDutyEdCess"+userid).val()); - $('#EditExcisedutySHcess').val($("#ExciseDutySHCess"+userid).val()); - $('#EditAfterExcisedutySHcess').val($("#AfterExciseDutySHCess"+userid).val()); + - $('#EditCustomEDcess').val($("#CustomEdCess"+userid).val()); - $('#EditAfterCustomEDcess').val($("#AfterCustomEdCess"+userid).val()); + $('#EditCustomEDcess').val($("#CustomEdCess1"+userid).val()); + $('#EditAfterCustomEDcess').val($("#AfterCustomEdCess1"+userid).val()); $('#EditCustomSHcess').val($("#CustomSHCess"+userid).val()); $('#EditAfterCustomSHcess').val($("#AfterCustomSHCess"+userid).val()); - $('#EditAdditionalExciseduty').val($("#AddlExciseDuty"+userid).val()); - $('#EditAfterAdditionalExciseduty').val($("#AfterAddlExciseDuty"+userid).val()); - $('#EditGrossdutypayable').val($("#Grossdutypayable"+userid).val()); - $('#EditGrossexpenses').val($("#Grossexpensesduetocustomduty"+userid).val()); + + $('#EditGrossdutypayable').val($("#Grossdutypayable1"+userid).val()); + $('#EditPurQuantity').val($("#QuantityKG"+userid).val()); - $('#Editpurchaserate').val($("#purchaseratePerKG"+userid).val()); + $('#EditCustomDutyExpenses').val($("#CustomDutyExpensesPerKG"+userid).val()); - $('#EditRMCIncludingCustomers').val($("#RMCIncludingCustomersPerKG"+userid).val()); + //$('#EditAfterBasicPriceTax').val($("#BasicINRValue"+userid).val()); - $('#EditAvailableModvat').val($("#AvailableModvat"+userid).val()); + $('#EditTotalExp').val($("#TotalValue"+userid).val()); //$('#EditINRBasicvalue').val($("#BasicINRValue"+userid).val()); + + $('#EditAfterAssessable').val($("#AssessableValue"+userid).val()); + $('#EditSubtotal').val($("#SubTotal"+userid).val()); + $('#EditIgst').val($("#IGST"+userid).val()); + $('#EditAfterIgst').val($("#AfterIGST"+userid).val()); + $('#EditDutyImpact').val($("#DutyImpact"+userid).val()); + $('#EditNett').val($("#NetValue"+userid).val()); + $('#EditClearingCharges').val($("#ClearingCharge"+userid).val()); + + + + + $('#drpamendFreight').val($("#FreightType"+userid).val()); $('#AmendNOOfTrips').val($("#NoOfTrip"+userid).val()); $('#AmendtxtFreight').val($("#FreightValue"+userid).val()); @@ -3633,32 +3026,30 @@ $('.EditImport').click(function(){ var AfterBasicPrice=$("#EditAfterBasicPriceTax").val(); var Landingcharge=$("#EditLandingCharge").val(); var AfterLanding=$("#EditAfterLandingCharge").val(); - var Highseass=$("#EditHighseas").val(); - var AfterHighseas=$("#EditAfterHighseas").val(); + var CustomDuty=$("#EditCustomduty").val(); var AfterCustomDuty=$("#EditAfterCustomduty").val(); - var ExciseDuty=$("#EditExcisedutyTax").val(); - var AfterExciseDuty=$("#EditAfterExcisedutyTax").val(); - var ExciseEd=$("#EditExcisedutyEDcess").val(); - var AfterExciseEd=$("#EditAfterExcisedutyEDcess").val(); - var ExciseDutySH=$("#EditExcisedutySHcess").val(); - var AfterExciseDutySH=$("#EditAfterExcisedutySHcess").val(); var CustomED=$("#EditCustomEDcess").val(); var AfterCustomED=$("#EditAfterCustomEDcess").val(); var CustomSH=$("#EditCustomSHcess").val(); var AfterCustomSH=$("#EditAfterCustomSHcess").val(); - var AdditionalExciseduty=$("#EditAdditionalExciseduty ").val(); - var AfterAdditionalExciseduty=$("#EditAfterAdditionalExciseduty").val(); + var GrossDuty=$("#EditGrossdutypayable").val(); - var AvailaleModvat=$("#EditAvailableModvat").val(); - var GrossExpense=$("#EditGrossexpenses").val(); - var PurchaseRate=$("#Editpurchaserate").val(); + + //console.log(GrossDuty); var Quantity=$("#EditPurQuantity").val(); var CustomDutyExpense=$("#EditCustomDutyExpenses").val(); - var RMC=$("#EditRMCIncludingCustomers").val(); + var TotalExp=$('#EdittxtBasicValue').val(); //alert(itemRate); - + + var Assessable=$("#EditAfterAssessable").val(); + var SubTotal=$("#EditSubtotal").val(); + var Igst=$("#EditIgst").val(); + var AfterIgst=$("#EditAfterIgst").val(); + var DutyImpact=$("#EditDutyImpact").val(); + var ClearingCharges=$('#EditClearingCharges').val(); + var Nett=$('#EditNett').val(); var FreightType=$('#drpamendFreight').val(); @@ -3718,39 +3109,40 @@ $('.EditImport').click(function(){ $('#AfterBasicPriceTax'+userid).val(AfterBasicPrice); $('#LandingCharge'+userid).val(Landingcharge); $('#AfterLandingCharge'+userid).val(AfterLanding); - $('#HighSeasSalesCharge'+userid).val(Highseass); - $('#AfterHighSeasSalesCharge'+userid).val(AfterHighseas); + $('#CustomDuty'+userid).val(CustomDuty); $('#AfterCustomDuty'+userid).val(AfterCustomDuty); - $('#ExciseDuty'+userid).val(ExciseDuty); - $('#AfterExciseDuty'+userid).val(AfterExciseDuty); - $('#ExciseDutyEdCess'+userid).val(ExciseEd); - $('#AfterExciseDutyEdCess'+userid).val(AfterExciseEd); - $('#ExciseDutySHCess'+userid).val(ExciseDutySH); - $('#AfterExciseDutySHCess'+userid).val(AfterExciseDutySH); - $('#CustomEdCess'+userid).val(CustomED); - $('#AfterCustomEdCess'+userid).val(AfterCustomED); + + $('#CustomEdCess1'+userid).val(CustomED); + $('#AfterCustomEdCess1'+userid).val(AfterCustomED); $('#CustomSHCess'+userid).val(CustomSH); $('#AfterCustomSHCess'+userid).val(AfterCustomSH); - $('#AddlExciseDuty'+userid).val(AdditionalExciseduty); - $('#AfterAddlExciseDuty'+userid).val(AfterAdditionalExciseduty); - $('#Grossdutypayable'+userid).val(GrossDuty); - $('#Grossexpensesduetocustomduty'+userid).val(GrossExpense); - $('#purchaseratePerKG'+userid).val(PurchaseRate); + + $('#Grossdutypayable1'+userid).val(GrossDuty); + $('#QuantityKG'+userid).val(Quantity); $('#CustomDutyExpensesPerKG'+userid).val(CustomDutyExpense); - $('#RMCIncludingCustomersPerKG'+userid).val(RMC); + //$('#TotalValue'+userid).val(TotalExp); $('#TotalValue'+userid).val(BasicValue); - $('#AvailableModvat'+userid).val(AvailaleModvat); - + $('#FreightType'+userid).val(FreightType); $('#NoOfTrip'+userid).val(Nooftrip); $('#FreightValue'+userid).val(FreightRate); $('#AfterFreightValue'+userid).val(FreightRateAmount); + + $('#AssessableValue'+userid).val(Assessable); + $('#SubTotal'+userid).val(SubTotal); + $('#IGST'+userid).val(Igst); + $('#AfterIGST'+userid).val(AfterIgst); + $('#DutyImpact'+userid).val(DutyImpact); + $('#NetValue'+userid).val(Nett); + $('#ClearingCharge'+userid).val(ClearingCharges); + + $('#Per'+userid).val(per.trim()); $('#Addinstruction'+userid).val(spclins); @@ -3824,20 +3216,18 @@ function populateValueMainFormForEditImportTax() { var rows =document.getElementById('ImportTax').rows.length; var TotalLanding=0; - var TotalHighseas=0; var TotalCustom=0; - var TotalExcise=0; - var TotalExciseED=0; - var TotalExciseSH=0; var TotalCustomED=0; var TotalCustomSH=0; - var TotalAdditionalExcise=0; var TotalGrossDuty=0; - var TotalAvlmodvat=0; var TotalGrossExpense=0; var Totalvalue=0; var TotalOrdervalue=0; var TotalFreight=0; + + var TotalAssessable=0; + var TotalSubtotal=0; + var TotalIgst=0; var i = 0; @@ -3855,54 +3245,43 @@ function populateValueMainFormForEditImportTax() var AfterLandingCharge= $('#AfterLandingCharge'+rowid).val() == '' ? '0.00' : $('#AfterLandingCharge'+rowid).val(); //console.log(AfterLandingCharge); //console.log(rowid); -var AfterHighseas=$('#AfterHighSeasSalesCharge'+rowid).val()==''?'0.00':$('#AfterHighSeasSalesCharge'+rowid).val(); + var AfterCustomduty=$('#AfterCustomDuty'+rowid).val()==''?'0.00':$('#AfterCustomDuty'+rowid).val(); -var AfterExcisedutyTax=$('#AfterExciseDuty'+rowid).val()==''?'0.00':$('#AfterExciseDuty'+rowid).val(); -var AfterExcisedutyEDcess=$('#AfterExciseDutyEdCess'+rowid).val()==''?'0.00':$('#AfterExciseDutyEdCess'+rowid).val(); -var AfterExciseDutySH=$('#AfterExciseDutySHCess'+rowid).val()==''?'0.00':$('#AfterExciseDutySHCess'+rowid).val(); -var AfterAdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val(); -var AfterCustomEDcess=$('#AfterCustomEdCess'+rowid).val()==''?'0.00':$('#AfterCustomEdCess'+rowid).val(); + +var AfterCustomEDcess=$('#AfterCustomEdCess1'+rowid).val()==''?'0.00':$('#AfterCustomEdCess1'+rowid).val(); var AfterCustomSHcess=$('#AfterCustomSHCess'+rowid).val()==''?'0.00':$('#AfterCustomSHCess'+rowid).val(); //var AdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val(); -var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossdutypayable'+rowid).val(); -var AvailableModvat=$('#AvailableModvat'+rowid).val()==''?'0.00':$('#AvailableModvat'+rowid).val(); -var Grossexpenses=$('#Grossexpensesduetocustomduty'+rowid).val()==''?'0.00':$('#Grossexpensesduetocustomduty'+rowid).val(); +var Grossdutypayable=$('#Grossdutypayable1'+rowid).val()==''?'0.00':$('#Grossdutypayable1'+rowid).val(); + //var Totalvalue=$('#TotalValue'+rowid).val()==''?'0.00':$('#TotalValue'+rowid).val(); var Total= $('#ProductPrice'+rowid).val() == '' ? '0.00' : $('#ProductPrice'+rowid).val(); var Frieght=$('#AfterFreightValue'+rowid).val()==''?'0.00':$('#AfterFreightValue'+rowid).val(); //console.log(rowid); -//console.log(Total); -//var RMC=$('#RMCIncludingCustomers'+rowid).val()==''?'0.00':$('#RMCIncludingCustomers'+rowid).val(); -//console.log(Totalvalue); -// console.log(AfterHighseas); -// console.log(AfterCustomduty); -// console.log(AfterExcisedutyTax); -// console.log(AfterExcisedutyEDcess); -// console.log(AfterExciseDutySH); -// console.log(AfterAdditionalExciseduty); -// console.log(AfterCustomEDcess); -// console.log(AfterCustomSHcess); - //console.log(AfterAdditionalExciseduty); -// console.log(Grossdutypayable); -// console.log(AvailableModvat); -// console.log(Grossexpenses); + +var Assesable=$('#AssessableValue'+rowid).val()==''?'0.00':$('#AssessableValue'+rowid).val(); +var Subtotal=$('#SubTotal'+rowid).val()==''?'0.00':$('#SubTotal'+rowid).val(); +var Igst=$('#AfterIGST'+rowid).val()==''?'0.00':$('#AfterIGST'+rowid).val(); + + TotalLanding = parseFloat(TotalLanding) + parseFloat(AfterLandingCharge); -TotalHighseas = parseFloat(TotalHighseas) + parseFloat(AfterHighseas); + TotalCustom = parseFloat(TotalCustom) + parseFloat(AfterCustomduty); -TotalExcise = parseFloat(TotalExcise) + parseFloat(AfterExcisedutyTax); -TotalExciseED = parseFloat(TotalExciseED ) + parseFloat(AfterExcisedutyEDcess); -TotalExciseSH = parseFloat(TotalExciseSH) + parseFloat(AfterExciseDutySH); + TotalCustomED = parseFloat(TotalCustomED) + parseFloat(AfterCustomEDcess); TotalCustomSH = parseFloat(TotalCustomSH ) + parseFloat(AfterCustomSHcess); -TotalAdditionalExcise = parseFloat(TotalAdditionalExcise ) + parseFloat(AfterAdditionalExciseduty); + TotalGrossDuty = parseFloat(TotalGrossDuty) + parseFloat(Grossdutypayable); -TotalAvlmodvat = parseFloat(TotalAvlmodvat ) + parseFloat(AvailableModvat); -TotalGrossExpense = parseFloat(TotalGrossExpense ) + parseFloat(Grossexpenses); + TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Total); TotalFreight=parseFloat(TotalFreight)+parseFloat(Frieght); + +TotalAssessable=parseFloat(TotalAssessable)+parseFloat(Assesable); +TotalSubtotal=parseFloat(TotalSubtotal)+parseFloat(Subtotal); +TotalIgst=parseFloat(TotalIgst)+parseFloat(Igst); + //TotalRMC=parseFloat(TotalRMC)+parseFloat(RMC); //console.log(Totalvalue); @@ -3913,21 +3292,23 @@ TotalFreight=parseFloat(TotalFreight)+parseFloat(Frieght); }while (i < rows); $('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2)); - $('#txttotalhighseas').val(parseFloat(TotalHighseas).toFixed(2)); + $('#txttotalcustom').val(parseFloat(TotalCustom).toFixed(2)); - $('#txttotalexcise').val(parseFloat(TotalExcise).toFixed(2)); - $('#txttotalexciseED').val(parseFloat(TotalExciseED).toFixed(2)); - $('#txttotalexciseSH').val(parseFloat(TotalExciseSH).toFixed(2)); + $('#txttotalcustomED').val(parseFloat(TotalCustomED).toFixed(2)); $('#txttotalcustomSH').val(parseFloat(TotalCustomSH).toFixed(2)); - $('#txttotalAdditionalExciseduty').val(parseFloat(TotalAdditionalExcise).toFixed(2)); + $('#txttotalgrossduty').val(parseFloat(TotalGrossDuty).toFixed(2)); - $('#txttotalavlmodvat').val(parseFloat(TotalAvlmodvat).toFixed(2)); - $('#txttotalgrossexpense').val(parseFloat(TotalGrossExpense).toFixed(2)); + $('#txtToatlOrder').val(parseFloat(TotalOrdervalue).toFixed(2)); $('#txttot').val(parseFloat(TotalOrdervalue).toFixed(2)); $('#txtTotalFreight').val(parseFloat(TotalFreight).toFixed(2)); + + + $('#txttotalAssessable').val(parseFloat(TotalAssessable).toFixed(2)); + $('#txttotalSubtotal').val(parseFloat(TotalSubtotal).toFixed(2)); + $('#txttotalIgst').val(parseFloat(TotalIgst).toFixed(2)); //var a=parseFloat($('#txttot').val()); //console.log(a); diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 3ca5427f..48908fb3 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -1867,9 +1867,6 @@ echo form_textarea($data); - - -
@@ -2872,7 +2869,7 @@ echo form_textarea($data); ; console.log(tot); @@ -4623,34 +4616,38 @@ $("#viewimportmodal").on("shown.bs.modal", function(e) { $('#ViewLandingCharge').val($("#LandingCharge"+userid).val()); $('#ViewAfterLandingCharge').val($("#AfterLandingCharge"+userid).val()); - $('#ViewHighseas').val($("#HighSeasSalesCharge"+userid).val()); - $('#ViewAfterHighseas').val($("#AfterHighSeasSalesCharge"+userid).val()); + $('#ViewCustomduty').val($("#CustomDuty"+userid).val()); $('#ViewAfterCustomduty').val($("#AfterCustomDuty"+userid).val()); - $('#ViewExcisedutyTax').val($("#ExciseDuty"+userid).val()); - $('#ViewAfterExcisedutyTax').val($("#AfterExciseDuty"+userid).val()); - $('#ViewExcisedutyEDcess').val($("#ExciseDutyEdCess"+userid).val()); - $('#ViewAfterExcisedutyEDcess').val($("#AfterExciseDutyEdCess"+userid).val()); - $('#ViewExcisedutySHcess').val($("#ExciseDutySHCess"+userid).val()); - $('#ViewAfterExcisedutySHcess').val($("#AfterExciseDutySHCess"+userid).val()); + $('#ViewCustomEDcess').val($("#CustomEdCess"+userid).val()); $('#ViewAfterCustomEDcess').val($("#AfterCustomEDCess"+userid).val()); $('#ViewCustomSHcess').val($("#CustomSHCess"+userid).val()); $('#ViewAfterCustomSHcess').val($("#AfterCustomSHCess"+userid).val()); - $('#ViewAdditionalExciseduty').val($("#AddlExciseDuty"+userid).val()); - $('#ViewAfterAdditionalExciseduty').val($("#AfterAddlExciseDuty"+userid).val()); + $('#ViewGrossdutypayable').val($("#Grossdutypayable"+userid).val()); - $('#ViewGrossexpenses').val($("#Grossexpensesduetocustomduty"+userid).val()); + $('#ViewPurQuantity').val($("#QuantityKG"+userid).val()); - $('#Viewpurchaserate').val($("#purchaseratePerKG"+userid).val()); + $('#ViewCustomDutyExpenses').val($("#CustomDutyExpensesPerKG"+userid).val()); - $('#ViewRMCIncludingCustomers').val($("#RMCIncludingCustomersPerKG"+userid).val()); + //$('#ViewAfterBasicPriceTax').val($("#BasicINRValue"+userid).val()); - $('#ViewAvailableModvat').val($("#AvailableModvat"+userid).val()); + $('#ViewTotalExp').val($("#TotalValue"+userid).val()); // $('#ViewINRBasicvalue').val($("#BasicINRValue"+userid).val()); + + + $('#ViewAfterAssessable').val($("#AssessableValue"+userid).val()); + $('#ViewAfterCustomEDcess').val($("#AfterCustomEdCess1"+userid).val()); + $('#ViewSubtotal').val($("#SubTotal"+userid).val()); + $('#ViewIgst').val($("#IGST"+userid).val()); + $('#ViewAfterIgst').val($("#AfterIGST"+userid).val()); + $('#ViewDutyImpact').val($("#DutyImpact"+userid).val()); + $('#ViewClearingCharges').val($("#ClearingCharge"+userid).val()); + $('#ViewNett').val($("#NetValue"+userid).val()); + $('#drpviewFreight').val($("#FreightType"+userid).val()); @@ -5584,73 +5581,90 @@ function DeleteRow(rowid) function populateValueMainFormForDeleteItem(rowid) { var TotalLanding=$('#txttotallanding').val(); - var TotalHighseas=$('#txttotalhighseas').val(); + var TotalCustom=$('#txttotalcustom').val(); - var TotalExcise=$('#txttotalexcise').val(); - var TotalExciseED=$('#txttotalexciseED').val(); - var TotalExciseSH=$('#txttotalexciseSH').val(); + var TotalCustomED=$('#txttotalcustomED').val(); var TotalCustomSH=$('#txttotalcustomSH').val(); - var TotalAdditionalExcise=$('#txttotalAdditionalExciseduty').val(); + var TotalGrossDuty=$('#txttotalgrossduty').val(); - var TotalAvlmodvat=$('#txttotalavlmodvat').val(); - var TotalGrossExpense=$('#txttotalgrossexpense').val(); + var TotalOrderValue=$('#txtToatlOrder').val(); var TotalFreight=$('#txtTotalFreight').val(); + + var TotalAssessable=$('#txttotalAssessable').val(); + + var TotalSubtotal=$('#txttotalSubtotal').val(); + + var TotalIgst=$('#txttotalIgst').val(); + //console.log(TotalCustomED); var AfterLandingCharge= $('#AfterLandingCharge'+rowid).val() == '' ? '0.00' : $('#AfterLandingCharge'+rowid).val(); -var AfterHighseas=$('#AfterHighSeasSalesCharge'+rowid).val()==''?'0.00':$('#AfterHighSeasSalesCharge'+rowid).val(); + var AfterCustomduty=$('#AfterCustomDuty'+rowid).val()==''?'0.00':$('#AfterCustomDuty'+rowid).val(); -var AfterExcisedutyTax=$('#AfterExciseDuty'+rowid).val()==''?'0.00':$('#AfterExciseDuty'+rowid).val(); -var AfterExcisedutyEDcess=$('#AfterExciseDutyEdCess'+rowid).val()==''?'0.00':$('#AfterExciseDutyEdCess'+rowid).val(); -var AfterExciseDutySH=$('#AfterExciseDutySHCess'+rowid).val()==''?'0.00':$('#AfterExciseDutySHCess'+rowid).val(); -var AfterAdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val(); -var AfterCustomEDcess=$('#AfterCustomEDcess'+rowid).val()==''?'0.00':$('#AfterCustomEDcess'+rowid).val(); + + +var AfterCustomEDcess=$('#AfterCustomEdCess1'+rowid).val()==''?'0.00':$('#AfterCustomEdCess1'+rowid).val(); var AfterCustomSHcess=$('#AfterCustomSHCess'+rowid).val()==''?'0.00':$('#AfterCustomSHCess'+rowid).val(); -var AdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val(); + var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossdutypayable'+rowid).val(); -var AvailableModvat=$('#AvailableModvat'+rowid).val()==''?'0.00':$('#AvailableModvat'+rowid).val(); -var Grossexpenses=$('#Grossexpensesduetocustomduty'+rowid).val()==''?'0.00':$('#Grossexpensesduetocustomduty'+rowid).val(); -//var =$('#TotalExp'+rowid).val()==''?'0.00':$('#TotalExp'+rowid).val(); + //console.log(AfterCustomEDcess); var totalExp=$('#TotalValue'+rowid).val()==''?'0.00':$('#TotalValue'+rowid).val(); var Frieght=$('#AfterFreightValue'+rowid).val()==''?'0.00':$('#AfterFreightValue'+rowid).val(); + +var AfterAssessable=$('#AssessableValue'+rowid).val()==''?'0.00':$('#AssessableValue'+rowid).val(); + +var AfterIgst=$('#AfterIGST'+rowid).val()==''?'0.00':$('#AfterIGST'+rowid).val(); + +var AfterSubtotal=$('#SubTotal'+rowid).val()==''?'0.00':$('#SubTotal'+rowid).val(); + + + +TotalAssessable=parseFloat(TotalAssessable)-parseFloat(AfterAssessable); + +TotalIgst=parseFloat(TotalIgst)-parseFloat(AfterIgst); + +TotalSubtotal=parseFloat(TotalSubtotal)-parseFloat(AfterSubtotal); + + + TotalLanding = parseFloat(TotalLanding) - parseFloat(AfterLandingCharge); -TotalHighseas = parseFloat(TotalHighseas) - parseFloat(AfterHighseas); + TotalCustom = parseFloat(TotalCustom) - parseFloat(AfterCustomduty); -TotalExcise = parseFloat(TotalExcise) - parseFloat(AfterExcisedutyTax); -TotalExciseED = parseFloat(TotalExciseED ) - parseFloat(AfterExcisedutyEDcess); -TotalExciseSH = parseFloat(TotalExciseSH) - parseFloat(AfterExciseDutySH); + TotalCustomED = parseFloat(TotalCustomED) - parseFloat(AfterCustomEDcess); TotalCustomSH = parseFloat(TotalCustomSH ) - parseFloat(AfterCustomSHcess); -TotalAdditionalExcise = parseFloat(TotalAdditionalExcise ) - parseFloat(AdditionalExciseduty); + TotalGrossDuty = parseFloat(TotalGrossDuty) - parseFloat(Grossdutypayable); -TotalAvlmodvat = parseFloat(TotalAvlmodvat ) - parseFloat(AvailableModvat); -TotalGrossExpense = parseFloat(TotalGrossExpense ) - parseFloat(Grossexpenses); + TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp); TotalFreight=parseFloat(TotalFreight)-parseFloat(Frieght); $('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2)); - $('#txttotalhighseas').val(parseFloat(TotalHighseas).toFixed(2)); + $('#txttotalcustom').val(parseFloat(TotalCustom).toFixed(2)); - $('#txttotalexcise').val(parseFloat(TotalExcise).toFixed(2)); - $('#txttotalexciseED').val(parseFloat(TotalExciseED).toFixed(2)); - $('#txttotalexciseSH').val(parseFloat(TotalExciseSH).toFixed(2)); + $('#txttotalcustomED').val(parseFloat(TotalCustomED).toFixed(2)); $('#txttotalcustomSH').val(parseFloat(TotalCustomSH).toFixed(2)); - $('#txttotalAdditionalExciseduty').val(parseFloat(TotalAdditionalExcise).toFixed(2)); + $('#txttotalgrossduty').val(parseFloat(TotalGrossDuty).toFixed(2)); - $('#txttotalavlmodvat').val(parseFloat(TotalAvlmodvat).toFixed(2)); - $('#txttotalgrossexpense').val(parseFloat(TotalGrossExpense).toFixed(2)); + $('#txtToatlOrder').val(parseFloat(TotalOrderValue).toFixed(2)); $('#txttot').val(parseFloat(TotalOrderValue).toFixed(2)); $('#txtTotalFreight').val(parseFloat(TotalFreight).toFixed(2)); + + $('#txttotalAssessable').val(parseFloat(TotalAssessable).toFixed(2)); + + $('#txttotalSubtotal').val(parseFloat(TotalSubtotal).toFixed(2)); + + $('#txttotalIgst').val(parseFloat(TotalIgst).toFixed(2)); diff --git a/application/views/importpo.php b/application/views/importpo.php index f981a5ad..23802ad8 100755 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -4282,68 +4282,83 @@ function DeleteRow(rowid) function populateValueMainFormForDeleteItem(rowid) { //alert(); var TotalLanding=$('#txttotallanding').val(); - var TotalHighseas=$('#txttotalhighseas').val(); + var TotalCustom=$('#txttotalcustom').val(); - var TotalExcise=$('#txttotalexcise').val(); - var TotalExciseED=$('#txttotalexciseED').val(); - var TotalExciseSH=$('#txttotalexciseSH').val(); + var TotalCustomED=$('#txttotalcustomED').val(); var TotalCustomSH=$('#txttotalcustomSH').val(); - var TotalAdditionalExcise=$('#txttotalAdditionalExciseduty').val(); + var TotalGrossDuty=$('#txttotalgrossduty').val(); - var TotalAvlmodvat=$('#txttotalavlmodvat').val(); - var TotalGrossExpense=$('#txttotalgrossexpense').val(); + var TotalOrderValue=$('#txtToatlOrder').val(); var TotalFrieght=$('#txtTotalFreight').val(); - //console.log(TotalLanding); + + var TotalAssessable=$('#txttotalAssessable').val(); + + var TotalSubtotal=$('#txttotalSubtotal').val(); + + var TotalIgst=$('#txttotalIgst').val(); +//console.log(TotalSubtotal); var AfterLandingCharge= $('#AfterLandingChargee'+rowid).val() == '' ? '0.00' : $('#AfterLandingChargee'+rowid).val(); //console.log(AfterLandingCharge); -var AfterHighseas=$('#AfterHighseass'+rowid).val()==''?'0.00':$('#AfterHighseass'+rowid).val(); + var AfterCustomduty=$('#AfterCustomduty'+rowid).val()==''?'0.00':$('#AfterCustomduty'+rowid).val(); -var AfterExcisedutyTax=$('#AfterExcisedutyTax'+rowid).val()==''?'0.00':$('#AfterExcisedutyTax'+rowid).val(); -var AfterExcisedutyEDcess=$('#AfterExcisedutyED'+rowid).val()==''?'0.00':$('#AfterExcisedutyED'+rowid).val(); -var AfterExciseDutySH=$('#AfterExcisedutySH'+rowid).val()==''?'0.00':$('#AfterExcisedutySH'+rowid).val(); -var AfterAdditionalExciseduty=$('#AfterAdditionalExciseduty'+rowid).val()==''?'0.00':$('#AfterAdditionalExciseduty'+rowid).val(); + + var AfterCustomEDcess=$('#AfterCustomEDcess'+rowid).val()==''?'0.00':$('#AfterCustomEDcess'+rowid).val(); var AfterCustomSHcess=$('#AfterCustomSHcess'+rowid).val()==''?'0.00':$('#AfterCustomSHcess'+rowid).val(); -var AdditionalExciseduty=$('#AfterAdditionalExciseduty'+rowid).val()==''?'0.00':$('#AfterAdditionalExciseduty'+rowid).val(); + var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossdutypayable'+rowid).val(); -var AvailableModvat=$('#AvilableModvat'+rowid).val()==''?'0.00':$('#AvilableModvat'+rowid).val(); -var Grossexpenses=$('#Grossexpenses'+rowid).val()==''?'0.00':$('#Grossexpenses'+rowid).val(); + var totalExp=$('#TotalExp'+rowid).val()==''?'0.00':$('#TotalExp'+rowid).val(); var AfterFreight=$('#AfterFreightRate'+rowid).val()==''?'0.00':$('#AfterFreightRate'+rowid).val(); + + +var AfterAssessable=$('#AfterAssessable'+rowid).val()==''?'0.00':$('#AfterAssessable'+rowid).val(); + +var AfterIgst=$('#AfterIgst'+rowid).val()==''?'0.00':$('#AfterIgst'+rowid).val(); + +var AfterSubtotal=$('#Subtotal'+rowid).val()==''?'0.00':$('#Subtotal'+rowid).val(); + TotalLanding = parseFloat(TotalLanding) - parseFloat(AfterLandingCharge); -//console.log(TotalLanding); -TotalHighseas = parseFloat(TotalHighseas) - parseFloat(AfterHighseas); +//console.log(AfterSubtotal); + TotalCustom = parseFloat(TotalCustom) - parseFloat(AfterCustomduty); -TotalExcise = parseFloat(TotalExcise) - parseFloat(AfterExcisedutyTax); -TotalExciseED = parseFloat(TotalExciseED ) - parseFloat(AfterExcisedutyEDcess); -TotalExciseSH = parseFloat(TotalExciseSH) - parseFloat(AfterExciseDutySH); + TotalCustomED = parseFloat(TotalCustomED) - parseFloat(AfterCustomEDcess); TotalCustomSH = parseFloat(TotalCustomSH ) - parseFloat(AfterCustomSHcess); -TotalAdditionalExcise = parseFloat(TotalAdditionalExcise ) - parseFloat(AdditionalExciseduty); + TotalGrossDuty = parseFloat(TotalGrossDuty) - parseFloat(Grossdutypayable); -TotalAvlmodvat = parseFloat(TotalAvlmodvat ) - parseFloat(AvailableModvat); -TotalGrossExpense = parseFloat(TotalGrossExpense ) - parseFloat(Grossexpenses); + TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp); TotalFrieght=parseFloat(TotalFrieght)-parseFloat(AfterFreight); +TotalAssessable=parseFloat(TotalAssessable)-parseFloat(AfterAssessable); + +TotalIgst=parseFloat(TotalIgst)-parseFloat(AfterIgst); + +TotalSubtotal=parseFloat(TotalSubtotal)-parseFloat(AfterSubtotal); + + $('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2)); - $('#txttotalhighseas').val(parseFloat(TotalHighseas).toFixed(2)); + $('#txttotalcustom').val(parseFloat(TotalCustom).toFixed(2)); - $('#txttotalexcise').val(parseFloat(TotalExcise).toFixed(2)); - $('#txttotalexciseED').val(parseFloat(TotalExciseED).toFixed(2)); - $('#txttotalexciseSH').val(parseFloat(TotalExciseSH).toFixed(2)); + $('#txttotalcustomED').val(parseFloat(TotalCustomED).toFixed(2)); $('#txttotalcustomSH').val(parseFloat(TotalCustomSH).toFixed(2)); - $('#txttotalAdditionalExciseduty').val(parseFloat(TotalAdditionalExcise).toFixed(2)); + $('#txttotalgrossduty').val(parseFloat(TotalGrossDuty).toFixed(2)); - $('#txttotalavlmodvat').val(parseFloat(TotalAvlmodvat).toFixed(2)); - $('#txttotalgrossexpense').val(parseFloat(TotalGrossExpense).toFixed(2)); + $('#txtToatlOrder').val(parseFloat(TotalOrderValue).toFixed(2)); $('#txtTotalFreight').val(parseFloat(TotalFrieght).toFixed(2)); + $('#txttotalAssessable').val(parseFloat(TotalAssessable).toFixed(2)); + + $('#txttotalSubtotal').val(parseFloat(TotalSubtotal).toFixed(2)); + + $('#txttotalIgst').val(parseFloat(TotalIgst).toFixed(2)); + }