diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php
index 22a4cceb..10bd0908 100755
--- a/application/views/capitalpopdf.php
+++ b/application/views/capitalpopdf.php
@@ -137,7 +137,7 @@
  
 </td>
 <td colspan="3" style="text-align: center;"><?php echo $SuplierName?><br /><?php  echo $SuplierAddress ?> </td>
-<td colspan="1">DISPATCH INSTRUCTION / SCHEDULE BY: <?php echo $DeliveryDate.$DeliverySchedule;?><br /><br /></td>
+<td colspan="1">DISPATCH INSTRUCTION / SCHEDULE BY: <?php echo $DeliveryDate.$DeliverySchedule.$dispatch;?><br /><br /></td>
 </tr>
 </tbody>
 </table>
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php
index 7ce2b9ee..56da83aa 100755
--- a/application/views/editCapitalAmendPO.php
+++ b/application/views/editCapitalAmendPO.php
@@ -654,12 +654,12 @@ document.getElementById('dispatchinternational').style.display = 'block';
                     <td style="text-align:right"><?php echo $record->Quantity ?></td>                      
                     <td><?php echo $record->UOM ?></td>                     
                     <td style="text-align:right"><?php echo $record->Rate ?></td>                     
-                    <td style="text-align:right"><?php echo $record->Rate * $record->Quantity ?></td>    
+                    <td style="text-align:right"><?php echo number_format($record->Rate * $record->Quantity,2,'.',''); ?></td>    
                     <td style="text-align:right"><?php if($CapitalRange=='1'){echo $record->ServiceTaxamount;}else if($CapitalRange=='0'){echo "0.0"; }?></td>
 					<?php if($CapitalRange=='1'){?>
                     <td style="text-align:right"><?php echo (($record->Rate * $record->Quantity)+$record->ServiceTaxamount); ?></td>
 					<?php }else if($CapitalRange=='0'){?>
-					 <td style="text-align:right"><?php echo (($record->Rate * $record->Quantity)); ?></td>
+					 <td style="text-align:right"><?php echo number_format(($record->Rate * $record->Quantity),2,'.',''); ?></td>
 						<?php }?>
                 <?php 
                                 $row=array("materialCode"=>$record->MaterialCode,"ReqNo"=>$record->ReqNo);
@@ -1103,15 +1103,15 @@ document.getElementById('dispatchinternational').style.display = 'block';
                                                                 <div class="col-md-4" >
                                                                     Basic Price In<?php echo "($INR)"?> 
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <!--<div class="col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'EditBasicPriceTax','value' => set_value('EditBasicPriceTax'),'id'=>'EditBasicPriceTax',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
                                                                         echo form_input($data);
                                                                         ?>
                                                                     </div>
-                                                                </div>
-                                                                <div class="col-md-4">
+                                                                </div>-->
+                                                                <div class="col-md-4 col-md-offset-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'EditAfterBasicPriceTax','value' => set_value('EditAfterBasicPriceTax'),'id'=>'EditAfterBasicPriceTax',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -1354,7 +1354,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
                                                             </div>
 
                                                             <div class="col-md-12">
-                                                                <center> <label>Cost of the product Per KG</label></center>
+                                                                <center> <label>Cost of the product Per UOM</label></center>
                                                                 <hr/>
                                                             </div>
                                                             <div class="col-md-12">
@@ -1668,7 +1668,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
 				
 	
 	<a class="btn btn-primary Save"  ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-    <input type="reset" class="btn btn-primary" value="Reset">
+    <input type="button" class="btn btn-primary" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
     
     
 
@@ -1758,7 +1758,7 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
       //$('#DOMdiv').hide();
  }
 
-    $('#drpSupplier').change(function() {
+    $('#Supplier').change(function() {
 
      var id = $('#drpSupplier').val();
  var supPaymentTerms='';
@@ -3297,17 +3297,17 @@ basicamt=$('#Totalservicesummary').val();
 
                     cellval[2].innerHTML = materialName;
 					//alert(materialName);
-                    cellval[3].innerHTML = quantity;
+                    cellval[3].innerHTML = parseFloat(quantity).toFixed(2);
 					//alert(quantity);
                     cellval[4].innerHTML =uom;
 					//alert(uom);
-                    cellval[5].innerHTML =itemRate;
+                    cellval[5].innerHTML =parseFloat(itemRate).toFixed(2);
 					//alert(itemRate);
-                    cellval[6].innerHTML =basicval;
+                    cellval[6].innerHTML =parseFloat(basicval).toFixed(2);
 					//alert(basicval);
-                    cellval[7].innerHTML =TotalTaxValue;
+                    cellval[7].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
 					//alert(TotalTaxValue);
-                    cellval[8].innerHTML =totalservicevalue;
+                    cellval[8].innerHTML =parseFloat(totalservicevalue).toFixed(2);
 					//alert(basicval);
 
 
diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
index e7bb7b7c..04ba90ff 100755
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -597,6 +597,7 @@ function calculatePackaging()
 				{		
 					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
 				}
+				
 				else if(FreightType == '<?php echo PERUOM;?>')
 				{		
 					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
@@ -617,7 +618,14 @@ function calculatePackaging()
 					AfterFreight = AfterFreight * nooftrips;
 					}
 				}
+				
+				
 				}
+				else
+					{
+						
+						AfterFreight = $('#txtEditFreight').val();
+					}
 				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
 		 
 				$('#txtEditAfterFreight').val(AfterFreightval); 
@@ -709,7 +717,7 @@ function validateEditExceedLimit()
 	 var tot =  parseFloat(totvalue).toFixed(2);
 	    		
 	 $('#txtEditTotalOrderValue').val(tot);
-	 validateEditExceedLimit();
+	// validateEditExceedLimit();
 	
  }
 function calculateEditTaxValue()
@@ -830,7 +838,7 @@ function calculateEditTaxValue()
 						endforeach;
 						}										
 			
-						echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
+						echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2','disabled=disabled');
 
 						?>						 					 
 				</div>
@@ -1141,7 +1149,7 @@ function calculateEditTaxValue()
 											</div>
 								 </div>
 								  <div class="col-md-3">
-								   <label>Cost Center Name</label>
+								   <label>Cost Center Code</label>
 											<div class="form-group">
 														<?php
 								$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
@@ -1512,7 +1520,7 @@ function calculateEditTaxValue()
 					<td><?php echo $record->UOM ?></td>                     
 					<td align="right"><?php echo $record->Rate ?></td>                     
 					
-					<td align="right"><?php echo $record->BasicValue ?></td>    
+					<td align="right"><?php echo number_format($record->BasicValue,2,'.','') ?></td>    
 					  
 					<td align="right"><?php echo $record->Taxamount ?></td>
 					<td align="right"><?php echo $record->TotalValue ?></td>
@@ -1673,7 +1681,7 @@ function calculateEditTaxValue()
 		  <label >Total Insurance Amount  In INR </label> 
 				 						
 							<?php
-						 $data = array('name' => 'txtTotalInsurance','value' => set_value('txtTotalInsurance',$totInsuranceAmt),'id'=>'txtTotalInsurance',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
+						 $data = array('name' => 'txtTotalInsurance','value' => set_value('txtTotalInsurance',number_format($totInsuranceAmt,2,'.','')),'id'=>'txtTotalInsurance',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
 						echo form_input($data);
 						?>   					
 				 
@@ -1682,7 +1690,7 @@ function calculateEditTaxValue()
 			  <label >Total Freight Amount In INR </label> 
 				 								
 							<?php
-						 $data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight',$totFreightAmt),'id'=>'txtTotalFreight',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
+						 $data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight',number_format($totFreightAmt,2,'.','')),'id'=>'txtTotalFreight',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
 						echo form_input($data);
 						?>   					
 				 
@@ -1691,7 +1699,7 @@ function calculateEditTaxValue()
 <label>Total Order Amount In INR  </label>		
 <input type="hidden" name="preTotalOdervalue" value="<?php echo $totOrderSummaryAmt;?>">
 					<?php
-				 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$totOrderSummaryAmt),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true','style'=>'text-align:right;');
+				 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($totOrderSummaryAmt,2,'.','')),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true','style'=>'text-align:right;');
 				echo form_input($data);
 				?>   					
 		</div> 
@@ -1717,7 +1725,7 @@ function calculateEditTaxValue()
 	
 	<!-- <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
 	<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-    <input type="reset" class="btn btn-primary" value="Reset">
+    <input type="button" class="btn btn-primary" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
    
       <!-- <input type="reset" class="btn btn-primary" value = "OK">  -->
  
@@ -1789,7 +1797,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		
 		$('#EditRate').val($('#itemRate'+userid).val());
 		
-		$('#txtEditBasicValue').val(cellval[6].innerHTML);
+		$('#txtEditBasicValue').val(parseFloat(cellval[6].innerHTML).toFixed(2));
 	   	RequistQuantity = $('#quantity'+userid).val();
 		$('#txtEditDiscount').val($('#DisVal'+userid).val());
 		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
@@ -1939,13 +1947,13 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
             var tr= document.getElementById(userid);
 			var cellval = tr.cells;   
 			
-			cellval[2].innerHTML = editDescription;			
-			cellval[3].innerHTML = editQuantity;
+			cellval[2].innerHTML = editDescription;		
+			cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2);
 			cellval[4].innerHTML =editUOM;
-			cellval[5].innerHTML =itemRate;
-			cellval[6].innerHTML =basicval;
-			cellval[7].innerHTML =TotalTaxValue;
-			cellval[8].innerHTML =TotalOrderValue;
+			cellval[5].innerHTML =parseFloat(itemRate).toFixed(2);
+			cellval[6].innerHTML =parseFloat(basicval).toFixed(2);
+			cellval[7].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
+			cellval[8].innerHTML =parseFloat(TotalOrderValue).toFixed(2);
 					
 			
 			$('#materialCode'+userid).val(editMaterialCode);
@@ -2274,7 +2282,7 @@ $('#Scheduleby').change(function(){
       "paging": false,
       "lengthChange": false,
       "searching": false,
-      //"ordering": true,
+      "ordering": false,
      // "info": true,
       "autoWidth": true
 	   
diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php
index 89da94a5..c1ef47f6 100755
--- a/application/views/editServiceAmendPO.php
+++ b/application/views/editServiceAmendPO.php
@@ -179,11 +179,11 @@ var AvilBudAmt = '';
 $("#PODate").datepicker({
 	minDate : d,
 	maxDate : 'now',
-	dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+	dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
 });
  $("#Deliverydt").datepicker({
 	minDate : 'now',	
-	dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
+	dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
 });	  
  
 $('#drpSupplier').change(function() {
@@ -862,7 +862,7 @@ $(document).ready(function () {
 															</div>
 												 </div>
 												  <div class="col-md-3">
-												   <label>Cost Center Name</label>
+												   <label>Cost Center Code</label>
 															<div class="form-group">
 																		<?php
 												$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
@@ -1296,7 +1296,7 @@ $(document).ready(function () {
 								
 								<!-- <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
 								<a class="btn btn-primary Save"  ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-								<input type="reset" class="btn btn-primary" value="Reset">
+								<input type="button" class="btn btn-primary" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
 								
 								
 								</div><br/>
@@ -1919,7 +1919,7 @@ $('#Scheduleby').change(function(){
            
              $("#Deliverydt").datepicker({
             minDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
+            dateFormat: 'mm-dd-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
         });
 		
                 
diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php
index a3e8b80a..1538fef0 100755
--- a/application/views/revenuepopdf.php
+++ b/application/views/revenuepopdf.php
@@ -286,6 +286,58 @@ $OrderValue =  (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
  
 </tbody>
 </table>
+<?php 
+		$i=0;
+		if(!empty($POItem))
+		      {
+				foreach($POItem as $x){
+						if($x->ParentPO != ''){
+							$i++;
+						}
+				}
+			  }
+			 if($i>0){ 
+		?>
+		<table style="border-collapse: collapse;font-size:12px;" cellpadding="0" cellspacing="0" border="1" width="100%">
+			<tbody>
+			<tr>
+			<td style="text-align: center;" colspan="3">
+			<p>Amended Details</p>
+			</td>
+			</tr>
+			<tr>
+			<td colspan="3">
+<?php		
+		if(!empty($POItem))
+{
+	
+	foreach($POItem as $v)
+	{
+		echo "<b>" . $v->AmendedDetails . "</b>";
+		break;
+	}
+}?>
+			</td>
+			</tr>
+			<tr>
+			<td style="text-align: center;"><strong>Item Description</strong></td>
+			<td style="text-align: center;" rowspan="2"><strong>Previous Details</strong></td><td style="text-align: center;" rowspan="2" ><strong>Current Details</strong></td>
+			</tr>
+			
+
+				
+			<?php if(!empty($POItem))
+			{
+				
+			 foreach($POItem as $record)
+			   { 
+			     echo $record->LineAmend ;			
+			   }
+            } ?> 
+			</tbody>
+		</table>
+			 <?php 
+			}?>
  &nbsp; 
 <p> <b>Payment Terms :</b> &nbsp;<?php echo $PaymentTerms ."&nbsp;&nbsp;".$PaymentOtherDescription;?> </p>
  <div> <b>Special Instruction:</b><br/><?php echo $ServiceDescription;?></div>