diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 4eed3119..f6eba7ca 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -1270,7 +1270,8 @@ $AdvanceAmount=0.00;
 
 public function importpoprint($PONO) 
   {
-    
+    // echo $PONO;
+    // die();
             //$this->load->view('includes/pdfheader');
             
             // Load the pdf page with multiviews
@@ -1377,17 +1378,17 @@ public function importpoprint($PONO)
          $php = $this->output->get_output();
             
             // Load library
-         $this->load->library('dompdf_gen');
-		 $paper_orientation = 'portrait';
+      $this->load->library('dompdf_gen');
+		  $paper_orientation = 'portrait';
 			$customPaper = array(0,0,750,950);
 			$this->dompdf->set_paper($customPaper,$paper_orientation);
             
             // Convert to PDF
             //$this->dompdf->set_paper(array(0, 0, 841.89, 1190.55), 'landscape');
-         $this->dompdf->load_html($php);
+            $this->dompdf->load_html($php);
             $this->dompdf->render();
             $data['Attachment'] = FALSE;
-          $this->dompdf->stream("ImportPOReport".$PONO.".pdf",$data,$php); 
+            $this->dompdf->stream("ImportPOReport".$PONO.".pdf",$data,$php); 
           
 }
 
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 39bb3808..e1848e4e 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -152,11 +152,12 @@ if(!empty($POMaster))
         $Insurance=$Req->InsuranceStatus;
         $InsuranceNo=$Req->InsuranceNumber;
         $Importoption=$Req->POSubType;
+        $InsuranceStatus=$Req->InsuranceStatus;
 
     }
 }
 //$AvilableBudget=0;
-//echo $Otherpay;
+//echo $InsuranceStatus;
 $SavedSum=$Orderedsum*$ExchangeRate;
 //echo $SavedSum;
 $AvilableBudget=$SavedSum+$AvlAmount;
@@ -747,7 +748,7 @@ if(!empty($RequistionDetails))
                    
                     
                         
-                         <select id='Insurance' name='Insurance'>
+                         <!-- <select id='Insurance' name='Insurance'>
                     <?php  if($Insurance==1)
                             {
                                   $opt1='YES';
@@ -763,7 +764,25 @@ if(!empty($RequistionDetails))
                         
                         <option value="NO"><?php echo $opt1;?></option>
                         <option value="YES"><?php echo $opt2;?></option>
-                    </select>                                            
+                    </select>    -->    
+
+                    <?php 
+
+                   if($Insurance==1)
+                            {
+                                  $opt1='YES';
+                                  $opt2='NO';
+                            }
+
+                            else 
+                            {
+                                $opt1='NO';
+                                $opt2='YES';   
+                             }
+
+                    $data = array('name' => 'Insurance','Insurance' => set_value('Insurance',$opt1),'id'=>'Insurance',  'class' => 'form-control' ,'required' => 'true', 'readonly'=>true);
+                           echo form_input($data);
+                    ?>                                     
                     
            </div>  
 
@@ -776,7 +795,7 @@ if(!empty($RequistionDetails))
                        <div class="form-group">                        
                            <?php
                             
-                            $data = array('name' => 'insurancenumber','insurancenumber' => set_value('insurancenumber'),'id'=>'insurancenumber',  'class' => 'form-control' ,'required' => 'true');
+                            $data = array('name' => 'insurancenumber','insurancenumber' => set_value('insurancenumber'),'id'=>'insurancenumber',  'class' => 'form-control' ,'required' => 'true', 'readonly'=>true);
                            echo form_input($data);
                            ?>  
                        </div>
@@ -1311,7 +1330,7 @@ if(!empty($RequistionDetails))
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <span>Freight Amt In INR</span>
+                                                            <span>Freight Amt In <?php echo $INR;?></span>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'AmendtxtAfterFreight','value' => set_value('AmendtxtAfterFreight'),'id'=>'AmendtxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -2037,16 +2056,21 @@ else
 var insureoption=<?php echo json_encode($Insurance,JSON_PRETTY_PRINT)?>;
 var insureno=<?php echo json_encode($InsuranceNo,JSON_PRETTY_PRINT)?>;
 //console.log(insureoption);
+// $('#insurancenum').attr("style", "pointer-events: none;");
+// $('#insurancenumber').attr("style", "pointer-events: none;");
 
 
 if(insureoption==1)
 {
  $('#insurancenum').show(); 
  $('#insurancenumber').val(insureno);
+ $('#Insurance').val('YES');
 }
 
 else
 {
+
+  $('#Insurance').val('NO');
   $('#insurancenum').hide(); 
 }
 
@@ -2403,6 +2427,7 @@ function EditRatechange()
       $('#EditINRBasicvalue').val(parseFloat(txtINR).toFixed(2));
       $('#EditBasicPriceTax').val(parseFloat(txtINR).toFixed(2));
       $('#EditAfterBasicPriceTax').val(parseFloat(txtINR).toFixed(2));
+      calculateFreight(1);
       EditCalculateloadingcharge();
     }
 }
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 6dd0ee81..906a474e 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -1366,7 +1366,7 @@ if($PONOStatus == PO_RELEASED)
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <span>Freight Amt In INR</span>
+                                                            <span>Freight Amt In <?php echo $INR;?></span>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'addtxtAfterFreight','value' => set_value('addtxtAfterFreight'),'id'=>'addtxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -2004,7 +2004,7 @@ echo form_textarea($data);
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <span>Freight Amt In INR</span>
+                                                            <span>Freight Amt In <?php echo $INR;?></span>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'edittxtAfterFreight','value' => set_value('edittxtAfterFreight'),'id'=>'edittxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -2227,7 +2227,7 @@ echo form_textarea($data);
                                                     <label>Quantity</label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'ViewQuantity','value' => set_value('ViewQuantity'),'id'=>'ViewQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
+                                                        $data = array('name' => 'ViewQuantity','value' => set_value('ViewQuantity'),'id'=>'ViewQuantity','readonly'=>true  ,'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
                                                         echo form_input($data);
 
                                                         ?>
@@ -2239,14 +2239,14 @@ echo form_textarea($data);
                                             <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> </label>
                                                     <div class="form-group">
                                                         <?php
-                                                       $data = array('name' => 'ViewRate','value' => set_value('ViewRate'),'id'=>'ViewRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
+                                                       $data = array('name' => 'ViewRate','value' => set_value('ViewRate'),'id'=>'ViewRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>true ,'onchange'=>'EditRatechange()' );
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
                                                 </div>
                                                         <div class="col-md-3">
                                                   <label>Per</label>  <?php
-                                                $data = array('name' => 'ViewPer','value' => set_value('ViewPer'),'id'=>'ViewPer',  'class' => 'form-control');
+                                                $data = array('name' => 'ViewPer','value' => set_value('ViewPer'),'id'=>'ViewPer','readonly'=>true  ,'class' => 'form-control');
                                                echo form_input($data); ?>
                                                   </div>
                                                 <div class="col-md-3" style="padding: 0px;">
@@ -2318,10 +2318,10 @@ echo form_textarea($data);
                                                             <div class="col-md-4" >
                                                                 Basic Price:
                                                             </div>
-                                                            <div class="col-md-4">
+                                                            <div class="col-md-4" >
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewBasicPriceTax','value' => set_value('ViewBasicPriceTax'),'id'=>'ViewBasicPriceTax',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'ViewBasicPriceTax','value' => set_value('ViewBasicPriceTax'),'id'=>'ViewBasicPriceTax','readonly'=>true  ,'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2343,7 +2343,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewLandingCharge','value' => set_value('ViewLandingCharge'),'id'=>'ViewLandingCharge',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateloadingcharge()');
+                                                                    $data = array('name' => 'ViewLandingCharge','value' => set_value('ViewLandingCharge'),'id'=>'ViewLandingCharge','readonly'=>true  ,'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateloadingcharge()');
                                                                     echo form_input($data);
 
                                                   
@@ -2354,7 +2354,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewAfterLandingCharge','value' => set_value('ViewAfterLandingCharge'),'id'=>'ViewAfterLandingCharge',  'class' => 'form-control num'  ,'readonly' => 'true');
+                                                                    $data = array('name' => 'ViewAfterLandingCharge','value' => set_value('ViewAfterLandingCharge'),'id'=>'ViewAfterLandingCharge','readonly'=>true  ,'class' => 'form-control num'  ,'readonly' => 'true');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2368,7 +2368,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewHighseas ','value' => set_value('ViewHighseas'),'id'=>'ViewHighseas',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateHighseassalescharge()');
+                                                                    $data = array('name' => 'ViewHighseas ','value' => set_value('ViewHighseas'),'id'=>'ViewHighseas',  'class' => 'form-control num','readonly'=>true ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateHighseassalescharge()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2390,7 +2390,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewCustomduty','value' => set_value('ViewCustomduty'),'id'=>'ViewCustomduty',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomduty()');
+                                                                    $data = array('name' => 'ViewCustomduty','value' => set_value('ViewCustomduty'),'id'=>'ViewCustomduty',  'class' => 'form-control num','readonly'=>true ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomduty()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2412,7 +2412,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewExcisedutyTax','value' => set_value('ViewExcisedutyTax'),'id'=>'ViewExcisedutyTax',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseDuty()');
+                                                                    $data = array('name' => 'ViewExcisedutyTax','value' => set_value('ViewExcisedutyTax'),'id'=>'ViewExcisedutyTax','readonly'=>true  ,'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseDuty()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2434,7 +2434,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewExcisedutyEDcess','value' => set_value('ViewExcisedutyEDcess'),'id'=>'ViewExcisedutyEDcess',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseED1()');
+                                                                    $data = array('name' => 'ViewExcisedutyEDcess','value' => set_value('ViewExcisedutyEDcess'),'id'=>'ViewExcisedutyEDcess','readonly'=>true  ,'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseED1()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2457,7 +2457,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewExcisedutySHcess','value' => set_value('ViewExcisedutySHcess'),'id'=>'ViewExcisedutySHcess',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateexciseSHcess()');
+                                                                    $data = array('name' => 'ViewExcisedutySHcess','value' => set_value('ViewExcisedutySHcess'),'id'=>'ViewExcisedutySHcess',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>true,'onchange'=>'EditCalculateexciseSHcess()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2479,7 +2479,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewCustomEDcess','value' => set_value('ViewCustomEDcess'),'id'=>'ViewCustomEDcess',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomEdcess()');
+                                                                    $data = array('name' => 'ViewCustomEDcess','value' => set_value('ViewCustomEDcess'),'id'=>'ViewCustomEDcess','readonly'=>true  ,'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomEdcess()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2501,7 +2501,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewCustomSHcess','value' => set_value('ViewCustomSHcess'),'id'=>'ViewCustomSHcess',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomSHcess()');
+                                                                    $data = array('name' => 'ViewCustomSHcess','value' => set_value('ViewCustomSHcess'),'id'=>'ViewCustomSHcess',  'class' => 'form-control num','readonly'=>true ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomSHcess()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2525,7 +2525,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewAdditionalExciseduty ','value' => set_value('ViewAdditionalExciseduty'),'id'=>'ViewAdditionalExciseduty',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
+                                                                    $data = array('name' => 'ViewAdditionalExciseduty ','value' => set_value('ViewAdditionalExciseduty'),'id'=>'ViewAdditionalExciseduty',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>true,'onchange'=>'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2547,7 +2547,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewGrossdutypayable ','value' => set_value('ViewGrossdutypayable'),'id'=>'ViewGrossdutypayable',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'ViewGrossdutypayable ','value' => set_value('ViewGrossdutypayable'),'id'=>'ViewGrossdutypayable',  'class' => 'form-control num','readonly'=>true ,'onkeypress'=>'return isNumberKey(event);');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2561,7 +2561,7 @@ echo form_textarea($data);
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewAvailableModvat','value' => set_value('ViewAvailableModvat'),'id'=>'ViewAvailableModvat',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                    $data = array('name' => 'ViewAvailableModvat','value' => set_value('ViewAvailableModvat'),'id'=>'ViewAvailableModvat','readonly'=>true , 'class' => 'form-control num' ,'readonly' => 'true');
                                                                     echo form_input($data);
                                                                     ?>   (b + c + d + g)
                                                                 </div>
@@ -2611,7 +2611,7 @@ echo form_textarea($data);
                                                             <span>NO Of Trips</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'viewNOOfTrips','value' => set_value('viewNOOfTrips'),'id'=>'viewNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                $data = array('name' => 'viewNOOfTrips','value' => set_value('viewNOOfTrips'),'id'=>'viewNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(2);' );
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -2620,14 +2620,14 @@ echo form_textarea($data);
                                                             <span>Freight Rate </span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'viewtxtFreight','value' => set_value('viewtxtFreight'),'id'=>'viewtxtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                $data = array('name' => 'viewtxtFreight','value' => set_value('viewtxtFreight'),'id'=>'viewtxtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(2);');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <span>Freight Amt In INR</span>
+                                                            <span>Freight Amt In <?php echo $INR;?></span>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'viewtxtAfterFreight','value' => set_value('viewtxtAfterFreight'),'id'=>'viewtxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -2660,7 +2660,7 @@ echo form_textarea($data);
                                                                 <span>Quantity</span>
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'ViewPurQuantity','value' => set_value('ViewPurQuantity'),'id'=>'ViewPurQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCtable()');
+                                                                    $data = array('name' => 'ViewPurQuantity','value' => set_value('ViewPurQuantity'),'id'=>'ViewPurQuantity',  'class' => 'form-control num','readonly'=>true ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCtable()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -2731,6 +2731,8 @@ echo form_textarea($data);
                                             <!-- <a class="btn btn-primary font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
+                                            <a class="btn btn-primary font UpdateImport"  ID="UpdateImport" > &nbsp;&nbsp;<span class="bold">Update</span></a>
+
                                             <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                         </div>
@@ -3135,8 +3137,17 @@ echo form_textarea($data);
    <!--  <input type="reset" class="btn btn-primary" value="Reset"> -->
    <a class="btn btn-primary Save"  ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
     <?php }else {?>
+
+    
+    <?php if($DEPCode== FINANCE){?>
+    <a class="btn btn-primary" ID="OK" onclick="PageRedirect()">OK</a>
+
+      <?php } 
+      else{?>
       <!-- <input type="reset" class="btn btn-primary" value = "OK"> -->
+      <a class="btn btn-primary Submit"  ID="Submit" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
       <a class="btn btn-primary"  href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
+       <?php }?>
        <?php } ?>
   
   </div>
@@ -3649,6 +3660,7 @@ function EditRatechange()
       $('#EditINRBasicvalue').val(parseFloat(txtINR).toFixed(2));
       $('#EditBasicPriceTax').val(parseFloat(txtINR).toFixed(2));
       $('#EditAfterBasicPriceTax').val(parseFloat(txtINR).toFixed(2));
+      calculateFreight(1);
       EditCalculateloadingcharge();
   }
 }
@@ -5046,6 +5058,19 @@ tinyMCE.get('viewtxtInstruction').setContent($('#Addinstruction'+userid).val());
             
         });
         }
+
+
+
+   var FreightType=$('#drpviewFreight').val();
+   var FreightRate=$('#viewtxtFreight').val();
+   var FreightRateAmount=$('#viewtxtAfterFreight').val();
+   var Nooftrip=$('#viewNOOfTrips').val();
+
+
+   // console.log(FreightType);
+   // console.log(FreightRate);
+   // console.log(FreightRateAmount);
+   // console.log(Nooftrip);
         
 });
 
@@ -5293,6 +5318,8 @@ function clearTaxField()
     $('#addtxtFreight').val('');
 
     $('#addtxtAfterFreight').val('');
+
+    tinyMCE.get('addtxtInstruction').setContent('');
 }
 
 
@@ -5750,6 +5777,38 @@ TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Totalvalue);
 
 
 
+$('.UpdateImport').click(function()
+{
+
+   var FreightType=$('#drpviewFreight').val();
+   var FreightRate=$('#viewtxtFreight').val();
+   var FreightRateAmount=$('#viewtxtAfterFreight').val();
+   var Nooftrip=$('#viewNOOfTrips').val();
+
+   var FreightTypename = $('#drpviewFreight').val();
+   if (FreightTypename != "PER TRIP")
+        {
+           
+           Nooftrip='';
+        }
+
+    var tr= document.getElementById(userid);   
+    
+    $('#FreightType'+userid).val(FreightType);
+    $('#NoOfTrip'+userid).val(Nooftrip);
+    $('#FreightValue'+userid).val(FreightRate);
+    $('#AfterFreightValue'+userid).val(FreightRateAmount);
+
+} ); 
+
+
+function PageRedirect()
+{
+ window.location =   "poapproval";
+
+}
+
+
 
 
 var DeletedMaterialCode='';
@@ -5977,11 +6036,16 @@ if(status == '0')
 {
     stat = '<?php echo PO_DRAFT; ?>';
 }
-else
+else if(status=='1')
 {
     stat = '<?php echo PO_CREATED; ?>';
 }
 
+else
+{
+  stat = '<?php echo PO_RELEASED; ?>';
+}
+
 $('#txtStatus').val(stat);
 //var txtRowCount = $('#txtRowCount').val();
 //var Row=$('#txtRow').val();
@@ -6088,10 +6152,34 @@ if (FreightType == "PER TRIP")
            $('#ViewTripsValue').hide();  
         } 
 
+$('#viewNOOfTrips').val('');
+$('#viewtxtFreight').val('');
+$('#viewtxtAfterFreight').val('');
+selValue = $("#drpviewFreight").val() ;
+if (selValue == NilType)
+  {
+     
+     $('#viewtxtFreight').attr('readonly', 'true');
+     $('#viewtxtFreight').val('0.00');
+    
+  }
+  
+  else
+  {
+     $('#viewtxtFreight').removeAttr( 'readonly','true' );
+     $('#viewtxtFreight').val('');
+  }
+  
+  calculateFreight(2);
+
+
 });
 
 
 
+
+
+
 $('#drpeditFreight').change(function(){
   var FreightType = $('#drpeditFreight').val();
 
@@ -6285,7 +6373,7 @@ function calculateFreight(isEdit)
      } 
     // calculateTotalValue(); 
   }
-  else
+  else if(isEdit == '1')
   {
 
 
@@ -6371,6 +6459,77 @@ function calculateFreight(isEdit)
      } 
     // calculateEditTotalValue(); 
 
+  }
+
+
+  else
+  {
+        //alert();
+       var basicValue = parseFloat($('#ViewINRBasicvalue').val());
+
+       ///console.log(basicValue);
+       var FreightType =$("#drpviewFreight").val();
+       if(FreightType == "0")
+       {
+         alert('Please select Freight Type');
+         $('#viewtxtFreight').val('');
+         $("#drpviewFreight").focus();
+       }
+       else if( $('#viewtxtFreight').val() != "0"  && $('#viewtxtFreight').val() != '')
+       {  
+        var FreightValue =  parseFloat($('#viewtxtFreight').val());
+        var UOM          = parseFloat($('#ViewUOM').val());
+        var Quantity          = parseFloat($('#ViewQuantity').val());
+        //alert(FreightType);
+        var AfterFreight = 0.0; 
+        if(FreightType == PercentageType)
+        {   
+          AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;          
+        }
+        else if(FreightType == NilType)
+        {   
+          AfterFreight = 0.0;           
+        }
+        else if(FreightType == '<?php echo LUMPSUM;?>')
+        {   
+          AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;         
+        }
+        else if(FreightType == '<?php echo PERUOM;?>')
+        {   
+          AfterFreight = <?php echo FREIGHT_PERUOM;?>;          
+        }
+        else if(FreightType == '<?php echo PERTRIP;?>')
+        {   
+           if($('#viewNOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+        
+         $("#viewNOOfTrips").focus();
+                                 $('#viewtxtFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#viewtxtAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#viewNOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }         
+        }
+                                    else {
+        AfterFreight = $("#viewtxtFreight").val();
+        } 
+        var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+     
+        $('#viewtxtAfterFreight').val(AfterFreightval); 
+       }
+       else
+       {
+        $('#viewtxtAfterFreight').val("0.00");  
+       }
+
+
+
+
   }
  }
  
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 5ac71c6a..823319f3 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -256,6 +256,15 @@ else if($('#addsupplierreference').val()=='')
   }
 
 
+  else if($('#Importoption').val()== "0")
+  {
+    alert('Please Enter Value In Import Option Field');
+    $('#Importoption').focus();
+    return false;
+
+  }
+
+
     
   else 
   {
@@ -546,7 +555,7 @@ else if($('#addsupplierreference').val()=='')
     <div class="col-md-4" style="padding:0px;">
   <div class="col-md-6" style="padding:0px;">
   
-   <label>Other Reference(S)</label>
+   <label>Our Reference(S)</label>
             <div class="form-group">
             
                   <?php
@@ -1206,7 +1215,7 @@ else if($('#addsupplierreference').val()=='')
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <label>Freight Amt In INR</label>
+                                                            <label>Freight Amt In <?php echo $INR;?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -1838,7 +1847,7 @@ echo form_textarea($data);
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <label>Freight Amt In INR</label>
+                                                            <label>Freight Amt In <?php echo $INR;?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'edittxtAfterFreight','value' => set_value('edittxtAfterFreight'),'id'=>'edittxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -4257,7 +4266,7 @@ function clearTaxField()
 
     //$('#addtxtInstruction').val('');
 
-    //tinymce.get('addtxtInstruction').setContent(''); 
+    tinymce.get('addtxtInstruction').setContent(''); 
 }