diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index 79c4d2f3..4d083c38 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -286,7 +286,7 @@ class amendmentpurchaseorder extends BaseController
 				
 				
 				$POType = $this->input->post('POType');
-				$PoRange = $this->input->post('txtPoRange');
+				$PoRange = $this->input->post('Range');
 				$PaymentTermsText=$this->input->post('beforePaymentTermsText');
 				$PaymentTerms=$this->input->post('PaymentTerms');
 				$Otherpayment=$this->input->post('Otherpayment');
@@ -332,7 +332,7 @@ class amendmentpurchaseorder extends BaseController
 					
 			    }
 					
-				$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'PaymentOtherDescription'=>$Otherpayment,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD);
+				$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'CapitalRange'=>$PoRange,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'PaymentOtherDescription'=>$Otherpayment,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD);
 				//print_r($POMaster);
 				
 				
diff --git a/application/controllers/monthlypay.php b/application/controllers/monthlypay.php
index e975ae11..e53f1ad8 100755
--- a/application/controllers/monthlypay.php
+++ b/application/controllers/monthlypay.php
@@ -91,7 +91,7 @@ class monthlypay extends BaseController
             $this->form_validation->set_rules('LOP_days','LOP_days','trim|required');
             $this->form_validation->set_rules('OT_Hrs_Worked','OT_Hrs_Worked','trim|required');
             $this->form_validation->set_rules('Loan_Recovered','Loan_Recovered','trim|required');
-            $this->form_validation->set_rules('Loan_Balance','Loan_Balance','trim|required');
+            
             $this->form_validation->set_rules('Incentives','Incentives','trim|required');
             $this->form_validation->set_rules('Other_Deductions','Other_Deductions','trim|required');            
          
@@ -106,7 +106,7 @@ class monthlypay extends BaseController
                 $LOP_days =     $this->input->post('LOP_days');            
                 $OT_Hrs_Worked =     $this->input->post('OT_Hrs_Worked');            
                 $Loan_Recovered =     $this->input->post('Loan_Recovered');            
-                $Loan_Balance =     $this->input->post('Loan_Balance');            
+                
                 $Incentives =     $this->input->post('Incentives');            
                 $Other_Deductions =     $this->input->post('Other_Deductions');            
                 
@@ -120,7 +120,7 @@ class monthlypay extends BaseController
                 
                 if(count($CodeExists) == 0)
                 {
-                 $montlypay = array('month_year'=>$month_year, 'emp_id'=>$emp_id,'LOP_days'=>$LOP_days,'OT_Hrs_Worked'=>$Loan_Recovered,'Loan_Balance'=>$Loan_Balance,'Incentives'=>$Incentives,'Other_Deductions'=>$Other_Deductions,'CreatedBy'=>$CreateBy,'createdDate'=>$createddt); 
+                 $montlypay = array('month_year'=>$month_year, 'emp_id'=>$emp_id,'LOP_days'=>$LOP_days,'OT_Hrs_Worked'=>$Loan_Recovered,'Incentives'=>$Incentives,'Other_Deductions'=>$Other_Deductions,'CreatedBy'=>$CreateBy,'createdDate'=>$createddt); 
                  $this->monthlypay_model->addNewmonthly($monthlypay);
                 }
                 
@@ -192,7 +192,7 @@ class monthlypay extends BaseController
                 $LOP_Days =$this->input->post('LOP_Days');
                 $OT_Hrs_Worked = $this->input->post('OT_Hrs_Worked');
                 $Loan_Recovered = $this->input->post('Loan_Recovered');
-                $Loan_Balance = $this->input->post('Loan_Balance');
+                
                 $Incentives = $this->input->post('Incentives');
                 $Other_Deductions = $this->input->post('Other_Deductions');
                 $LastModBy =   $this->session->userdata ( 'userId' );
@@ -205,7 +205,7 @@ class monthlypay extends BaseController
                $monthdata = array();
     
     
-                $monthdata = array('Month_Year'=>$month_year,'EmpID'=>$EmpID,'LOP_Days'=>$LOP_Days,'OT_Hrs_Worked'=>$OT_Hrs_Worked,'Loan_Recovered'=>$Loan_Recovered,'Loan_Balance'=>$Loan_Balance,'Incentives'=>$Incentives,'Other_Deductions'=>$Other_Deductions,'Last_Mod_By'=>$LastModBy,'Last_Mod_Time'=>$LastModTime);               
+                $monthdata = array('Month_Year'=>$month_year,'EmpID'=>$EmpID,'LOP_Days'=>$LOP_Days,'OT_Hrs_Worked'=>$OT_Hrs_Worked,'Incentives'=>$Incentives,'Other_Deductions'=>$Other_Deductions,'Last_Mod_By'=>$LastModBy,'Last_Mod_Time'=>$LastModTime);               
      
 
 
diff --git a/application/logs/log-2017-09-01.php b/application/logs/log-2017-09-01.php
new file mode 100644
index 00000000..40caa029
--- /dev/null
+++ b/application/logs/log-2017-09-01.php
@@ -0,0 +1,18 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-09-01 07:39:43 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\system\database\drivers\mysqli\mysqli_result.php 38
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Undefined variable: l C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 263
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Trying to get property of non-object C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 263
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Undefined variable: l C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Trying to get property of non-object C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Undefined variable: tax C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Undefined variable: l C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Trying to get property of non-object C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Undefined variable: l C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 263
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Trying to get property of non-object C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 263
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Undefined variable: l C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Trying to get property of non-object C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Undefined variable: tax C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Undefined variable: l C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:16 --> Severity: Notice  --> Trying to get property of non-object C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\views\revenuepopdf.php 265
+ERROR - 2017-09-01 07:44:17 --> Severity: Warning  --> explode() expects parameter 2 to be string, array given C:\5.6\xampp\htdocs\SIA\SIANEW\siddharth_application\application\third_party\dompdf\include\style.cls.php 948
diff --git a/application/models/monthlypay_model.php b/application/models/monthlypay_model.php
index f3c63dad..409d940a 100755
--- a/application/models/monthlypay_model.php
+++ b/application/models/monthlypay_model.php
@@ -19,7 +19,7 @@ class monthlypay_model extends CI_Model
                             OR  LOP_Days  LIKE '%".$searchText."%'
                             OR  OT_Hrs_Worked  LIKE '%".$searchText."%'
                             OR  Loan_Recovered  LIKE '%".$searchText."%'
-                            OR  Loan_Balance  LIKE '%".$searchText."%'
+                            
                             OR  Incentives  LIKE '%".$searchText."%'
                             OR  Other_Deductions  LIKE '%".$searchText."%'
                             
@@ -52,7 +52,7 @@ class monthlypay_model extends CI_Model
                             OR  LOP_Days  LIKE '%".$searchText."%'
                             OR  OT_Hrs_Worked  LIKE '%".$searchText."%'
                             OR  Loan_Recovered  LIKE '%".$searchText."%'
-                            OR  Loan_Balance  LIKE '%".$searchText."%'
+                            
                             OR  Incentives  LIKE '%".$searchText."%'
                             OR  Other_Deductions  LIKE '%".$searchText."%'
 							
@@ -82,7 +82,7 @@ function addNewmonthlisting($m_list)
     }
      function getUserInfo($EmpID,$month_year)
     {
-        $this->db->select('Month_Year, EmpID, LOP_Days, OT_Hrs_Worked, Loan_Recovered, Loan_Balance, Incentives, Other_Deductions, Created_By, Created_Time, Last_Mod_By, Last_Mod_Time');
+        $this->db->select('Month_Year, EmpID, LOP_Days, OT_Hrs_Worked, Loan_Recovered,Incentives, Other_Deductions, Created_By, Created_Time, Last_Mod_By, Last_Mod_Time');
         $this->db->from('T_Monthly_Pay_Inputs');
         //$this->db->where('isDeleted', 0);
         //$this->db->where('roleId !=', 1);
diff --git a/application/third_party/dompdf/lib/fonts/log.htm b/application/third_party/dompdf/lib/fonts/log.htm
index 6113ac35..47bb4bb6 100755
--- a/application/third_party/dompdf/lib/fonts/log.htm
+++ b/application/third_party/dompdf/lib/fonts/log.htm
@@ -1,4 +1,4 @@
-<span style='color: #900'>6,144 KB</span>    <span style='color: #090'>141.9919 ms</span><br /><div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+<span style='color: #900'>10,240 KB</span>    <span style='color: #090'>1,080.7450 ms</span><br /><div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
 
 <h4>A PHP Error was encountered</h4>
 
diff --git a/application/views/addemppaydate.php b/application/views/addemppaydate.php
index 7b2619c5..04b1a21c 100755
--- a/application/views/addemppaydate.php
+++ b/application/views/addemppaydate.php
@@ -99,7 +99,7 @@ $("#due_started").datepicker({
                                         <div class="form-group">
                                                 <?php
                                          
-                                       $data = array('name' => 'Total_salary','id' => 'Total_salary','value' => set_value('Total_salary'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Total salary Amount,Minimum Four Digit Positive Number','onchange'=>'calculalteHRA();');
+                                       $data = array('name' => 'Total_salary','id' => 'Total_salary','value' => set_value('Total_salary'),'pattern' => '([0-9]{1,8}([.][0-9]{1,2})?)', 'class' => 'form-control', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Total salary Amount,Minimum Four Digit Positive Number','onchange'=>'calculalteHRA();');
                                         echo form_input($data);
                                         ?>   
                                     </div>
@@ -184,7 +184,7 @@ $("#due_started").datepicker({
                                         <div class="form-group">
                                                 <?php
                                          
-                                         $data = array('name' => 'Allowances','value' => set_value('Allowances'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'[0-9]{1,4}','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 4 digit ');
+                                         $data = array('name' => 'Allowances','value' => set_value('Allowances'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,5}([.][0-9]{1,2})?)','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 4 digit ');
                                         echo form_input($data);
                                         ?>   
                                     </div>
@@ -223,7 +223,7 @@ $("#due_started").datepicker({
                                         <div class="form-group">
                                                 <?php
                                          
-                                         $data = array('name' => 'Food_Allowances','value' => set_value('Food_Allowances'), 'class' => 'form-control','pattern'=>'[0-9]{1,4}','onfocusout'=>'validateFood();', 'title'=>'Enter the Valid Food Allowances,Minimun 1 Digit,Maximum 4 Digit');
+                                         $data = array('name' => 'Food_Allowances','value' => set_value('Food_Allowances'), 'class' => 'form-control','pattern'=>'([0-9]{1,3}([.][0-9]{1,2})?)','onfocusout'=>'validateFood();', 'title'=>'Enter the Valid Food Allowances,Minimun 1 Digit,Maximum 4 Digit');
                                         echo form_input($data);
                                         ?>   
                                     </div>
@@ -244,7 +244,7 @@ $("#due_started").datepicker({
 
 
                                         <span for="Pay_Data_ID">Loan Amount</span>
-                                        <input type="text" value="0" class="form-control"  id="Loan_Amount" name="Loan_Amount" value="" pattern="[0-9]{1,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
+                                        <input type="text" value="0" class="form-control"  id="Loan_Amount" name="Loan_Amount" value="" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
                                     </div>
                                     </div>
                                 </div>
@@ -290,7 +290,7 @@ $("#due_started").datepicker({
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Basic_Pay">Paid Amount</span>
-                                        <input type="text" value="0" class="form-control requried" id="Paid_Amount" name="Paid_Amount" value="0" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit" readonly>
+                                        <input type="text" value="0" class="form-control requried" id="Paid_Amount" name="Paid_Amount" value="0" pattern="[([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" readonly>
                                     </div>
                                     </div>
                                 </div>
diff --git a/application/views/editOldemppay.php b/application/views/editOldemppay.php
index f767dca3..49074beb 100755
--- a/application/views/editOldemppay.php
+++ b/application/views/editOldemppay.php
@@ -147,7 +147,7 @@ if(!empty($emppay))
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Basic_Pay">Total Salary</span><font color="Red">*</font>
-                                        <input type="text" class="form-control requried" id="total_salary" name="total_salary" value="<?php echo number_format($TotalSalary,0,'',''); ?>" pattern="[0-9]{4,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="calculateBasic();">
+                                        <input type="text" class="form-control requried" id="total_salary" name="total_salary" value="<?php echo number_format($TotalSalary,0,'',''); ?>" pattern="([0-9]{1,8}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" onchange="calculateBasic();">
                                     </div>
                                     </div>
                                 </div>
@@ -208,7 +208,7 @@ if(!empty($emppay))
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="Allowances">Allowances</span><font color="Red">*</font>
-                                           <input type="text" class="form-control required" id="Allowances" name="Allowances" value="<?php echo $Allowances; ?>" pattern="[0-9]{1,4}" title="Minimum 1 digit,Maximum 4 Digit">
+                                           <input type="text" class="form-control required" id="Allowances" name="Allowances" value="<?php echo $Allowances; ?>" pattern="([0-9]{1,5}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 4 Digit">
                                         </div>
                                     </div>
                                 </div>
@@ -235,7 +235,7 @@ if(!empty($emppay))
                                 <div class="form-group">
                                     <div class="form-group">
                                         <span for ="Food_Allowances">Food Allowances</span><font color="Red">*</font>
-                                         <input type="text" class="form-control" id="Food_Allowances" name="Food_Allowances" value="<?php echo $Food_Allowances; ?>" pattern="[0-9]{1,4}" title="Minimum 1 digit,Maximum 4 Digit">  
+                                         <input type="text" class="form-control" id="Food_Allowances" name="Food_Allowances" value="<?php echo $Food_Allowances; ?>" pattern="([0-9]{1,3}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 4 Digit">  
                                         </div>
                                     </div>
                                 </div>
@@ -252,7 +252,7 @@ if(!empty($emppay))
 
 
                                         <span for="Pay_Data_ID">Loan Amount</span>
-                                        <input type="text" class="form-control"  id="Loan_Amount" name="Loan_Amount" value="<?php echo $Loan_Amount; ?>" pattern="[0-9]{1,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
+                                        <input type="text" class="form-control"  id="Loan_Amount" name="Loan_Amount" value="<?php echo $Loan_Amount; ?>" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
                                     </div>
                                     </div>
                                 </div>
@@ -274,7 +274,7 @@ if(!empty($emppay))
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Basic_Pay">Monthly Due</span>
-                                        <input type="text" class="form-control requried" id="monthly_due" name="monthly_due" value="<?php echo $Monthly_due; ?>" pattern="[0-9]{4,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
+                                        <input type="text" class="form-control requried" id="monthly_due" name="monthly_due" value="<?php echo $Monthly_due; ?>" pattern="[0-9]{1,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
                                     </div>
                                     </div>
                                 </div>
@@ -299,7 +299,7 @@ if(!empty($emppay))
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Basic_Pay">Paid Amount</span>
-                                        <input type="text" class="form-control requried" id="Paid_Amount" name="Paid_Amount" value="<?php echo $Paid_Amount; ?>" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit" readonly>
+                                        <input type="text" class="form-control requried" id="Paid_Amount" name="Paid_Amount" value="<?php echo $Paid_Amount; ?>" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" readonly>
                                     </div>
                                     </div>
                                 </div>
diff --git a/application/views/editOldmonthly.php b/application/views/editOldmonthly.php
index d9acb46b..f259510d 100755
--- a/application/views/editOldmonthly.php
+++ b/application/views/editOldmonthly.php
@@ -26,7 +26,7 @@ if(!empty($monthly))
                 $LOP_Days=$mpi->LOP_Days; 
                 $OT_Hrs_Worked=$mpi->OT_Hrs_Worked;
                 $Loan_Recovered=$mpi->Loan_Recovered;
-                $Loan_Balance=$mpi->Loan_Balance; 
+
                 $Incentives=$mpi->Incentives;
                 $Other_Deductions=$mpi->Other_Deductions; 
                 $Created_By=$mpi->Created_By;
@@ -47,7 +47,7 @@ if(!empty($monthly))
 function validateLOP(){
 	var x = $("#LOPDays").val();
     
-	var ck_lopdays = /^[0-9 ]{1,2}$/;
+	var ck_lopdays = /^([0-9]{1,2}([.][0-9]{1,2})$/;
 	if(!(ck_lopdays.test(x) && x<=31)){
 	 
 	 $("#LOPDays").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
@@ -76,7 +76,7 @@ else{
 function validateLR(){
 var x = $("#Loan_Recovered").val();
     
-	var ck_lopdays = /^[0-9 ]{1,6}$/;
+	var ck_lopdays = /^[0-9]{1,6}([.][0-9]{1,2})?$/;
 	if(!(ck_lopdays.test(x) && x<=100000)){
 	 
 	$("#Loan_Recovered").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
@@ -120,7 +120,7 @@ else{
 function validateINC(){
 var x = $("#Incentives").val();
     
-	var ck_lopdays = /^[0-9 ]{1,6}$/;
+	var ck_lopdays = /^[0-9]{1,5}([.][0-9]{1,2})?$/;
 	if(!(ck_lopdays.test(x))){
 	 
 	 $("#Incentives").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
@@ -134,7 +134,7 @@ else{
 function validateODD(){
 var x = $("#Other_Deductions").val();
     
-	var ck_lopdays = /^[0-9 ]{1,6}$/;
+	var ck_lopdays = /^[0-9]{1,6}([.][0-9]{1,2})?$/;
 	if(!(ck_lopdays.test(x))){
 	 
 	 $("#Other_Deductions").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
@@ -208,7 +208,7 @@ function validateAll(){
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="LOP_Days">LOP Days:</span>
-                                        <input type="text" class="form-control requried" id="LOPDays" onfocusout="validateLOP();" title="lopdays" name="LOP_Days" pattern="[0-9]{1,2}" value="<?php echo $LOP_Days; ?>">
+                                        <input type="text" class="form-control requried" id="LOPDays" onfocusout="validateLOP();" title="lopdays" name="LOP_Days" pattern="([0-9]{1,2}([.][0-9]{1,2})" value="<?php echo $LOP_Days; ?>">
                                     </div>
                                     </div>
                                 </div>
@@ -235,7 +235,7 @@ function validateAll(){
                                     <div class="form-group">
                                          <div class="form-group">
                                            <span for="Loan_Recovered">Loan Recovered:</span>
-                                           <input type="text" class="form-control required" id="Loan_Recovered" name="Loan_Recovered" onfocusout="validateLR();" pattern="[0-9 ]{1,6}" value="<?php echo $Loan_Recovered; ?>">
+                                           <input type="text" class="form-control required" id="Loan_Recovered" name="Loan_Recovered" onfocusout="validateLR();" pattern="[0-9]{1,6}([.][0-9]{1,2})?" value="<?php echo $Loan_Recovered; ?>">
                                         </div>
                                     </div>
                                 </div>
@@ -244,7 +244,7 @@ function validateAll(){
                                     <div class="form-group">
                                          <div class="form-group">
                                            <span for="Incentives">Incentives:</span>
-                                           <input type="text" class="form-control required" id="Incentives" onfocusout="validateINC();" name="Incentives" pattern="[0-9 ]{1,6}" value="<?php echo $Incentives; ?>">
+                                           <input type="text" class="form-control required" id="Incentives" onfocusout="validateINC();" name="Incentives" pattern="[0-9]{1,5}([.][0-9]{1,2})?" value="<?php echo $Incentives; ?>">
                                         </div>
                                     </div>
                                 </div>
@@ -271,7 +271,7 @@ function validateAll(){
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="Other_Deductions">Other Deductions:</span>
-                                           <input type="text" class="form-control required" id="Other_Deductions" onfocusout="validateODD();" name="Other_Deductions" pattern="[0-9 ]{1,6}" value="<?php echo $Other_Deductions; ?>">
+                                           <input type="text" class="form-control required" id="Other_Deductions" onfocusout="validateODD();" name="Other_Deductions" pattern="[0-9]{1,6}([.][0-9]{1,2})?" value="<?php echo $Other_Deductions; ?>">
                                         </div>
                                     </div>
                                 </div>
diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
index b4c68679..af39ac74 100755
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -56,6 +56,7 @@ foreach ($PaymentTerms as $TER)
 		$totOrderSummaryAmt   = 0.0;
 		$PaymentOtherDescription='';
 		$ServiceDescription = '';
+		$taxrange="";
 
 if(!empty($POMaster))
 {
@@ -83,6 +84,8 @@ if(!empty($POMaster))
 		$DeliveryAddress =$Req->DeliveryAddress;
 		$POStatus	 = 	$Req->StatusName;
 		$PONO = 	$Req->PONO;	
+		$taxrange=$Req->CapitalRange;
+		//echo $taxrange . "t";
 		$ServiceDescription = $Req->ServiceDescription;	
 			
     }
@@ -354,6 +357,46 @@ function calculateDiscount()
 				calculateEditTotalValue();	
 	
  }
+ 
+ function SetVatorCST()
+ {
+	  StateTaxCheck = $("input:radio[name='Range']:checked").val();
+	  $('#txtPoRange').val(StateTaxCheck) ; 
+	  //alert(StateTaxCheck);
+	  //alert('Radio clicke:'+StateTaxCheck);
+	  if(StateTaxCheck == "0")
+	  {
+		  //alert("local");
+		  // style="display:none;"
+			$('#Vat').removeAttr("style");
+			$('#TotSCST').removeAttr("style");
+		   $('#CST').attr("style","display:none;");
+		    $('#TotICST').attr("style","display:none;");
+			 $('#IGSTEditModel').attr("style","display:none;");
+					  $('#SGSTEditModel').removeAttr("style");
+					   $('#IGSTViewModel').attr("style","display:none;");
+					  $('#SGSTViewModel').removeAttr("style");
+					  
+					 $('#IGSTAddModel').attr("style","display:none;");
+					  $('#SGSTAddModel').removeAttr("style");
+	  }
+	  else
+	  {
+		 // alert("111"); 
+		   $('#CST').removeAttr("style");
+		   $('#TotICST').removeAttr("style");
+		   $('#SGSTShow').attr("style","display:none;");
+		   $('#IGSTShow').attr("style","display:block;");
+		   
+		   $('#TotSCST').attr("style","display:none;");
+		    $('#IGSTEditModel').removeAttr("style");
+					  $('#SGSTModel').attr("style","display:none;");
+					   $('#IGSTViewModel').removeAttr("style");
+					  $('#IGSTModel').attr("style","display:block;");
+					  $('#IGSTAddModel').removeAttr("style");
+					  $('#SGSTAddModel').attr("style","display:none;");
+	  }
+ }
  /*
  * To calcuate the Packaging  */
 function calculatePackaging()
@@ -424,6 +467,7 @@ function calculatePackaging()
 	
  }
  
+ 
 
  function calculateVat()//SGST
  {
@@ -752,6 +796,7 @@ function calculateEditTaxValue()
                     $('#Deliverydtdiv').hide();
                     $('#Schedulediv').show();
                 });
+				SetVatorCST();
             });
 			$(document).ready(function () {
                 $('#Local').click(function () {
@@ -857,8 +902,9 @@ function calculateEditTaxValue()
 							<b><u>Select Tax Range</u></b><br/> 
 							<tr>
 							<td>
-							<?php echo form_label('Local', 'Local') ."&nbsp;&nbsp;". form_radio(array("name"=>"Range","id"=>"Local","value"=>"0", 'checked'=>set_radio('Range', '0', TRUE),'onchange'=>'SetVatorCST();')); ?>&nbsp;&nbsp;</td>
-							<td><?php echo form_label('Inter state', 'Inter state') ."&nbsp;&nbsp;". form_radio(array("name"=>"Range","id"=>"Inter_state","value"=>"1", 'checked'=>set_radio('Range', '1', FALSE),'onchange'=>'SetVatorCST();')); ?> 										
+							
+							<?php echo form_label('Local', 'Local') ."&nbsp;&nbsp;". form_radio(array("name"=>"Range","id"=>"Local","value"=>"0", 'checked'=>('0' == $taxrange) ? TRUE : FALSE,'onchange'=>'SetVatorCST();')); ?>&nbsp;&nbsp;</td>
+							<td><?php echo form_label('Inter state', 'Inter state') ."&nbsp;&nbsp;". form_radio(array("name"=>"Range","id"=>"Inter_state","value"=>"1", 'checked'=>('1' == $taxrange) ? TRUE : FALSE,'onchange'=>'SetVatorCST();')); ?> 										
 							</td> 
 							</tr>
 						</div>