diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 323fea22..f08e7c7b 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -23,6 +23,7 @@
      	$("#Reqnumber").select2();
      	$("#CapitalCostCenter").select2();
 		$("#MaterialCode").select2();
+		 $("#currencytype").select2();
 	 
          $("#PODate").datepicker({
             //minDate : d,
@@ -33,6 +34,16 @@
             minDate : 'now',
             dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
         });
+		$('#Date').click(function () {
+                    //for Date range selection
+                    $('#Schedulediv').hide();
+                    $('#Deliverydtdiv').show();
+                });
+                $('#Schedule').click(function () {
+                    //for schedule range selection
+                    $('#Deliverydtdiv').hide();
+                    $('#Schedulediv').show();
+                });
 
     });
 </script>
@@ -47,12 +58,12 @@
 	  
 	 <div style="border:2px solid #333">
 			<div class="col-md-12">
-				<div class="col-md-11">
+				 
 				 <center><b><h2>Siddharth Industries - Capital Purchase Order</h2></b></center>
-				</div>
-				<div class="col-md-1"><br/>
+				 
+				<!-- <div class="col-md-1"><br/>
 				 <a class="btn btn-info" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a>
-				</div>
+				</div> -->
 			</div>
          <div class="container-fluid">
 		<div class="row">
@@ -77,13 +88,16 @@
 							?>
 		</div>
 		<div class="col-md-12">
-				Basic Price in US $ per Ton :
-				<div class="form-group">
-					<?php
-					$data = array('name' => 'imBasicPrice','value' => set_value('imBasicPrice'),'id'=>'imBasicPrice',  'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);');
-					echo form_input($data);
-					?>
-				</div>
+				<label>Currency Type</label> 
+                <div class="form-group">                     
+					 <?php
+									$options = array("0"=>'Select Currency Type ');     
+ 						
+									echo form_dropdown('currencytype', $options,set_value('currencytype'),'id="currencytype"' ,'class="form-control select2"' , 'required="true"' );
+
+									?>	
+                     
+                </div>
 		</div>	
 		<div class="col-md-12">
 			<a href="http://www.xe.com/" target="_blank"><u>Click here to check Today's Foreign Exchange value</u></a>		
@@ -123,7 +137,7 @@
 					</div>
 			</div>
 			<div class="col-md-12">
-				Exchange Rate : 
+				<label>Exchange Rate </label> 
 				<div class="form-group">
 					<?php
 					$data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
@@ -153,17 +167,6 @@
 						?>   
 					</div>
 			</div>
-			<div class="col-md-12">
-				Basic value in INR : 
-				<div class="form-group">
-					<?php
-					$data = array('name' => 'INRBasicvalue','value' => set_value('INRBasicvalue'),'id'=>'INRBasicvalue',  'class' => 'form-control' ,'readonly' => 'true');
-					echo form_input($data);
-					?>
-				</div>
-			</div>
-		</div>
-		<div class="col-md-4">
 			<div class="col-md-12">
 				<label>Purchase Order Date</label>
 						<div class="form-group">
@@ -173,15 +176,40 @@
 							?>   
 						</div>
 			</div>
+		</div>
+		<div class="col-md-4">
 			<div class="col-md-12">
-				<label>Delivery Date</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt'),'id'=>'Deliverydt',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
-						echo form_input($data);
-						?>   
-					</div>
-			</div>
+
+                            <b><u>Select Delivery By</u></b><br/>
+                            <tr>
+                                <td>
+                                    <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                                <td>
+                                    <?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
+
+                                </td>
+                            </tr>
+                        </div>
+            
+				<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
+						<label >Schedule :</label>
+						 
+						<?php
+						$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+						echo Form_textarea($data);
+						?>
+
+				</div>
+				<div class="col-md-12" id="Deliverydtdiv"><br/>
+                            <label>Delivery Date</label>
+                             
+                                <?php
+                                $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt'),'id'=>'Deliverydt',  'class' => 'form-control'  ,'required' => 'true');
+                                echo form_input($data);
+                                ?>
+                             
+                </div>
+			 
 		</div>
 		
 	</div>
@@ -193,7 +221,7 @@
  	 <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
-  <a data-toggle="modal" data-target="#capitalpomodel" class="btn btn-primary" data-dismiss="modal" >Add Line Item </a>
+  <a data-toggle="modal" data-target="#capitalpomodel" class="btn btn-primary" data-dismiss="modal" >Select Line Item </a>
   
      <div class="modal fade" id="capitalpomodel" role="dialog">
                             <div class="modal-dialog">
@@ -232,9 +260,9 @@
                                                     <label>Cost Center Name</label>
                                                     <div>
                                                         <?php
-                                                        $options = array("0"=>'Select Cost Center');
-
-                                                        echo form_dropdown('CapitalCostCenter', $options,set_value('CapitalCostCenter'),'id="CapitalCostCenter"' ,'class="form-control select2"');
+                                                        													
+														 $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+                                                        echo form_input($data);
 
                                                         ?>
                                                     </div>
@@ -294,7 +322,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="col-md-2">
-                                                    <label>Rate </label>
+                                                    <label>Rate(in US $ /Ton)</label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' );
@@ -303,7 +331,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="col-md-2">
-                                                    <label>Basic Amount	</label>
+                                                    <label>Basic value in INR</label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'CPTotalAmount','value' => set_value('CPTotalAmount'),'id'=>'CPTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
@@ -315,18 +343,7 @@
                                             </div>
                                             <div class="col-md-12">
 												<div class="col-md-12" >
-                                                <div class="col-md-3">
-
-                                                    Basic Price in US $ per Ton :
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'CPBasicPrice','value' => set_value('CPBasicPrice'),'id'=>'CPBasicPrice',  'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
+                                               
 
                                                 <div class="col-md-3">
 
@@ -335,26 +352,14 @@
 
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                        $data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt',  'class' => 'form-control' ,'readonly' => 'true');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
 
                                                 </div>
 
-                                                <div class="col-md-3">
-
-                                                    Basic value in INR :
-
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'INRBasicvalue','value' => set_value('INRBasicvalue'),'id'=>'INRBasicvalue',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
+                                                
 												<div class="col-md-3">
 														 Service Tax @14% :
 					 
@@ -777,8 +782,9 @@
 					</div>
 			</div> 
  <div align="right" style="padding-right:10px">
-  <button type="button" class="btn btn-primary">Save</button>
-  <button type="button" class="btn btn-primary">Cancel</button>
+  <a class="btn btn-primary Save"  ID="Save" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+<a class="btn btn-primary Submit"  ID="Submit" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
+    <input type="reset" class="btn btn-primary" value="Reset">
     
   </div>
          <br/>
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php
index 6de3db6d..f85906fe 100755
--- a/application/views/editRevenuepurchaseorder.php
+++ b/application/views/editRevenuepurchaseorder.php
@@ -1628,6 +1628,7 @@ function validateEditExceedLimit()
 	    		
 	 $('#txtEditTotalOrderValue').val(tot);
 	 validateEditExceedLimit();
+	 ExceedEditQuantityCheck();
  }
 function calculateEditTaxValue()
  {