From 0ac549f276fa860ac54943625664d2951f14a44a Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 16 Feb 2018 17:44:30 +0530
Subject: [PATCH] cashbook issues fixed

---
 application/views/addnewIncomeExpense.php  |  35 +++---
 application/views/cashbooklisting.php      |  36 ++++++-
 application/views/cashbookpdf.php          |  14 +--
 application/views/editincomeexpenses.php   | 120 ++++++++++-----------
 application/views/includes/header.php      |   2 +-
 application/views/income_expense_list.php  |   8 +-
 application/views/viewIndIncomeExpense.php |   8 +-
 7 files changed, 128 insertions(+), 95 deletions(-)

diff --git a/application/views/addnewIncomeExpense.php b/application/views/addnewIncomeExpense.php
index 5af6c133..e4684b96 100755
--- a/application/views/addnewIncomeExpense.php
+++ b/application/views/addnewIncomeExpense.php
@@ -145,14 +145,14 @@
 									<div class="col-md-3">
 										<div class="form-group">
 										<b>
-											<span for="ValuebeforeGST">Value before GST:</span></b>
+											<span for="ValuebeforeGST">Value before GST(&#8377;):</span></b>
 											<input  id="valuebeforegST"  name="valuebeforegST"  style="text-align:right;" class="form-control" onkeypress="return isNumberKey(event)">
 									    </div>
 								    </div>
 									<div class="col-md-3">
 											<div class="form-group">
 											<b>
-												<span for="SGST">SGST:</span><span style="color:red">*</span>
+												<span for="SGST">SGST(&#8377;):</span><span style="color:red">*</span>
 												</b>
 												<input type="text" class="form-control" style="text-align:right;" onchange="GSTvalue(this.id)" id="SGST" name="SGST" onkeypress="return isNumberKey(event)">
 												
@@ -161,7 +161,7 @@
 									<div class="col-md-3">
 											<div class="form-group">
 											<b>
-												<span for="CGST">CGST:</span><span style="color:red">*</span>
+												<span for="CGST">CGST(&#8377;):</span><span style="color:red">*</span>
 												</b>
 												<input type="text" class="form-control" id="CGST" style="text-align:right;" name="CGST" onkeypress="return isNumberKey(event)">
 												
@@ -171,7 +171,7 @@
 									<div class="col-md-3">
 										<div class="form-group">
 										<b>
-											<span for="IGST">IGST:</span></b><span style="color:red">*</span>
+											<span for="IGST">IGST(&#8377;):</span></b><span style="color:red">*</span>
 											
 											<input type="text" class="form-control required"  style="text-align:right;" onkeypress="return isNumberKey(event)" onchange = GSTvalue(this.id) id="IGST" name="IGST">
 										</div>
@@ -181,7 +181,7 @@
 							<div class="row">
 								<div class="col-md-12">
 										<div class="col-md-4">
-											<b><span for="Total">Total Amount:</span></b><!--<span style="color:red">*</span>-->
+											<b><span for="Total">Total Amount(&#8377;):</span></b><!--<span style="color:red">*</span>-->
 											
 											<input type="text" class="form-control"  id="totalamount" name="totalamount"  onkeypress="return isNumberKey(event)" style="text-align:right;">
 										</div>
@@ -265,12 +265,12 @@
 	            </div></div>
 
 			    <div class="col-md-3"><div class="form-group">
-					<b><span for="ValuebeforeGST">Value before GST:</span></b><!--<span style="color:red">*</span>--></br></br>
+					<b><span for="ValuebeforeGST">Value before GST(&#8377;):</span></b><!--<span style="color:red">*</span>--></br></br>
 					<input  id="PaymentvaluebeforegST"  name="PaymentvaluebeforegST"  style="text-align:right;" class="form-control" onkeypress="return isNumberKey(event)" value='0.00' readonly>
 			    </div></div>
 				
 				<div class="col-md-3"><div class="form-group">
-			    	<b><span for="SGST">SGST:</span><span style="color:red">*</span></b></br></br>
+			    	<b><span for="SGST">SGST(&#8377;):</span><span style="color:red">*</span></b></br></br>
 					<input type="text" class="form-control" style="text-align:right;" onchange="PaymentGSTvalue(this.id)" id="PaymentSGST" name="PaymentSGST" onkeypress="return isNumberKey(event)">	
 				</div>	</div>
 		</div>
@@ -279,13 +279,13 @@
 		
 		<div class="col-md-12">
 			    <div class="col-md-3"><div class="form-group">
-				    <b><span for="CGST">CGST:</span><span style="color:red">*</span></b></br></br>
+				    <b><span for="CGST">CGST(&#8377;):</span><span style="color:red">*</span></b></br></br>
 					<input type="text" class="form-control" id="PaymentCGST" style="text-align:right;" name="PaymentCGST" onkeypress="return isNumberKey(event)" onchange="paymrnttotalamount();">
 				</div></div>
 			  
 	
 		        <div class="col-md-3"><div class="form-group">
-			        <b><span for="IGST">IGST:</span></b></br></br>
+			        <b><span for="IGST">IGST(&#8377;):</span></b></br></br>
 					<input type="text" class="form-control required"  style="text-align:right;" onkeypress="return isNumberKey(event)" onchange = PaymentGSTvalue(this.id) id="PaymentIGST" name="PaymentIGST">
 				</div></div>
         </div>
@@ -307,7 +307,7 @@
 			</div></div>
 
 			<div class="col-md-3"><div class="form-group">
-					<span for="amount"><b>Amount:</b></span><span style="color:red">*</span> 
+					<span for="amount"><b>Amount(&#8377;):</b></span><span style="color:red">*</span> 
 					<input type="text" class="form-control"  required style="text-align:right;" id="Paymentamount1" name="mydata1[Paymentamount1]" onchange="paymenttotalamount();" onkeypress="return isNumberKey(event)" requried>
 			</div></div>
 	
@@ -326,7 +326,7 @@
 	
 	<div class="row">
 		<div class="col-md-12"><div class="col-md-4">
-					<b><span for="Total">Total Amount:</span></b><!--<span style="color:red">*</span>-->				 
+					<b><span for="Total">Total Amount(&#8377;):</span></b><!--<span style="color:red">*</span>-->				 
 					<input type="text" class="form-control"  id="Paymenttotalamount" name="Paymenttotalamount"  onkeypress="return isNumberKey(event)" style="text-align:right;" value='0.00' readonly>
 		</div></div>
 	</div>
@@ -369,6 +369,13 @@ $(function() {
 	var t = [];
 	var ex = [];
 	var inc = [];
+	$('#SGST').val('0.00');
+  	$('#CGST').val('0.00');
+  	$('#IGST').val('0.00');
+	$('#PaymentSGST').val('0.00');
+    $('#PaymentCGST').val('0.00');
+    $('#PaymentIGST').val('0.00');
+
 	t= <?php echo json_encode($dropdownvalues)?>;
 	
 	var options = '';
@@ -683,17 +690,17 @@ div.id = "divid"+counterConstant;
 div.className="row";
 div.style.cssText = "border:1px dashed; margin-left:0px;margin-right:0px;";
 div.innerHTML='<div class="col-md-12"><div class="col-md-3"><div class="form-group"><b>'+
-					'<span for="name">Account Name Select:</span><span style="color:red">*</span>'+
+					'<span for="name">Account Name Select:</span>'+
 					'<select class="form-control required Pay"  required id="Paymentaccode'+counterConstant+'"  required onchange="changevalue();" name="mydata'+counterConstant+'[Paymentaccode'+counterConstant+']">'+
 						'<option value="-1">Account Name Select</option>'+
 					'</select>'+
 				'</div></div>'+
 			    '<div class="col-md-3"><div class="form-group">'+
-					'<span for="Decription"><b>Description:</b></span> '+
+					'<span for="subDecription"><b>Account Description:</b></span> '+
 					'<input type="text" class="form-control required"  style="text-align:right;" id="subdescription'+counterConstant+'" name="mydata'+counterConstant+'[subdescription'+counterConstant+']">'+
 				'</div></div>'+
 				'<div class="col-md-3"><div class="form-group">'+
-					'<span for="amount"><b>Amount:</b></span> '+
+					'<span for="amount"><b>Amount(&#8377;):</b></span> '+
 					'<input type="text" class="form-control required"  style="text-align:right;" id="Paymentamount'+counterConstant+'" name="mydata'+counterConstant+'[Paymentamount'+counterConstant+']" onchange="paymenttotalamount();" onkeypress="return isNumberKey(event)">'+
 				'</div></div>'+
 		     	'<div class="col-md-offset-2 col-md-1" style="padding-top:15px;padding-left:0px"><div class="form-group">'+
diff --git a/application/views/cashbooklisting.php b/application/views/cashbooklisting.php
index 7ead6e4c..6ec3e004 100755
--- a/application/views/cashbooklisting.php
+++ b/application/views/cashbooklisting.php
@@ -117,6 +117,22 @@
 </script>
 <script>
 
+$(document).ready(function(){
+//  var columnNumber = 2;
+  
+// if($('#databaseAppend tr').find('td').eq(2).text() == ''){
+//   alert('new');
+// }
+
+alert($('#cashbooktable tbody').find('td:empty').length);
+if( $('#cashbooktable tbody').find('td:empty').length ) {
+  alert("at least one <td> is empty"):
+  
+}
+
+
+});
+
 var index     = '1';
  var localcodes =[];
 $('#Add').click(function(){
@@ -210,12 +226,21 @@ $('#Add').click(function(){
   
   function saveAll()
   {
-	 
-	  $('#loadingcontent').loader('show');
+	 var i=0;
+    $('#databaseAppend tr').each(function(){
+          if($(this).find('td').eq(2).text() == ''){
+          //alert('One or More Account Name is Empty');
+          //return false;
+          }
+          i++;
+    });
+    if(i==0){
+      //alert('i am not empty value');
+    
+    $('#loadingcontent').loader('show');
                 var tablevalue = $('#cashbooktable').tableToJSON(); // Convert the table into a javascript object
-                  var value = JSON.stringify(tablevalue);
+                var value = JSON.stringify(tablevalue);      
                 $.ajax({
-
                 data:{id:value},
                 type:"POST",
                 url:"<?php echo base_url() ?>cashbook/cashbookdtl",
@@ -227,6 +252,9 @@ $('#Add').click(function(){
                 }//success function closed
                 
                 });//ajax function closed
+              }else{alert('In Account Table One or More Account Name is Empty !');
+          return false;}
+
   }
   
 </script>
diff --git a/application/views/cashbookpdf.php b/application/views/cashbookpdf.php
index 8a4d67d9..91a2ba51 100755
--- a/application/views/cashbookpdf.php
+++ b/application/views/cashbookpdf.php
@@ -47,19 +47,19 @@ $pic = base_url().'uploads/images/'.$company[0]->ProfilePic;
 <?php if(($data[0]->name) == 'multiple'){ ?>
 <tr style="height: 46px;">
 <td style="width: 100px; height: 46px;">&nbsp;Tax</td>
-<td>SGST :<b><?php echo $data[0]->sgst;?></b></td>
-<td>CGST :<b><?php echo $data[0]->cgst;?></b></td>
-<td>IGST :<b><?php echo $data[0]->igst;?></b></td>
+<td>SGST :<b>&#8377;<?php echo $data[0]->sgst;?></b></td>
+<td>CGST :<b>&#8377;<?php echo $data[0]->cgst;?></b></td>
+<td>IGST :<b>&#8377;<?php echo $data[0]->igst;?></b></td>
 </tr>
 
 <tr style="height: 46px;">
-<td style="width: 100px; height: 46px;">&nbsp;Multiple Payment</td>
+<td style="width: 100px; height: 46px;">&nbsp;Payment Details</td>
 <td colspan="3">
 <table style="border: 1px solid black;  border-collapse: collapse;">
     <tr style="border: 1px solid black;  border-collapse: collapse;">
-	   <td style="border: 1px solid black;  border-collapse: collapse;">Account Name</td>
-	   <td style="border: 1px solid black;  border-collapse: collapse;">Account Description</td>
-	   <td style="border: 1px solid black;  border-collapse: collapse;">Account Amount</td></tr>        
+	   <td style="border: 1px solid black;  border-collapse: collapse;">Name</td>
+	   <td style="border: 1px solid black;  border-collapse: collapse;">Description</td>
+	   <td style="border: 1px solid black;  border-collapse: collapse;">Amount(&#8377;)</td></tr>        
 			<?php if(!empty($PaymentDetails) ) {
 			      foreach($PaymentDetails as $paydtl)
 				  { 
diff --git a/application/views/editincomeexpenses.php b/application/views/editincomeexpenses.php
index 8f855442..4abbd12b 100755
--- a/application/views/editincomeexpenses.php
+++ b/application/views/editincomeexpenses.php
@@ -164,20 +164,20 @@ if(!empty($PaymentMultiple))
 								<div class="col-md-12">
 								
 								        <div class="col-md-3"><div class="form-group">
-												<b><span for="ValuebeforeGST">Value before GST:</span></b>
+												<b><span for="ValuebeforeGST">Value before GST(&#8377;):</span></b>
 												<input  id="valuebeforegST"  name="valuebeforegST"  style="text-align:right;" class="form-control" onkeypress="return isNumberKey(event)" value="<?php echo $valuebeforegst1; ?>">
                                     	</div></div>
 										<div class="col-md-3"><div class="form-group">
-												<b><span for="SGST">SGST:</span></b>
+												<b><span for="SGST">SGST(&#8377;):</span></b>
 												<input type="text" class="form-control" style="text-align:right;" onchange="GSTvalue(this.id)" id="SGST" name="SGST" onkeypress="return isNumberKey(event)" value="<?php echo $SGST1; ?>">
 										</div></div>
 									    <div class="col-md-3"><div class="form-group">
-										        <b><span for="CGST">CGST:</span></b>
+										        <b><span for="CGST">CGST(&#8377;):</span></b>
 											    <input type="text" class="form-control" id="CGST" style="text-align:right;" name="CGST" onkeypress="return isNumberKey(event)" value="<?php echo $CGST1; ?>">
 										</div></div>
 									  
 									    <div class="col-md-3"><div class="form-group">
-									             <b><span for="IGST">IGST:</span></b>
+									             <b><span for="IGST">IGST(&#8377;):</span></b>
 												 <input type="text" class="form-control required"  style="text-align:right;" onkeypress="return isNumberKey(event)" onchange = GSTvalue(this.id) id="IGST" name="IGST" value="<?php echo $IGST1; ?>">
 										</div></div>
 
@@ -188,8 +188,7 @@ if(!empty($PaymentMultiple))
 							<div class="row">
 								<div class="col-md-12">
 										<div class="col-md-4">
-											<b><span for="Total">Total Amount:</span></b><span style="color:red">*</span>
-											 
+											<b><span for="Total">Total Amount(&#8377;):</span></b><span style="color:red">*</span>
 											<input type="text" class="form-control"  id="totalamount" name="totalamount"  onkeypress="return isNumberKey(event)" style="text-align:right;" value="<?php echo $viewdep; ?>">
 										</div>
 								</div>
@@ -277,7 +276,7 @@ if(!empty($PaymentMultiple))
 										
 										<div class="col-md-12">
 												<div class="col-md-3"><div class="form-group">
-														<b><span for="Paymentvoucher">Voucher Code</span></b><span style="color:red">*</span></br></br>
+														<b><span for="Paymentvoucher">Voucher Code:</span></b><span style="color:red">*</span></br></br>
 														<input  id="Paymentvouchercode"   name="Paymentvouchercode" value="<?php echo $invoiceno1; ?>" class="form-control" required onkeypress="return isNumberKey(event)" >
 												</div></div>
 
@@ -287,12 +286,12 @@ if(!empty($PaymentMultiple))
 												</div></div>
 
 												<div class="col-md-3"><div class="form-group">
-													<b><span for="ValuebeforeGST">Value before GST:</span></b><!--<span style="color:red">*</span>--></br></br>
+													<b><span for="ValuebeforeGST">Value before GST(&#8377;):</span></b><!--<span style="color:red">*</span>--></br></br>
 													<input  id="PaymentvaluebeforegST"  name="PaymentvaluebeforegST"  style="text-align:right;" class="form-control" onkeypress="return isNumberKey(event)" value="<?php echo $valuebeforegst1; ?>" readonly>
 												</div></div>
 												
 												<div class="col-md-3"><div class="form-group">
-													<b><span for="SGST">SGST:</span><span style="color:red">*</span></b></br></br>
+													<b><span for="SGST">SGST(&#8377;):</span><span style="color:red">*</span></b></br></br>
 													<input type="text" class="form-control" style="text-align:right;" onchange="PaymentGSTvalue(this.id)" id="PaymentSGST" name="PaymentSGST" onkeypress="return isNumberKey(event)" value="<?php echo $SGST1; ?>">	
 												</div>	</div>
 										</div>
@@ -301,13 +300,13 @@ if(!empty($PaymentMultiple))
 										
 										<div class="col-md-12">
 												<div class="col-md-3"><div class="form-group">
-													<b><span for="CGST">CGST:</span><span style="color:red">*</span></b></br></br>
+													<b><span for="CGST">CGST(&#8377;):</span><span style="color:red">*</span></b></br></br>
 													<input type="text" class="form-control" id="PaymentCGST" style="text-align:right;" name="PaymentCGST" onkeypress="return isNumberKey(event)" value="<?php echo $CGST1; ?>">
 												</div></div>
 											
 									
 												<div class="col-md-3"><div class="form-group">
-													<b><span for="IGST">IGST:</span></b></br></br>
+													<b><span for="IGST">IGST(&#8377;):</span></b></br></br>
 													<input type="text" class="form-control required"  style="text-align:right;" onkeypress="return isNumberKey(event)" onchange = PaymentGSTvalue(this.id) id="PaymentIGST" name="PaymentIGST" value="<?php echo $IGST1; ?>">
 												</div></div>
 										</div>
@@ -324,12 +323,12 @@ if(!empty($PaymentMultiple))
 											</div></div>
 										
 											<div class="col-md-3"><div class="form-group">
-													<b><span for="Decription"><b>Account Description:</b></span> 
+													<b><span for="Decription"><b>Account Description:</b></span><span style="color:red">*</span>
 													<input type="text" class="form-control"  style="text-align:right;" id="subdescription1" name="mydata1[subdescription1]" requried>
 											</div></div>
 
 											<div class="col-md-3"><div class="form-group">
-													<span for="amount"><b>Amount:</b></span> 
+													<span for="amount"><b>Amount(&#8377;):</b></span><span style="color:red">*</span>
 													<input type="text" class="form-control"  style="text-align:right;" id="Paymentamount1" name="mydata1[Paymentamount1]" onchange="paymenttotalamount();" requried onkeypress="return isNumberKey(event)">
 											</div></div>
 									
@@ -358,7 +357,7 @@ if(!empty($PaymentMultiple))
 									<div id="divid<?php echo $paydtlcount?>" class="row" style="border:1px dashed; margin-left:0px;margin-right:0px;">
 										<div class="col-md-12">
 											<div class="col-md-3"><div class="form-group">
-													<b><span for="PaymentAccname">Account Name Select:</span><span style="color:red">*</span>
+													<b><span for="PaymentAccname">Account Name Select:</span>
 													<select class="form-control required select2" id= "Paymentaccode<?php echo $paydtlcount?>" height required name="mydata<?php echo $paydtlcount?>[Paymentaccode<?php echo $paydtlcount?>]">
 													<option value="<?php echo $paydtl->Account_code;?>"><?php echo $paydtl->name;?></option>
 													<?php
@@ -395,7 +394,7 @@ if(!empty($PaymentMultiple))
 											</div></div>
 
 											<div class="col-md-3"><div class="form-group">
-													<span for="amount"><b>Amount:</b></span> 
+													<span for="amount"><b>Amount(&#8377;):</b></span> 
 													<input type="text" class="form-control"  style="text-align:right;" id="Paymentamount<?php echo $paydtlcount?>" name="mydata<?php echo $paydtlcount?>[Paymentamount<?php echo $paydtlcount?>]" onchange="paymenttotalamount();" requried value="<?php echo $paydtl->Amount ?>" onkeypress="return isNumberKey(event)">
 											</div></div>
 											
@@ -419,7 +418,7 @@ if(!empty($PaymentMultiple))
 									
 									<div class="row">
 										<div class="col-md-12"><div class="col-md-4">
-													<b><span for="Total">Total Amount:</span></b><!--<span style="color:red">*</span>-->				 
+													<b><span for="Total">Total Amount(&#8377;):</span></b><!--<span style="color:red">*</span>-->				 
 													<input type="text" class="form-control"  id="Paymenttotalamount" name="Paymenttotalamount"  onkeypress="return isNumberKey(event)" style="text-align:right;" value="<?php echo $viewdep; ?>" readonly>
 										</div></div>
 									</div>
@@ -866,28 +865,27 @@ if(paydtl == ''){ var counterConstant = 1; }
 
 function add_more()
 {
-//    if($("option:selected", $("#Paymentaccode1")).val() == '-1')
-//    {
-//      alert('Select/Choose account name');
-//      $('#Paymentaccode1').focus();
-//      return false;
-//    }
-//   else if($('#subdescription1').val() == '')
-//   {
-// 	alert("Provide Account description..!");
-// 	$('#subdescription1').focus();
-// 	return false;
+if($("option:selected", $("#Paymentaccode1")).val() == '-1')
+{
+     alert('Select/Choose account name');
+     $('#Paymentaccode1').focus();
+     return false;
+}
+else if($('#subdescription1').val() == '')
+{
+	alert("Provide Account description..!");
+	$('#subdescription1').focus();
+	return false;
 	
-//   }
-//   else if($('#Paymentamount1').val() == '')
-//   {
-// 	alert("Provide Amount data..!");
-// 	$('#Paymentamount1').focus();
-// 	return false;
-	
-//   }
-//   else
-//  {
+}
+else if($('#Paymentamount1').val() == '')
+{
+	alert("Provide Amount data..!");
+	$('#Paymentamount1').focus();
+	return false;
+}
+else
+{
 //	var paydtl = $('#hidepaydtl').val();
 // alert(paydtl);
 	
@@ -899,7 +897,7 @@ div.id = "divid"+counterConstant;
 div.className="row";
 div.style.cssText = "border:1px dashed; margin-left:0px;margin-right:0px;";
 div.innerHTML='<div class="col-md-12"><div class="col-md-3"><div class="form-group"><b>'+
-					'<span for="name">Account Name Select:</span><span style="color:red">*</span>'+
+					'<span for="name">Account Name Select:</span>'+
 					'<select class="form-control required "  required id="Paymentaccode'+counterConstant+'"  required name="mydata'+counterConstant+'[Paymentaccode'+counterConstant+']">'+
 						'<option value="-1">Account Name Select</option>'+
 					'</select>'+
@@ -909,7 +907,7 @@ div.innerHTML='<div class="col-md-12"><div class="col-md-3"><div class="form-gro
 					'<input type="text" class="form-control required"  style="text-align:right;" id="subdescription'+counterConstant+'" name="mydata'+counterConstant+'[subdescription'+counterConstant+']">'+
 				'</div></div>'+
 				'<div class="col-md-3"><div class="form-group">'+
-					'<span for="amount"><b>Amount:</b></span> '+
+					'<span for="amount"><b>Amount(&#8377;):</b></span> '+
 					'<input type="text" class="form-control required"  style="text-align:right;" id="Paymentamount'+counterConstant+'" name="mydata'+counterConstant+'[Paymentamount'+counterConstant+']" onkeypress="return isNumberKey(event)" onchange="paymenttotalamount();" onkeypress="return isNumberKey(event)">'+
 				'</div></div>'+
 		     	'<div class="col-md-offset-2 col-md-1" style="padding-top:15px;padding-left:0px"><div class="form-group">'+
@@ -919,7 +917,7 @@ div.innerHTML='<div class="col-md-12"><div class="col-md-3"><div class="form-gro
 			 
  $('#hidecounter').val(counter);
  $('#hideconstant').val(counterConstant);
-
+}
  t= <?php echo json_encode($dropdownvalues) ?>;
 
  var option = '';
@@ -1076,27 +1074,27 @@ function valid(){
 	return false;
 	
   }
-//   else if($("option:selected", $("#Paymentaccode1")).val() == '-1')
-//   {
-// 	alert("Please Select Account Code..!");
-// 	$('#Paymentaccode1').focus();
-// 	return false;
-	
-//   }
-//   else if($('#subdescription1').val() == '')
-//   {
-// 	alert("Please Provide Account description..!");
-// 	$('#subdescription1').focus();
-// 	return false;
-	
-//   }
-//   else if($('#Paymentamount1').val() == '')
-//   {
-// 	alert("Please Provide Amount data..!");
-// 	$('#Paymentamount1').focus();
-// 	return false;
-	
-//   }
+  else if($('#hidecounter').val() == 1){
+
+   if($("option:selected", $("#Paymentaccode1")).val() == '-1')
+   {
+ 	alert("Please Select Account Code..!");
+ 	$('#Paymentaccode1').focus();
+	return false;
+   }
+   else if($('#subdescription1').val() == '')
+   {
+ 	alert("Please Provide Account description..!");
+ 	$('#subdescription1').focus();
+ 	return false;	
+   }
+   else if($('#Paymentamount1').val() == '')
+   {
+ 	alert("Please Provide Amount data..!");
+ 	$('#Paymentamount1').focus();
+ 	return false;	
+   }
+  }
   else{
 	$('#updatePayment').submit();
   }
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index f94c1094..3f6e0188 100644
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -719,7 +719,7 @@ $full_path = $path .$pic;
                         </a></li>
             					<li><a href="<?php echo base_url(); ?>ViewIncomeExpense">
 														<i class="fa fa-credit-card"></i>
-														<span>Income and Expense</span>
+														<span>Receipt and Payment</span>
 												</a></li>
 										</ul>
 								</li>
diff --git a/application/views/income_expense_list.php b/application/views/income_expense_list.php
index 4f8b31ae..85c2ebb7 100755
--- a/application/views/income_expense_list.php
+++ b/application/views/income_expense_list.php
@@ -26,7 +26,7 @@
                     <th>Account Type</th>
                     <th>DATE</th>
                     <th>Account Name</th>
-                    <th>Amount</th>         
+                    <th>Amount(&#8377;)</th>         
                     <th>Details</th>
                     <th>Action</th>
                   </tr>
@@ -85,9 +85,9 @@
         <th>Account Type</th>
         <th>Account Name</th>
         <th>Sub Description</th>
-        <th>Amount</th>         
-        <th>Tax value (sgst+cgst+igst)</th>
-        <th>Total amount</th>
+        <th>Amount(&#8377;)</th>         
+        <th>Tax value(&#8377;)(sgst+cgst+igst)</th>
+        <th>Total amount(&#8377;)</th>
         </thead>
         <tbody id="tbleAppend"></tbody>
         </table>
diff --git a/application/views/viewIndIncomeExpense.php b/application/views/viewIndIncomeExpense.php
index c831a088..b1aef57d 100755
--- a/application/views/viewIndIncomeExpense.php
+++ b/application/views/viewIndIncomeExpense.php
@@ -88,9 +88,9 @@ if(!empty($data))
 			<tr><td colspan="12" >
 			<table width="100%" style="border: 1px solid black;  border-collapse: collapse;">
 			<tr style="border: 1px solid black;  border-collapse: collapse;">
-			<td style="text-align:left; border: 1px solid black;  border-collapse: collapse;" size="10"> Account Name &nbsp;</td>
-            <td style="text-align:right; border: 1px solid black;  border-collapse: collapse;" size="6"> Account Description &nbsp;</td>
-            <td style="text-align:right; border: 1px solid black;  border-collapse: collapse;" size="6"> Account Amount &nbsp;</td>
+			<td style="text-align:left; border: 1px solid black;  border-collapse: collapse;" size="10">Name &nbsp;</td>
+            <td style="text-align:right; border: 1px solid black;  border-collapse: collapse;" size="6">Description &nbsp;</td>
+            <td style="text-align:right; border: 1px solid black;  border-collapse: collapse;" size="6">Amount(&#8377;) &nbsp;</td>
 			</tr>
 			<?php if(!empty($PaymentDetails)) {
 			      foreach($PaymentDetails as $paydtl) { 
@@ -103,7 +103,7 @@ if(!empty($data))
 			<?php } } ?>
 			</table></td></tr>
 			
-			<tr style="border-bottom: 1px solid #000;"><td style="text-align:left; "><h5>Total Amount </h5></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td></td><td></td><td style="text-align:right;"><?php if(!empty($data[0]->total)){echo $data[0]->total;}?></td></tr>
+			<tr style="border-bottom: 1px solid #000;"><td style="text-align:left; "><h5>Total Amount(&#8377;) with tax </h5></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td></td><td></td><td style="text-align:right;"><?php if(!empty($data[0]->total)){echo $data[0]->total;}?></td></tr>
 			<tr> <td style="text-align:right;"><h5>Description :</h5></td> <td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><?php if(!empty($data[0]->description)){echo $data[0]->description;}?></td></tr>	
 			
 			</tbody>