diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index 23aebb1a..344a1599 100644
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -16,6 +16,7 @@
 		$TotalBasicAmount = 0.0;
 		$ServiceDescription = '';
 $MaxPoDate = '';
+$AvlAmount = 0;
 if(!empty($MaxPODate))
 {
     foreach ($MaxPODate as $date)
@@ -43,7 +44,12 @@ if(!empty($POMaster))
     }
 }
 
-
+if(!empty($AvlBudAmt))
+{
+   
+		$AvlAmount = $AvlBudAmt;		
+	
+}
 ?>
 <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
 <script>
@@ -51,6 +57,9 @@ var RequistQuantity = '';
 var AvilBudAmt = '';
  var POMaxDate = '<?php echo $MaxPoDate;?>';
   var d = new Date(POMaxDate);
+   var SelectedMaterialList = {
+    Mat: []
+};
  $(function() {   
 $("#PODate").datepicker({
 	minDate : d,
@@ -95,7 +104,7 @@ $('#ReqNo').change(function() {
   
  var id = $('#ReqNo').val();
  $("#AvlBudAmt").val('');
- $("#CostCenter").empty();
+  $("#CostCenter").val('');
   $("#MaterialCode").empty();
   $("#deptName").val('');
  $("#UOM").val('');
@@ -107,68 +116,68 @@ $("#txtBasicValue").val('');
 		if(id != '0')
 		{
 			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-			var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
+		
 			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			//alert(Material);
+			var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
 			
 		// For Binding DepartmentName	           			
 		$.each(y, function(idx, obj) {
 			if(obj.ReqNo === id)
 			{
 				$("#deptName").val(obj.DepartmentName);
-				
+				$("#CostCenter").val(obj.CostCenterCode);
 			}			
 		});
-			// For Binding Cost center for the selected department	
-		$("#CostCenter").append( $('<option></option>').val("0").html("Select Cost Center") );
-		$.each(cost, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#CostCenter").append( $('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName) );
-				
-			}
-			
-		});
+			$("#AvlBudAmt").val(AvlBudAmt);	
 		// For Binding Material list center for the selected Requistion Number	
 		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-		for(i=0;i<Material.length;i++)
+		var isAdded = "0";
+		 for(i=0;i<Material.length;i++)
 		{
 		$.each(Material[i], function(idx, obj) {
 			
 				if(obj.ReqNo === id )
 				{
-					if(SelectedMaterialCode.length > 0)
-					{
-						for (i = 0; i < CollIndex; i++) 
-						{ 
-							if( SelectedMaterialCode[i] != obj.MaterialCode)
+									   
+						$.each(SelectedMaterialList.Mat, function(idx1, el){															
+							if (id == el.ReqNo )
 							{
-							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName) );
+															
+								if(el.materialCode == obj.MaterialCode)
+								{
+										isAdded  = "1";
+										return false;																		
+								}
+								else
+								{
+									isAdded  = "0";
+								}
+								
+							}
+					});
+					
+					 
+						if(isAdded  == "0")
+						{
+							
+							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 						}
-						
-						}
-					}
-					else
-					{
-						 $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-					}
+												
 				}
 			
 			
 		});
 		}
-			
 		}
 		else
 		{
 			alert('Please select the Requisition Number');
 			return false;
 		}
+		id = '';
   
-  
-});	
-
-
+});
+	
 $('#MaterialCode').change(function() {
     
  var id = $('#MaterialCode').val();
@@ -197,131 +206,6 @@ $('#MaterialCode').change(function() {
   
 });
 
-/*$('#CostCenter').change(function() {
-    
- var id = $('#CostCenter').val();
- $("#AvlBudAmt").val('');
-
-		if(id != '0')
-		{
-			var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
-
-	 	$.each(cost, function(idx, obj) {
-			if(obj.CostCenterCode === id)
-			{
-				$("#AvlBudAmt").val(obj.BudgetAmount);	
-				AvilBudAmt	 = 	obj.BudgetAmount;		
-			}
-			
-		});	
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});*/
-$('#CostCenter').change(function() {
-    
- var id = $('#CostCenter').val();
- $("#AvlBudAmt").val('');
- var ReqTpe =$('#POType').val();
-			
-		if(id != '0')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqTpe, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#AvlBudAmt").val(data);
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}
-		  });
-			
-		}
-		else
-		{
-			alert('Please select the Cost Center');
-			return false;
-		}
-  
-}); /*	
-$('#EditMaterialCode').change(function() {
-    
- var id = $('#EditMaterialCode').val();
- RequistQuantity = '';
- clearEditTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-	 
-		$.each(y, function(idx, obj) {
-			if(obj.MaterialCode === id)
-			{
-				$("#EditItemName").val(obj.MaterialName);
-				$("#EditUOM").val(obj.UOM);
-				$("#EditQuantity").val(obj.Quantity);
-				RequistQuantity	= 	obj.Quantity;		
-			}			
-		});			
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});*/
-
-$('#EditCostCenter').change(function() {
-    
- var id = $('#EditCostCenter').val();
- alert(id);
- var ReqTpe =$('#POType').val();
-			
- $("#EditAvlBudAmt").val('');
-
-		if(id != '0')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqTpe, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				//salert(data);
-				$("#EditAvlBudAmt").val(data);
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}
-		  });
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});	
 
 });
 function Ratechange(){
@@ -776,12 +660,8 @@ function clearEditTaxField()
 						   <label>Cost Center Name</label>
 									<div class="form-group">
 												<?php
-						$options = array("0"=>'Select Cost Center');     
-						//print_r(  $options);
-						
-														
-			
-						echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
+						$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
 
 						?>		
 									</div>
@@ -1012,9 +892,8 @@ function clearEditTaxField()
 						   <label>Cost Center Name</label>
 									<div class="form-group">
 												<?php
-						$options = array("0"=>'Select Cost Center');     
-									
-						echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
+						$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
 
 						?>		
 									</div>
@@ -1423,12 +1302,13 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		
 		$('#EditReqNo').val($('#Reqnumber'+userid).val());
 		$('#EditdeptName').val($('#departmentName'+userid).val());
-		
+		$("#EditCostCenter").val($('#costCode'+userid).val());
 		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
 		
 		$('#EditItemName').val($('#materialName'+userid).val());
 		$('#EditUOM').val($('#uom'+userid).val());
 		$('#EditQuantity').val($('#quantity'+userid).val());
+		RequistQuantity = $('#quantity'+userid).val();
 		$('#EditRate').val($('#itemRate'+userid).val());
 		$('#txtEditBasicValue').val(cellval[6].innerHTML);
 		$('#EditAfterServiceTax').val($('#ServiceTax'+userid).val());
@@ -1440,69 +1320,55 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		
 		RequistQuantity = $('#quantity'+userid).val();
 		
-		$("#EditCostCenter").empty();
-	   var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
-	 
-	   // For Binding Cost center for the selected department	
-		$("#EditCostCenter").append( $('<option></option>').val($('#costCode'+userid).val()).html($('#costCode'+userid).val()) );
-		$.each(cost, function(idx, obj) {
-			
-		if(obj.ReqNo === $('#Reqnumber'+userid).val())
-			{
-				$("#EditCostCenter").append( $('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName) );
-			
-			
-		} });
-		var id = $('#costCode'+userid).val();
-		var ReqType = '<?php echo REVENUE ?>';
-		//alert(ReqType);
-		$.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				//alert(data);
-				$("#EditAvlBudAmt").val(data);
-			}
-						
 		
-		}
-		  });
 		  
 		$("#EditMaterialCode").empty();
 		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 		 // For Binding Material list center for the selected Requistion Number	
 		 
 		$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-		for(i=0;i<Material.length;i++)
+		
+		var isAdded = "0";
+		 for(i=0;i<Material.length;i++)
 		{
 		$.each(Material[i], function(idx, obj) {
 			
 				if(obj.ReqNo === id )
 				{
-					if(SelectedMaterialCode.length > 0)
-					{
-					for (i = 0; i < CollIndex; i++) { 
-						if( SelectedMaterialCode[i] != obj.MaterialCode)
-						 {
-						 $("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName) );
+								   
+						$.each(SelectedMaterialList.Mat, function(idx1, el){															
+							if (id == el.ReqNo )
+							{
+								
+								if(el.materialCode == obj.MaterialCode)
+								{
+									
+										isAdded  = "1";
+										return false;																		
+								}
+								else
+								{
+									isAdded  = "0";
+								}
+								
+							}
+												
+					
+					});
+					
+					
+						if(isAdded  == "0")
+						{
+							
+							$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 						}
-						
-						}
-					}
-					else
-					{
-						 $("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-					}
+												
 				}
 			
 			
 		});
 		}
 	   
-	   
 });
 
 $('.AddService').click(function(){
@@ -1548,6 +1414,12 @@ $('.AddService').click(function(){
 		 $('#MaterialCode option[value='+materialCode+']').remove();
 		  SelectedMaterialCode[CollIndex] = materialCode;
 			CollIndex = CollIndex + 1;
+			
+			SelectedMaterialList.Mat.push({ 
+        "materialCode" :  materialCode,
+        "ReqNo"  : Reqnumber,
+      
+		});	
 		 populateValueMainFormForServiceTax();	 
 		
 			
@@ -1696,9 +1568,9 @@ function populateValueMainFormForServiceTax()
 }
 function populateValueMainFormForEditServiceTax()
 {
-	   //alert('Tst');
-	   var rows =  document.getElementById('ServiceTable').rows.length;
 	  
+		var rows =  document.getElementById('serviceTax').rows.length;
+       
 		var TotServiceTax = 0;
 		var TotEduCess = 0;
 		var TotSecHighTax = 0;
@@ -1706,18 +1578,27 @@ function populateValueMainFormForEditServiceTax()
 		var TotSwachhTax = 0;
 		var TotSummary = 0;
 		var TotBasicAmout = 0;
-		
-	   for (i = 1; i < rows; i++) { 
+	  var i = 0;
+	   do {
+		   i += 1;
+		   var tr= document.getElementById(i);
+			 //alert(tr);
+			 if(tr != null)
+			 {
+			 cells = tr.getElementsByTagName('td');
+					
 			
-		var AfterServiceTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val();
-		var AfterEduCess = $('#EduCess'+i).val() == '' ? '0.00' : $('#EduCess'+i).val();
-		var AfterSecHighTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val();
-		var AfterKrishiTax =$('#KrishiTax'+i).val() == '' ? '0.00' : $('#KrishiTax'+i).val();
-	    var AfterSwachhTax = $('#SwachhTax'+i).val() == '' ? '0.00' : $('#SwachhTax'+i).val();
-		var TotalVal =$('#TotalOrderValue'+i).val() == '' ? '0.00' : $('#TotalOrderValue'+i).val();
+		     var rowid = cells[0].innerHTML;
+			
+		var AfterServiceTax = $('#ServiceTax'+rowid).val() == '' ? '0.00' : $('#ServiceTax'+rowid).val();
+		var AfterEduCess = $('#EduCess'+rowid).val() == '' ? '0.00' : $('#EduCess'+rowid).val();
+		var AfterSecHighTax = $('#SecHighTax'+rowid).val() == '' ? '0.00' : $('#SecHighTax'+rowid).val();
+		var AfterKrishiTax =$('#KrishiTax'+rowid).val() == '' ? '0.00' : $('#KrishiTax'+rowid).val();
+	    var AfterSwachhTax = $('#SwachhTax'+rowid).val() == '' ? '0.00' : $('#SwachhTax'+rowid).val();
+		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
 		
-		var Quantity = $('#quantity'+i).val() == '' ? '0.00' : $('#quantity'+i).val();
-		var ItemRate = $('#itemRate'+i).val() == '' ? '0.00' : $('#itemRate'+i).val();	
+		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
+		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();	
 		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
 		
 		TotServiceTax = parseFloat(TotServiceTax) + parseFloat(AfterServiceTax);
@@ -1728,8 +1609,11 @@ function populateValueMainFormForEditServiceTax()
 		TotSummary = parseFloat(TotSummary) + parseFloat(TotalVal);
 		TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
 		
-		}    				
-       
+		}    
+			
+		
+ }		while (i < rows);  	
+
 		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
 		$('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
 		$('#txtTotHigherEdu').val(parseFloat(TotSecHighTax).toFixed(2) );
@@ -1858,12 +1742,59 @@ function DeleteRow(rowid)
 		}});  
 			}		   
 		
-		  
+		   populateValueMainFormForDeleteItem(rowid);
 		  
 		}
        	
 } 
+function populateValueMainFormForDeleteItem(rowid)
+{
+	  
+		
+       // alert(rows);
+		var TotServiceTax = $('#txtTotalServiceTax'+rowid).val();
+		var TotEduCess = $('#txtTotalEducess'+rowid).val();
+		var TotSecHighTax = $('#txtTotHigherEdu'+rowid).val();
+		var TotKrishiTax = $('#txtTotalKrishiKalyan'+rowid).val();
+		var TotSwachhTax = $('#txtTotSwachhBharat'+rowid).val();
+		var TotSummary = $('#TotalOrderValue'+rowid).val();
+		var TotBasicAmout = $('#txtTotalOrderValueSummary'+rowid).val();
+		
+	  
+			
+		var AfterServiceTax = $('#ServiceTax'+rowid).val() == '' ? '0.00' : $('#ServiceTax'+rowid).val();
+		var AfterEduCess = $('#EduCess'+rowid).val() == '' ? '0.00' : $('#EduCess'+rowid).val();
+		var AfterSecHighTax = $('#SecHighTax'+rowid).val() == '' ? '0.00' : $('#SecHighTax'+rowid).val();
+		var AfterKrishiTax =$('#KrishiTax'+rowid).val() == '' ? '0.00' : $('#KrishiTax'+rowid).val();
+	    var AfterSwachhTax = $('#SwachhTax'+rowid).val() == '' ? '0.00' : $('#SwachhTax'+rowid).val();
+		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
+		
+		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
+		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();	
+		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
+		//alert(TotalVal);
+		
+		TotServiceTax = parseFloat(TotServiceTax) -  parseFloat(AfterServiceTax);
+		TotEduCess = parseFloat(TotEduCess) - parseFloat(AfterEduCess);
+		TotSecHighTax = parseFloat(TotSecHighTax) - parseFloat(AfterSecHighTax);
+		TotKrishiTax = parseFloat(TotKrishiTax) - parseFloat(AfterKrishiTax);
+		TotSwachhTax = parseFloat(TotSwachhTax) - parseFloat(AfterSwachhTax);
+		TotSummary = parseFloat(TotSummary) - parseFloat(TotalVal);
+		TotBasicAmout = parseFloat(TotBasicAmout) - parseFloat(BasicVal);
+		
+			
+		   
+		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
+		$('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
+		$('#txtTotHigherEdu').val(parseFloat(TotSecHighTax).toFixed(2) );
+		$('#txtTotalEducess').val(parseFloat(TotEduCess).toFixed(2) );
+		$('#txtTotalKrishiKalyan').val(parseFloat(TotKrishiTax).toFixed(2) );
+		$('#txtTotSwachhBharat').val(parseFloat(TotSwachhTax).toFixed(2) );
+		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );	
 
+		
+		
+}
 function validateServiceTax()
  {  
 
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php
index 3f5638ca..a1e4a659 100644
--- a/application/views/editRevenuepurchaseorder.php
+++ b/application/views/editRevenuepurchaseorder.php
@@ -4,6 +4,7 @@ $CompanyAddress = '';
 $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
 $CurrentDate =  $dt->format('Y-m-d');
 $MaxPoDate = '';
+$AvlAmount = 0;
 if(!empty($MaxPODate))
 {
     foreach ($MaxPODate as $date)
@@ -17,6 +18,12 @@ if(!empty($CompanyDetails))
     {
 		$CompanyAddress = $Req->Address;
 	}
+}
+if(!empty($AvlBudAmt))
+{
+   
+		$AvlAmount = $AvlBudAmt;		
+	
 }
   
 		$SupId = '';
@@ -150,7 +157,7 @@ $('#ReqNo').change(function() {
     
  var id = $('#ReqNo').val();
  $("#deptName").val('');
- $("#CostCenter").empty();
+  $("#CostCenter").val('');
   $("#MaterialCode").empty();
   $("#ItemName").val('');
 $("#UOM").val('');
@@ -158,31 +165,23 @@ $("#Quantity").val('');
 $("#ItemName").val('');
 $("#Rate").val('');
 $("#txtBasicValue").val('');
+$("#AvlBudAmt").val('');	
  resetTaxField();
 		if(id != '0')
 		{
 			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-			var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 			
+			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+			var AvlBudAmt = '<?php echo $AvlAmount ?>';  
 		// For Binding DepartmentName	           			
 		$.each(y, function(idx, obj) {
 			if(obj.ReqNo === id)
 			{
 				$("#deptName").val(obj.DepartmentName);
-				
+				$("#CostCenter").val(obj.CostCenterCode);
 			}			
 		});
-			// For Binding Cost center for the selected department	
-		$("#CostCenter").append( $('<option></option>').val("0").html("Select Cost Center") );
-		$.each(cost, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#CostCenter").append( $('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName) );
-				
-			}
-			
-		});
+			$("#AvlBudAmt").val(AvlBudAmt);		
 		// For Binding Material list center for the selected Requistion Number	
 		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
 	
@@ -193,54 +192,29 @@ $("#txtBasicValue").val('');
 			
 				if(obj.ReqNo === id )
 				{
-					if(SelectedMaterialList.Mat.length > 0)
-					{					   
+									   
 						$.each(SelectedMaterialList.Mat, function(idx1, el){															
 							if (id == el.ReqNo )
 							{
-								if(el.materialCode != obj.MaterialCode)
+															
+								if(el.materialCode == obj.MaterialCode)
 								{
-									//alert(obj.MaterialCode);
-										//alert("Inside No there:"+obj.MaterialCode);
-										$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 										isAdded  = "1";
 										return false;																		
 								}
 								else
 								{
-									//alert(obj.MaterialCode);
-									isAdded  = "1";
-									return false;
+									isAdded  = "0";
 								}
+								
 							}
-							else if(id != el.ReqNo )
-							{ 
-								//alert(el.ReqNo + "Selected Id:"+id);
-								if( el.materialCode != 	obj.MaterialCode && isAdded  == "0"	)
-								{   
-									alert("Inside other:"+el.materialCode + "id is:"+ id);
-									$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-									return false;
-								}
-							}							
-					
 					});
 					
-					} 
-					
-						else 
+					 
+						if(isAdded  == "0")
 						{
-								//alert("Outside No Requist:"+obj.MaterialCode);
-							var exists = false; 
-						$('#MaterialCode  option').each(function(){
-						if (this.value == obj.MaterialCode) {
-							exists = true;
-						}
-							);
-							if(exists == false)
-							{
+							
 							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-							}
 						}
 												
 				}
@@ -254,6 +228,7 @@ $("#txtBasicValue").val('');
 			alert('Please select the Requisition Number');
 			return false;
 		}
+		id = '';
   
 });	
 $('#MaterialCode').change(function() {
@@ -327,74 +302,7 @@ $("#txtEditBasicValue").val('');
   
 });
 
-$('#CostCenter').change(function() {
-    
- var id = $('#CostCenter').val();
- $("#AvlBudAmt").val('');
- var ReqTpe =$('#POType').val();
-		if(id != '0')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqTpe, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#AvlBudAmt").val(data);
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}			
-		
-		}
-		  });
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});	
-$('#EditCostCenter').change(function() {
-    
- var id = $('#EditCostCenter').val();
- $("#EditAvlBudAmt").val('');
- var ReqTpe =$('#POType').val();
-		if(id != '0')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqTpe, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#EditAvlBudAmt").val(data);
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}			
-		
-		}
-		  });
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});	
+
 /* Revenue Tax calcualation */
 
  $('#DiscountType').change(function() {
@@ -2054,9 +1962,8 @@ body {
 								   <label>Cost Center Name</label>
 											<div class="form-group">
 														<?php
-								$options = array("0"=>'Select Cost Center');  													
-					
-								echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
+								$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
 
 								?>		
 											</div>
@@ -2446,9 +2353,8 @@ body {
 								   <label>Cost Center Name</label>
 											<div class="form-group">
 														<?php
-								$options = array("0"=>'Select Cost Center');  													
-					
-								echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
+								$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
 
 								?>		
 											</div>
@@ -3100,7 +3006,8 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		
 		$('#EditReqNo').val($('#Reqnumber'+userid).val());
 		$('#EditdeptName').val($('#departmentName'+userid).val());
-		
+		$("#EditCostCenter").val($('#costCode'+userid).val());
+		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
 		//
 		
 		$('#EditItemName').val($('#materialName'+userid).val());
@@ -3130,45 +3037,6 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		
 		$('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val());
 		
-		$("#EditCostCenter").empty();
-	   var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
-	   var CostName = '';
-	   $.each(cost, function(idx, obj) {
-			
-		if( obj.CostCenterCode === $('#costCode'+userid).val())
-			{
-				CostName = 	obj.CostCenterName	;
-		} });
-
-             
-		
-	   // For Binding Cost center for the selected department	
-		$("#EditCostCenter").append( $('<option></option>').val($('#costCode'+userid).val()).html($('#costCode'+userid).val() + "-" + CostName) );
-		$.each(cost, function(idx, obj) {
-			
-		if(obj.ReqNo === $('#Reqnumber'+userid).val() && obj.CostCenterCode != $('#costCode'+userid).val())
-			{
-				$("#EditCostCenter").append( $('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName) );		
-			
-		} });
-		
-		var id = $('#costCode'+userid).val();
-		var ReqType = '<?php echo REVENUE ?>';
-		//alert(ReqType);
-		$.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				//alert(data);
-				$("#EditAvlBudAmt").val(data);
-			}
-						
-		
-		}
-		  });
 		
 		
 		
@@ -3176,54 +3044,41 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 		 // For Binding Material list center for the selected Requistion Number	
 		$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-		//alert(Material.length);
-		 var isAdded = "0";
+		var isAdded = "0";
 		 for(i=0;i<Material.length;i++)
 		{
 		$.each(Material[i], function(idx, obj) {
 			
 				if(obj.ReqNo === id )
 				{
-					if(SelectedMaterialList.Mat.length > 0)
-					{
-					   
-						$.each(SelectedMaterialList.Mat, function(i, el){
-															
+								   
+						$.each(SelectedMaterialList.Mat, function(idx1, el){															
 							if (id == el.ReqNo )
 							{
-								if(el.materialCode != obj.MaterialCode)
+								
+								if(el.materialCode == obj.MaterialCode)
 								{
-									if($('#materialCode'+userid).val() != obj.MaterialCode)
-									{
-										alert("Inside No there:"+obj.MaterialCode);
-									$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-									isAdded  = "1";
-									}
 									
+										isAdded  = "1";
+										return false;																		
 								}
-							}
-							else if(id != el.ReqNo &&  isAdded == "0" )
-							{ 
-								if($('#materialCode'+userid).val() != obj.MaterialCode && el.materialCode != 		obj.MaterialCode	)
-								{   
-									alert("Inside other:"+obj.ReqNo + "id is:"+ id);
-									$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								else
+								{
+									isAdded  = "0";
 								}
+								
 							}
-							
+												
 					
 					});
 					
-					} 
-					else
-					{
-						//alert(obj.MaterialCode);
-						if($('#materialCode'+userid).val() != obj.MaterialCode)
+					
+						if(isAdded  == "0")
 						{
-							alert("Outside No Requist:"+obj.MaterialCode);
-						 $("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+							
+							$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 						}
-					}
+												
 				}
 			
 			
@@ -3516,7 +3371,7 @@ function populateValueMainFormForEditRevenueTax()
 {
 	  
 		var rows =  document.getElementById('revenueTax').rows.length;
-
+        //alert(rows);
 		var totBasicAmt = 0;
 		var totDiscountAmt = 0;
 		var totPackagingAmt = 0;
@@ -3528,21 +3383,32 @@ function populateValueMainFormForEditRevenueTax()
 		var totFreightAmt = 0;
 		var totInsuranceAmt = 0;
 		var totOrderSummaryAmt = 0;
-		
-	   for (i = 1; i < rows; i++) { 
+		var i = 0;
+	   do {
+		   i += 1;
+		    
+			 
+			 var tr= document.getElementById(i);
+			 //alert(tr);
+			 if(tr != null)
+			 {
+			 cells = tr.getElementsByTagName('td');
+					
 			
-		var Packaging = $('#AfterPackVal'+i).val() == '' ? '0.00' : $('#AfterPackVal'+i).val();
-		var ExciseDuty = $('#AfterExciseVal'+i).val() == '' ? '0.00' : $('#AfterExciseVal'+i).val();
-		var Vat  = $('#AfterVatVal'+i).val() == '' ? '0.00' : $('#AfterVatVal'+i).val();
-		var CST  =$('#AfterCSTVal'+i).val() == '' ? '0.00' : $('#AfterCSTVal'+i).val();
-	    var GST  = $('#AfterGSTVal'+i).val() == '' ? '0.00' : $('#AfterGSTVal'+i).val();
-		var OtherTax  = $('#AfterOtherTaxVal'+i).val() == '' ? '0.00' : $('#AfterOtherTaxVal'+i).val();
-		var Freight  = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
-		var Insurance    = $('#Insval'+i).val() == '' ? '0.00' : $('#Insval'+i).val();
-		var Discount   =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
-	    var BasicVal   = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
-		var TotalVal =$('#TotalOrderValue'+i).val() == '' ? '0.00' : $('#TotalOrderValue'+i).val();
-		
+		     var rowid = cells[0].innerHTML;
+			// alert(rowid);
+		var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
+		var ExciseDuty = $('#AfterExciseVal'+rowid).val() == '' ? '0.00' : $('#AfterExciseVal'+rowid).val();
+		var Vat  = $('#AfterVatVal'+rowid).val() == '' ? '0.00' : $('#AfterVatVal'+rowid).val();
+		var CST  =$('#AfterCSTVal'+rowid).val() == '' ? '0.00' : $('#AfterCSTVal'+rowid).val();
+	    var GST  = $('#AfterGSTVal'+rowid).val() == '' ? '0.00' : $('#AfterGSTVal'+rowid).val();
+		var OtherTax  = $('#AfterOtherTaxVal'+rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal'+rowid).val();
+		var Freight  = $('#AfterFreightVal'+rowid).val() == '' ? '0.00' : $('#AfterFreightVal'+rowid).val();
+		var Insurance    = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val();
+		var Discount   =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
+	    var BasicVal   = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
+		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
+		//alert(TotalVal);
 		
 		
 		totBasicAmt  = parseFloat(totBasicAmt ) + parseFloat(BasicVal);
@@ -3556,10 +3422,11 @@ function populateValueMainFormForEditRevenueTax()
 		totFreightAmt  = parseFloat(totFreightAmt ) + parseFloat(Freight);
 		totInsuranceAmt  = parseFloat(totInsuranceAmt ) + parseFloat(Insurance);
 		totOrderSummaryAmt  = parseFloat(totOrderSummaryAmt ) + parseFloat(TotalVal);
+			 }
 		
-		}    
-				
-
+ }		while (i < rows);  
+	  		
+       alert(totOrderSummaryAmt);
 		$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2)  );
 		$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2)  );
 		$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2)  );
@@ -3776,7 +3643,7 @@ function DeleteRow(rowid)
 					DelRows=  "0" + ":" + rowid;
 					}
 				$('#txtDeletedRow').val(DelRows);				
-					
+				
 			 $.ajax({ 
 			data:{id:id},
 			type:"POST",
@@ -3795,12 +3662,72 @@ function DeleteRow(rowid)
 		}});  
 			}		   
 		
-		  
+		   populateValueMainFormForDeleteItem(rowid);	
 		  
 		}
        	
 } 
+function populateValueMainFormForDeleteItem(rowid)
+{
+	  
+		
+       // alert(rows);
+		var totBasicAmt = $('#txtTotBasicAmount').val();
+		var totDiscountAmt = $('#txtTotalDiscount').val();;
+		var totPackagingAmt = $('#txtTotalPackaing').val();;
+		var totExciseAmt = $('#txtTotExciseDuty').val();;
+		var totVATAmt = $('#txtTotalVat').val();;
+		var totCSTAmt = $('#txtTotCST').val();;
+		var totGSTAmt = $('#txtTotalGST').val();;
+		var totOtherTaxAmt = $('#txtTotalOtherTaxes').val();;
+		var totFreightAmt = $('#txtTotalFreight').val();;
+		var totInsuranceAmt = $('#txtTotalInsurance').val();;
+		var totOrderSummaryAmt = $('#txtTotalOrderValueSummary').val();;
+		
+	  
+			
+		var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
+		var ExciseDuty = $('#AfterExciseVal'+rowid).val() == '' ? '0.00' : $('#AfterExciseVal'+rowid).val();
+		var Vat  = $('#AfterVatVal'+rowid).val() == '' ? '0.00' : $('#AfterVatVal'+rowid).val();
+		var CST  =$('#AfterCSTVal'+rowid).val() == '' ? '0.00' : $('#AfterCSTVal'+rowid).val();
+	    var GST  = $('#AfterGSTVal'+rowid).val() == '' ? '0.00' : $('#AfterGSTVal'+rowid).val();
+		var OtherTax  = $('#AfterOtherTaxVal'+rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal'+rowid).val();
+		var Freight  = $('#AfterFreightVal'+rowid).val() == '' ? '0.00' : $('#AfterFreightVal'+rowid).val();
+		var Insurance    = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val();
+		var Discount   =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
+	    var BasicVal   = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
+		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
+		//alert(TotalVal);
+		
+		
+		totBasicAmt  = parseFloat(totBasicAmt ) - parseFloat(BasicVal);
+		totDiscountAmt  = parseFloat(totDiscountAmt ) - parseFloat(Discount);
+		totPackagingAmt  = parseFloat(totPackagingAmt) - parseFloat(Packaging);
+		totExciseAmt  = parseFloat(totExciseAmt) - parseFloat(ExciseDuty);
+		totVATAmt  = parseFloat(totVATAmt ) - parseFloat(Vat);
+		totCSTAmt  = parseFloat(totCSTAmt ) - parseFloat(CST);
+		totGSTAmt  = parseFloat(totGSTAmt ) - parseFloat(GST);
+		totOtherTaxAmt  = parseFloat(totOtherTaxAmt ) - parseFloat(OtherTax);
+		totFreightAmt  = parseFloat(totFreightAmt ) - parseFloat(Freight);
+		totInsuranceAmt  = parseFloat(totInsuranceAmt ) - parseFloat(Insurance);
+		totOrderSummaryAmt  = parseFloat(totOrderSummaryAmt ) - parseFloat(TotalVal);
+		
+		   
+				
 
+		$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2)  );
+		$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2)  );
+		$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2)  );
+		$('#txtTotExciseDuty').val(parseFloat(totExciseAmt).toFixed(2)  );
+		$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)  );
+		$('#txtTotCST').val(parseFloat(totCSTAmt).toFixed(2) );
+		$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)  );
+		$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2) );
+		$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2) );
+		$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2) );
+		$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2)  );
+		
+}
 function Save(status)
 {  
 if(status == '0')
diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php
index 93a953dd..b6b95fbf 100644
--- a/application/views/purchaseorder.php
+++ b/application/views/purchaseorder.php
@@ -4,6 +4,7 @@ $CompanyAddress = '';
 $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
 $CurrentDate =  $dt->format('Y-m-d');
 $MaxPoDate = '';
+$AvlAmount = 0;
 if(!empty($MaxPODate))
 {
     foreach ($MaxPODate as $date)
@@ -18,6 +19,12 @@ if(!empty($CompanyDetails))
 		$CompanyAddress = $Req->Address;
 	}
 }
+if(!empty($AvlBudAmt))
+{
+   
+		$AvlAmount = $AvlBudAmt;		
+	
+}
 ?>
 <style>
             
@@ -108,7 +115,7 @@ $('#ReqNo').change(function() {
     
  var id = $('#ReqNo').val();
  $("#deptName").val('');
- $("#CostCenter").empty();
+ $("#CostCenter").val('');
   $("#MaterialCode").empty();
   $("#ItemName").val('');
 $("#UOM").val('');
@@ -116,32 +123,25 @@ $("#Quantity").val('');
 $("#ItemName").val('');
 $("#Rate").val('');
 $("#txtBasicValue").val('');
+$("#AvlBudAmt").val('');	
  resetTaxField();
 		if(id != '0')
 		{
 			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-			var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
+			
 			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			 
+			var AvlBudAmt = '<?php echo $AvlAmount ?>';  
 			
 		// For Binding DepartmentName	           			
 		$.each(y, function(idx, obj) {
 			if(obj.ReqNo === id)
 			{
 				$("#deptName").val(obj.DepartmentName);
-				
+				$("#CostCenter").val(obj.CostCenterCode);
 			}			
 		});
-			// For Binding Cost center for the selected department	
-		$("#CostCenter").append( $('<option></option>').val("0").html("Select Cost Center") );
-		$.each(cost, function(idx, obj) {
-			if(obj.ReqNo === id )
-			{
-				$("#CostCenter").append( $('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName) );
-				
-			}
+		$("#AvlBudAmt").val(AvlBudAmt);			
 			
-		});
 		
 		// For Binding Material list center for the selected Requistion Number	
 		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
@@ -153,44 +153,28 @@ $("#txtBasicValue").val('');
 			
 				if(obj.ReqNo === id )
 				{
-					if(SelectedMaterialList.Mat.length > 0)
-					{					   
+									   
 						$.each(SelectedMaterialList.Mat, function(idx1, el){															
 							if (id == el.ReqNo )
 							{
-								if(el.materialCode != obj.MaterialCode)
+															
+								if(el.materialCode == obj.MaterialCode)
 								{
-									//alert(obj.MaterialCode);
-										//alert("Inside No there:"+obj.MaterialCode);
-										$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 										isAdded  = "1";
 										return false;																		
 								}
 								else
 								{
-									alert(obj.MaterialCode);
-									isAdded  = "1";
-									return false;
+									isAdded  = "0";
 								}
+								
 							}
-							else if(id != el.ReqNo )
-							{ 
-								alert(el.ReqNo + "Selected Id:"+id);
-								if( el.materialCode != 	obj.MaterialCode && isAdded  == "0"	)
-								{   
-									alert("Inside other:"+el.materialCode + "id is:"+ id);
-									$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-									return false;
-								}
-							}							
-					
 					});
 					
-					} 
-					
-						else 
+					 
+						if(isAdded  == "0")
 						{
-							alert("Outside No Requist:"+obj.MaterialCode);
+							
 							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 						}
 												
@@ -281,74 +265,8 @@ $("#txtEditBasicValue").val('');
   
 });
 
-$('#CostCenter').change(function() {
-    
- var id = $('#CostCenter').val();
- $("#AvlBudAmt").val('');
- var ReqType =$('#POType').val();
-		if(id != '0')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#AvlBudAmt").val(data);
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}			
-		
-		}
-		  });
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});	
-$('#EditCostCenter').change(function() {
-    
- var id = $('#EditCostCenter').val();
- $("#EditAvlBudAmt").val('');
- var ReqTpe =$('#POType').val();
-		if(id != '0')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqTpe, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#EditAvlBudAmt").val(data);
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}			
-		
-		}
-		  });
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});	
+
+
 /* Revenue Tax calcualation */
 
  $('#DiscountType').change(function() {
@@ -2088,10 +2006,9 @@ body {
 								   <label>Cost Center Name</label>
 											<div class="form-group">
 														<?php
-								$options = array("0"=>'Select Cost Center');  													
-					
-								echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
-
+							
+									$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
 								?>		
 											</div>
 								 </div>
@@ -2479,11 +2396,9 @@ body {
 								  <div class="col-md-3">
 								   <label>Cost Center Name</label>
 											<div class="form-group">
-														<?php
-								$options = array("0"=>'Select Cost Center');  													
-					
-								echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
-
+														<?php								
+										$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
 								?>		
 											</div>
 								 </div>
@@ -3039,7 +2954,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		
 		$('#EditReqNo').val($('#Reqnumber'+userid).val());
 		$('#EditdeptName').val($('#departmentName'+userid).val());
-		
+		$("#EditCostCenter").val($('#costCode'+userid).val());
 		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
 		
 		$('#EditItemName').val($('#materialName'+userid).val());
@@ -3047,7 +2962,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		$('#EditQuantity').val($('#quantity'+userid).val());
 		$('#EditRate').val($('#itemRate'+userid).val());
 		$('#txtEditBasicValue').val(cellval[6].innerHTML);
-		
+		RequistQuantity = $('#quantity'+userid).val();
 		$('#txtEditDiscount').val($('#DisVal'+userid).val());
 		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
 		$('#txtEditVat').val($('#VatVal'+userid).val());
@@ -3069,82 +2984,54 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		
 		$('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val());
 		
-		$("#EditCostCenter").empty();
-	   var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
-	   var CostName = '';
-	   $.each(cost, function(idx, obj) {
-			
-		if( obj.CostCenterCode === $('#costCode'+userid).val())
-			{
-				CostName = 	obj.CostCenterName	;
-		} });
-	 
-	   // For Binding Cost center for the selected department	
-		$("#EditCostCenter").append( $('<option></option>').val($('#costCode'+userid).val()).html($('#costCode'+userid).val() + "-" + CostName) );
-		$.each(cost, function(idx, obj) {
-			
-		if(obj.ReqNo === $('#Reqnumber'+userid).val() && obj.CostCenterCode != $('#costCode'+userid).val())
-			{
-				$("#EditCostCenter").append( $('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName) );		
-			
-		} });
+		
 		
 		$("#EditMaterialCode").empty();
 		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 		 // For Binding Material list center for the selected Requistion Number	
 		$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-		 var isAdded = "0";
+		
+		var isAdded = "0";
 		 for(i=0;i<Material.length;i++)
 		{
 		$.each(Material[i], function(idx, obj) {
 			
 				if(obj.ReqNo === id )
 				{
-					if(SelectedMaterialList.Mat.length > 0)
-					{
-					   
-						$.each(SelectedMaterialList.Mat, function(i, el){
-															
+								   
+						$.each(SelectedMaterialList.Mat, function(idx1, el){															
 							if (id == el.ReqNo )
 							{
-								if(el.materialCode != obj.MaterialCode)
+								
+								if(el.materialCode == obj.MaterialCode)
 								{
-									if($('#materialCode'+userid).val() != obj.MaterialCode)
-									{
-										alert("Inside No there:"+obj.MaterialCode);
-									$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-									isAdded  = "1";
-									}
 									
+										isAdded  = "1";
+										return false;																		
 								}
-							}
-							else if(id != el.ReqNo &&  isAdded == "0" )
-							{ 
-								if($('#materialCode'+userid).val() != obj.MaterialCode && el.materialCode != 		obj.MaterialCode	)
-								{   
-									alert("Inside other:"+obj.ReqNo + "id is:"+ id);
-									$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								else
+								{
+									isAdded  = "0";
 								}
+								
 							}
-							
+												
 					
 					});
 					
-					} 
-					else
-					{
-						//alert(obj.MaterialCode);
-						if($('#materialCode'+userid).val() != obj.MaterialCode)
+					
+						if(isAdded  == "0")
 						{
-							alert("Outside No Requist:"+obj.MaterialCode);
-						 $("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+							
+							$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 						}
-					}
+												
 				}
 			
 			
 		});
 		}
+		
 		$("#EditDiscountType").val($('#DisType'+userid).val());
 		$("#drpEditFreight").val($('#FreightType'+userid).val());
 		$("#EditPackagingType").val($('#PackType'+userid).val())
@@ -3433,7 +3320,7 @@ function populateValueMainFormForEditRevenueTax()
 {
 	  
 		var rows =  document.getElementById('revenueTax').rows.length;
-       // alert(rows);
+        //alert(rows);
 		var totBasicAmt = 0;
 		var totDiscountAmt = 0;
 		var totPackagingAmt = 0;
@@ -3445,20 +3332,31 @@ function populateValueMainFormForEditRevenueTax()
 		var totFreightAmt = 0;
 		var totInsuranceAmt = 0;
 		var totOrderSummaryAmt = 0;
-		
-	   for (i = 1; i < rows-1; i++) { 
+		var i = 0;
+	   do {
+		   i += 1;
+		    
+			 
+			 var tr= document.getElementById(i);
+			 //alert(tr);
+			 if(tr != null)
+			 {
+			 cells = tr.getElementsByTagName('td');
+					
 			
-		var Packaging = $('#AfterPackVal'+i).val() == '' ? '0.00' : $('#AfterPackVal'+i).val();
-		var ExciseDuty = $('#AfterExciseVal'+i).val() == '' ? '0.00' : $('#AfterExciseVal'+i).val();
-		var Vat  = $('#AfterVatVal'+i).val() == '' ? '0.00' : $('#AfterVatVal'+i).val();
-		var CST  =$('#AfterCSTVal'+i).val() == '' ? '0.00' : $('#AfterCSTVal'+i).val();
-	    var GST  = $('#AfterGSTVal'+i).val() == '' ? '0.00' : $('#AfterGSTVal'+i).val();
-		var OtherTax  = $('#AfterOtherTaxVal'+i).val() == '' ? '0.00' : $('#AfterOtherTaxVal'+i).val();
-		var Freight  = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
-		var Insurance    = $('#Insval'+i).val() == '' ? '0.00' : $('#Insval'+i).val();
-		var Discount   =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
-	    var BasicVal   = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
-		var TotalVal =$('#TotalOrderValue'+i).val() == '' ? '0.00' : $('#TotalOrderValue'+i).val();
+		     var rowid = cells[0].innerHTML;
+			// alert(rowid);
+		var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
+		var ExciseDuty = $('#AfterExciseVal'+rowid).val() == '' ? '0.00' : $('#AfterExciseVal'+rowid).val();
+		var Vat  = $('#AfterVatVal'+rowid).val() == '' ? '0.00' : $('#AfterVatVal'+rowid).val();
+		var CST  =$('#AfterCSTVal'+rowid).val() == '' ? '0.00' : $('#AfterCSTVal'+rowid).val();
+	    var GST  = $('#AfterGSTVal'+rowid).val() == '' ? '0.00' : $('#AfterGSTVal'+rowid).val();
+		var OtherTax  = $('#AfterOtherTaxVal'+rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal'+rowid).val();
+		var Freight  = $('#AfterFreightVal'+rowid).val() == '' ? '0.00' : $('#AfterFreightVal'+rowid).val();
+		var Insurance    = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val();
+		var Discount   =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
+	    var BasicVal   = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
+		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
 		//alert(TotalVal);
 		
 		
@@ -3473,10 +3371,11 @@ function populateValueMainFormForEditRevenueTax()
 		totFreightAmt  = parseFloat(totFreightAmt ) + parseFloat(Freight);
 		totInsuranceAmt  = parseFloat(totInsuranceAmt ) + parseFloat(Insurance);
 		totOrderSummaryAmt  = parseFloat(totOrderSummaryAmt ) + parseFloat(TotalVal);
+			 }
 		
-		}    
-				
-
+ }		while (i < rows);  
+	  		
+       alert(totOrderSummaryAmt);
 		$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2)  );
 		$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2)  );
 		$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2)  );
@@ -3612,9 +3511,71 @@ function DeleteRow(rowid)
 			  DelRows=  "0" + ":" + rowid;
 		  }
 		  $('#txtDeletedRow').val(DelRows);
+		 populateValueMainFormForDeleteItem(rowid);
 		}
        	
 } 
+
+function populateValueMainFormForDeleteItem(rowid)
+{
+	  
+		
+       // alert(rows);
+		var totBasicAmt = $('#txtTotBasicAmount').val();
+		var totDiscountAmt = $('#txtTotalDiscount').val();;
+		var totPackagingAmt = $('#txtTotalPackaing').val();;
+		var totExciseAmt = $('#txtTotExciseDuty').val();;
+		var totVATAmt = $('#txtTotalVat').val();;
+		var totCSTAmt = $('#txtTotCST').val();;
+		var totGSTAmt = $('#txtTotalGST').val();;
+		var totOtherTaxAmt = $('#txtTotalOtherTaxes').val();;
+		var totFreightAmt = $('#txtTotalFreight').val();;
+		var totInsuranceAmt = $('#txtTotalInsurance').val();;
+		var totOrderSummaryAmt = $('#txtTotalOrderValueSummary').val();		
+	  
+			
+		var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
+		var ExciseDuty = $('#AfterExciseVal'+rowid).val() == '' ? '0.00' : $('#AfterExciseVal'+rowid).val();
+		var Vat  = $('#AfterVatVal'+rowid).val() == '' ? '0.00' : $('#AfterVatVal'+rowid).val();
+		var CST  =$('#AfterCSTVal'+rowid).val() == '' ? '0.00' : $('#AfterCSTVal'+rowid).val();
+	    var GST  = $('#AfterGSTVal'+rowid).val() == '' ? '0.00' : $('#AfterGSTVal'+rowid).val();
+		var OtherTax  = $('#AfterOtherTaxVal'+rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal'+rowid).val();
+		var Freight  = $('#AfterFreightVal'+rowid).val() == '' ? '0.00' : $('#AfterFreightVal'+rowid).val();
+		var Insurance    = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val();
+		var Discount   =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
+	    var BasicVal   = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
+		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
+		//alert(TotalVal);
+		
+		
+		totBasicAmt  = parseFloat(totBasicAmt ) - parseFloat(BasicVal);
+		totDiscountAmt  = parseFloat(totDiscountAmt ) - parseFloat(Discount);
+		totPackagingAmt  = parseFloat(totPackagingAmt) - parseFloat(Packaging);
+		totExciseAmt  = parseFloat(totExciseAmt) - parseFloat(ExciseDuty);
+		totVATAmt  = parseFloat(totVATAmt ) - parseFloat(Vat);
+		totCSTAmt  = parseFloat(totCSTAmt ) - parseFloat(CST);
+		totGSTAmt  = parseFloat(totGSTAmt ) - parseFloat(GST);
+		totOtherTaxAmt  = parseFloat(totOtherTaxAmt ) - parseFloat(OtherTax);
+		totFreightAmt  = parseFloat(totFreightAmt ) - parseFloat(Freight);
+		totInsuranceAmt  = parseFloat(totInsuranceAmt ) - parseFloat(Insurance);
+		totOrderSummaryAmt  = parseFloat(totOrderSummaryAmt ) - parseFloat(TotalVal);
+		
+		   
+				
+
+		$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2)  );
+		$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2)  );
+		$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2)  );
+		$('#txtTotExciseDuty').val(parseFloat(totExciseAmt).toFixed(2)  );
+		$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)  );
+		$('#txtTotCST').val(parseFloat(totCSTAmt).toFixed(2) );
+		$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)  );
+		$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2) );
+		$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2) );
+		$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2) );
+		$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2)  );
+		
+}
 function Save(status)
 {  
 if(status == '0')
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index c16caa0b..f17e4d3f 100644
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -3,6 +3,7 @@ $CompanyAddress = '';
 $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
 $CurrentDate =  $dt->format('Y-m-d');
 $MaxPoDate = '';
+$AvlAmount = 0;
 if(!empty($MaxPODate))
 {
     foreach ($MaxPODate as $date)
@@ -17,6 +18,12 @@ if(!empty($CompanyDetails))
 		$CompanyAddress = $Req->Address;
 	}
 }
+if(!empty($AvlBudAmt))
+{
+   
+		$AvlAmount = $AvlBudAmt;		
+	
+}
 ?>
 <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
 <script>
@@ -26,6 +33,9 @@ var AvilBudAmt = '';
   var d = new Date(POMaxDate);
    var SelectedMaterialCode = [];
  var CollIndex = 0;
+  var SelectedMaterialList = {
+    Mat: []
+};
  $(function() {  
  
  $("#PODate").datepicker({
@@ -71,7 +81,7 @@ $('#ReqNo').change(function() {
     
  var id = $('#ReqNo').val();
  $("#AvlBudAmt").val('');
- $("#CostCenter").empty();
+
   $("#MaterialCode").empty();
   $("#deptName").val('');
  $("#UOM").val('');
@@ -79,66 +89,73 @@ $("#Quantity").val('');
 $("#ItemName").val('');
 $("#Rate").val('');
 $("#txtBasicValue").val('');
+ $("#CostCenter").val('');
  clearTaxField();
 		if(id != '0')
 		{
 			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-			var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
+			
 			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			//alert(Material);
+			var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
 			
 		// For Binding DepartmentName	           			
 		$.each(y, function(idx, obj) {
 			if(obj.ReqNo === id)
 			{
 				$("#deptName").val(obj.DepartmentName);
+				$("#CostCenter").val(obj.CostCenterCode);
 				
 			}			
 		});
-			// For Binding Cost center for the selected department	
-		$("#CostCenter").append( $('<option></option>').val("0").html("Select Cost Center") );
-		$.each(cost, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#CostCenter").append( $('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName) );
-				
-			}
+		$("#AvlBudAmt").val(AvlBudAmt);	
+			
 			
-		});
 		// For Binding Material list center for the selected Requistion Number	
 		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-		for(i=0;i<Material.length;i++)
+		var isAdded = "0";
+		 for(i=0;i<Material.length;i++)
 		{
 		$.each(Material[i], function(idx, obj) {
 			
 				if(obj.ReqNo === id )
 				{
-					if(SelectedMaterialCode.length > 0)
-					{
-					for (i = 0; i < CollIndex; i++) { 
-						if( SelectedMaterialCode[i] != obj.MaterialCode)
-						 {
-						 $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName) );
+									   
+						$.each(SelectedMaterialList.Mat, function(idx1, el){															
+							if (id == el.ReqNo )
+							{
+															
+								if(el.materialCode == obj.MaterialCode)
+								{
+										isAdded  = "1";
+										return false;																		
+								}
+								else
+								{
+									isAdded  = "0";
+								}
+								
+							}
+					});
+					
+					 
+						if(isAdded  == "0")
+						{
+							
+							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 						}
-						
-						}
-					}
-					else
-					{
-						 $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-					}
+												
 				}
 			
 			
 		});
 		}
-			
 		}
 		else
 		{
 			alert('Please select the Requisition Number');
 			return false;
 		}
+		id = '';
   
 });	
 $('#MaterialCode').change(function() {
@@ -177,41 +194,6 @@ $("#txtBasicValue").val('');
   
 });
 
-$('#CostCenter').change(function() {
-    
- var id = $('#CostCenter').val();
- $("#AvlBudAmt").val('');
- var ReqType =$('#POType').val();
-
-		if(id != '0')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#AvlBudAmt").val(data);
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}			
-		
-		}
-		  });
-		}
-		else
-		{
-			alert('Please select the CostCenter');
-			return false;
-		}
-  
-});
 
 $('#EditMaterialCode').change(function() {
     
@@ -249,41 +231,9 @@ $("#txtEditBasicValue").val('');
   
 });
 
-$('#EditCostCenter').change(function() {
-    
- var id = $('#EditCostCenter').val();
- $("#EditAvlBudAmt").val('');
- var ReqType =$('#POType').val();
-		if(id != '0')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				//salert(data);
-				$("#EditAvlBudAmt").val(data);
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}
-		  });
-		}
-		else
-		{
-			alert('Please select the CostCenter');
-			return false;
-		}
-  
+
 });	
-});
+
 
 function Ratechange(){
 	 
@@ -745,12 +695,8 @@ function clearEditTaxField()
 						   <label>Cost Center Name</label>
 									<div class="form-group">
 												<?php
-						$options = array("0"=>'Select Cost Center');     
-						//print_r(  $options);
-						
-														
-			
-						echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
+						$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
 
 						?>		
 									</div>
@@ -983,9 +929,8 @@ function clearEditTaxField()
 						   <label>Cost Center Name</label>
 									<div class="form-group">
 												<?php
-						$options = array("0"=>'Select Cost Center');     
-									
-						echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
+						$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
 
 						?>		
 									</div>
@@ -1328,12 +1273,13 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		
 		$('#EditReqNo').val($('#Reqnumber'+userid).val());
 		$('#EditdeptName').val($('#departmentName'+userid).val());
-		
+		$("#EditCostCenter").val($('#costCode'+userid).val());
 		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
 		
 		$('#EditItemName').val($('#materialName'+userid).val());
 		$('#EditUOM').val($('#uom'+userid).val());
 		$('#EditQuantity').val($('#quantity'+userid).val());
+		RequistQuantity = $('#quantity'+userid).val();
 		$('#EditRate').val($('#itemRate'+userid).val());
 		$('#txtEditBasicValue').val(cellval[6].innerHTML);
 		$('#EditAfterServiceTax').val($('#ServiceTax'+userid).val());
@@ -1343,46 +1289,47 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		$('#EditAfterSwachhTax').val($('#SwachhTax'+userid).val());
 		$('#EditTotalOrderValue').val(cellval[8].innerHTML);
 		
-		$("#EditCostCenter").empty();
-	   var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
-	  // alert(cost);
-	   //alert(cost);
-	   // For Binding Cost center for the selected department	
-		$("#EditCostCenter").append( $('<option></option>').val($('#costCode'+userid).val()).html($('#costCode'+userid).val()) );
-		$.each(cost, function(idx, obj) {
-			
-		if(obj.ReqNo === $('#Reqnumber'+userid).val())
-			{
-				$("#EditCostCenter").append( $('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName) );
-				//alert(obj.ReqNo);
-			}
-			
-		});
+		
 		
 		$("#EditMaterialCode").empty();
 		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 		 // For Binding Material list center for the selected Requistion Number	
 		$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
+		var isAdded = "0";
 		 for(i=0;i<Material.length;i++)
 		{
 		$.each(Material[i], function(idx, obj) {
 			
 				if(obj.ReqNo === id )
 				{
-					if(SelectedMaterialCode.length > 0)
-					{
-					for (i = 0; i < CollIndex; i++) { 
-						if( SelectedMaterialCode[i] != obj.MaterialCode)
-						 {
-						 $("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName) );
+								   
+						$.each(SelectedMaterialList.Mat, function(idx1, el){															
+							if (id == el.ReqNo )
+							{
+								
+								if(el.materialCode == obj.MaterialCode)
+								{
+									
+										isAdded  = "1";
+										return false;																		
+								}
+								else
+								{
+									isAdded  = "0";
+								}
+								
+							}
+												
+					
+					});
+					
+					
+						if(isAdded  == "0")
+						{
+							
+							$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 						}
-						
-						}
-					}
-					else
-					{
-						 $("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-					}
+												
 				}
 			
 			
@@ -1435,6 +1382,12 @@ $('.AddService').click(function(){
 		 
 		  SelectedMaterialCode[CollIndex] = materialCode;
 			CollIndex = CollIndex + 1;
+			
+			SelectedMaterialList.Mat.push({ 
+        "materialCode" :  materialCode,
+        "ReqNo"  : Reqnumber,
+      
+		});	
 		 
 		 populateValueMainFormForServiceTax();	 
 		
@@ -1446,7 +1399,7 @@ $('.AddService').click(function(){
 	     
           $('#ServiceAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue}));
 		  
-		 clearServiceModalFields
+		
 		 
 		 var theForm = $(".ServicePO");
 		
@@ -1469,6 +1422,7 @@ $('.AddService').click(function(){
 		  addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);		
 		
 		  $('#txtRowCount').val(temp); 
+		   clearServiceModalFields();
 		 
       	  }	  
    
@@ -1595,17 +1549,27 @@ function populateValueMainFormForEditServiceTax()
 		var TotSwachhTax = 0;
 		var TotSummary = 0;
 		var TotBasicAmout = 0;
-	   for (i = 1; i < rows-1; i++) { 
+	  var i = 0;
+	   do {
+		   i += 1;
+		   var tr= document.getElementById(i);
+			 //alert(tr);
+			 if(tr != null)
+			 {
+			 cells = tr.getElementsByTagName('td');
+					
 			
-		var AfterServiceTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val();
-		var AfterEduCess = $('#EduCess'+i).val() == '' ? '0.00' : $('#EduCess'+i).val();
-		var AfterSecHighTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val();
-		var AfterKrishiTax =$('#KrishiTax'+i).val() == '' ? '0.00' : $('#KrishiTax'+i).val();
-	    var AfterSwachhTax = $('#SwachhTax'+i).val() == '' ? '0.00' : $('#SwachhTax'+i).val();
-		var TotalVal =$('#TotalOrderValue'+i).val() == '' ? '0.00' : $('#TotalOrderValue'+i).val();
+		     var rowid = cells[0].innerHTML;
+			
+		var AfterServiceTax = $('#ServiceTax'+rowid).val() == '' ? '0.00' : $('#ServiceTax'+rowid).val();
+		var AfterEduCess = $('#EduCess'+rowid).val() == '' ? '0.00' : $('#EduCess'+rowid).val();
+		var AfterSecHighTax = $('#SecHighTax'+rowid).val() == '' ? '0.00' : $('#SecHighTax'+rowid).val();
+		var AfterKrishiTax =$('#KrishiTax'+rowid).val() == '' ? '0.00' : $('#KrishiTax'+rowid).val();
+	    var AfterSwachhTax = $('#SwachhTax'+rowid).val() == '' ? '0.00' : $('#SwachhTax'+rowid).val();
+		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
 		
-		var Quantity = $('#quantity'+i).val() == '' ? '0.00' : $('#quantity'+i).val();
-		var ItemRate = $('#itemRate'+i).val() == '' ? '0.00' : $('#itemRate'+i).val();	
+		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
+		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();	
 		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
 		
 		TotServiceTax = parseFloat(TotServiceTax) + parseFloat(AfterServiceTax);
@@ -1617,7 +1581,9 @@ function populateValueMainFormForEditServiceTax()
 		TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
 		
 		}    
-				
+			
+		
+ }		while (i < rows);  	
 
 		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
 		$('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
@@ -1676,7 +1642,13 @@ function DeleteRow(rowid)
 		
 			
 		  SelectedMaterialCode.splice( SelectedMaterialCode.indexOf('removeItem'), 1 );
-	
+			$.each(SelectedMaterialList.Mat, function(i, el){
+	    
+			if (this.materialCode == removeItem){//Type = '';
+		          SelectedMaterialList.Mat.splice(i, 1);
+		}
+		});
+		
 		  if(DelRows != '')
 		  {
 		  DelRows = DelRows + ":" + rowid;
@@ -1686,10 +1658,60 @@ function DeleteRow(rowid)
 			  DelRows=  "0" + ":" + rowid;
 		  }
 		  $('#txtDeletedRow').val(DelRows);
+		   populateValueMainFormForDeleteItem(rowid);
 		}
        	
 } 
 
+function populateValueMainFormForDeleteItem(rowid)
+{
+	  
+		
+       // alert(rows);
+		var TotServiceTax = $('#txtTotalServiceTax'+rowid).val();
+		var TotEduCess = $('#txtTotalEducess'+rowid).val();
+		var TotSecHighTax = $('#txtTotHigherEdu'+rowid).val();
+		var TotKrishiTax = $('#txtTotalKrishiKalyan'+rowid).val();
+		var TotSwachhTax = $('#txtTotSwachhBharat'+rowid).val();
+		var TotSummary = $('#TotalOrderValue'+rowid).val();
+		var TotBasicAmout = $('#txtTotalOrderValueSummary'+rowid).val();
+		
+	  
+			
+		var AfterServiceTax = $('#ServiceTax'+rowid).val() == '' ? '0.00' : $('#ServiceTax'+rowid).val();
+		var AfterEduCess = $('#EduCess'+rowid).val() == '' ? '0.00' : $('#EduCess'+rowid).val();
+		var AfterSecHighTax = $('#SecHighTax'+rowid).val() == '' ? '0.00' : $('#SecHighTax'+rowid).val();
+		var AfterKrishiTax =$('#KrishiTax'+rowid).val() == '' ? '0.00' : $('#KrishiTax'+rowid).val();
+	    var AfterSwachhTax = $('#SwachhTax'+rowid).val() == '' ? '0.00' : $('#SwachhTax'+rowid).val();
+		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
+		
+		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
+		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();	
+		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
+		//alert(TotalVal);
+		
+		TotServiceTax = parseFloat(TotServiceTax) -  parseFloat(AfterServiceTax);
+		TotEduCess = parseFloat(TotEduCess) - parseFloat(AfterEduCess);
+		TotSecHighTax = parseFloat(TotSecHighTax) - parseFloat(AfterSecHighTax);
+		TotKrishiTax = parseFloat(TotKrishiTax) - parseFloat(AfterKrishiTax);
+		TotSwachhTax = parseFloat(TotSwachhTax) - parseFloat(AfterSwachhTax);
+		TotSummary = parseFloat(TotSummary) - parseFloat(TotalVal);
+		TotBasicAmout = parseFloat(TotBasicAmout) - parseFloat(BasicVal);
+		
+			
+		   
+		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
+		$('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
+		$('#txtTotHigherEdu').val(parseFloat(TotSecHighTax).toFixed(2) );
+		$('#txtTotalEducess').val(parseFloat(TotEduCess).toFixed(2) );
+		$('#txtTotalKrishiKalyan').val(parseFloat(TotKrishiTax).toFixed(2) );
+		$('#txtTotSwachhBharat').val(parseFloat(TotSwachhTax).toFixed(2) );
+		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );	
+
+		
+		
+}
+
 function validateServiceTax()
  {