From 27b6ed60659f5a02805e7128cfdadc0d21ac8da4 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sun, 18 Feb 2018 15:34:40 +0530
Subject: [PATCH] cashbook issue fixed

---
 application/views/addnewIncomeExpense.php | 29 +++++++++++++----------
 application/views/cashbooklisting.php     |  6 +----
 application/views/editincomeexpenses.php  | 27 ++++++++++-----------
 application/views/income_expense_list.php |  2 +-
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/application/views/addnewIncomeExpense.php b/application/views/addnewIncomeExpense.php
index e4684b96..f13e8331 100755
--- a/application/views/addnewIncomeExpense.php
+++ b/application/views/addnewIncomeExpense.php
@@ -50,7 +50,7 @@
     
     <section class="content">
 		<div style="text-align:right;">
-			<a href="<?php base_url() ?>ViewIncomeExpense" class="btn btn-primary" value="Back"/>Back</a>
+			<a href="<?php echo base_url() ?>cashbook/incomeExpenseList" class="btn btn-primary" value="Back"/>Back</a>
 		</div><br><br>
 		
 		<div style="">
@@ -152,7 +152,7 @@
 									<div class="col-md-3">
 											<div class="form-group">
 											<b>
-												<span for="SGST">SGST(&#8377;):</span><span style="color:red">*</span>
+												<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)">
 												
@@ -161,7 +161,7 @@
 									<div class="col-md-3">
 											<div class="form-group">
 											<b>
-												<span for="CGST">CGST(&#8377;):</span><span style="color:red">*</span>
+												<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)">
 												
@@ -171,9 +171,9 @@
 									<div class="col-md-3">
 										<div class="form-group">
 										<b>
-											<span for="IGST">IGST(&#8377;):</span></b><span style="color:red">*</span>
+											<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">
+											<input type="text" class="form-control"  style="text-align:right;" onkeypress="return isNumberKey(event)" onchange = GSTvalue(this.id) id="IGST" name="IGST">
 										</div>
 									</div>
 								</div>
@@ -270,8 +270,8 @@
 			    </div></div>
 				
 				<div class="col-md-3"><div class="form-group">
-			    	<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)">	
+			    	<b><span for="SGST">SGST(&#8377;):</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,14 +279,14 @@
 		
 		<div class="col-md-12">
 			    <div class="col-md-3"><div class="form-group">
-				    <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();">
+				    <b><span for="CGST">CGST(&#8377;):</span></b></br></br>
+					<input type="text" class="form-control" id="PaymentCGST" style="text-align:right;" name="PaymentCGST" onkeypress="return isNumberKey(event)" onchange="paymenttotalamount();">
 				</div></div>
 			  
 	
 		        <div class="col-md-3"><div class="form-group">
 			        <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">
+					<input type="text" class="form-control"  style="text-align:right;" onkeypress="return isNumberKey(event)" onchange = "PaymentGSTvalue(this.id);" id="PaymentIGST" name="PaymentIGST" >
 				</div></div>
         </div>
 		
@@ -642,7 +642,7 @@ function PaymentGSTvalue(id)
 	  $('#PaymentCGST').val(parseFloat(sgst).toFixed(2));
 	  $('#PaymentSGST').val(parseFloat(sgst).toFixed(2));
 	  $('#PaymentIGST').val('0.00');
-	  paymenttotalamount()
+	 paymenttotalamount()
   }
   
   if(id == 'PaymentIGST')
@@ -752,7 +752,11 @@ function removeRow(input) {
 
 	var subtracttotal = $("#Paymentamount"+number).val();
 	var total = $('#Paymenttotalamount').val();	
+	var valuebeforegst = $('#PaymentvaluebeforegST').val();
 	subtracttotal = total - subtracttotal;	
+	valuebeforegst = valuebeforegst - subtracttotal;
+	
+
 //	var accode = $('#Paymentaccode'+number).val();
 
 //	temparray = jQuery.grep(temparray, function(value) {
@@ -771,6 +775,7 @@ function removeRow(input) {
 	
 	
 	$('#Paymenttotalamount').val(subtracttotal);	
+	$('#PaymentvaluebeforegST').val(valuebeforegst);
 }
 
 	
@@ -814,7 +819,7 @@ function paymenttotalamount(){
 	 } 
 
 	   withtax = parseFloat(total)+parseFloat(sgst)+parseFloat(cgst)+parseFloat(igst);
-	   //alert('withtax'+withtax+'total'+total+'sgst'+sgst+'cgst'+cgst+'igst'+igst);
+	   //alert('sgst'+sgst+'cgst'+cgst+'igst'+igst);
 	 $('#PaymentvaluebeforegST').val(parseFloat(total).toFixed(2));
 	 $('#Paymenttotalamount').val(parseFloat(withtax).toFixed(2));
 
diff --git a/application/views/cashbooklisting.php b/application/views/cashbooklisting.php
index 35af8ea0..c9b43ad6 100755
--- a/application/views/cashbooklisting.php
+++ b/application/views/cashbooklisting.php
@@ -232,8 +232,8 @@ $('#Add').click(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');
@@ -261,10 +261,6 @@ $('#Add').click(function(){
 </script>
 <script>
 
-
-	
-	
-	
 	function validateACCODE()
 	{
 		var accode = [];
diff --git a/application/views/editincomeexpenses.php b/application/views/editincomeexpenses.php
index 4abbd12b..7ae24a7c 100755
--- a/application/views/editincomeexpenses.php
+++ b/application/views/editincomeexpenses.php
@@ -86,7 +86,7 @@ if(!empty($PaymentMultiple))
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php base_url() ?>incomeExpenseList" class="btn btn-primary" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>cashbook/incomeExpenseList" class="btn btn-primary" value="Back"/>Back</a>
 	</div>
 	<br>
 
@@ -178,7 +178,7 @@ if(!empty($PaymentMultiple))
 									  
 									    <div class="col-md-3"><div class="form-group">
 									             <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; ?>">
+												 <input type="text" class="form-control"  style="text-align:right;" onkeypress="return isNumberKey(event)" onchange = GSTvalue(this.id) id="IGST" name="IGST" value="<?php echo $IGST1; ?>">
 										</div></div>
 
 								</div>
@@ -307,7 +307,7 @@ if(!empty($PaymentMultiple))
 									
 												<div class="col-md-3"><div class="form-group">
 													<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; ?>">
+													<input type="text" class="form-control"  style="text-align:right;" onkeypress="return isNumberKey(event)" onchange = PaymentGSTvalue(this.id) id="PaymentIGST" name="PaymentIGST" value="<?php echo $IGST1; ?>">
 												</div></div>
 										</div>
 										
@@ -679,9 +679,9 @@ function validate()
   var merchant = $('#merchant').val();
   var mergst = $('#merchantgst').val();
   var beforegst = $('#valuebeforegST').val();
-  var sgst = $('#SGST').val();
-  var cgst = $('#CGST').val();
-  var igst = $('#IGST').val();
+//   var sgst = $('#SGST').val();
+//   var cgst = $('#CGST').val();
+//   var igst = $('#IGST').val();
   var total = $('#totalamount').val();
   var errorflag = 0;
   
@@ -709,7 +709,7 @@ function validate()
  if(gstcheck == true)
   {
 	  
-	  if((merchant == '') || (mergst == '') || (Invoiceno == '') || (beforegst == '') || (sgst == '') || (cgst == '') || (igst == ''))
+	  if((merchant == '') || (mergst == '') || (Invoiceno == '') || (beforegst == '')) /* || (sgst == '') || (cgst == '') || (igst == ''))*/
 	  {
 		  errorflag++;
 	  }
@@ -1067,13 +1067,12 @@ function valid(){
 	return false;
 	
   }
-  else if($('#PaymentSGST').val() == '')
-  {
-	alert("Please Provide Sgst data..!");
-	$('#PaymentSGST').focus();
-	return false;
-	
-  }
+//   else if($('#PaymentSGST').val() == '')
+//   {
+// 	alert("Please Provide Sgst data..!");
+// 	$('#PaymentSGST').focus();
+// 	return false;
+//   }
   else if($('#hidecounter').val() == 1){
 
    if($("option:selected", $("#Paymentaccode1")).val() == '-1')
diff --git a/application/views/income_expense_list.php b/application/views/income_expense_list.php
index 85c2ebb7..c1a4d85b 100755
--- a/application/views/income_expense_list.php
+++ b/application/views/income_expense_list.php
@@ -12,7 +12,7 @@
 	   <div class="box">
         <div class="box-header">
           <div align="right" style="padding-right:10px">		
-            <a href="cashbook/addNewIncomeExpenseLoad"  class="btn btn-primary" align="right"style="padding-right:10px" >Add New</a>
+            <a href="<?php echo base_url(); ?>cashbook/addNewIncomeExpenseLoad"  class="btn btn-primary" align="right"style="padding-right:10px" >Add New</a>
                 <!-- <a href="<?php echo base_url(); ?>addNewIncomeExpenseLoad"  class="btn btn-primary" align="right"style="padding-right:10px" >Add New</a> -->
 			    </div>
         </div>