diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index f49de933..3352a29e 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -1823,7 +1823,7 @@ function addNewImportPurchaseOrder()
         $PODate =  $this->getDateformat($POdt);
                                 $SupplierID = $this->input->post('drpSupplier');  
         $DeliveryAddr = $this->input->post('DeliveryAddr');
-        $dt = $this->input->post('Deliverydt');
+        $dt = $this->input->post('Deliverydate');
         
         $POType = $this->input->post('POType');
         $PoRange = $this->input->post('txtPoRange');
@@ -2046,7 +2046,7 @@ function addNewImportPurchaseOrder()
         $PODate =  $this->getDateformat($POdt);
         $SupplierID = $this->input->post('drpSupplier');  
         $DeliveryAddr = $this->input->post('DeliveryAddr');
-        $dt = $this->input->post('Deliverydt');
+        $dt = $this->input->post('Deliverydate');
         
         $POType = $this->input->post('POType');
         $PoRange = $this->input->post('txtPoRange');
diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php
index bd384f3f..e93e58f5 100755
--- a/application/models/mrir_model.php
+++ b/application/models/mrir_model.php
@@ -61,21 +61,24 @@ class mrir_model extends CI_Model
 function ViewDistributionList()
 	{
 		$subQuery = 'Select distinct ReqLine.MaterialCode, MR.PONO, REQ.ReqNo,MM.MaterialName,MM.UOM,
-					 EMP.FirstName,DD.DEPCode,DD.DepartmentName,ReqLine.Quantity as RequestedQty,POL.Quantity  
-					 as OrderedQuantity ,(MD.ActualQuantityReceived) as ActualReceivedqty,(MD.QuantityAccepted) as
-					 AcceptedQty,REQ.ReqDate, ReqLine.Status as ReqStatus,
-					  st.StatusCode as ReqStatus,st.StatusName,
-					 ReqLine.Remarks 
-					 from  T_Requestion_Details ReqLine  join  T_PurchaseOrder_LineItem POL   on ReqLine.ReqNo = POL.ReqNo
-					  join T_Requestion_Master REQ on REQ.ReqNo = ReqLine.ReqNo 
-					  join T_PurchaseOrder_Master POMast on POMast.PONO=POL.PONO
-					 join T_Status st on   ReqLine.Status =  st.StatusCode 
-					 join T_MRIR_Master MR on MR.PONO = POL.PONO join T_MRIR_Details MD 
-					 on MD.MRIRNO = MR.MRIRNO and ReqLine.MaterialCode = MD.MaterialCode join T_MaterialMaster MM on 
-					 MM.MaterialCode = ReqLine.MaterialCode  join 
-					 T_Employee_Details EMP on EMP.EmpID = REQ.Requestedby  join 
-					 T_DepartmentDetails DD on DD.DEPCode = EMP.Departmentcode where 
-					 POL.status in (?,?) and ReqLine.Status not in(?) and POMast.status not in(?) group by ReqLine.MaterialCode ,POL.PONO';   
+EMP.FirstName,DD.DEPCode,DD.DepartmentName,ReqLine.Quantity as RequestedQty,POL.Quantity  
+as OrderedQuantity ,(MD.ActualQuantityReceived) as ActualReceivedqty,(MD.QuantityAccepted) as
+AcceptedQty,REQ.ReqDate, ReqLine.Status as ReqStatus,
+ st.StatusCode as ReqStatus,st.StatusName,
+ReqLine.Remarks
+from  T_Requestion_Details ReqLine  join  T_PurchaseOrder_LineItem POL
+on ReqLine.ReqNo = POL.ReqNo and ReqLine.MaterialCode = POL.MaterialCode
+ join T_Requestion_Master REQ on REQ.ReqNo = ReqLine.ReqNo
+ join T_PurchaseOrder_Master POMast on POMast.PONO=POL.PONO
+join T_Status st on   ReqLine.Status =  st.StatusCode
+join T_MRIR_Master MR on MR.PONO = POL.PONO join T_MRIR_Details MD
+on MD.MRIRNO = MR.MRIRNO and ReqLine.MaterialCode = MD.MaterialCode join T_MaterialMaster MM on
+MM.MaterialCode = ReqLine.MaterialCode  join
+T_Employee_Details EMP on EMP.EmpID = REQ.Requestedby  join
+T_DepartmentDetails DD on DD.DEPCode = EMP.Departmentcode where
+POL.status in (?,?)  
+ and ReqLine.Status not in(?) and POMast.status not in(?)
+  group by ReqLine.MaterialCode ,POL.PONO';   
         $query = $this->db->query($subQuery,array(MRIR_APPROVED,PARTIAL_MRIRAPPROVED,REQITEM_NEW,PO_AMENDED));
 		//print_r($this->db->last_query());
         return $query->result();
@@ -377,4 +380,4 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
 	
       
 }
-?>
\ No newline at end of file
+?>
diff --git a/application/views/Editmaterialinspectionreport.php b/application/views/Editmaterialinspectionreport.php
index 1e4bba06..1cc611c2 100755
--- a/application/views/Editmaterialinspectionreport.php
+++ b/application/views/Editmaterialinspectionreport.php
@@ -26,25 +26,25 @@ if(!empty($MRIRDetails))
     	$MRIRNO = $MRIR->MRIRNO;
     	$MRIRDate=$MRIR->MRIRCreatedon;
     	$mrir_date = strtotime( $MRIRDate );
-		$mrirdate = date( 'd/m/Y', $mrir_date );
+		$mrirdate = date( 'd-m-Y', $mrir_date );
 		$MRIRRasiedbyName=$MRIR->MRIRRasiedbyName; 
     	$IGRNO = $MRIR->IGRNO;
     	$IGRDate = $MRIR->IGRCreated;
     	$igr_date = strtotime( $IGRDate );
-		$igrdate = date( 'd/m/Y', $igr_date );
+		$igrdate = date( 'd-m-Y', $igr_date );
     	$IGRRasiedbyName=$MRIR->IGRRasiedbyName; 
     	$PONO = $MRIR->PONO;
     	$PODate=$MRIR->PODate;
     	$PORasiedbyName=$MRIR->PORasiedbyName;	
     	$po_date = strtotime( $PODate );
-		$podate = date( 'd/m/Y', $po_date );
+		$podate = date( 'd-m-Y', $po_date );
     	$VehicleNo = $MRIR->VehicleNo;
 		$CourierNo= $MRIR->CourierNo;
 		$DeliveryChellanOrInvoiceNo=$MRIR->DeliveryChellanOrInvoiceNo;
 		$SupplierName=$MRIR->SupplierName;
 		$DeliveryChellanDate=$MRIR->DeliveryChellanDate;
 		$dc_date = strtotime( $DeliveryChellanDate );
-		$dcdate = date( 'd/m/Y', $dc_date );
+		$dcdate = date( 'd-m-Y', $dc_date );
 		$Address=$MRIR->Address;
 		//$CreatedBy=$MRIR->CreatedBy;
 		$ServiceDescription=$MRIR->ServiceDescription;
@@ -261,7 +261,7 @@ if(!empty($MRIRDetails))
 						<?php $SNo = 0;
                               
                               if(!empty($MRIRDetails))
-                               
+                        
                                {
                                    
                                     foreach($MRIRDetails as $record)
@@ -287,7 +287,7 @@ if(!empty($MRIRDetails))
 						<input type="hidden" name="<?php echo 'QuantityAccepted'.$SNo ?>" id="<?php echo 'QuantityAccepted'.$SNo ?>" />
 						<td><input type="text" id="<?php echo 'RejectQuantity'.$SNo;?>" name="<?php echo 'RejectQuantity'.$SNo;?>" onchange="setreject('<?php echo $SNo;?>');" value="<?php echo $record->QuantityRejected?>"></td>
 						<input type="hidden" name="<?php echo 'QuantityRejected'.$SNo ?>" id="<?php echo 'QuantityRejected'.$SNo ?>" />
-						<td><input type="text" id="<?php echo 'Remark'.$SNo ?>" name="<?php echo 'Remark'.$SNo ?>" onchange="setremark('<?php echo $SNo;?>');"></td>
+						<td><input type="text" id="<?php echo 'Remark'.$SNo ?>" name="<?php echo 'Remark'.$SNo ?>" onchange="setremark('<?php echo $SNo;?>');" value="<?php echo $record->Remarks?>"></td>
 						<input type="hidden" name="<?php echo 'Remarks1'.$SNo ?>" id="<?php echo 'Remarks1'.$SNo ?>" />
 					</tr> 
                         <?php 
@@ -540,4 +540,4 @@ function updatemrir()
  }
  }//update function closed
 
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index dec8ec21..32723085 100755
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -1811,7 +1811,7 @@ $(document).ready(function () {
 								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> 
-								<input type="reset" class="btn btn-primary" value="Reset">
+								<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 } ?>
 								</div> 
@@ -2893,4 +2893,4 @@ $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
 		}
 	   
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/MaterialIssueList.php b/application/views/MaterialIssueList.php
index d80c916c..b9d4ff6d 100755
--- a/application/views/MaterialIssueList.php
+++ b/application/views/MaterialIssueList.php
@@ -263,3 +263,4 @@
 		}); 
 		});
 		</script>
+
diff --git a/application/views/addstorerequisitionslip.php b/application/views/addstorerequisitionslip.php
index 1248328e..800f2c56 100755
--- a/application/views/addstorerequisitionslip.php
+++ b/application/views/addstorerequisitionslip.php
@@ -1,6 +1,6 @@
  <?php
  $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-$CurrentDate =  $dt->format('d-m-y'); 
+$CurrentDate =  $dt->format('d-m-Y'); 
  
 // print_r($cost);die();
  ?>
@@ -19,7 +19,7 @@ $(function() {
       $("#Date").datepicker({
            // minDate : 'now',
             maxDate : 'now',
-            dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
         });
     
     
@@ -137,7 +137,7 @@ $(function() {
 				<label>Material Code</label>
 					<div >
 						 <?php
-						$options = array("-1"=>'Material Code');     
+						$options = array("-1"=>'Select Material Code');     
 						//print_r(  $options);
 						
 						if(!empty($MaterialList))
@@ -514,7 +514,7 @@ function openmodal()
 
 function clear()
 {
-        $('#MaterialCode').val('');
+        
 	 	$('#Description').val('');
 	 	$('#UOM').val('');
 	 	$('#Quantity').val('');
@@ -672,7 +672,7 @@ else
 			
 			else
 			{
-				console.log($('.requistion').serialize());
+				
 
 				$('#content').loader('show');
 		        $.ajax({ 
@@ -751,4 +751,4 @@ function validate()
 	   
     }); 
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index 42c470cf..3566967e 100755
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -4877,7 +4877,7 @@ function populateValueMainFormForDeleteItem(rowid)
                               <!-- <a class="btn btn-primary Save"  ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
 
                                 <a class="btn btn-primary Submit"  ID="Submit" onclick="RevenueSave(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                    <input type="reset" class="btn btn-primary">
+                                    <a class="btn btn-primary Save"  ID="Cancel" href="<?php echo base_url().'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
                                
                                 
                             </div>
@@ -4959,7 +4959,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                     <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" >
                                      
                                     <a class="btn btn-primary Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                    <input type="reset" class="btn btn-primary">
+                                    <a class="btn btn-primary Save"  ID="Cancel" href="<?php echo base_url().'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
                                 </div><br/>
                             </div>
                         </div>
@@ -7045,8 +7045,8 @@ function calculateTotalValue()
 	  	
 	 $('#txtTotalOrderValue').val(tot);
 	
-	 validateExceedLimit();
-	  ExceedQuantityCheck();
+	// validateExceedLimit();
+	 // ExceedQuantityCheck();
  }
 
 $("#ScheduleType").change(function(){
@@ -7166,3 +7166,4 @@ $("#PaymentMethod").change(function() {
         }
 
         </script>
+
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index db122584..d9f619c0 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -1926,7 +1926,7 @@ function vaildateBeforeOpenModal()
                                           
               <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a> 
               <a class="btn btn-primary Submit"  ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-              <input type="reset" class="btn btn-primary" value="Reset">
+             <a class="btn btn-primary Save"  ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
 
               </div>
              <br/>
@@ -2005,11 +2005,11 @@ function vaildateBeforeOpenModal()
      $("#PODate").datepicker({
             minDate : d,
             maxDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
     });
       $("#Deliverydate").datepicker({
               minDate : 'now',	
-             dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
+             dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
      });
 
 
@@ -4461,8 +4461,12 @@ $("#PaymentMethod").change(function() {
         }
 
 
+function Reset(){
+location.reload();
 
+}
     </script>
 
 
   
+
diff --git a/application/views/createPOfromRequistion.php b/application/views/createPOfromRequistion.php
index c368fdec..5788fccd 100755
--- a/application/views/createPOfromRequistion.php
+++ b/application/views/createPOfromRequistion.php
@@ -399,13 +399,14 @@ $("#myModal").on("shown.bs.modal", function(e) {
 			url:"<?php echo base_url() ?>requisitionform/ViewRequest",
 			success:function(json) {
 				$('#content').loader('hide');
-				//alert(json.Requist[0]['ReqDate']);
+				var getAvalAmt = json.AvilBudAmount;
+                                getAvalAmt = getAvalAmt.replace(/\,/g,'');
 				$("#ReqType").val(json.Requist[0]['ReqType']);	
 				$("#ReqBy").val(json.Requist[0]['FirstName']);
 				 $("#RequistionDate").val(json.Requist[0]['ReqDate']);
 		        $("#Desigination").val(json.Requist[0]['Designation']);
 				$("#CostCenter").val(json.Requist[0]['CostCenterCode']);
-				 $("#AvlBudgetAmount").val(json.AvilBudAmount);
+				 $("#AvlBudgetAmount").val(parseFloat(getAvalAmt).toFixed(2));
 				
 				$("#tbleAppend").empty();
 				$("#tbleAppend").append(json.Items);			
@@ -444,4 +445,4 @@ $(function () {
   });
 	
 	</script>
-		  
\ No newline at end of file
+		  
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index 7d843e39..41835888 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -183,6 +183,7 @@ if(!empty($AvlBudAmt))
     var DelOpt = '<?php echo $DeliverOption; ?>';
     var SchName = <?php echo json_encode($DeliverSchedule); ?>;
 var DelDt = '<?php echo $Deliverydt; ?>';
+
 $(document).ready(function () {
 	
 	$("#PaymentTerms").select2();
@@ -190,7 +191,7 @@ $(document).ready(function () {
  $('#Deliverydtdiv').hide();
                     $('#Schedulediv').hide();
 $('#deliverydateby').show();
-$('#Deliverydt').val(DelDt);
+$('#Deliverydate').val(DelDt);
  }
 
  else if(DelOpt=="1"){
@@ -300,6 +301,11 @@ $("#PaymentMethod").select2();
                         $('#Deliverydtdiv').show();
 						 $('#deliverydateby').hide();
                     });
+                         $("#Deliverydate").datepicker({
+              minDate : 'now',	
+             dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
+     });
+
                     $('#Schedule').click(function () {
                         //for schedule range selection
                         $('#Deliverydtdiv').hide();
@@ -1318,7 +1324,7 @@ $("#PaymentMethod").select2();
                                                             </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">
@@ -1906,7 +1912,7 @@ $("#PaymentMethod").select2();
                                                             </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">
@@ -2492,7 +2498,7 @@ $("#PaymentMethod").select2();
                                                             </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">
@@ -2769,8 +2775,9 @@ $("#PaymentMethod").select2();
 				  <?php if($PONOStatus == PO_DRAFT || $PONOStatus == 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> 
-				<input type="reset" class="btn btn-primary" value="Reset"/>
+				<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 } ?>
 
@@ -5408,4 +5415,4 @@ $("#PaymentMethod").change(function() {
 				}
 			});
 
-    </script>
\ No newline at end of file
+    </script>
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php
index 2bad79df..84a8eebf 100755
--- a/application/views/editRevenuepurchaseorder.php
+++ b/application/views/editRevenuepurchaseorder.php
@@ -1811,8 +1811,8 @@ function validateEditExceedLimit()
 	 var tot =  parseFloat(totvalue).toFixed(2);
 	    		
 	 $('#txtEditTotalOrderValue').val(tot);
-	 validateEditExceedLimit();
-	 ExceedEditQuantityCheck();
+	 //validateEditExceedLimit();
+	 //ExceedEditQuantityCheck();
  }
 function calculateEditTaxValue()
  {
@@ -3438,7 +3438,7 @@ function calculateEditTaxValue()
       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> 
-    <input type="reset" class="btn btn-primary" value="Reset">
+    <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 } ?>
  
@@ -4255,8 +4255,8 @@ function calculateTotalValue()
 	    		
 	 $('#txtTotalOrderValue').val(tot);
 	
-	 validateExceedLimit();
-	  ExceedQuantityCheck();
+	 //validateExceedLimit();
+	//  ExceedQuantityCheck();
  }
 function calculateTaxValue()
  {
@@ -4548,4 +4548,4 @@ $("#VIEWREVENUE").on("shown.bs.modal", function(e) {
 		
 	   
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 98535415..cb7c6573 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -1790,7 +1790,7 @@ function vaildateBeforeOpenModal()
         <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />   
         <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
         <a class="btn btn-primary Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-    <input type="reset" class="btn btn-primary" value="Reset">
+    <input type="reset" class="btn btn-primary" value="Reset" onclick="window.location.reload()">
   
   </div>
          <br/>
diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php
index e59cf9fe..5ebe8bf2 100755
--- a/application/views/purchaseorder.php
+++ b/application/views/purchaseorder.php
@@ -1917,7 +1917,7 @@ function validateEditExceedLimit()
 	 var tot =  parseFloat(totvalue).toFixed(2);
 	    		
 	 $('#txtEditTotalOrderValue').val(tot);
-	 validateEditExceedLimit();
+	// validateEditExceedLimit();
  }
 function calculateEditTaxValue()
  {
@@ -3129,7 +3129,7 @@ function calculateEditTaxValue()
    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />   
  <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
 <a class="btn btn-primary Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-    <input type="reset" class="btn btn-primary" value="Reset">
+    <a class="btn btn-primary Save"  ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
  
     
    
@@ -3907,8 +3907,8 @@ function calculateTotalValue()
 	    		
 	 $('#txtTotalOrderValue').val(tot);
 	
-	 validateExceedLimit();
-	  ExceedQuantityCheck();
+	 //validateExceedLimit();
+	  //ExceedQuantityCheck();
  }
 
    function calculateCgstTax(varBasicValue,Cgst,discount)
@@ -4002,7 +4002,11 @@ $("#PaymentTerms").change(function() {
 		$('#txtTotalOrderValueSummary').val('');
 
         }
-			
+	function Reset(){
+location.reload();
+
+}		
 			 
 </script>
  
+
diff --git a/application/views/requisitionlisting.php b/application/views/requisitionlisting.php
index 5ba6e1a9..92011a9e 100755
--- a/application/views/requisitionlisting.php
+++ b/application/views/requisitionlisting.php
@@ -114,7 +114,7 @@ span.highlight {
 
 					<td><?php echo $record->StatusName ?></td>                     
 					<td><?php $Pdt =	new DateTime($record->CreatedDate );
-							$PODate =  $Pdt->format('Y-m-d');
+							$PODate =  $Pdt->format('d-m-Y');
 					echo $PODate 
 					?></td>                     
 					<td>   <a  	 data-toggle="tooltip"  href="<?php echo base_url().'EditRequisition?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a data-toggle="tooltip"  onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )"   ><span class="glyphicon glyphicon-trash" title="<?php echo $record->ReqNo; ?>  -  Click here to Delete Requisition details"></span></a> </td>            
@@ -146,4 +146,4 @@ span.highlight {
     }); 
   });
 	</script>
-	
\ No newline at end of file
+	
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index 6770b1ed..501a829c 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -1390,7 +1390,7 @@ function clearEditTaxField()
 					<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" >   
 					<a class="btn btn-primary Save"  ID="Save"onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
 					<a class="btn btn-primary Submit"  ID="Submit"onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 		 
-					<input type="reset" class="btn btn-primary">
+					<a class="btn btn-primary Save"  ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
 				</div><br/>
 			</div>
 		</div>
@@ -2210,4 +2210,10 @@ $("#PaymentTerms").change(function() {
                }
            });
 
+	function Reset(){
+location.reload();
+
+}
+
 </script>
+
diff --git a/application/views/storerequisition.php b/application/views/storerequisition.php
index c30df158..3540d7a1 100755
--- a/application/views/storerequisition.php
+++ b/application/views/storerequisition.php
@@ -156,4 +156,4 @@ $ReqDate =  $dt->format('d-m-Y');  echo $ReqDate  ?>
 	   
     }); 
   });
-	</script>
\ No newline at end of file
+	</script>
diff --git a/application/views/storerequisitionlisting.php b/application/views/storerequisitionlisting.php
index 7fa7ea09..2fbada6d 100755
--- a/application/views/storerequisitionlisting.php
+++ b/application/views/storerequisitionlisting.php
@@ -397,4 +397,4 @@ function(start, end, label) {
 	   
     }); 
   });
-	</script>
\ No newline at end of file
+	</script>
diff --git a/application/views/storestatus.php b/application/views/storestatus.php
index 176094fa..a301639a 100755
--- a/application/views/storestatus.php
+++ b/application/views/storestatus.php
@@ -326,9 +326,9 @@
 					} echo $St ; ?></td>
 					<td align="right"><?php
 
- $dt = new DateTime($record->updatedOn );
-$updatedOn =  $dt->format('d-m-y'); 					
-     echo $updatedOn ; ?></td>
+    $dt = new DateTime($record->updatedOn );
+   $updatedOn =  $dt->format('d-m-Y'); 					
+        echo $updatedOn ; ?></td>
 					<td><?php echo $record->storeremarks ; ?>
 							
 					</td>
@@ -370,7 +370,8 @@ $("#UOM").val('');
 			dataType: 'json',
 			type:"POST",
 			url:"<?php echo base_url();?>requisitionform/getMaterialDetails",
-			success:function(json) {		
+			success:function(json) {
+                           
 			$('#content').loader('hide');
 			
 					$("#Description").val(json.MatDetail[0]['MaterialName']);	
@@ -455,6 +456,7 @@ $("#UOM").val('');
   function AddStock()
 {  
      id= $('#MaterialCode').val(); 
+
 	if(validate())
 		{ 	
 			
@@ -487,7 +489,7 @@ $("#UOM").val('');
 
 function EditStock()
 {
-	 
+
 		if(Editvalidate())
 		{ 
 	
@@ -536,19 +538,20 @@ function cancel()
 }
 function clearLineitemData()
 {
-	$('#MaterialCode').val(''); 
+	
 	$('#Description').val(''); 
 	$('#UOM').val(''); 
-	$('#StockAvail').val('YES'); 
+	
 	$('#AddAvailableStock').val(''); 
 	$('#Remarks').val(''); 
 }
 
 function validate()
 {
-	if($("option:selected", $("#MaterialCode")).val() == '-1')
+
+	if($("option:selected", $("#MaterialCode")).val() == '-1' || $("#MaterialCode").val() == '0')
 	{
-		alert('Please Select MaterialCode Names');
+		alert('Please Select MaterialCode');
 		$("#MaterialCode").focus();
 		return false;
 	}
@@ -595,8 +598,8 @@ function validate()
 </script><script type="text/javascript">
 	 $(document).ready(function(){
 $("#MaterialCode").select2();
-$("#StockAvail").select2();
-$("#EditStockAvail").select2();
+//$("#StockAvail").select2();
+//$("#EditStockAvail").select2();
 
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/viewIGRDetails.php b/application/views/viewIGRDetails.php
index a0f1148a..6790b689 100755
--- a/application/views/viewIGRDetails.php
+++ b/application/views/viewIGRDetails.php
@@ -276,4 +276,4 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
 });
 
 </script>
- 
\ No newline at end of file
+ 
diff --git a/application/views/viewinwardgateregister.php b/application/views/viewinwardgateregister.php
index ba3591a9..93e9ae75 100755
--- a/application/views/viewinwardgateregister.php
+++ b/application/views/viewinwardgateregister.php
@@ -244,7 +244,7 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
 					//alert(item.DeliveryChellanDate);
 					var dcd = new Date(item.DeliveryChellanDate);
 	 				//alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear());
-        			var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear());
+        			var dcd2 = (dcd.getDate()+ '-' + (dcd.getMonth() + 1)+ '-' + dcd.getFullYear());
 					$("#Invoice_Date").val(dcd2);
 					$("#ser").val(item.ServiceDescription);
 				
@@ -269,4 +269,4 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
 			});
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/viewmaterialinspectionreport.php b/application/views/viewmaterialinspectionreport.php
index 6874a46a..0bfb73b0 100755
--- a/application/views/viewmaterialinspectionreport.php
+++ b/application/views/viewmaterialinspectionreport.php
@@ -101,4 +101,4 @@
     }); 
   });
   </script> 
- 
\ No newline at end of file
+