diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index c907569a..90697827 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -1092,7 +1092,9 @@ function UpdateAmendServicePurchaseOrder()
 
 
                 $Exchangerate=$this->input->post('ExchangeRate');
-				$ExchangeRateCalculatedon=$this->input->post('Exchangerateon');
+                $Edt=$this->input->post('Exchangerateon');
+                $ExchangeRateCalculatedon=$this->getDateformat($Edt);
+				//$ExchangeRateCalculatedon=$this->input->post('Exchangerateon');
 				$CurrencyType=$this->input->post('currencytype');
 				$DeliveryOption = $this->input->post('DateRange');
                  
diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 368f2116..fedd65a2 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -1457,7 +1457,10 @@ function addNewImportPurchaseOrder()
                 //$DeliveryOption = $this->input->post('DateRange');
 
                 $Exchangerate=$this->input->post('ExchangeRate');
-                $ExchangeRateCalculatedon=$this->input->post('Exchangerateon');
+                $Edt=$this->input->post('Exchangerateon');
+                $ExchangeRateCalculatedon=$this->getDateformat($Edt);
+
+               // $ExchangeRateCalculatedon=$this->input->post('Exchangerateon');
                 $CurrencyType=$this->input->post('currencytype');
 
                 $DeliveryOption = $this->input->post('DateRange');
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 9f6f1bd3..f548c896 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -40,7 +40,7 @@ foreach ($PaymentTerms as $TER)
 }
 
 $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));                
-$CurrentDate =  $dt->format('Y-m-d');
+$CurrentDate =  $dt->format('d-m-Y');
 
 $MaxPoDate = '';
 if(!empty($MaxPODate))
@@ -115,10 +115,10 @@ if(!empty($POMaster))
         $Address = $Req->Address;
         
         $Pdt =  new DateTime($Req->PODate);
-        $PODate =  $Pdt->format('Y-m-d');
+        $PODate =  $Pdt->format('d-m-Y');
         
         $Ddt =  new DateTime($Req->DeliveryDate);
-        $Deliverydt =  $Ddt->format('Y-m-d');
+        $Deliverydt =  $Ddt->format('d-m-Y');
         
         $DeliveryAddress =$Req->DeliveryAddress;
         $PONOStatus    =  $Req->StatusCode;
@@ -411,7 +411,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>
@@ -507,7 +507,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>