diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index af7e93a9..15f7ebdd 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -386,8 +386,16 @@ class purchaseorder extends BaseController
                {
                	$unicode=$Detail->FontCode2000;
                }
+
+
+               foreach ($data['CurrencyDetail'] as $Detail)
+               {
+               	 $currencycode=$Detail->Currency_Code;
+               }
+
                //print_r($unicode);
                 $data['unicode']=$unicode;
+                $data['currencycode']=$currencycode;
                $this->global['pageTitle'] = 'Siddharth : Edit Import Purchase order form';
                 $this->loadViews("editimportpo", $this->global,  $data, NULL);      
                 }
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 26caab0f..bc9802eb 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -9,6 +9,8 @@ $EXCRATE=0;
 //echo $unicode;
 $Value=$unicode;
 //echo $Value;
+$Currencycode=$currencycode;
+//echo $Currencycode;
 
 
 foreach ($CurrencyDetail as $Detail) 
@@ -418,7 +420,7 @@ if(!empty($RequistionDetails))
          <div class="col-md-3">
                <!--  <label>Exchange Rate </label> -->
 
-                <p id=label1><?php echo "Exchange Rate $Value"?></p>
+                <p id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?></p>
                 <div class="form-group">
                     <?php
                     $data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate',$ExchangeRate),'id'=>'ExchangeRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
@@ -632,7 +634,10 @@ if(!empty($RequistionDetails))
                                                     </div>
                                                 </div>
                                                 <div class="col-md-2">
-                                                    <label>Rate </label>
+                                                    <!-- <label>Rate </label>
+ -->
+
+                                        <P id=labelRate>  <label><?php echo "Rate in $Currencycode ($Value)";?> </label></P>
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
@@ -642,7 +647,10 @@ if(!empty($RequistionDetails))
                                                 </div>
                                                 <div class="col-md-2">
                                                    <!-- <label>Basic Amount </label>-->
-                                            <p id=label2><label><?php echo "Basic Value In $Value";?></label></p>
+                                    <!-- <p id=labelBasicvalue><label><?php echo "Basic Value In $Currencycode ($Value)";?></label></p>
+ -->
+
+                            <p id=label2>  <label><?php echo "Basic Value In $Currencycode";?></label></p>
                                                     <div class="form-group">
                                                         <?php
                                                         //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
@@ -657,7 +665,8 @@ if(!empty($RequistionDetails))
 
                                                 <div class="col-md-3">
 
-                                                    Basic Price in US $ per Ton :
+                                                   <!--  Basic Price in US $ per Ton : -->
+                                    <p id=labelBasicpriceus><b><?php echo "Basic Price in $Currencycode ($Value)"?></p>
 
 
                                                     <div class="form-group">
@@ -670,7 +679,9 @@ if(!empty($RequistionDetails))
 
                                                 <div class="col-md-3">
 
-                                                    Exchange Rate :
+                                                    <!-- Exchange Rate : -->
+
+                                        <p id=label1><b><?php echo "Exchange Rate"?></p>
 
 
                                                     <div class="form-group">
@@ -684,8 +695,8 @@ if(!empty($RequistionDetails))
 
                                                 <div class="col-md-3">
 
-                                                    Basic value in INR :
-
+                                                    <!-- Basic value in INR : -->
+                                               <P id=labelBasicINR>  <label><?php echo "Basic value in INR";?> </label></P>
 
 
                                                     <div class="form-group">
@@ -1169,7 +1180,9 @@ if(!empty($RequistionDetails))
                                                     </div>
                                                 </div>
                                                 <div class="col-md-2">
-                                                    <label>Rate </label>
+                                                   <!--  <label>Rate </label> -->
+
+                                            <P id=labelEditRate>  <label><?php echo "Rate in $Currencycode ($Value)";?> 
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
@@ -1179,7 +1192,7 @@ if(!empty($RequistionDetails))
                                                 </div>
                                                 <div class="col-md-2">
                                                    <!-- <label><?php echo "Basic Value In";?></label>-->
-                                            <p id=label3><label><?php echo "Basic Value In $Value";?></label></p>
+                                            <p id=label3><label><?php echo "Basic Value In $Currencycode ($Value)";?></label></p>
                                                     <div class="form-group">
                                                         <?php
                                                         //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
@@ -1194,7 +1207,9 @@ if(!empty($RequistionDetails))
 
                                                 <div class="col-md-3">
 
-                                                    Basic Price in US $ per Ton :
+                                                    <!-- Basic Price in US $ per Ton : -->
+
+                                <p id=labelEditBasicPriceUs><b><?php echo "Basic Price in $Currencycode ($Value)"?></p>
 
 
                                                     <div class="form-group">
@@ -1221,9 +1236,9 @@ if(!empty($RequistionDetails))
 
                                                 <div class="col-md-3">
 
-                                                    Basic value in INR :
-
+                                                   <!--  Basic value in INR : -->
 
+                                        <p id=labelEditBasicINR><label><?php echo "Basic value in INR :";?></label></p>
 
                                                     <div class="form-group">
                                                         <?php
@@ -2028,10 +2043,17 @@ $('#currencytype').change(function()
           if(obj.Currency_Code==id)
           { 
            var sign=obj.FontCode2000;
-           document.getElementById("label1").innerHTML ='Exchange Rate in' +sign;
-           document.getElementById("label2").innerHTML ='Basic Value in '+sign;
-           document.getElementById("label3").innerHTML ='Basic Value in '+sign;
-              //alert(sign);
+           var code=obj.Currency_Code;
+           
+        document.getElementById("label1").innerHTML ='Exchange Rate in '+code+'('+sign+')';
+        document.getElementById("label2").innerHTML ='Basic Value in '+code+'('+sign+')';
+        document.getElementById("label3").innerHTML ='Basic Value in '+code+'('+sign+')';
+        document.getElementById("labelRate").innerHTML ='Rate in '+code+'('+sign+')';
+        document.getElementById("labelBasicpriceus").innerHTML ='Basic Price In '+code+'('+sign+')'+' per Ton';
+        document.getElementById("labelBasicINR").innerHTML ='Basic Price in INR:'+code+'('+sign+')';
+        document.getElementById("labelEditRate").innerHTML ='Rate in '+sign;
+        document.getElementById("labelEditBasicPriceUs").innerHTML ='Basic Price In '+code+'('+sign+')'+' per Ton';
+        document.getElementById("labelEditBasicINR").innerHTML ='Basic Price in INR:'+code+'('+sign+')';
           }
 
        });
diff --git a/application/views/importpo.php b/application/views/importpo.php
index e1e7e76b..dd8be5e9 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -318,7 +318,7 @@ function vaildateBeforeOpenModal()
                             </div>
         </div>
          <div class="col-md-3">
-              <p id=label1>  <label>Exchange Rate </label></p>
+              <p id=label1> <label>Exchange Rate </label></p>
                 <div class="form-group">
                     <?php
                     $data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate'),'id'=>'ExchangeRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
@@ -1901,16 +1901,19 @@ $.each(symbol,function(idx,obj)
     if(obj.Currency_Code==id)
     {
         var sign=obj.FontCode2000;
+        var code=obj.Currency_Code;
+        //console.log(code);
+       // alert(code);
         //alert(sign);
-        document.getElementById("label1").innerHTML ='Exchange Rate in '+sign;
-        document.getElementById("label2").innerHTML ='Basic Value in '+sign;
-        document.getElementById("label3").innerHTML ='Basic Value in '+sign;
-        document.getElementById("labelRate").innerHTML ='Rate in '+sign;
-        document.getElementById("labelBasicpriceus").innerHTML ='Basic Price In '+sign+' per Ton';
-        document.getElementById("labelBasicINR").innerHTML ='Basic Price in INR:'+sign;
+        document.getElementById("label1").innerHTML ='Exchange Rate in '+code+'('+sign+')';
+        document.getElementById("label2").innerHTML ='Basic Value in '+code+'('+sign+')';
+        document.getElementById("label3").innerHTML ='Basic Value in '+code+'('+sign+')';
+        document.getElementById("labelRate").innerHTML ='Rate in '+code+'('+sign+')';
+        document.getElementById("labelBasicpriceus").innerHTML ='Basic Price In '+code+'('+sign+')'+' per Ton';
+        document.getElementById("labelBasicINR").innerHTML ='Basic Price in INR:'+code+'('+sign+')';
         document.getElementById("labelEditRate").innerHTML ='Rate in '+sign;
-        document.getElementById("labelEditBasicPriceUs").innerHTML ='Basic Price In '+sign+' per Ton';
-        document.getElementById("labelEditBasicINR").innerHTML ='Basic Price in INR:'+sign;
+        document.getElementById("labelEditBasicPriceUs").innerHTML ='Basic Price In '+code+'('+sign+')'+' per Ton';
+        document.getElementById("labelEditBasicINR").innerHTML ='Basic Price in INR:'+code+'('+sign+')';
 
 
     }
@@ -1978,6 +1981,27 @@ function Ratechange(){
       var txtUnitPrice = parseFloat($('#Rate').val());
       var Tot =  txtQuantity * txtUnitPrice
       $('#txtBasicValue').val(Math.round(Tot));
+      $('#imBasicPrice').val(Math.round(Tot));
+
+
+      var txtbasics=parseFloat($('#imBasicPrice').val());
+       var txtexchangerate=parseFloat($('#ExchangeRate').val());
+       $('#ExchangeRt').val(txtexchangerate);
+       var txtINRvalue=txtbasics*txtexchangerate;
+       $('#INRBasicvalues').val(txtINRvalue)
+       $('#INRBasicvalue').val(Math.round(txtINRvalue));
+       $('#BasicPriceTax').val(txtINRvalue);
+       //txtINR = Math.ceil(txtINR*10)/10;
+       txtINR = Math.round(txtINRvalue);
+       //alert(txtINR);BasicPriceTax
+       
+      $('#AfterBasicPriceTax').val(txtINR);
+      $('#imBasicPrice').val(txtbasics);
+      $('#ExchangeRt').val(txtexchangerate);
+      $('#EditAfterBasicPriceTax').val(txtINR);
+      $('#EditimBasicPrice').val(txtbasics);
+      $('#EditExchangeRt').val(txtexchangerate);
+      $('#EditINRBasicvalue').val(txtINRvalue);
      }
 }