diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 3478c50f..f49de933 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -2373,9 +2373,10 @@ function addNewImportPurchaseOrder()
 
 
 
-            /*This function is used to convert amount(digit) into words*/
+             /*This function is used to convert amount(digit) into words*/
 
-        public function convertNumber($amt){
+    public function convertNumber($amt){
+			//echo $amt;die();
 $ShowPaise='0';
 $totalAmt=explode(".",$amt);
 
@@ -2407,6 +2408,14 @@ $point=0;
     '30' => 'thirty', '40' => 'forty', '50' => 'fifty',
     '60' => 'sixty', '70' => 'seventy',
     '80' => 'eighty', '90' => 'ninety');
+	 $words1 = array('2' => 'twenty',
+    '3' => 'thirty', '4' => 'fourty',
+    '5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
+    '8' => 'eighty', '9' =>'ninty');
+	 $words12 = array('11' => 'eleven',
+    '12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',
+    '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
+    '18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',);
    $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
    while ($i < $digits_1) {
      $divider = ($i == 2) ? 10 : 100;
@@ -2414,8 +2423,10 @@ $point=0;
      $no = floor($no / $divider);
      $i += ($divider == 10) ? 1 : 2;
      if ($number) {
-        $plural = (($counter = count($str)) && $number > 9) ? 's' : null;
+        $plural = (($counter = count($str)) && $number > 1) ? 's' : null;
+		//print_r($plural);
         $hundred = ($counter == 1 && $str[0]) ? ' and ' : null;
+		//print_r($hundred);
         $str [] = ($number < 21) ? $words[$number] .
             " " . $digits[$counter] . $plural . " " . $hundred
             :
@@ -2426,18 +2437,30 @@ $point=0;
   }
   $str = array_reverse($str);
   $result = implode('', $str);
-
-  $points = ($point) ?
-    " " . $words[$point / 10] . " " . 
-          $words[$point = $point % 10] : '';
+  if($point>=1 && $point<=10)
+  {
+	 $points = ($point) ?
+          " " . $words[$point] : " ";  
+  }
+  else if($point>=11 && $point<=20)
+  {
+         $points = ($point) ?
+          " " . $words12[$point] : " ";
+  }
+  else
+  {
+	$points = ($point) ?
+          " " . $words1[$point / 10] . " " . 
+          $words[$point = $point % 10] : '';  
+  }
 
 if($ShowPaise=='0'){
 
-$amountInWords = "Rupee " . $result." Only";
+$amountInWords = "Rupees " . $result." Only";
 }
 else{
 
-$amountInWords = "Rupee " . $result ." Paise ". $points." Only";
+$amountInWords = "Rupees " . $result ." Paise ". $points." Only";
 }
   
 
@@ -2463,7 +2486,7 @@ $point=0;
 
    $i = 0;
    $str = array();
-   $words = array('0' => '', '1' => 'one', '2' => 'two',
+  $words = array('0' => '', '1' => 'one', '2' => 'two',
     '3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
     '7' => 'seven', '8' => 'eight', '9' => 'nine',
     '10' => 'ten', '11' => 'eleven', '12' => 'twelve',
@@ -2473,6 +2496,14 @@ $point=0;
     '30' => 'thirty', '40' => 'forty', '50' => 'fifty',
     '60' => 'sixty', '70' => 'seventy',
     '80' => 'eighty', '90' => 'ninety');
+	 $words1 = array('2' => 'twenty',
+    '3' => 'thirty', '4' => 'fourty',
+    '5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
+    '8' => 'eighty', '9' =>'ninty');
+	 $words12 = array('11' => 'eleven',
+    '12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',
+    '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
+    '18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',);
    $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
    while ($i < $digits_1) {
      $divider = ($i == 2) ? 10 : 100;
@@ -2480,8 +2511,10 @@ $point=0;
      $no = floor($no / $divider);
      $i += ($divider == 10) ? 1 : 2;
      if ($number) {
-        $plural = (($counter = count($str)) && $number > 9) ? 's' : null;
+        $plural = (($counter = count($str)) && $number > 1) ? 's' : null;
+		//print_r($plural);
         $hundred = ($counter == 1 && $str[0]) ? ' and ' : null;
+		//print_r($hundred);
         $str [] = ($number < 21) ? $words[$number] .
             " " . $digits[$counter] . $plural . " " . $hundred
             :
@@ -2492,10 +2525,22 @@ $point=0;
   }
   $str = array_reverse($str);
   $result = implode('', $str);
-
-  $points = ($point) ?
-    " " . $words[$point / 10] . " " . 
-          $words[$point = $point % 10] : '';
+  if($point>=1 && $point<=10)
+  {
+	 $points = ($point) ?
+          " " . $words[$point] : " ";  
+  }
+  else if($point>=11 && $point<=20)
+  {
+         $points = ($point) ?
+          " " . $words12[$point] : " ";
+  }
+  else
+  {
+	$points = ($point) ?
+          " " . $words1[$point / 10] . " " . 
+          $words[$point = $point % 10] : '';  
+  }
 
 if($ShowPaise=='0'){
 $amountInWords = $name." " . $result." Only";
diff --git a/application/views/AmendPOlist.php b/application/views/AmendPOlist.php
index e3fe57d9..d46b2229 100755
--- a/application/views/AmendPOlist.php
+++ b/application/views/AmendPOlist.php
@@ -18,8 +18,8 @@
               <center><h3 class="box-title"> Siddharth Industries - Amendment Purchase Order List </h3></center>
             </div>
             <!-- /.box-header -->
-            <div class="box-body" style="font-size:12px;">
-              <table id="example1" class="table table-bordered table-hover editableTable">
+            <div class="box-body" >
+              <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
                 <thead>
                 <tr style="background-color:#ddf">
 				<th>#</th>
diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index a0e13d52..dec8ec21 100755
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -51,7 +51,7 @@ if(!empty($POMaster))
     {
 
 		$SupId = $Req->SupplierID;
-        $SupName = $Req->SupplierName;
+                $SupName = $Req->SupplierName;
 		$Address = $Req->Address;
 		$pdt = new DateTime($Req->PODate);
 		$PODate =  $pdt->format('d-m-Y');
@@ -92,7 +92,8 @@ if(!empty($RequistionDetails))
 if(!empty($AvlBudAmt))
 {
    
-		$AvlAmount = number_format($AvlBudAmt, 2, '.', '');		
+		$AvlAmount = number_format($AvlBudAmt, 2, '.', '');
+              
 	
 }
 
@@ -243,135 +244,7 @@ $('#drpSupplier').change(function() {
   
 });	
 
-$('#ReqNo').change(function() {
-  
- var id = $('#ReqNo').val();
- $("#AvlBudAmt").val('');
-  $("#CostCenter").val('');
-  $("#MaterialCode").empty();
-  $("#deptName").val('');
- $("#UOM").val('');
-$("#Quantity").val('');
-$("#ItemName").val('');
-$("#Rate").val('');
-$("#txtBasicValue").val('');
- clearTaxField();
-$("#MaterialCode").empty();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-		
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 
-			var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
-			//ServiceTable
-                   var rows =  document.getElementById('ServiceTable').rows.length;
-
-if(DeletedMaterialCode!=undefined && DeletedMaterialCode!=''){
-  
-                                                                                $("#MaterialCode").append( $('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
-DeletedMaterialCode='';
-DeletedMaterialCode='';
-}
-
-for(i=2;i<=rows;i++){
-
-//var j=1;
-  $.each(Material[i], function(idx, obj) {
-
-    // j=j+1;
-           var materialCode = $('#materialCode'+i);
-
-
-
-
-                                    if(obj.materialCode == materialCode )
-                                    {
-                                    $("#MaterialCode").val('');
-                                    }
-
-                                 
-                                
-                               else{
-                                                                                $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-
-                        }
-
-
-                    });
-
-
-
-
-}		// For Binding DepartmentName	           			
-		$.each(y, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#deptName").val(obj.DepartmentName);
-				$("#CostCenter").val(obj.CostCenterCode);
-                                 if(obj.Service_Period!='' && obj.Service_Period!=null){
-                                $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
-                                $("#FrequencyNo").val(obj.NumberOfService);
-                                
-                               }
-                           else{
-                            var text='One Time';
-                              $("#Frequency").val(text);
-                              $("#FrequencyNo").val(1);
-                               }
-			}			
-		});
-			$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));	
-		// For Binding Material list center for the selected Requistion Number	
-                
-		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-									   
-						$.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
-		{
-			alert('Please select the Requisition Number');
-			return false;
-		}
-		id = '';
-  
-});
 	
 $('#MaterialCode').change(function() {
     
@@ -1993,185 +1866,7 @@ var userid  = '';
 
 
 
-$("#EDITSERVICE").on("shown.bs.modal", function(e) {
 
-		userid = $(e.relatedTarget).data('userid');
-	
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#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[7].innerHTML);
-		$('#EditCgst').val($('#Cgst'+userid).val());
-		$('#EditSgst').val($('#Sgst'+userid).val());
-		$('#EditIgst').val($('#Igst'+userid).val());
-		$('#EditAfterCgst').val($('#AfterCgst'+userid).val());
-		$('#EditAfterSgst').val($('#AfterSgst'+userid).val());
-		$('#EditAfterIgst').val($('#AfterIgst'+userid).val());
-		  if($('#FrequencyValue'+userid).val()==1){
-                    $('#EditFrequency').val($('#Frequency'+userid).val());
-                     $("#EditFrequencyNo").val(1);
-                   }
-		else{
-                    $('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
-                    $("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
-                     }
-
-		$('#EditTotalOrderValue').val(cellval[9].innerHTML);
-                $('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
-		$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		
-		
-		  
-		$("#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 )
-				{
-								   
-						$.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));
-						}
-												
-				}
-			
-			
-		});
-		}
-	   
-});
-$("#VIEWSERVICE").on("shown.bs.modal", function(e) {
-
-		userid = $(e.relatedTarget).data('userid');
-	
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#ViewReqNo').val($('#Reqnumber'+userid).val());
-		$('#ViewdeptName').val($('#departmentName'+userid).val());
-		$("#ViewCostCenter").val($('#costCode'+userid).val());
-		$('#ViewAvlBudAmt').val($('#AvilBudget'+userid).val());
-		
-		$('#ViewItemName').val($('#materialName'+userid).val());
-		$('#ViewUOM').val($('#uom'+userid).val());
-		$('#ViewQuantity').val($('#quantity'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#ViewRate').val($('#itemRate'+userid).val());
-		$('#txtViewBasicValue').val(cellval[7].innerHTML);
-		$('#ViewCgst').val($('#Cgst'+userid).val());
-		$('#ViewSgst').val($('#Sgst'+userid).val());
-		$('#ViewIgst').val($('#Igst'+userid).val());
-		$('#ViewAfterCgst').val($('#AfterCgst'+userid).val());
-		$('#ViewAfterSgst').val($('#AfterSgst'+userid).val());
-		$('#ViewAfterIgst').val($('#AfterIgst'+userid).val());
-		  if($('#FrequencyValue'+userid).val()==1){
-                    $('#ViewFrequency').val($('#Frequency'+userid).val());
-                     $("#ViewFrequencyNo").val(1);
-                   }
-		else{
-                    $('#ViewFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
-                    $("#ViewFrequencyNo").val($('#FrequencyValue'+userid).val());
-                     }
-
-		$('#ViewTotalOrderValue').val(cellval[9].innerHTML);
-                $('#ViewOtherAllowances').val($('#OtherAmt'+userid).val());
-		$('#ViewtxtSpcialInstruction').val($('#ItemDescription'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		
-		
-		  
-		$("#ViewMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		 // For Binding Material list center for the selected Requistion Number	
-		 
-		$("#ViewMaterialCode").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 )
-				{
-								   
-						$.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")
-						{
-							
-							//$("#ViewMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-	   
-});
 
 $('.AddService').click(function(){
         
@@ -2737,7 +2432,10 @@ tinyMCE.triggerSave();
 var splinstr = $('#ScopeOfWork').val();
 $('#ScopeOfWork').val(splinstr);
 $('#txtDeliveryAddress').val(deladd);
-var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
+
+                        
+                        AvlBudAmt = '<?php echo number_format($AvlAmount+$TotalBasicAmount, 2, '.', '') ?>';
+
 var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val();
 
 	if(validate())
@@ -2877,5 +2575,322 @@ $("#PaymentTerms").change(function() {
 	   
     }); 
   });
+$('#ReqNo').change(function() {
+  
+ var id = $('#ReqNo').val();
+ $("#AvlBudAmt").val('');
+  $("#CostCenter").val('');
+  $("#MaterialCode").empty();
+  $("#deptName").val('');
+ $("#UOM").val('');
+$("#Quantity").val('');
+$("#ItemName").val('');
+$("#Rate").val('');
+$("#txtBasicValue").val('');
+ clearTaxField();
+$("#MaterialCode").empty();
+		if(id != '0')
+		{
+			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
+		
+			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 
-</script>
+			var AvlBudAmt = '<?php echo $AvlAmount?>'; 
+                        
+                        AvlBudAmt = '<?php echo number_format($AvlAmount+$TotalBasicAmount, 2, '.', '') ?>';
+                      
+			//ServiceTable
+                   var rows =  document.getElementById('ServiceTable').rows.length;
+
+if(DeletedMaterialCode!=undefined && DeletedMaterialCode!=''){
+  
+                                                                                $("#MaterialCode").append( $('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
+DeletedMaterialCode='';
+DeletedMaterialCode='';
+}
+
+for(i=2;i<=rows;i++){
+
+//var j=1;
+  $.each(Material[i], function(idx, obj) {
+
+    // j=j+1;
+           var materialCode = $('#materialCode'+i);
+
+
+
+
+                                    if(obj.materialCode == materialCode )
+                                    {
+                                    $("#MaterialCode").val('');
+                                    }
+
+                                 
+                                
+                               else{
+                                                                                $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+
+                        }
+
+
+                    });
+
+
+
+
+}		// For Binding DepartmentName	           			
+		$.each(y, function(idx, obj) {
+			if(obj.ReqNo === id)
+			{
+				$("#deptName").val(obj.DepartmentName);
+				$("#CostCenter").val(obj.CostCenterCode);
+                                 if(obj.Service_Period!='' && obj.Service_Period!=null){
+                                $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
+                                $("#FrequencyNo").val(obj.NumberOfService);
+                                
+                               }
+                           else{
+                            var text='One Time';
+                              $("#Frequency").val(text);
+                              $("#FrequencyNo").val(1);
+                               }
+			}			
+		});
+			$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));	
+		// For Binding Material list center for the selected Requistion Number	
+                
+		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
+		var isAdded = "0";
+		 for(i=0;i<Material.length;i++)
+		{
+		$.each(Material[i], function(idx, obj) {
+			
+				if(obj.ReqNo === id )
+				{
+									   
+						$.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
+		{
+			alert('Please select the Requisition Number');
+			return false;
+		}
+		id = '';
+  
+});
+$("#EDITSERVICE").on("shown.bs.modal", function(e) {
+                
+               
+                    var AvlBudAmt = '<?php echo $AvlAmount?>'; 
+                        
+                        AvlBudAmt = '<?php echo number_format($AvlAmount+$TotalBasicAmount, 2, '.', '') ?>';
+
+		userid = $(e.relatedTarget).data('userid');
+	
+		var tr= document.getElementById(userid);
+		var cellval = tr.cells;
+		var id= $('#Reqnumber'+userid).val();
+		
+		$('#EditAvlBudAmt').val(AvlBudAmt);
+		$('#EditReqNo').val($('#Reqnumber'+userid).val());
+		$('#EditdeptName').val($('#departmentName'+userid).val());
+		$("#EditCostCenter").val($('#costCode'+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[7].innerHTML);
+		$('#EditCgst').val($('#Cgst'+userid).val());
+		$('#EditSgst').val($('#Sgst'+userid).val());
+		$('#EditIgst').val($('#Igst'+userid).val());
+		$('#EditAfterCgst').val($('#AfterCgst'+userid).val());
+		$('#EditAfterSgst').val($('#AfterSgst'+userid).val());
+		$('#EditAfterIgst').val($('#AfterIgst'+userid).val());
+		  if($('#FrequencyValue'+userid).val()==1){
+                    $('#EditFrequency').val($('#Frequency'+userid).val());
+                     $("#EditFrequencyNo").val(1);
+                   }
+		else{
+                    $('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
+                    $("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
+                     }
+
+		$('#EditTotalOrderValue').val(cellval[9].innerHTML);
+                $('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
+		$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
+		RequistQuantity = $('#quantity'+userid).val();
+		
+		
+		  
+		$("#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 )
+				{
+								   
+						$.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));
+						}
+												
+				}
+			
+			
+		});
+		}
+	   
+});
+$("#VIEWSERVICE").on("shown.bs.modal", function(e) {
+
+		userid = $(e.relatedTarget).data('userid');
+	 var AvlBudAmt = '<?php echo $AvlAmount?>'; 
+                        
+                        AvlBudAmt = '<?php echo number_format($AvlAmount+$TotalBasicAmount, 2, '.', '') ?>';
+		var tr= document.getElementById(userid);
+		var cellval = tr.cells;
+		var id= $('#Reqnumber'+userid).val();
+		
+		$('#ViewReqNo').val($('#Reqnumber'+userid).val());
+		$('#ViewdeptName').val($('#departmentName'+userid).val());
+		$("#ViewCostCenter").val($('#costCode'+userid).val());
+		$('#ViewAvlBudAmt').val(AvlBudAmt);
+		
+		$('#ViewItemName').val($('#materialName'+userid).val());
+		$('#ViewUOM').val($('#uom'+userid).val());
+		$('#ViewQuantity').val($('#quantity'+userid).val());
+		RequistQuantity = $('#quantity'+userid).val();
+		$('#ViewRate').val($('#itemRate'+userid).val());
+		$('#txtViewBasicValue').val(cellval[7].innerHTML);
+		$('#ViewCgst').val($('#Cgst'+userid).val());
+		$('#ViewSgst').val($('#Sgst'+userid).val());
+		$('#ViewIgst').val($('#Igst'+userid).val());
+		$('#ViewAfterCgst').val($('#AfterCgst'+userid).val());
+		$('#ViewAfterSgst').val($('#AfterSgst'+userid).val());
+		$('#ViewAfterIgst').val($('#AfterIgst'+userid).val());
+		  if($('#FrequencyValue'+userid).val()==1){
+                    $('#ViewFrequency').val($('#Frequency'+userid).val());
+                     $("#ViewFrequencyNo").val(1);
+                   }
+		else{
+                    $('#ViewFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
+                    $("#ViewFrequencyNo").val($('#FrequencyValue'+userid).val());
+                     }
+
+		$('#ViewTotalOrderValue').val(cellval[9].innerHTML);
+                $('#ViewOtherAllowances').val($('#OtherAmt'+userid).val());
+		$('#ViewtxtSpcialInstruction').val($('#ItemDescription'+userid).val());
+		RequistQuantity = $('#quantity'+userid).val();
+		
+		
+		  
+		$("#ViewMaterialCode").empty();
+		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+		 // For Binding Material list center for the selected Requistion Number	
+		 
+		$("#ViewMaterialCode").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 )
+				{
+								   
+						$.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")
+						{
+							
+							//$("#ViewMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+						}
+												
+				}
+			
+			
+		});
+		}
+	   
+});
+</script>
\ No newline at end of file
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index ca60d7ce..7d843e39 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -59,10 +59,13 @@
                $ExchangeRateOn='';
                $UpdatedOn;
                  $CapitalRange='';
-$PoStatusName='';
-$otherPayment='';
-$INR='';
-$INRSYM='';
+            $PoStatusName='';
+            $otherPayment='';
+            $INR='';
+            $INRSYM='';
+            $ExitTotalOrderValue=0;
+
+            $ExitExchangeRate='';
 if(!empty($INRSYMBOL))
 { 
    foreach ($INRSYMBOL as $INR) 
@@ -88,6 +91,7 @@ if(!empty($POMaster))
 
     foreach ($POMaster as $Req)
     {
+
       
 		$SupId = $Req->SupplierID;
 
@@ -121,18 +125,29 @@ if(!empty($POMaster))
                 $Import_DispatchDetails=$Req->Import_DispatchDetails;
                 $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
                 $CapitalRange=$Req->CapitalRange;
+
+                if($CapitalRange=='0'){
+                $ExitExchangeRate=$Req->ExchangeRate;
+                $ExitTotalOrderValue=number_format($Req->TotalOrderValue*$ExitExchangeRate, 2, '.', '');
+                        }
+                        else{
+                        $ExitTotalOrderValue=$Req->TotalOrderValue;
+                            }
                 
     }
+
 }
 
-//echo $CapitalRange;
+
 
 if(!empty($AvlBudAmt))
 {
    
-		$AvlAmount = number_format($AvlCapitalBudAmt, 2, '.', '');		
+		$AvlAmount = number_format($AvlCapitalBudAmt+$ExitTotalOrderValue, 2, '.', '');
+               
 	
 }
+
 ?>
     <style>
                 .modal
@@ -435,7 +450,7 @@ $("#PaymentMethod").select2();
                             </div>
                            
                     </div>
-                    <div class="col-md-4" style="padding:0px;">
+                    <div class="col-md-4">
                             <div class="col-md-12">
 
                                 <b><u>Select Delivery By</u></b> 
@@ -742,13 +757,6 @@ $("#PaymentMethod").select2();
 <input type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>" value="<?php echo $record->Rate * $record->Quantity ; ?>" />
 
 
-
-
-
-
-
-
-
                    <?php 
                             
                             if($POStatus == PO_DRAFT || $POStatus == PO_CREATED) 
@@ -2951,7 +2959,7 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
                             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)
@@ -3588,16 +3596,14 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
 
 
     purchaserate = <?php echo Capital_purchaserate_Charge; ?>;
-     if (isFinite(purchaserate))
-     {
-             
-      return parseFloat(purchaserate).toFixed(2);
-    }
-
-    else
-        return(0);
 
     //return parseFloat(purchaserate).toFixed(2);
+if (isFinite(purchaserate))
+    {
+           
+     return parseFloat(purchaserate).toFixed(2);
+   }    else
+       return(0);
 
     }
     /*
@@ -3612,24 +3618,16 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
 
     CustomDutyExpenses = <?php echo Capital_CustomDutyExpenses_Charge; ?>;
 
-    //return parseFloat(CustomDutyExpenses).toFixed(2);
-    if(isNaN(CustomDutyExpenses))
+   // return parseFloat(CustomDutyExpenses).toFixed(2);
+if(isNaN(CustomDutyExpenses))
+   {
+       return(0);
+   }     else if (isFinite(CustomDutyExpenses))
     {
-        return(0);
-    }
-
-
-     else if (isFinite(CustomDutyExpenses))
-     {
-             return parseFloat(CustomDutyExpenses).toFixed(2);
-     }
-
-
-    else
-    
-    return(0);
-
-    //return parseFloat(CustomDutyExpenses).toFixed(2);
+            return parseFloat(CustomDutyExpenses).toFixed(2);
+    }    else
+   
+   return(0);
 
     }
     /*
@@ -5410,4 +5408,4 @@ $("#PaymentMethod").change(function() {
 				}
 			});
 
-    </script>
+    </script>
\ No newline at end of file
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php
index f751a296..2bad79df 100755
--- a/application/views/editRevenuepurchaseorder.php
+++ b/application/views/editRevenuepurchaseorder.php
@@ -276,86 +276,7 @@ $('#drpSupplier').change(function() {
   
 });	
 
-$('#ReqNo').change(function() {
-    
- var id = $('#ReqNo').val();
- $("#deptName").val('');
-  $("#CostCenter").val('');
-  $("#MaterialCode").empty();
-  $("#ItemName").val('');
-$("#UOM").val('');
-$("#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 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);
-			}			
-		});
-			$("#AvlBudAmt").val(AvlBudAmt);		
-		// For Binding Material list center for the selected Requistion Number	
-		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
 	
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-									   
-						$.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
-		{
-			alert('Please select the Requisition Number');
-			return false;
-		}
-		id = '';
-  
-});	
 $('#MaterialCode').change(function() {
     
  var id = $('#MaterialCode').val();
@@ -3565,178 +3486,7 @@ $("#REVENUE").on("shown.bs.modal", function(e) {
 	
 	$('#isEdit').val(0);
 });
-$("#EDITREVENUE").on("shown.bs.modal", function(e) {
-	
-		userid = $(e.relatedTarget).data('userid');
-		$('#isEdit').val(1);
-	    //alert(userid);
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#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());
-		$('#EditRate').val($('#itemRate'+userid).val());
-		$('#txtEditBasicValue').val(cellval[7].innerHTML);
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#txtEditDiscount').val($('#DisVal'+userid).val());
-		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
-		
-		$('#txtEditPackaging').val($('#PackVal'+userid).val());
-		$('#txtEditAfterPackaging').val($('#AfterPackVal'+userid).val());
-		
-		$('#txtEditFreight').val($('#FreightVal'+userid).val());
-		$('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val());
-                  var FreightType =$('#FreightType'+userid).val();
-              $('#EditNOOfTrips').val($('#NoOfTrip'+userid).val());
-	        if (FreightType == "PER TRIP"){
-                $('#EditTripsValue').show();
-                    }
-                    else{
-                    $('#EditTripsValue').hide();
-                    }
-		$('#txtEditInsurance').val($('#Insval'+userid).val());
-		
-		$('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val());
-		 $('#EditAfterCgst').val($('#RevenueAfterCgst'+userid).val());
-                $('#EditAfterSgst').val($('#RevenueAfterSgst'+userid).val());
-                $('#EditAfterIgst').val($('#RevenueAfterIgst'+userid).val());
-               $('#EditCgst').val($('#RevenueCgst'+userid).val());
-                $('#EditSgst').val($('#RevenueSgst'+userid).val());
-                $('#EditIgst').val($('#RevenueIgst'+userid).val());
-		
-		
-		
-		$("#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 )
-				{
-								   
-						$.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));
-						}
-												
-				}
-			
-			
-		});
-		}
-		
-		$("#EditDiscountType").val($('#DisType'+userid).val());
-		$("#drpEditFreight").val($('#FreightType'+userid).val());
-		$("#EditPackagingType").val($('#PackType'+userid).val())
-		
-		$("input:radio[name='optPackaging'][value='"+$('#PackOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='"+$('#ExciseOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='"+$('#VatOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='"+$('#CSTOption'+userid).val()+"']").prop('checked', 'checked');
-		
-	   
-});
-$("#VIEWREVENUE").on("shown.bs.modal", function(e) {
-	
-		userid = $(e.relatedTarget).data('userid');
-		$('#isEdit').val(1);
-	    //alert(userid);
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#ViewReqNo').val($('#Reqnumber'+userid).val());
-		$('#ViewdeptName').val($('#departmentName'+userid).val());
-		$("#ViewCostCenter").val($('#costCode'+userid).val());
-		$('#ViewAvlBudAmt').val($('#AvilBudget'+userid).val());
-		//
-		
-		$('#ViewItemName').val($('#materialName'+userid).val());
-		$('#ViewUOM').val($('#uom'+userid).val());
-		$('#ViewQuantity').val($('#quantity'+userid).val());
-		$('#ViewRate').val($('#itemRate'+userid).val());
-		$('#txtViewBasicValue').val(cellval[7].innerHTML);
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#txtViewDiscount').val($('#DisVal'+userid).val());
-		$('#txtViewAfterDiscount').val($('#AfterDisVal'+userid).val());
-		
-	
-		$('#txtViewPackaging').val($('#PackVal'+userid).val());
-		$('#txtViewAfterPackaging').val($('#AfterPackVal'+userid).val());
-		
-		$('#txtViewFreight').val($('#FreightVal'+userid).val());
-		$('#txtViewAfterFreight').val($('#AfterFreightVal'+userid).val());
-		$('#txtViewInsurance').val($('#Insval'+userid).val());
-		     var FreightType =$('#FreightType'+userid).val();
-              $('#ViewNOOfTrips').val($('#NoOfTrip'+userid).val());
-	        if (FreightType == "PER TRIP"){
-                $('#ViewTripsValue').show();
-                    }
-                    else{
-                    $('#ViewTripsValue').hide();
-                    }
-		$('#txtViewTotalOrderValue').val($('#TotalOrderValue'+userid).val());
-		 $('#ViewAfterCGST').val($('#RevenueAfterCgst'+userid).val());
-                $('#ViewAfterSGST').val($('#RevenueAfterSgst'+userid).val());
-                $('#ViewAfterIGST').val($('#RevenueAfterIgst'+userid).val());
-               $('#ViewCGST').val($('#RevenueCgst'+userid).val());
-                $('#ViewSGST').val($('#RevenueSgst'+userid).val());
-                $('#ViewIGST').val($('#RevenueIgst'+userid).val());
-		
-		
-		
-		$("#ViewMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		 // For Binding Material list center for the selected Requistion Number	
-		$("#ViewMaterialCode").val($('#materialCode'+userid).val());
-		
-		
 
-		$("#ViewDiscountType").val($('#DisType'+userid).val());
-		$("#drpViewFreight").val($('#FreightType'+userid).val());
-		$("#ViewPackagingType").val($('#PackType'+userid).val())
-		
-		$("input:radio[name='optPackaging'][value='"+$('#PackOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='"+$('#ExciseOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='"+$('#VatOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='"+$('#CSTOption'+userid).val()+"']").prop('checked', 'checked');
-		
-	   
-});
 $('.AddRevenue').click(function(){
          
       if(validateRevenueTax() && validateExceedLimit()  && ExceedQuantityCheck())
@@ -4364,7 +4114,7 @@ var splinstr = $('#txtSpcialInstruction').val();
 $('#SpcialInstruction').val(splinstr);
 
 $('#txtDeliveryAddress').val(deladd);
-var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
+var AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>';
 var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val();
 
 	if(validate())
@@ -4539,4 +4289,263 @@ $("#PaymentTerms").change(function() {
                                          $('#Otherpayment').val('');
 				}
 			});
-</script>
+$('#ReqNo').change(function() {
+    
+ var id = $('#ReqNo').val();
+ $("#deptName").val('');
+  $("#CostCenter").val('');
+  $("#MaterialCode").empty();
+  $("#ItemName").val('');
+$("#UOM").val('');
+$("#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 Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+
+
+			var AvlBudAmt = '<?php echo $AvlAmount?>'; 
+                        
+                        AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>'; 
+
+		// For Binding DepartmentName	           			
+		$.each(y, function(idx, obj) {
+			if(obj.ReqNo === id)
+			{
+				$("#deptName").val(obj.DepartmentName);
+				$("#CostCenter").val(obj.CostCenterCode);
+			}			
+		});
+			$("#AvlBudAmt").val(AvlBudAmt);		
+		// For Binding Material list center for the selected Requistion Number	
+		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
+	
+		var isAdded = "0";
+		 for(i=0;i<Material.length;i++)
+		{
+		$.each(Material[i], function(idx, obj) {
+			
+				if(obj.ReqNo === id )
+				{
+									   
+						$.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
+		{
+			alert('Please select the Requisition Number');
+			return false;
+		}
+		id = '';
+  
+});
+$("#EDITREVENUE").on("shown.bs.modal", function(e) {
+	var AvlBudAmt = '<?php echo $AvlAmount?>'; 
+                        
+                        AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>'; 
+		userid = $(e.relatedTarget).data('userid');
+		$('#isEdit').val(1);
+	    //alert(userid);
+		var tr= document.getElementById(userid);
+		var cellval = tr.cells;
+		var id= $('#Reqnumber'+userid).val();
+		
+		$('#EditReqNo').val($('#Reqnumber'+userid).val());
+		$('#EditdeptName').val($('#departmentName'+userid).val());
+		$("#EditCostCenter").val($('#costCode'+userid).val());
+		$('#EditAvlBudAmt').val(AvlBudAmt);
+		//
+		
+		$('#EditItemName').val($('#materialName'+userid).val());
+		$('#EditUOM').val($('#uom'+userid).val());
+		$('#EditQuantity').val($('#quantity'+userid).val());
+		$('#EditRate').val($('#itemRate'+userid).val());
+		$('#txtEditBasicValue').val(cellval[7].innerHTML);
+		RequistQuantity = $('#quantity'+userid).val();
+		$('#txtEditDiscount').val($('#DisVal'+userid).val());
+		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
+		
+		$('#txtEditPackaging').val($('#PackVal'+userid).val());
+		$('#txtEditAfterPackaging').val($('#AfterPackVal'+userid).val());
+		
+		$('#txtEditFreight').val($('#FreightVal'+userid).val());
+		$('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val());
+                  var FreightType =$('#FreightType'+userid).val();
+              $('#EditNOOfTrips').val($('#NoOfTrip'+userid).val());
+	        if (FreightType == "PER TRIP"){
+                $('#EditTripsValue').show();
+                    }
+                    else{
+                    $('#EditTripsValue').hide();
+                    }
+		$('#txtEditInsurance').val($('#Insval'+userid).val());
+		
+		$('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val());
+		 $('#EditAfterCgst').val($('#RevenueAfterCgst'+userid).val());
+                $('#EditAfterSgst').val($('#RevenueAfterSgst'+userid).val());
+                $('#EditAfterIgst').val($('#RevenueAfterIgst'+userid).val());
+               $('#EditCgst').val($('#RevenueCgst'+userid).val());
+                $('#EditSgst').val($('#RevenueSgst'+userid).val());
+                $('#EditIgst').val($('#RevenueIgst'+userid).val());
+		
+		
+		
+		$("#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 )
+				{
+								   
+						$.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));
+						}
+												
+				}
+			
+			
+		});
+		}
+		
+		$("#EditDiscountType").val($('#DisType'+userid).val());
+		$("#drpEditFreight").val($('#FreightType'+userid).val());
+		$("#EditPackagingType").val($('#PackType'+userid).val())
+		
+		$("input:radio[name='optPackaging'][value='"+$('#PackOption'+userid).val()+"']").prop('checked', 'checked');
+		$("input:radio[name='optExcise'][value='"+$('#ExciseOption'+userid).val()+"']").prop('checked', 'checked');
+		$("input:radio[name='optVat'][value='"+$('#VatOption'+userid).val()+"']").prop('checked', 'checked');
+		$("input:radio[name='optCST'][value='"+$('#CSTOption'+userid).val()+"']").prop('checked', 'checked');
+		
+	   
+});
+$("#VIEWREVENUE").on("shown.bs.modal", function(e) {
+	var AvlBudAmt = '<?php echo $AvlAmount?>'; 
+                        
+                        AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>';
+		userid = $(e.relatedTarget).data('userid');
+		$('#isEdit').val(1);
+	    //alert(userid);
+		var tr= document.getElementById(userid);
+		var cellval = tr.cells;
+		var id= $('#Reqnumber'+userid).val();
+		
+		$('#ViewReqNo').val($('#Reqnumber'+userid).val());
+		$('#ViewdeptName').val($('#departmentName'+userid).val());
+		$("#ViewCostCenter").val($('#costCode'+userid).val());
+		$('#ViewAvlBudAmt').val(AvlBudAmt);
+		//
+		
+		$('#ViewItemName').val($('#materialName'+userid).val());
+		$('#ViewUOM').val($('#uom'+userid).val());
+		$('#ViewQuantity').val($('#quantity'+userid).val());
+		$('#ViewRate').val($('#itemRate'+userid).val());
+		$('#txtViewBasicValue').val(cellval[7].innerHTML);
+		RequistQuantity = $('#quantity'+userid).val();
+		$('#txtViewDiscount').val($('#DisVal'+userid).val());
+		$('#txtViewAfterDiscount').val($('#AfterDisVal'+userid).val());
+		
+	
+		$('#txtViewPackaging').val($('#PackVal'+userid).val());
+		$('#txtViewAfterPackaging').val($('#AfterPackVal'+userid).val());
+		
+		$('#txtViewFreight').val($('#FreightVal'+userid).val());
+		$('#txtViewAfterFreight').val($('#AfterFreightVal'+userid).val());
+		$('#txtViewInsurance').val($('#Insval'+userid).val());
+		     var FreightType =$('#FreightType'+userid).val();
+              $('#ViewNOOfTrips').val($('#NoOfTrip'+userid).val());
+	        if (FreightType == "PER TRIP"){
+                $('#ViewTripsValue').show();
+                    }
+                    else{
+                    $('#ViewTripsValue').hide();
+                    }
+		$('#txtViewTotalOrderValue').val($('#TotalOrderValue'+userid).val());
+		 $('#ViewAfterCGST').val($('#RevenueAfterCgst'+userid).val());
+                $('#ViewAfterSGST').val($('#RevenueAfterSgst'+userid).val());
+                $('#ViewAfterIGST').val($('#RevenueAfterIgst'+userid).val());
+               $('#ViewCGST').val($('#RevenueCgst'+userid).val());
+                $('#ViewSGST').val($('#RevenueSgst'+userid).val());
+                $('#ViewIGST').val($('#RevenueIgst'+userid).val());
+		
+		
+		
+		$("#ViewMaterialCode").empty();
+		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+		 // For Binding Material list center for the selected Requistion Number	
+		$("#ViewMaterialCode").val($('#materialCode'+userid).val());
+		
+		
+
+		$("#ViewDiscountType").val($('#DisType'+userid).val());
+		$("#drpViewFreight").val($('#FreightType'+userid).val());
+		$("#ViewPackagingType").val($('#PackType'+userid).val())
+		
+		$("input:radio[name='optPackaging'][value='"+$('#PackOption'+userid).val()+"']").prop('checked', 'checked');
+		$("input:radio[name='optExcise'][value='"+$('#ExciseOption'+userid).val()+"']").prop('checked', 'checked');
+		$("input:radio[name='optVat'][value='"+$('#VatOption'+userid).val()+"']").prop('checked', 'checked');
+		$("input:radio[name='optCST'][value='"+$('#CSTOption'+userid).val()+"']").prop('checked', 'checked');
+		
+	   
+});
+</script>
\ No newline at end of file
diff --git a/application/views/inwardgateregister.php b/application/views/inwardgateregister.php
index 217b0a77..64268919 100755
--- a/application/views/inwardgateregister.php
+++ b/application/views/inwardgateregister.php
@@ -107,7 +107,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
 		<div class="col-md-2">
 			<label>Delivery Challan/Invoice No</label>
 			<?php
-				 $data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo',  'class' => 'form-control', 'required=>"true"' );
+				 $data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo',  'class' => 'form-control', 'required=>"true"','onkeypress'=>'return isNumberKey(event);' );
 				 
 				echo form_input($data);
 				?> 
@@ -132,7 +132,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
 			<div class="col-md-2">
 			<label>Courier No</label>
 			<?php
-				 $data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo',  'class' => 'form-control' );
+				 $data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo',  'class' => 'form-control','onkeypress'=>'return isNumberKey(event);' );
 				echo form_input($data);
 				?>
 			</div>								
diff --git a/assets/dist/jquery.loader.css b/assets/dist/jquery.loader.css
index 8826a55d..7b2a814a 100755
--- a/assets/dist/jquery.loader.css
+++ b/assets/dist/jquery.loader.css
@@ -61,7 +61,7 @@
 }
 .loader.overlay {
   bottom: 0;
-  height: 100%;
+  height: 250%;
   left: 0;
   margin: 0;
   right: 0;