From e492632e165e5300f03c59e436ba11bde228f41e Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 18 Aug 2017 12:33:37 +0530
Subject: [PATCH] import issues

---
 application/controllers/purchaseorder.php |   4 +-
 application/views/editImportAmendPO.php   | 124 ++++++++++++------
 application/views/editimportpo.php        | 150 +++++++++++++++-------
 application/views/importpo.php            |   6 +-
 4 files changed, 199 insertions(+), 85 deletions(-)

diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index b878b512..368f2116 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -1306,7 +1306,9 @@ function addNewImportPurchaseOrder()
                 $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));                
                 $createddt =  $dt->format('Y-m-d H:i:s');
                 $Exchangerate=$this->input->post('ExchangeRate');
-                $ExchangeRateCalculatedon=$this->input->post('Exchangerateon');
+                $Edt=$this->input->post('Exchangerateon');
+                $ExchangeRateCalculatedon=$this->getDateformat($Edt);
+                
                 $CurrencyType=$this->input->post('currencytype');
                 
                 $PaymentTerms=$this->input->post('PaymentTerms');
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 385cd319..9f6f1bd3 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -125,8 +125,11 @@ if(!empty($POMaster))
         $PONO =     $Req->PONO; 
         $ServiceDescription = $Req->ServiceDescription; 
         $ExchangeRate=number_format(($Req->ExchangeRate),2);
+
+        $EDt =  new DateTime($Req->ExchangeRateCalculatedon);
+        $ExchangeRateCalculatedon =  $EDt->format('d-m-Y');
        
-        $ExchangeRateCalculatedon=$Req->ExchangeRateCalculatedon;
+       // $ExchangeRateCalculatedon=$Req->ExchangeRateCalculatedon;
         $PaymentTerms=$Req->PaymentTerms;
         // $PayableAT=$Req->PayableAT;
         // $PaymentDays=$Req->PaymentDays;
@@ -224,7 +227,7 @@ if(!empty($RequistionDetails))
          $("#PODate").datepicker({
             minDate : d,
             maxDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
         });
 
       
@@ -236,13 +239,13 @@ if(!empty($RequistionDetails))
         $("#Requeston").datepicker({
             //minDate : d,
             maxDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
         });
 
         $("#Exchangerateon").datepicker({
             minDate : m,
             //maxDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
         });
 
     });
@@ -2061,7 +2064,7 @@ $('#TotalExp').val('');
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
 
-    $('#AfterLandingCharge').val(parseFloat(Math.round(result)));
+    $('#AfterLandingCharge').val(result.toFixed(2));
     CalculateHighseassalescharge();
 
     //alert();
@@ -2080,7 +2083,7 @@ $('#TotalExp').val('');
     txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
-    $('#EditAfterLandingCharge').val(parseFloat(Math.round(result)));
+    $('#EditAfterLandingCharge').val(result.toFixed(2));
     EditCalculateHighseassalescharge();
     //alert();
  }
@@ -2108,7 +2111,7 @@ function CalculateHighseassalescharge()
         $('#AfterHighseas').val('');
     }
     else{
-    $('#AfterHighseas').val(parseFloat(Math.round(txtAfterhighsess)));
+    $('#AfterHighseas').val(txtAfterhighsess.toFixed(2));
      }
     
     CalculateCustomduty();
@@ -2136,7 +2139,7 @@ function EditCalculateHighseassalescharge()
         $('#EditAfterHighseas').val('');
     }
     else{
-    $('#EditAfterHighseas').val(parseFloat(Math.round(txthighsess)));
+    $('#EditAfterHighseas').val(txthighsess.toFixed(2));
     }
     EditCalculateCustomduty();
  }
@@ -2160,7 +2163,7 @@ function CalculateCustomduty()
      $('#AfterCustomduty').val('');
    }
    else{
-   $('#AfterCustomduty').val(parseFloat(Math.round(txtcustomduty)));
+   $('#AfterCustomduty').val(txtcustomduty.toFixed(2));
    }
    CalculateExciseDuty() ;
 
@@ -2205,7 +2208,7 @@ function EditCalculateCustomduty()
     $('#EditAfterCustomduty').val('');
    }
    else{
-   $('#EditAfterCustomduty').val(parseFloat(Math.round(txtcustomduty)));
+   $('#EditAfterCustomduty').val(txtcustomduty.toFixed(2));
    }
    EditCalculateExciseDuty() ;
 
@@ -2237,7 +2240,7 @@ function CalculateExciseDuty()
     }
     //var totalexcise=txtcustomduty+Exciseduty;
     else{
-    $('#AfterExcisedutyTax').val(parseFloat(Math.round(totalexcise)));
+    $('#AfterExcisedutyTax').val(totalexcise.toFixed(2));
       }
     CalculateExciseED1();
 }
@@ -2269,7 +2272,7 @@ function EditCalculateExciseDuty()
     else
     {
     //var totalexcise=txtcustomduty+Exciseduty;
-    $('#EditAfterExcisedutyTax').val(parseFloat(Math.round(totalexcise)));
+    $('#EditAfterExcisedutyTax').val(totalexcise.toFixed(2));
     }
     EditCalculateExciseED1();
 }
@@ -2291,7 +2294,7 @@ function CalculateExciseED1()
   }
   else
   {
-  $('#AfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot)));
+  $('#AfterExcisedutyEDcess').val(txtexcisetot.toFixed(2));
    }
  
   CalculateexciseSHcess();
@@ -2315,7 +2318,7 @@ function EditCalculateExciseED1()
   }
   else
   {
-  $('#EditAfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot)));
+  $('#EditAfterExcisedutyEDcess').val(txtexcisetot.toFixed(2));
   }
   EditCalculateexciseSHcess();
 
@@ -2337,7 +2340,7 @@ function CalculateexciseSHcess()
     }
     else
     {
-    $('#AfterExcisedutySHcess').val(parseFloat(Math.round(exciseshcesstot)));
+    $('#AfterExcisedutySHcess').val(exciseshcesstot.toFixed(2));
     //$('#AfterExcisedutySHcess').val('');
     }
     CalculateCustomEdcess();
@@ -2362,7 +2365,7 @@ function CalculateexciseSHcess()
     }
     else
     {
-    $('#EditAfterExcisedutySHcess').val(parseFloat(Math.round(exciseshcesstot)));
+    $('#EditAfterExcisedutySHcess').val(exciseshcesstot.toFixed(2));
     }
     EditCalculateCustomEdcess();
 
@@ -2403,7 +2406,7 @@ function CalculateexciseSHcess()
     }
     else
     {
-    $('#AfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess)));
+    $('#AfterCustomEDcess').val(txtcustomedsess.toFixed(2));
     }
     CalculateCustomSHcess();
 
@@ -2440,7 +2443,7 @@ function EditCalculateCustomEdcess()
     }
     else
     {
-    $('#EditAfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess)));
+    $('#EditAfterCustomEDcess').val(txtcustomedsess.toFixed(2));
     }
     EditCalculateCustomSHcess();
 
@@ -2481,7 +2484,7 @@ function EditCalculateCustomEdcess()
   }
   else
   {
-  $('#AfterCustomSHcess').val(parseFloat(Math.round(totresult)));
+  $('#AfterCustomSHcess').val(totresult.toFixed(2));
   }
   CalculateaddlExciseDuty();
 
@@ -2520,7 +2523,7 @@ function EditCalculateCustomEdcess()
   }
   else
   {
-  $('#EditAfterCustomSHcess').val(parseFloat(Math.round(totresult)));
+  $('#EditAfterCustomSHcess').val(totresult.toFixed(2));
   }
   EditCalculateaddlExciseDuty();
 
@@ -2563,7 +2566,7 @@ function CalculateaddlExciseDuty()
  }
  else
  {
-  $('#AfterAdditionalExciseduty').val(parseFloat(Math.round(txtaddtnexciseduty)));
+  $('#AfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2));
   }
   //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
 
@@ -2573,7 +2576,7 @@ function CalculateaddlExciseDuty()
     $('#Grossdutypayable').val('');
   }
   else{
-  $('#Grossdutypayable').val(parseFloat(Math.round(txtgrossduty)));
+  $('#Grossdutypayable').val(txtgrossduty.toFixed(2));
   }
   CalculateAvlModvat();
 
@@ -2618,7 +2621,7 @@ function EditCalculateaddlExciseDuty()
  }
  else
  {
-  $('#EditAfterAdditionalExciseduty').val(Math.round(txtaddtnexciseduty));
+  $('#EditAfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2));
  }
   //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
 
@@ -2629,7 +2632,7 @@ function EditCalculateaddlExciseDuty()
   }
   else
   {
-  $('#EditGrossdutypayable').val(parseFloat(Math.round(txtgrossduty)));
+  $('#EditGrossdutypayable').val(txtgrossduty.toFixed(2));
   }
   EditCalculateAvlModvat();
 
@@ -2657,7 +2660,7 @@ function CalculateAvlModvat()
   }
   else
   {
-  $('#AvailableModvat').val(parseFloat(Math.round(totavlmodvat)));
+  $('#AvailableModvat').val(totavlmodvat.toFixed(2));
   }
   CalculateGrossExpense();
 
@@ -2688,7 +2691,7 @@ function EditCalculateAvlModvat()
   }
   else
   {
-  $('#EditAvailableModvat').val(parseFloat(Math.round(totavlmodvat)));
+  $('#EditAvailableModvat').val(totavlmodvat.toFixed(2));
    }
   EditCalculateGrossExpense();
 }
@@ -2713,7 +2716,7 @@ function CalculateGrossExpense()
     }
     else
     {
-    $('#Grossexpenses').val(parseFloat(Math.round(grossexp)));
+    $('#Grossexpenses').val(grossexp.toFixed(2));
     }
     CalculateCtable();
 
@@ -2740,7 +2743,7 @@ function EditCalculateGrossExpense()
     }
     else
     {
-    $('#EditGrossexpenses').val(parseFloat(Math.round(grossexp)));
+    $('#EditGrossexpenses').val(grossexp.toFixed(2));
     }
     EditCalculateCtable()
 
@@ -2784,7 +2787,7 @@ function CalculateCtable()
     }
     else
     {
-    $('#CustomDutyExpenses').val(Math.round(txtcustomdutyexp));
+    $('#CustomDutyExpenses').val(txtcustomdutyexp.toFixed(2));
     }
     //txtrmc=txtpurchaserate+txtcustomdutyexp;
     txtrmc=<?php echo RMC_CAL;?>;
@@ -2794,7 +2797,7 @@ function CalculateCtable()
     }
     else
     {
-    $('#RMCIncludingCustomers').val(Math.round(txtrmc));
+    $('#RMCIncludingCustomers').val(txtrmc.toFixed(2));
     }
     total=<?php echo CALCULATE_TOTAL;?>;
    
@@ -2816,25 +2819,72 @@ function EditCalculateCtable()
     var txtrmc=0;
     var total=0;
     var basicprice=0;
-    basicprice=parseFloat($('#EdittxtBasicValue').val());
+    //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());
-    txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
+    //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=<?php echo PURCHASE_RATE;?>;
-    $('#Editpurchaserate').val(txtpurchaserate);
+
+    if(isNaN(txtpurchaserate))
+    {
+        $('#Editpurchaserate').val(0);
+    }
+
+   else if (isFinite(txtpurchaserate))
+     {
+             $('#Editpurchaserate').val(txtpurchaserate.toFixed(2));
+     }
+
+    else{
+
+    //$('#Editpurchaserate').val(txtpurchaserate);
+
+    $('#Editpurchaserate').val(0);
+    }
+
+
+   // $('#Editpurchaserate').val(txtpurchaserate);
     //CustomDutyExpenses
     //RMCIncludingCustomers
-    txtgrossexp=parseFloat($('#EditGrossexpenses').val());
+    //txtgrossexp=parseFloat($('#EditGrossexpenses').val());
+    txtgrossexp = $('#EditGrossexpenses').val() == '' ? '0.00' : $('#EditGrossexpenses').val();
     //txtcustomdutyexp=txtgrossexp/txtCtablequantity;
     txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
-    $('#EditCustomDutyExpenses').val(txtcustomdutyexp);
+
+    if(isNaN(txtcustomdutyexp))
+    {
+        $('#EditCustomDutyExpenses').val(0);
+    }
+
+    else 
+    {
+    $('#EditCustomDutyExpenses').val(txtcustomdutyexp.toFixed(2));
+    }
+
+    //$('#EditCustomDutyExpenses').val(txtcustomdutyexp);
     //txtrmc=txtpurchaserate+txtcustomdutyexp;
     txtrmc=<?php echo RMC_CAL;?>;
-    $('#EditRMCIncludingCustomers').val(txtrmc);
+
+    if(isNaN(txtrmc))
+    {
+        $('#EditRMCIncludingCustomers').val(0);
+    }
+    
+    else{
+    $('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2));
+     }
+
+
+   /// $('#EditRMCIncludingCustomers').val(txtrmc);
     total=<?php echo CALCULATE_TOTAL;?>;
     $('#EditTotalExp').val(basicprice);
     
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index e9914cf6..fd7f1c57 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -29,7 +29,7 @@ foreach ($PaymentTerms as $TER)
 }
 //echo $Terms;
 $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));                
-$CurrentDate =  $dt->format('d-m-y');
+$CurrentDate =  $dt->format('d-m-Y');
 
 $MaxPoDate = '';
 if(!empty($MaxPODate))
@@ -129,7 +129,9 @@ if(!empty($POMaster))
         $ServiceDescription = $Req->ServiceDescription; 
         $ExchangeRate=number_format(($Req->ExchangeRate),2);
         //echo "$ExchangeRate";
-        $ExchangeRateCalculatedon=$Req->ExchangeRateCalculatedon;
+        $EDt =  new DateTime($Req->ExchangeRateCalculatedon);
+        $ExchangeRateCalculatedon =  $EDt->format('d-m-Y');
+       
         $PaymentTerms=$Req->PaymentTerms;
         // $PayableAT=$Req->PayableAT;
         // $PaymentDays=$Req->PaymentDays;
@@ -221,7 +223,7 @@ if(!empty($RequistionDetails))
          $("#PODate").datepicker({
             minDate : d,
             maxDate : 'now',
-            dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
         });
 
         //  $("#PayableAT").datepicker({
@@ -243,7 +245,7 @@ if(!empty($RequistionDetails))
         $("#Exchangerateon").datepicker({
             minDate : m,
             //maxDate : 'now',
-            dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
         });
 
     });
@@ -425,7 +427,7 @@ if(!empty($RequistionDetails))
                 <label>PO Date</label>
                         <div class="form-group">
                                     <?php
-                             $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+                             $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
                             echo form_input($data);
                             ?>   
                         </div>
@@ -501,7 +503,7 @@ if(!empty($RequistionDetails))
                     <label>Exchange Rate On</label>
                             <div class="form-group">
                                         <?php
-                                 $data = array('name' => 'Exchangerateon','value' => set_value('Exchangerateon',$CurrentDate),'id'=>'Exchangerateon',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
+                                 $data = array('name' => 'Exchangerateon','value' => set_value('Exchangerateon',$ExchangeRateCalculatedon),'id'=>'Exchangerateon',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
                                 echo form_input($data);
                                 ?>   
                             </div>
@@ -3028,8 +3030,11 @@ function USRate()
 
 function EditRatechange()
 {
-      var txteditQuantity=parseFloat($('#EditQuantity').val());
-      var txteditUnitPrice=parseFloat($('#EditRate').val());
+      //var txteditQuantity=parseFloat($('#EditQuantity').val());
+      var txteditQuantity = $('#EditQuantity').val() == '' ? '0.00' : $('#EditQuantity').val()
+      //var txteditUnitPrice=parseFloat($('#EditRate').val());
+      var txteditUnitPrice = $('#EditRate').val() == '' ? '0.00' : $('#EditRate').val()
+
       var editTot=txteditQuantity*txteditUnitPrice
       $('#EdittxtBasicValue').val(editTot);
       $(EditimBasicPrice).val(editTot);
@@ -3068,8 +3073,10 @@ function Ratechange(){
 
            if($('#Quantity').val() != '' && $('#Rate').val() != '')
      {    
-      var txtQuantity = parseFloat( $('#Quantity').val());
-      var txtUnitPrice = parseFloat($('#Rate').val());
+     // var txtQuantity = parseFloat( $('#Quantity').val());
+      var txtQuantity = $('#Quantity').val() == '' ? '0.00' : $('#Quantity').val()
+      //var txtUnitPrice = parseFloat($('#Rate').val());
+      var txtUnitPrice = $('#Rate').val() == '' ? '0.00' : $('#Rate').val()
       var Tot =  txtQuantity * txtUnitPrice
       $('#txtBasicValue').val(Tot);
 
@@ -3128,7 +3135,7 @@ $('#TotalExp').val('');
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
 
-    $('#AfterLandingCharge').val(parseFloat(Math.round(result)));
+    $('#AfterLandingCharge').val(result.toFixed(2));
     CalculateHighseassalescharge();
 
     //alert();
@@ -3147,7 +3154,7 @@ $('#TotalExp').val('');
     txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
-    $('#EditAfterLandingCharge').val(parseFloat(Math.round(result)));
+    $('#EditAfterLandingCharge').val(result.toFixed(2));
     EditCalculateHighseassalescharge();
     //alert();
  }
@@ -3175,7 +3182,7 @@ function CalculateHighseassalescharge()
         $('#AfterHighseas').val('');
     }
     else{
-    $('#AfterHighseas').val(parseFloat(Math.round(txtAfterhighsess)));
+    $('#AfterHighseas').val(txtAfterhighsess.toFixed(2));
      }
     
     CalculateCustomduty();
@@ -3203,7 +3210,7 @@ function EditCalculateHighseassalescharge()
         $('#EditAfterHighseas').val('');
     }
     else{
-    $('#EditAfterHighseas').val(parseFloat(Math.round(txthighsess)));
+    $('#EditAfterHighseas').val(txthighsess.toFixed(2));
     }
     EditCalculateCustomduty();
  }
@@ -3227,7 +3234,7 @@ function CalculateCustomduty()
      $('#AfterCustomduty').val('');
    }
    else{
-   $('#AfterCustomduty').val(parseFloat(Math.round(txtcustomduty)));
+   $('#AfterCustomduty').val(txtcustomduty.toFixed(2));
    }
    CalculateExciseDuty() ;
 
@@ -3272,7 +3279,7 @@ function EditCalculateCustomduty()
     $('#EditAfterCustomduty').val('');
    }
    else{
-   $('#EditAfterCustomduty').val(parseFloat(Math.round(txtcustomduty)));
+   $('#EditAfterCustomduty').val(txtcustomduty.toFixed(2));
    }
    EditCalculateExciseDuty() ;
 
@@ -3304,7 +3311,7 @@ function CalculateExciseDuty()
     }
     //var totalexcise=txtcustomduty+Exciseduty;
     else{
-    $('#AfterExcisedutyTax').val(parseFloat(Math.round(totalexcise)));
+    $('#AfterExcisedutyTax').val(totalexcise.toFixed(2));
       }
     CalculateExciseED1();
 }
@@ -3336,7 +3343,7 @@ function EditCalculateExciseDuty()
     else
     {
     //var totalexcise=txtcustomduty+Exciseduty;
-    $('#EditAfterExcisedutyTax').val(parseFloat(Math.round(totalexcise)));
+    $('#EditAfterExcisedutyTax').val(totalexcise.toFixed(2));
     }
     EditCalculateExciseED1();
 }
@@ -3474,7 +3481,7 @@ function CalculateexciseSHcess()
     }
     else
     {
-    $('#AfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess)));
+    $('#AfterCustomEDcess').val(txtcustomedsess.toFixed(2));
     }
     CalculateCustomSHcess();
 
@@ -3511,7 +3518,7 @@ function EditCalculateCustomEdcess()
     }
     else
     {
-    $('#EditAfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess)));
+    $('#EditAfterCustomEDcess').val(txtcustomedsess.toFixed(2));
     }
     EditCalculateCustomSHcess();
 
@@ -3552,7 +3559,7 @@ function EditCalculateCustomEdcess()
   }
   else
   {
-  $('#AfterCustomSHcess').val(parseFloat(Math.round(totresult)));
+  $('#AfterCustomSHcess').val(totresult.toFixed(2));
   }
   CalculateaddlExciseDuty();
 
@@ -3591,7 +3598,7 @@ function EditCalculateCustomEdcess()
   }
   else
   {
-  $('#EditAfterCustomSHcess').val(parseFloat(Math.round(totresult)));
+  $('#EditAfterCustomSHcess').val(totresult.toFixed(2));
   }
   EditCalculateaddlExciseDuty();
 
@@ -3634,7 +3641,7 @@ function CalculateaddlExciseDuty()
  }
  else
  {
-  $('#AfterAdditionalExciseduty').val(parseFloat(Math.round(txtaddtnexciseduty)));
+  $('#AfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2));
   }
   //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
 
@@ -3644,7 +3651,7 @@ function CalculateaddlExciseDuty()
     $('#Grossdutypayable').val('');
   }
   else{
-  $('#Grossdutypayable').val(parseFloat(Math.round(txtgrossduty)));
+  $('#Grossdutypayable').val(txtgrossduty.toFixed(2));
   }
   CalculateAvlModvat();
 
@@ -3689,7 +3696,7 @@ function EditCalculateaddlExciseDuty()
  }
  else
  {
-  $('#EditAfterAdditionalExciseduty').val(Math.round(txtaddtnexciseduty));
+  $('#EditAfterAdditionalExciseduty').val(txtaddtnexciseduty.toFixed(2));
  }
   //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
 
@@ -3700,7 +3707,7 @@ function EditCalculateaddlExciseDuty()
   }
   else
   {
-  $('#EditGrossdutypayable').val(parseFloat(Math.round(txtgrossduty)));
+  $('#EditGrossdutypayable').val(txtgrossduty.toFixed(2));
   }
   EditCalculateAvlModvat();
 
@@ -3728,7 +3735,7 @@ function CalculateAvlModvat()
   }
   else
   {
-  $('#AvailableModvat').val(parseFloat(Math.round(totavlmodvat)));
+  $('#AvailableModvat').val(totavlmodvat.toFixed(2));
   }
   CalculateGrossExpense();
 
@@ -3759,7 +3766,7 @@ function EditCalculateAvlModvat()
   }
   else
   {
-  $('#EditAvailableModvat').val(parseFloat(Math.round(totavlmodvat)));
+  $('#EditAvailableModvat').val(totavlmodvat.toFixed(2));
    }
   EditCalculateGrossExpense();
 }
@@ -3784,7 +3791,7 @@ function CalculateGrossExpense()
     }
     else
     {
-    $('#Grossexpenses').val(parseFloat(Math.round(grossexp)));
+    $('#Grossexpenses').val(grossexp.toFixed(2));
     }
     CalculateCtable();
 
@@ -3811,7 +3818,7 @@ function EditCalculateGrossExpense()
     }
     else
     {
-    $('#EditGrossexpenses').val(parseFloat(Math.round(grossexp)));
+    $('#EditGrossexpenses').val(grossexp.toFixed(2));
     }
     EditCalculateCtable()
 
@@ -3830,10 +3837,14 @@ function CalculateCtable()
     var txtrmc=0;
     var total=0;
     var basicamt=0;
-    basicprice=parseFloat($('#txtBasicValue').val());
+   // basicprice=parseFloat($('#txtBasicValue').val());
+    basicprice = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val()
    // console.log(basicprice);
-    quantity=parseFloat($('#PurQuantity').val());
-    txtbasicinrprice=parseFloat($('#AfterBasicPriceTax').val());
+    //quantity=parseFloat($('#PurQuantity').val());
+    quantity = $('#PurQuantity').val() == '' ? '0.00' : $('#PurQuantity').val()
+   // txtbasicinrprice=parseFloat($('#AfterBasicPriceTax').val());
+
+    txtbasicinrprice = $('#AfterBasicPriceTax').val() == '' ? '0.00' : $('#AfterBasicPriceTax').val()
     //txtpurchaserate=txtbasicinrprice/txtCtablequantity;
     txtpurchaserate=<?php echo PURCHASE_RATE;?>;
     //console.log(txtpurchaserate);
@@ -3841,13 +3852,24 @@ function CalculateCtable()
     {
         $('#purchaserate').val('');
     }
+
+
+    else if (isFinite(txtpurchaserate))
+     {
+             $('#purchaserate').val(txtpurchaserate.toFixed(2));
+     }
+
     else
     {
-    $('#purchaserate').val(txtpurchaserate);
+    $('#purchaserate').val(0);
     }
+
+
+    
     //CustomDutyExpenses
     //RMCIncludingCustomers
-    txtgrossexp=parseFloat($('#Grossexpenses').val());
+    //txtgrossexp=parseFloat($('#Grossexpenses').val());
+     txtgrossexp = $('#Grossexpenses').val() == '' ? '0.00' : $('#Grossexpenses').val()
     //txtcustomdutyexp=txtgrossexp/txtCtablequantity;
     txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
     if(isNaN(txtcustomdutyexp))
@@ -3856,7 +3878,7 @@ function CalculateCtable()
     }
     else
     {
-    $('#CustomDutyExpenses').val(Math.round(txtcustomdutyexp));
+    $('#CustomDutyExpenses').val(txtcustomdutyexp.toFixed(2));
     }
     //txtrmc=txtpurchaserate+txtcustomdutyexp;
     txtrmc=<?php echo RMC_CAL;?>;
@@ -3866,7 +3888,7 @@ function CalculateCtable()
     }
     else
     {
-    $('#RMCIncludingCustomers').val(Math.round(txtrmc));
+    $('#RMCIncludingCustomers').val(txtrmc.toFixed(2));
     }
     //total=<?php echo CALCULATE_TOTAL;?>;
    
@@ -3889,25 +3911,65 @@ function EditCalculateCtable()
     var txtrmc=0;
     var total=0;
     var basicprice=0;
-    basicprice=parseFloat($('#EdittxtBasicValue').val());
+    //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());
-    txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
+    //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=<?php echo PURCHASE_RATE;?>;
-    $('#Editpurchaserate').val(txtpurchaserate);
+
+    if(isNaN(txtpurchaserate))
+    {
+        $('#Editpurchaserate').val(0);
+    }
+
+   else if (isFinite(txtpurchaserate))
+     {
+             $('#Editpurchaserate').val(txtpurchaserate.toFixed(2));
+     }
+
+    else{
+
+    //$('#Editpurchaserate').val(txtpurchaserate);
+
+    $('#Editpurchaserate').val(0);
+    }
     //CustomDutyExpenses
     //RMCIncludingCustomers
-    txtgrossexp=parseFloat($('#EditGrossexpenses').val());
+    //txtgrossexp=parseFloat($('#EditGrossexpenses').val());
+
+    txtgrossexp = $('#EditGrossexpenses').val() == '' ? '0.00' : $('#EditGrossexpenses').val();
     //txtcustomdutyexp=txtgrossexp/txtCtablequantity;
     txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
-    $('#EditCustomDutyExpenses').val(txtcustomdutyexp);
+
+    if(isNaN(txtcustomdutyexp))
+    {
+        $('#EditCustomDutyExpenses').val(0);
+    }
+
+    else 
+    {
+    $('#EditCustomDutyExpenses').val(txtcustomdutyexp.toFixed(2));
+    }
     //txtrmc=txtpurchaserate+txtcustomdutyexp;
     txtrmc=<?php echo RMC_CAL;?>;
-    $('#EditRMCIncludingCustomers').val(txtrmc);
+
+   if(isNaN(txtrmc))
+    {
+        $('#EditRMCIncludingCustomers').val(0);
+    }
+    
+    else{
+    $('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2));
+     }
     total=<?php echo CALCULATE_TOTAL;?>;
     $('#EditTotalExp').val(basicprice);
     
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 94ba7fd3..4e194bab 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -2345,7 +2345,7 @@ $('#TotalExp').val('');
         $('#AfterLandingCharge').val('');
     }
     else{
-    $('#AfterLandingCharge').val(parseFloat(Math.round(result)));
+    $('#AfterLandingCharge').val(result.toFixed(2));
      }
     
 
@@ -2368,7 +2368,7 @@ $('#TotalExp').val('');
     txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
-    $('#EditAfterLandingCharge').val(parseFloat(Math.round(result)));
+    $('#EditAfterLandingCharge').val(result.toFixed(2));
     EditCalculateHighseassalescharge();
     //alert();
  }
@@ -2396,7 +2396,7 @@ $('#TotalExp').val('');
         $('#AfterHighseas').val('');
     }
     else{
-    $('#AfterHighseas').val(parseFloat(Math.round(txtAfterhighsess)));
+    $('#AfterHighseas').val(txtAfterhighsess.toFixed(2));
      }
     
     CalculateCustomduty();