From e07a601044910fabd680cd0b3a56d1ca99e9ef5b Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 12 Oct 2017 16:51:25 +0530
Subject: [PATCH] import modification

---
 application/views/editImportAmendPO.php |  14 +--
 application/views/editimportpo.php      |  84 +++++++--------
 application/views/importpo.php          | 130 +++++++++++++++++-------
 3 files changed, 141 insertions(+), 87 deletions(-)

diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index f4af13ad..80e85a10 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -1078,7 +1078,7 @@ if(!empty($RequistionDetails))
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- High seas sales charge -->
-                                                     <label><?php echo "Assessable Value ($INR)";?></label>           
+                                                     <label><?php echo "Assessable Value (A) ($INR)";?></label>           
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none">
@@ -1100,7 +1100,7 @@ if(!empty($RequistionDetails))
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom duty : (a) -->
-                                                      <label><?php echo "Custom duty : (a) ($INR)";?></label>          
+                                                      <label><?php echo "Custom duty : (B)($INR)";?></label>          
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1125,7 +1125,7 @@ if(!empty($RequistionDetails))
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom ED_cess : (e) -->
-                                                     <label><?php echo "Custom ED_cess : (e)($INR)";?></label>           
+                                                     <label><?php echo "Custom ED_cess : (C) ($INR)";?></label>           
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1147,7 +1147,7 @@ if(!empty($RequistionDetails))
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom S & H cess : (f) -->
-                                                 <label><?php echo "Custom S & H cess : (f) ($INR)";?></label>               
+                                                 <label><?php echo "Custom S & H cess : (D)($INR)";?></label>               
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1171,7 +1171,7 @@ if(!empty($RequistionDetails))
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                                     <label><?php echo "Subtotal:($INR)";?></label>           
+                                                     <label><?php echo "Subtotal: (E)($INR)  (A+B+C+D)";?></label>           
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none">
@@ -1198,7 +1198,7 @@ if(!empty($RequistionDetails))
                                                <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                               <label><?php echo "IGST($INR)";?></label>                 
+                                               <label><?php echo "IGST on (E): (F) ($INR)";?></label>                 
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1228,7 +1228,7 @@ if(!empty($RequistionDetails))
                                                         <div class="col-md-12">
                                                             <div class="col-md-8">
                                                                <!--  Gross duty payable -->
-                                                  <label><?php echo "Gross duty payable ($INR)";?></label>             
+                                                  <label><?php echo "Total Duty ($INR)   (B+C+D+E)";?></label>             
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 48908fb3..522f81eb 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -1145,7 +1145,7 @@ if($PONOStatus == PO_RELEASED)
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                <!--  Custom duty : (a) -->
-                                                    <label><?php echo "Custom duty : (a)($INR)";?></label>              
+                                                    <label><?php echo "Custom duty : (B)($INR)";?></label>              
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1170,7 +1170,7 @@ if($PONOStatus == PO_RELEASED)
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom ED_cess : (e) -->
-                                                  <label><?php echo "Custom ED_cess : (e)";?></label>              
+                                                  <label><?php echo "Custom ED_cess : (C) ($INR)";?></label>              
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1192,7 +1192,7 @@ if($PONOStatus == PO_RELEASED)
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom S & H cess : (f) -->
-                                                <label><?php echo "Custom S & H cess : (f)($INR)";?></label>                 
+                                                <label><?php echo "Custom S & H cess : (D)($INR)";?></label>                 
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1216,7 +1216,7 @@ if($PONOStatus == PO_RELEASED)
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                                   <label><?php echo "Subtotal:($INR)  (A+B+C+D)";?></label>             
+                                                   <label><?php echo "Subtotal: (E)($INR)  (A+B+C+D)";?></label>             
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none">
@@ -1242,7 +1242,7 @@ if($PONOStatus == PO_RELEASED)
                                                          <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                               <label><?php echo "IGST (E) ($INR)";?></label>                 
+                                               <label><?php echo "IGST on (E): (F) ($INR)";?></label>                 
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1372,7 +1372,7 @@ if($PONOStatus == PO_RELEASED)
 
                                                             <div class="col-md-4">
                                                                <!--  Custom Duty Expenses -->
-                                                      <label><?php echo "Custom Duty($INR)/UOM";?></label>         
+                                                      <label><?php echo "Custom Duty ($INR)/UOM";?></label>         
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1720,7 +1720,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                <!--  High seas sales charge -->
-                                                    <label><?php echo "Assessable Value ($INR)";?></label>             
+                                                    <label><?php echo "Assessable Value (A) ($INR)";?></label>             
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none;">
@@ -1742,7 +1742,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom duty : (a) -->
-                                                       <label><?php echo "Custom duty : (a)($INR)";?></label>            
+                                                       <label><?php echo "Custom duty : (B)($INR)";?></label>            
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1767,7 +1767,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom ED_cess : (e) -->
-                                                    <label><?php echo "Custom ED_cess : (e)";?></label>            
+                                                    <label><?php echo "Custom ED_cess : (C) ($INR)";?></label>            
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1789,7 +1789,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom S & H cess : (f) -->
-                                                      <label><?php echo "Custom S & H cess : (f)($INR)";?></label>           
+                                                      <label><?php echo "Custom S & H cess : (D)($INR)";?></label>           
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1815,7 +1815,7 @@ echo form_textarea($data);
                                                                 <!-- Additional Excise duty : (g) -->
 
 
-                                                    <label><?php echo "Subtotal:($INR)";?></label>            
+                                                    <label><?php echo "Subtotal: (E)($INR)  (A+B+C+D)";?></label>            
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none;">
@@ -1843,7 +1843,7 @@ echo form_textarea($data);
                                                     <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                               <label><?php echo "IGST($INR)";?></label>                 
+                                               <label><?php echo "IGST on (E): (F) ($INR)";?></label>                 
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1871,7 +1871,7 @@ echo form_textarea($data);
                                                             <div class="col-md-8">
                                                                 <!-- Gross duty payable -->
 
-                                                   <label><?php echo "Total Duty ($INR)";?></label>              
+                                                   <label><?php echo "Total Duty ($INR) (B+C+D+E)";?></label>              
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -2311,7 +2311,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- High seas sales charge -->
-                                                      <label><?php echo "Assessable Value ($INR)";?></label>            
+                                                      <label><?php echo "Assessable Value (A) ($INR)";?></label>            
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none">
@@ -2333,7 +2333,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom duty : (a) -->
-                                                    <label><?php echo "Custom duty : (a)($INR)";?></label>               
+                                                    <label><?php echo "Custom duty : (B)($INR)";?></label>               
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -2358,7 +2358,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                <!--  Custom ED_cess : (e) -->
-                                                   <label><?php echo "Custom ED_cess : (e)";?></label>            
+                                                   <label><?php echo "Custom ED_cess : (C) ($INR)";?></label>            
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -2380,7 +2380,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                <!--  Custom S & H cess : (f) -->
-                                                     <label><?php echo "Custom S & H cess : (f)($INR)";?></label>           
+                                                     <label><?php echo "Custom S & H cess : (D)($INR)";?></label>           
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -2404,7 +2404,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                                   <label><?php echo "Subtotal:($INR)";?></label>             
+                                                   <label><?php echo "Subtotal: (E)($INR)  (A+B+C+D)";?></label>             
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none;">
@@ -2430,7 +2430,7 @@ echo form_textarea($data);
                                                       <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                               <label><?php echo "IGST($INR)";?></label>                 
+                                               <label><?php echo "IGST on (E): (F) ($INR)";?></label>                 
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -2459,7 +2459,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-8">
                                                                 <!-- Gross duty payable -->
-                                                    <label><?php echo "Total Duty ($INR)";?></label>             
+                                                    <label><?php echo "Total Duty ($INR)   (B+C+D+E)";?></label>             
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -3683,11 +3683,12 @@ $('#RMCIncludingCustomers').val('');
     
     var txtlanding=0;
     var txtbasicprice=0;
-    //stxtlanding=parseFloat($('#LandingCharge').val());
-    txtlanding=$('#LandingCharge').val() == '' ? '0.00' : $('#LandingCharge').val()
-    //$('#Rate').val() == '' ? '0.00' : $('#Rate').val()
-    txtbasicprice=parseFloat($('#AfterBasicPriceTax').val());
     
+    //txtlanding=$('#LandingCharge').val() == '' ? '0.00' : $('#LandingCharge').val()
+  txtlanding=parseFloat($('#LandingCharge').val() == '' ? '0.00' : $('#LandingCharge').val());  
+    //$('#Rate').val() == '' ? '0.00' : $('#Rate').val()
+    //txtbasicprice=parseFloat($('#AfterBasicPriceTax').val());
+  txtbasicprice=parseFloat($('#AfterBasicPriceTax').val() == '' ? '0.00' : $('#AfterBasicPriceTax').val());  
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
     var assessble=parseFloat(result)+parseFloat(txtbasicprice);
@@ -3732,11 +3733,11 @@ $('#RMCIncludingCustomers').val('');
     var txtlanding=0;
     var txtbasicprice=0;
     var asss=0;
-    txtlanding=$('#EditLandingCharge').val() == '' ? '0.00' : $('#EditLandingCharge').val();
+    txtlanding=parseFloat($('#EditLandingCharge').val() == '' ? '0.00' : $('#EditLandingCharge').val());
     //txtlanding=parseFloat($('#EditLandingCharge').val());
     //txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
 
-  txtbasicprice=$('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#EditAfterBasicPriceTax').val()
+  txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#EditAfterBasicPriceTax').val());
   //  console.log(txtbasicprice);
     var result= <?php echo LOADING_CHARGE;?>;
 //console.log(result);
@@ -3769,10 +3770,10 @@ function CalculateCustomduty()
     var txtcustomduty=0;
     
     //var accessible=parseFloat($('#AfterAssessable').val()); 
-var accessible=$('#AfterAssessable').val() == '' ? '0.00' : $('#AfterAssessable').val()
+var accessible=parseFloat($('#AfterAssessable').val() == '' ? '0.00' : $('#AfterAssessable').val());
     
     //var txtcustompercentage=parseFloat($('#Customduty').val());
-var txtcustompercentage=$('#Customduty').val() == '' ? '0.00' : $('#Customduty').val() 
+var txtcustompercentage=parseFloat($('#Customduty').val() == '' ? '0.00' : $('#Customduty').val()); 
    txtcustomduty=<?php echo CUSTOM_DUTY1;?>;
    if(isNaN(txtcustomduty))
    {
@@ -3819,9 +3820,9 @@ function EditCalculateCustomduty()
     var txtcustomduty=0;
     
     //var accessible=parseFloat($('#EditAfterAssessable').val());
-var accessible=$('#EditAfterAssessable').val() == '' ? '0.00' : $('#EditAfterAssessable').val()  
+var accessible=parseFloat($('#EditAfterAssessable').val() == '' ? '0.00' : $('#EditAfterAssessable').val());  
    // var txtcustompercentage=parseFloat($('#EditCustomduty').val());
-var txtcustompercentage=$('#EditCustomduty').val() == '' ? '0.00' : $('#EditCustomduty').val()    
+var txtcustompercentage=parseFloat($('#EditCustomduty').val() == '' ? '0.00' : $('#EditCustomduty').val());    
    //sumcustom=txthighse+txtlandingch+txtbasic;
    
 
@@ -3857,10 +3858,10 @@ var txtcustompercentage=$('#EditCustomduty').val() == '' ? '0.00' : $('#EditCust
 
     //txtcustomduty1=parseFloat($('#AfterCustomduty').val());
 
-    txtcustomduty1=$('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val();
+    txtcustomduty1=parseFloat($('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val());
     
    // txtedcesspercentage=parseFloat($('#CustomEDcess').val());
-    txtedcesspercentage=$('#CustomEDcess').val() == '' ? '0.00' : $('#CustomEDcess').val()
+    txtedcesspercentage=parseFloat($('#CustomEDcess').val() == '' ? '0.00' : $('#CustomEDcess').val());
 
     //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
 
@@ -3900,10 +3901,10 @@ function EditCalculateCustomEdcess()
     //txtedcesspercentage=parseFloat($('#EditCustomEDcess').val());
     //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
 
-    txtcustomduty1=$('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val();
+txtcustomduty1=parseFloat($('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val());
     
    // txtedcesspercentage=parseFloat($('#CustomEDcess').val());
-    txtedcesspercentage=$('#EditCustomEDcess').val() == '' ? '0.00' : $('#EditCustomEDcess').val()
+txtedcesspercentage=parseFloat($('#EditCustomEDcess').val() == '' ? '0.00' : $('#EditCustomEDcess').val());
 
     txtcustomedsess=<?php echo CUSTOM_ED1;?>;
     if(isNaN(txtcustomedsess))
@@ -3935,10 +3936,10 @@ function EditCalculateCustomEdcess()
 
   //customch=parseFloat($('#AfterCustomduty').val());
   //console.log(customch);
-  customch=$('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val() 
+  customch=parseFloat($('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val()); 
 
   //txtshpercentage=parseFloat($('#CustomSHcess').val());
-  txtshpercentage=$('#CustomSHcess').val() == '' ? '0.00' : $('#CustomSHcess').val() 
+  txtshpercentage=parseFloat($('#CustomSHcess').val() == '' ? '0.00' : $('#CustomSHcess').val()); 
   //var totresult=(totcustomsh*txtshpercentage)/100; 
   totresult=<?php echo CUSTOM_SH1;?>;
   if(isNaN(totresult))
@@ -4043,15 +4044,15 @@ CalculateCtable();
   //var totresult=(totcustomsh*txtshpercentage)/100;
   var totresult=0;
 
-  var basucprice=$('#AfterBasicPriceTax').val() == '' ? '0.00' : $('#AfterBasicPriceTax').val()
+  var basucprice=parseFloat($('#AfterBasicPriceTax').val() == '' ? '0.00' : $('#AfterBasicPriceTax').val());
 
   //landingch=parseFloat($('#EditAfterLandingCharge').val());
-landingch=$('#EditAfterLandingCharge').val() == '' ? '0.00' : $('#EditAfterLandingCharge').val()
+landingch=parseFloat($('#EditAfterLandingCharge').val() == '' ? '0.00' : $('#EditAfterLandingCharge').val());
 
   //highsesssalles=parseFloat($('#EditAfterHighseas').val());
 
  // customch=parseFloat($('#EditAfterCustomduty').val());
-customch=$('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val()
+customch=parseFloat($('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val());
 
   //excisech=parseFloat($('#EditAfterExcisedutyTax').val());
 
@@ -4097,7 +4098,7 @@ txtshpercentage=$('#EditCustomSHcess').val() == '' ? '0.00' : $('#EditCustomSHce
   
 
   var tot=<?php echo SUBTOTAL;?>;
-  console.log(tot);
+  //console.log(tot);
   //var igstpercentage=parseFloat($('#EditIgst').val());
 var igstpercentage=$('#EditIgst').val() == '' ? '0.00' : $('#EditIgst').val()
   var afterigst=<?php echo IGST;?>;
@@ -5134,6 +5135,7 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck()&&EditQtyZerocheck())
    var CustomDuty=$("#EditCustomduty").val();
    var AfterCustomDuty=$("#EditAfterCustomduty").val();
    var CustomED=$("#EditCustomEDcess").val();
+   //console.log(CustomED);
    var AfterCustomED=$("#EditAfterCustomEDcess").val();
    var CustomSH=$("#EditCustomSHcess").val();
    var AfterCustomSH=$("#EditAfterCustomSHcess").val();
@@ -5204,7 +5206,7 @@ var spclins=$.trim(tinymce.get('edittxtInstruction').getContent());
           $('#AfterLandingCharge'+userid).val(AfterLanding);
           $('#CustomDuty'+userid).val(CustomDuty); 
           $('#AfterCustomDuty'+userid).val(AfterCustomDuty);
-          $('#CustomEDCess'+userid).val(CustomED);
+          $('#CustomEdCess'+userid).val(CustomED);
           $('#AfterCustomEdCess1'+userid).val(AfterCustomED);
           $('#CustomSHCess'+userid).val(CustomSH);
           $('#AfterCustomSHCess'+userid).val(AfterCustomSH);
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 23802ad8..e635a8e5 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -984,7 +984,7 @@ function vaildateBeforeOpenModal()
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom ED_cess : (e) -->
-                                                    <label><?php echo "Custom ED_cess : (C)";?></label>            
+                                                    <label><?php echo "Custom ED_cess : (C) ($INR)";?></label>            
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1030,7 +1030,7 @@ function vaildateBeforeOpenModal()
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                               <label><?php echo "Subtotal:($INR)  (A+B+C+D)";?></label>                 
+                                               <label><?php echo "Subtotal: (E)($INR)  (A+B+C+D)";?></label>                 
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none;">
@@ -1057,7 +1057,7 @@ function vaildateBeforeOpenModal()
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                               <label><?php echo "IGST (E) ($INR)";?></label>                 
+                                               <label><?php echo "IGST on (E): (F) ($INR)";?></label>                 
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1531,7 +1531,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- High seas sales charge -->
-                                                 <label><?php echo "Assessable Value ($INR)";?></label>               
+                                                 <label><?php echo "Assessable Value (A) ($INR)";?></label>               
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none">
@@ -1553,7 +1553,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                <!--  Custom duty : (a) -->
-                                                 <label><?php echo "Custom duty: (a)($INR)"?></label>              
+                                                 <label><?php echo "Custom duty : (B)($INR)"?></label>              
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1578,7 +1578,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom ED_cess : (e) -->
-                                                    <label><?php echo "Custom ED_cess : (e)($INR)";?></label>            
+                                                    <label><?php echo "Custom ED_cess : (C) ($INR)";?></label>            
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1600,7 +1600,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Custom S & H cess : (f) -->
-                                                       <label><?php echo "Custom S & H cess : (f)($INR)";?></label>         
+                                                       <label><?php echo "Custom S & H cess : (D)($INR)";?></label>         
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1624,7 +1624,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                                    <label><?php echo "Subtotal:($INR)";?></label>            
+                                                    <label><?php echo "Subtotal: (E)($INR)  (A+B+C+D)";?></label>            
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display: none;">
@@ -1652,7 +1652,7 @@ echo form_textarea($data);
                                                 <div class="col-md-12">
                                                             <div class="col-md-4">
                                                                 <!-- Additional Excise duty : (g) -->
-                                               <label><?php echo "IGST($INR)";?></label>                 
+                                               <label><?php echo "IGST on (E): (F) ($INR)";?></label>                 
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -1677,7 +1677,7 @@ echo form_textarea($data);
                                                         <div class="col-md-12">
                                                             <div class="col-md-8">
                                                                 <!-- Gross duty payable -->
-                                                     <label><?php echo "Total Duty ($INR)";?></label>           
+                                                     <label><?php echo "Total Duty ($INR)   (B+C+D+E)";?></label>           
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
@@ -2688,9 +2688,12 @@ $('#RMCIncludingCustomers').val('');
 
     var txtlanding=0;
     var txtbasicprice=0;
-    txtlanding=parseFloat($('#LandingCharge').val());
-    txtbasicprice=parseFloat($('#AfterBasicPriceTax').val());
+    txtlanding=parseFloat($('#LandingCharge').val() == '' ? '0.00' : $('#LandingCharge').val());
+
+    //$('#LandingCharge').val() == '' ? '0.00' : $('#LandingCharge').val()
+   // txtbasicprice=parseFloat($('#AfterBasicPriceTax').val());
     
+    txtbasicprice=parseFloat($('#AfterBasicPriceTax').val() == '' ? '0.00' : $('#AfterBasicPriceTax').val());
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
     var assessble=parseFloat(result)+parseFloat(txtbasicprice);
@@ -2700,7 +2703,7 @@ $('#RMCIncludingCustomers').val('');
     if(isNaN(result))
     {
         $('#AfterLandingCharge').val('');
-        $('#AfterAssessable').val(assessble.toFixed(2));
+        $('#AfterAssessable').val(txtbasicprice.toFixed(2));
 
 
     }
@@ -2719,10 +2722,15 @@ $('#RMCIncludingCustomers').val('');
     //alert();
     var txtlanding=0;
     var txtbasicprice=0;
-    txtlanding=parseFloat($('#EditLandingCharge').val());
-    txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
+    // txtlanding=parseFloat($('#EditLandingCharge').val());
+    // txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
 
     
+
+    txtlanding=parseFloat($('#EditLandingCharge').val() == '' ? '0.00' : $('#EditLandingCharge').val());
+    txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#EditAfterBasicPriceTax').val());    
+ 
+
     var result= <?php echo LOADING_CHARGE;?>;
     var assessble=<?php echo ASSESSBLE;?>;
    // console.log(assessble);
@@ -2753,8 +2761,14 @@ $('#RMCIncludingCustomers').val('');
     var sumcustom=0;
     var txtcustomduty=0;
     
-    var accessible=parseFloat($('#AfterAssessable').val());  
-    var txtcustompercentage=parseFloat($('#Customduty').val());
+    // var accessible=parseFloat($('#AfterAssessable').val());  
+    // var txtcustompercentage=parseFloat($('#Customduty').val());
+
+ 
+
+    var accessible=parseFloat($('#AfterAssessable').val() == '' ? '0.00' : $('#AfterAssessable').val());  
+    var txtcustompercentage=parseFloat($('#Customduty').val() == '' ? '0.00' : $('#Customduty').val());
+
    txtcustomduty=<?php echo CUSTOM_DUTY1;?>;
    if(isNaN(txtcustomduty))
    {
@@ -2777,9 +2791,11 @@ function EditCalculateCustomduty()
     var sumcustom=0;
     var txtcustomduty=0;
     
-    var accessible=parseFloat($('#EditAfterAssessable').val());  
-    var txtcustompercentage=parseFloat($('#EditCustomduty').val());
+    // var accessible=parseFloat($('#EditAfterAssessable').val());  
+    // var txtcustompercentage=parseFloat($('#EditCustomduty').val());
    //sumcustom=txthighse+txtlandingch+txtbasic;
+    var accessible=parseFloat($('#EditAfterAssessable').val() == '' ? '0.00' : $('#EditAfterAssessable').val());  
+    var txtcustompercentage=parseFloat($('#EditCustomduty').val() == '' ? '0.00' : $('#EditCustomduty').val());
    
    txtcustomduty=<?php echo CUSTOM_DUTY1;?>;
    if(isNaN(txtcustomduty))
@@ -2848,9 +2864,15 @@ return true;
     var txtcustomedsess=0;
 
 
-    txtcustomduty1=parseFloat($('#AfterCustomduty').val());
     
-    txtedcesspercentage=parseFloat($('#CustomEDcess').val());
+    // txtcustomduty1=parseFloat($('#AfterCustomduty').val());
+    
+    // txtedcesspercentage=parseFloat($('#CustomEDcess').val());
+
+
+    txtcustomduty1=parseFloat($('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val());
+    
+    txtedcesspercentage=parseFloat($('#CustomEDcess').val() == '' ? '0.00' : $('#CustomEDcess').val());
     //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
     txtcustomedsess=<?php echo CUSTOM_ED1;?>;
     if(isNaN(txtcustomedsess))
@@ -2881,9 +2903,14 @@ function EditCalculateCustomEdcess()
     //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
     var txtcustomedsess=0;
 
-    txtcustomduty1=parseFloat($('#EditAfterCustomduty').val());
+    // txtcustomduty1=parseFloat($('#EditAfterCustomduty').val());
     
-    txtedcesspercentage=parseFloat($('#EditCustomEDcess').val());
+    // txtedcesspercentage=parseFloat($('#EditCustomEDcess').val());
+
+
+    txtcustomduty1=parseFloat($('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val());
+    
+    txtedcesspercentage=parseFloat($('#EditCustomEDcess').val() == '' ? '0.00' : $('#EditCustomEDcess').val());
     //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
     txtcustomedsess=<?php echo CUSTOM_ED1;?>;
     if(isNaN(txtcustomedsess))
@@ -2913,11 +2940,13 @@ function EditCalculateCustomEdcess()
   var totresult=0;
 
 
-  customch=parseFloat($('#AfterCustomduty').val());
+  //customch=parseFloat($('#AfterCustomduty').val());
   //console.log(customch);
-  
+customch=parseFloat($('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val());  
 
-  txtshpercentage=parseFloat($('#CustomSHcess').val());
+ // txtshpercentage=parseFloat($('#CustomSHcess').val());
+
+txtshpercentage=parseFloat($('#CustomSHcess').val() == '' ? '0.00' : $('#CustomSHcess').val());  
   //var totresult=(totcustomsh*txtshpercentage)/100;
   totresult=<?php echo CUSTOM_SH1;?>;
   if(isNaN(totresult))
@@ -2951,13 +2980,16 @@ function EditCalculateCustomEdcess()
 
   landingch=parseFloat($('#EditAfterLandingCharge').val());
   highsesssalles=parseFloat($('#EditAfterHighseas').val());
-  customch=parseFloat($('#EditAfterCustomduty').val());
+  //customch=parseFloat($('#EditAfterCustomduty').val());
   excisech=parseFloat($('#EditAfterExcisedutyTax').val());
   exciseedch=parseFloat($('#EditAfterExcisedutyEDcess').val());
   exciseshch=parseFloat($('#EditAfterExcisedutySHcess').val());
   totcustomsh=landingch+highsesssalles+customch+excisech+exciseedch+exciseshch;
 
-  txtshpercentage=parseFloat($('#EditCustomSHcess').val());
+
+customch=parseFloat($('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val());
+  //txtshpercentage=parseFloat($('#EditCustomSHcess').val());
+ txtshpercentage=parseFloat($('#EditCustomSHcess').val() == '' ? '0.00' : $('#EditCustomSHcess').val());  
   //var totresult=(totcustomsh*txtshpercentage)/100;
   var totresult=<?php echo CUSTOM_SH1;?>;
   if(isNaN(totresult))
@@ -2980,18 +3012,27 @@ function CalculateIgst()
 {
   var basucprice=parseFloat($('#AfterBasicPriceTax').val());
   var landing=parseFloat($('#AfterLandingCharge').val());
-  var custom=parseFloat($('#AfterCustomduty').val());
-  var customsh=parseFloat($('#AfterCustomSHcess').val());
-  var customed=parseFloat($('#AfterCustomEDcess').val());
+  // var custom=parseFloat($('#AfterCustomduty').val());
+  // var customsh=parseFloat($('#AfterCustomSHcess').val());
+  // var customed=parseFloat($('#AfterCustomEDcess').val());
 
-  var assessble=parseFloat($('#AfterAssessable').val());
+  // var assessble=parseFloat($('#AfterAssessable').val());
+
+  var assessble=parseFloat($('#AfterAssessable').val() == '' ? '0.00' : $('#AfterAssessable').val());
+  var custom=parseFloat($('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val()
+); 
+var customsh=parseFloat($('#AfterCustomSHcess').val() == '' ? '0.00' : $('#AfterCustomSHcess').val());
+var customed=parseFloat($('#AfterCustomEDcess').val() == '' ? '0.00' : $('#AfterCustomEDcess').val());
 
 
  // var tot=parseFloat(assessble)+parseFloat(custom)+parseFloat(customsh)+
  //         parseFloat(customed);
 
    var tot=<?php echo SUBTOTAL;?>;
-  var igstpercentage=parseFloat($('#Igst').val());
+  //var igstpercentage=parseFloat($('#Igst').val());
+var igstpercentage=parseFloat($('#Igst').val() == '' ? '0.00' : $('#Igst').val());
+
+  
   var afterigst=<?php echo IGST;?>;
 
 
@@ -3044,17 +3085,28 @@ CalculateCtable();
 function EditCalculateIgst()
 {
   
-  var custom=parseFloat($('#EditAfterCustomduty').val());
-  var customsh=parseFloat($('#EditAfterCustomSHcess').val());
-  var customed=parseFloat($('#EditAfterCustomEDcess').val());
+  // var custom=parseFloat($('#EditAfterCustomduty').val());
+  // var customsh=parseFloat($('#EditAfterCustomSHcess').val());
+  // var customed=parseFloat($('#EditAfterCustomEDcess').val());
+
+  // var assessble=parseFloat($('#EditAfterAssessable').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());
+
 
-  var assessble=parseFloat($('#EditAfterAssessable').val());
 
   var tot=<?php echo SUBTOTAL;?>;
-  var igstpercentage=parseFloat($('#EditIgst').val());
+  //var igstpercentage=parseFloat($('#EditIgst').val());
+
+var igstpercentage=parseFloat($('#EditIgst').val() == '' ? '0.00' : $('#EditIgst').val());  
   var afterigst=<?php echo IGST;?>;
 
-
+$('#LandingCharge').val() == '' ? '0.00' : $('#LandingCharge').val()
   if(isNaN(tot))
   {
     $('#EditSubtotal').val('');