diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 96b9c7b0..3e29c3c7 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -952,7 +952,7 @@ function vaildateBeforeOpenModal()
                               <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
                                 <div class="form-group">
                                   <?php
-                                    $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);');
+                                    $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);calculateFreightlocaddper()');
                                     echo form_input($data);
                                    ?>
                                 </div>
@@ -1690,7 +1690,7 @@ function vaildateBeforeOpenModal()
                                                         <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
                                                         <div class="form-group">
                                                             <?php
-                                                            $data = array('name' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);');
+                                                            $data = array('name' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
                                                             echo form_input($data);
                                                             ?>
                                                         </div>
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index 338617d7..194164c7 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -1429,7 +1429,7 @@ $("#PaymentMethod").select2();
             <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
             <div class="form-group">
               <?php
-              $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);');
+              $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);calculateFreightlocaddper()');
               echo form_input($data);
               ?>
             </div>
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index b0012c2e..ba8a4e87 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -978,7 +978,7 @@ if($PONOStatus == PO_RELEASED)
                                                     <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
+                                                        $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange(),calculateFreight(0)');
                                                         echo form_input($data);
 
                                                         ?>
@@ -991,7 +991,7 @@ if($PONOStatus == PO_RELEASED)
                                        <!--  <P id=labelRate> -->  <label id=labelRate><?php echo "Rate in $Currencycode ($Value)";?><span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span> </label><!-- </P> -->
                                                     <div class="form-group">
                                                         <?php
-                                                       $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
+                                                       $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange(),calculateFreight(0)' );
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 3cd503fc..c0b0481a 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -804,7 +804,7 @@ function vaildateBeforeOpenModal()
                                                     <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange(),ExceedQuantityCheck()');
+                                                        $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange(),ExceedQuantityCheck(),calculateFreight(0)');
                                                         echo form_input($data);
 
                                                         ?>
@@ -814,7 +814,7 @@ function vaildateBeforeOpenModal()
                                                   <!-- <P id=labelRate> -->  <label id=labelRate><?php echo "Rate in";?> <span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label><!-- </P> -->
                                                     <div class="form-group">
                                                         <?php
-                                                       $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange(),validateExceedLimit()' );
+                                                       $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange(),validateExceedLimit(),calculateFreight(0)' );
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
@@ -1394,7 +1394,7 @@ echo form_textarea($data);
                                                     <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
+                                                        $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck(),calculateFreight(1)');
                                                         echo form_input($data);
 
                                                         ?>
@@ -1405,7 +1405,7 @@ echo form_textarea($data);
                                                     <!-- <label>Rate </label> -->
                                                     <div class="form-group">
                                                         <?php
-                                                       $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
+                                                       $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange(),calculateFreight(1)' );
                                                         echo form_input($data);