diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index 36c1933b..2810e89c 100755
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -1972,7 +1972,7 @@ $(document).ready(function () {
                                                                         
 									<?php 
 											
-											if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) 
+											if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ||$PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus==PO_APPROVED) 
 											{?>					
 									<td>    <a    data-target='#EDITSERVICE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
 									  <?php
@@ -2081,13 +2081,15 @@ $(document).ready(function () {
 								<input type="hidden" name="txtStatus" id="txtStatus" /> 
 								<input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $index;?>">
 								<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />  
-								<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED  ) {
+								<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED ) {
 								if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>  									
 								<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
 								<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
 								<a class="btn btn-primary Save"  ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
 								<?php }else {?>
-								<a class="btn btn-primary"  ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>  <?php } ?>
+								<a class="btn btn-primary"  ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> 
+
+								<a class="btn btn-primary Save"  ID="Submit" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>  <?php } ?>
 								</div> 
 						   
 						</div>
@@ -2736,10 +2738,15 @@ if(status == '0')
 {
 	stat = '<?php echo PO_DRAFT; ?>';
 }
-else
+else if(status == '1')
 {
 	stat = '<?php echo PO_CREATED; ?>';
 }
+
+else if(status == '2')
+{
+	stat = '<?php echo PO_AWAITING_RELEASE; ?>';
+}
 var splinstr = $('#txtSpcialInstruction').val();
 var deladd = $('#DeliveryAddr').val();
 $('#txtStatus').val(stat);
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index c758b3df..96b9c7b0 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -964,7 +964,7 @@ function vaildateBeforeOpenModal()
                                <label id="RateIn">Rate(INR /UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
                                   <div class="form-group">
                                     <?php
-                                      $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);' );
+                                      $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);calculateFreightlocaddper()' );
                                       echo form_input($data);
                                     ?>
                                                         </div>
@@ -1702,7 +1702,7 @@ function vaildateBeforeOpenModal()
                                                         <label id="EditRateIn">Rate (In INR/UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
                                                         <div class="form-group">
                                                             <?php
-                                                            $data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);' );
+                                                            $data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  '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 fa72e82c..9647fcbf 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -1441,7 +1441,7 @@ $("#PaymentMethod").select2();
 						<label id="RateIn">Rate(In INR /UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
 						<div class="form-group">
 							<?php
-							$data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);' );
+							$data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);calculateFreightlocaddper()' );
 							echo form_input($data);
 							?>
 						</div>
@@ -2183,7 +2183,7 @@ $("#PaymentMethod").select2();
 					<label id="EditRateIn">Rate(in INR/UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
 					<div class="form-group">
 						<?php
-						$data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);' );
+						$data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);calculateFreightloceditper()' );
 						echo form_input($data);
 						?>
 					</div>
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php
index 72cdc54c..1faed4ac 100644
--- a/application/views/editRevenuepurchaseorder.php
+++ b/application/views/editRevenuepurchaseorder.php
@@ -3867,7 +3867,7 @@ function calculateEditTaxValue()
  <input align="right" type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
                     <?php 
 					        
-							if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) 
+							if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus==PO_APPROVED) 
 							{?>					
 					<td>    <a    data-target='#EDITREVENUE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
                       <?php