diff --git a/application/views/editrequisitionform.php b/application/views/editrequisitionform.php
index 79cc86f9..02f9f260 100644
--- a/application/views/editrequisitionform.php
+++ b/application/views/editrequisitionform.php
@@ -5,18 +5,8 @@
         $FirstName ='';
 		$Designation ='';
 		$DepartmentName = '';
-		//print_r($MaterialCode);
-		$flag = 1;
-		$Test =  $MaterialCode[0]->UOM;
-		$item = null;
-		foreach($MaterialCode as $struct) {
-			if ($Test == $struct->UOM) {
-        $item = $struct;
-        break;
-    }
-	}
-		print_r($item);
-        echo $item->UOM;
+		$Status = '';
+	 	
 		
 if(!empty($ReqDetails))
 {
@@ -28,7 +18,7 @@ if(!empty($ReqDetails))
         $FirstName =$Req->FirstName;
 		$Designation =$Req->Designation;
 		$DepartmentName = $Req->DepartmentName;
-						
+		$Status	 = 	$Req->Status;		
     }
 }
 
@@ -50,7 +40,7 @@ if(!empty($ReqDetails))
 		   <?php
                       $attributes = array('class' => 'form-label-left requistion ','name'  => 'requistion','id'  => 'requistion');
                         
-                        echo form_open($this->config->base_url().'addNewcost/',$attributes); ?>
+                        echo form_open($this->config->base_url().'UpdateRequist',$attributes); ?>
 	 <div class="row">
 	 <div class="col-md-12">
 	   <div class="row" align="right">
@@ -65,7 +55,8 @@ if(!empty($ReqDetails))
                                         echo form_input($data);
 										
                                         ?>  
-				 
+										
+			 <input type="hidden" name="txtReqNo" id="txtReqNo"  value="<?php echo $ReqNo?>"/>	 
 			</div>
 		 </div>
 		 <div class="col-md-3">
@@ -143,8 +134,11 @@ if(!empty($ReqDetails))
   <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
+<?php if(count($MaterialCode) != 0)
+{ 
+?>
   <a data-toggle="modal" data-target="#myModal1"  class="btn btn-primary">Add Line Item</a>
-  
+<?php } ?>
   <div class="modal fade" id="myModal1" role="dialog">
 		<div class="modal-dialog">
 		
@@ -173,7 +167,7 @@ if(!empty($ReqDetails))
 						endforeach;
 						}										
 			
-						echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
+						echo form_dropdown('drpMaterial', $options,set_value('drpMaterial'),'id="drpMaterial"' ,'class="form-control"');
 
 						?>						 
 					</div>
@@ -301,12 +295,16 @@ if(!empty($ReqDetails))
 <?php
                     if(!empty($LineItem))
                     { 
-				        $index = 1;
+				        $index = 0;
                         foreach($LineItem as $record)
-                        {
+                        {	
+							$index = $index + 1;
                     ?>
 							<tr  id="<?php echo $index ; ?>">
 							<td align="left"><?php echo $index ; ?></td> 
+							 <input type="hidden" name="<?php echo 'MaterialCode'.$index ?>" id="<?php echo 'MaterialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
+							 <input type="hidden" name="<?php echo 'Quantity'.$index ?>" id="<?php echo 'Quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
+							   
 					<td align="left"><?php echo $record->MaterialCode ; ?></td>
 					<td align="left"><?php echo $record->MaterialName ; ?></td>
  
@@ -316,23 +314,37 @@ if(!empty($ReqDetails))
 
 						
 						<td>
-                          <a   data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->MaterialCode ; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $record->MaterialCode  ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
+                          <a   data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-target='#EditItem'	 data-toggle="modal" href="#EditItem"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->MaterialCode ; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a  onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $record->MaterialCode  ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
 						 
 						  
                       </td>
 </tr>
-						<?php $index = $index + 1;  }
+						<?php   }
+						?>
+						  <input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $index ; ?>"/>
+						<?php
 					}?>
     </tbody>
 	
   </table>
          
  <div align="right" style="padding-right:10px">
-   <input type="hidden" name="txtRowCount" id="txtRowCount" />
+    <input type="hidden" name="txtStatus" id="txtStatus" />
    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-  <a class="btn btn-primary"  ID="update" onclick="update()" >&nbsp;&nbsp;<span class="bold">Update</span></a> 
-  <a class="btn btn-primary"  href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Cancel</span></a> 
-
+   <?php if($Status == REQ_DRAFT)
+   { ?>
+		<a class="btn btn-primary Save"  ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+		<input type="submit" class="btn btn-primary" value="Submit">
+		<input type="reset" class="btn btn-primary">
+    <?php }
+	else if($Status == REQ_PENDING_APPROVAL)
+	{?>
+  <!--<a class="btn btn-primary"  ID="update" onclick="update()" >&nbsp;&nbsp;<span class="bold">Update</span></a> 
+  <a class="btn btn-primary"  href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Cancel</span></a> -->
+  <input type="submit" class="btn btn-primary" value="Update">
+   <input type="reset" class="btn btn-primary">
+	<?php } ?>
+  
   
    
   </div>
@@ -415,8 +427,8 @@ $('#CostCenter').change(function() {
 			success:function(json) {		
 			$('#content').loader('hide');
 				
-				$("#MaterialCode").empty();
-				$("#MaterialCode").append(json.Material);
+				$("#drpMaterial").empty();
+				$("#drpMaterial").append(json.Material);
                // $("#Description").val(json.MaterialName);	
 				//$("#UOM").val(json.UOM);					
 		      }
@@ -431,42 +443,30 @@ $('#CostCenter').change(function() {
 		}
   
 });
-$('#MaterialCode').change(function() {
+
+$('#drpMaterial').change(function() {
     
-	var x = '<?php echo json_encode($MaterialCode); ?>';
-	alert(x);
- var id = $('#MaterialCode').val(); 
+	
+	
+	var y = <?php echo json_encode($MaterialCode, JSON_PRETTY_PRINT) ?>;
 
-$("#Description").val('');	
-$("#UOM").val('');	
-		/*if(id != '-1')
+	var id = $('#drpMaterial').val(); 
+		
+		if(id != "0")
 		{
-			$('#content').loader('show');
-
-			$.ajax({
-			data:{id:id},
-			dataType: 'json',
-			type:"POST",
-			url:"<?php echo base_url();?>requisitionform/getMaterialDetails",
-			success:function(json) {		
-			$('#content').loader('hide');
-			//alert(json.MatDetail);
-					$("#Description").val(json.MatDetail[0]['MaterialName']);	
-					$("#UOM").val(json.MatDetail[0]['UOM']);									
-		      }
-			  
-			});	
-			//$('#content').loader('hide');
-		}
-		else
-		{
-			alert('Please select the RequestType');
-			return false;
-		}*/
-  
-}); 
-
-
+		
+				
+		$.each(y, function(idx, obj) {
+			if(obj.MaterialCode === id)
+			{ 
+		     
+				$("#Description").val(obj.MaterialName);
+				$("#UOM").val(obj.UOM);	
+			}
+			
+		});
+		} 
+});
 });
 	</script>
 	<script type="text/html" id="tempList">
@@ -487,7 +487,7 @@ $("#UOM").val('');
 </tr>
 </script>
 <script>
-var index     = '1';
+var index     = $('#txtRowCount').val();
 var userid  = '';
 function removeHiddenRows(rowcount)
 {
@@ -504,17 +504,22 @@ for (step = 1; step < rowcount; step++) {
 	userid  = '';	
 }
 }
+
+
+
 function Save()
 {  
 
- var id = 'Draft'; 
+   var id = '<?php echo REQ_DRAFT;?>'
+  
 	if(validate())
 		{ 	
 			$('#content').loader('show');
+			 $('#txtStatus').val(id);
 		  $.ajax({ 
 			data:$('.requistion').serialize(),
 			type:"POST",
-			url:"<?php echo base_url() ?>requisitionform/addNewRequistion?ID="+id, 
+			url:"<?php echo base_url() ?>requisitionform/EditRequistion", 
 			success:function(data) {
 			if(data)
 			{
@@ -562,23 +567,74 @@ function validate()
 }	
 function DeleteRow(rowid)
 {
-	   var DelRows  = $('#txtDeletedRow').val();
-	  
-	   var answer = confirm(" Do you want to delete the Item from the List?")
-		if (answer) 
-		{ 			
-			var td = document.getElementById(rowid);
-			td.parentNode.removeChild(td);
 	
-		  if(DelRows != '')
-		  {
-		  DelRows = DelRows + ":" + rowid;
-		  }
-		  else
-		  {
-			  DelRows=  "0" + ":" + rowid;
-		  }
-		  $('#txtDeletedRow').val(DelRows);
+	    var id = [];
+	     var tr= document.getElementById(rowid);
+		 var cellval = tr.cells;
+		 var MaterialCode = cellval[1].innerHTML;
+		 id[0] = $('#txtReqNo').val();		 
+		 id[1] = MaterialCode;
+	    var answer = confirm(" Do you want to delete the Item from the List?")
+		if (answer) 
+		{ 	
+	        // To delete the item from list
+				
+				var x = <?php echo json_encode($LineItem, JSON_PRETTY_PRINT) ?>;
+	            var result = '0';
+					//alert(x);
+					//alert(MaterialCode);
+				if(MaterialCode != "0")
+				{			
+					$.each(x, function(idx, obj) {
+						if(obj.MaterialCode === MaterialCode)
+						{			 
+						  result = '1';
+						   return  false;	
+						}
+						
+					   });
+				   }
+				  
+				   
+			if(result == '0')
+			{
+				var DelRows  = $('#txtDeletedRow').val();
+				tr.parentNode.removeChild(tr);
+				if(DelRows != '')
+					{
+					DelRows = DelRows + ":" + rowid;
+					}
+				else
+					{
+					DelRows=  "0" + ":" + rowid;
+					}
+				$('#txtDeletedRow').val(DelRows);
+			}
+           	// To delete the value from Tables
+			else  if(result == '1')
+			{
+				
+			 $.ajax({ 
+			data:{id:id},
+			type:"POST",
+			url:"<?php echo base_url() ?>requisitionform/DeleteRequistionForm", 
+			success:function(data) {
+			if(data)
+			{
+				$('#content').loader('hide'); 
+				alert(data);
+								
+				 location.reload();	
+				
+			
+			}
+			else
+			{
+				alert("Error");	
+			}			
+		
+		}}); 
+			}
 		}
        	
 } 
@@ -586,7 +642,7 @@ function DeleteRow(rowid)
 
 $('.addClick').click(function(){
          
-       if ($("#MaterialCode option:selected").val() =='-1' )
+       if ($("#drpMaterial option:selected").val() =='-1' )
 		{
 			 alert('Please Select the MaterialCode ');
 		}	
@@ -597,15 +653,15 @@ $('.addClick').click(function(){
 		  
 		}	  
 		
-        if ($("#MaterialCode option:selected").val() !='-1' &&  $('#Quantity').val() != ''  )
+        if ($("#drpMaterial option:selected").val() !='-1' &&  $('#Quantity').val() != ''  )
         {		       
-         var temp = index;
-         var materialCode = $("#MaterialCode option:selected").val();
+         var temp = parseInt(index) + 1;
+         var materialCode = $("#drpMaterial option:selected").val();
          var materialName =  $("#Description").val();
          var uom = $("#UOM").val();
 		 var quantity = $("#Quantity").val();
 		 
-		$('#MaterialCode option[value='+materialCode+']').remove();
+		$('#drpMaterial option[value='+materialCode+']').remove();
 		  
 		 $('#Description').val(''); 
 		  $('#UOM').val(''); 
@@ -691,37 +747,5 @@ $('.EditClick').click(function(){
       }
     
  });
-  $(".requistion").submit(function(e) {
-        
-		var id= "Pending Approval";
-		e.preventDefault();
-		if(validate())
-		{
-		$('#content').loader('show');
-		  $.ajax({ 
-			data:$('.requistion').serialize(),
-			type:"POST",
-			url:"<?php echo base_url() ?>requisitionform/addNewRequistion?ID="+id, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				$('#txtRowCount').val('');
-				$('#txtDeletedRow').val('');
-				
-				//window.location =	baseurl + 'CostCenter/CostListing';
-			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}
-  
-	});
-		}
-	
-		 });
+ 
 </script>
\ No newline at end of file
diff --git a/application/views/requisitionform.php b/application/views/requisitionform.php
index b7918514..c7eabdcf 100644
--- a/application/views/requisitionform.php
+++ b/application/views/requisitionform.php
@@ -711,7 +711,7 @@ $('.EditClick').click(function(){
 				$('#txtRowCount').val('');
 				$('#txtDeletedRow').val('');
 				
-				window.location =	baseurl + 'Requisition';
+				window.location =	"Requisition";
 			
 			}
 			else
diff --git a/application/views/requisitionlistapproval.php b/application/views/requisitionlistapproval.php
index 1605d725..21908d02 100644
--- a/application/views/requisitionlistapproval.php
+++ b/application/views/requisitionlistapproval.php
@@ -4,9 +4,14 @@
 
 <style>
             .table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;}
-</style>
-<div class="content-wrapper"> 
-	 <section class="content">	 	  
+			
+            </style>
+<div class="content-wrapper">
+    
+ 
+	 <section class="content">
+	 
+	 <div>
          <center><b><h2>Requisition Approval List </h2></b></center>
 		  <?php
                       $attributes = array('class' => 'form-label-left Approve ','name'  => 'Approve','id'  => 'Approve');
diff --git a/application/views/requisitionlisting.php b/application/views/requisitionlisting.php
index 652228a4..5fc71e44 100644
--- a/application/views/requisitionlisting.php
+++ b/application/views/requisitionlisting.php
@@ -1,13 +1,15 @@
 <?php
 
 		$DraftCount = '';
+		$ReqNo = '';
 		if(!empty($Status))
 {
     foreach ($Status as $St)
     {
 		$DraftCount = $St->cnt;
+		$ReqNo = $St->ReqNo;
 	}
-	//echo $DraftCount;
+	//echo $ReqNo;
 }?>
 	
 <script>
@@ -18,9 +20,46 @@ animation :'slide',
 speed:500
 } );
 });  
- 
+
+ function DeleteRow(rowid)
+{
+	    
+		 id = rowid;		 
+		 
+	    var answer = confirm(" Do you want to delete the Requisition?")
+		if (answer) 
+		{ 	
+	      				
+			 $.ajax({ 
+			data:{id:id},
+			type:"POST",
+			url:"<?php echo base_url() ?>requisitionform/DeleteReqNo", 
+			success:function(data) {
+			if(data)
+			{
+				$('#content').loader('hide'); 
+				alert(data);
+								
+				 location.reload();	
+				
+			
+			}
+			else
+			{
+				alert("Error");	
+			}			
+		
+		}}); 
+			}
+		}
+       	
+
 </script>
- 
+ <style>
+span.highlight {
+    background-color: yellow;
+}
+</style>
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
@@ -50,6 +89,9 @@ speed:500
                         </form>
                     </div>
                 </div><!-- /.box-header -->
+				<?php if($DraftCount > 0 ) {?><p>
+<span class="highlight">The Requisition No <b><?php echo $ReqNo;?></b> is in Draft status.</span>  Please act on the requisition.<span class="highlight">Then only you can raise New Requisition. </span>
+				</p> <?php } ?>
                 <div class="box-body table-responsive no-padding" >
                   <table id="datatable" class="table table-hover tableSorter" >
 				  
@@ -71,7 +113,7 @@ speed:500
 					<td><?php echo $record->ReqType ?></td>                     
 					<td><?php echo $record->StatusName ?></td>                     
 					<td><?php echo $record->CreatedDate ?></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 Asset details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#'  class="link" "   id="Del" ><span class="glyphicon glyphicon-trash"></span></a> </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>            
                     </tr>
 					
                  <?php