RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cashbook issue fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-02-18 15:34:40 +05:30
parent bbb8afe7ac
commit 27b6ed6065
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
application/views/addnewIncomeExpense.php
View File

@ -50,7 +50,7 @@
<section class="content"> <section class="content">
<div style="text-align:right;"> <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><br><br>
<div style=""> <div style="">
@ -152,7 +152,7 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<b> <b>
<span for="SGST">SGST(&#8377;):</span><span style="color:red">*</span> <span for="SGST">SGST(&#8377;):</span>
</b> </b>
<input type="text" class="form-control" style="text-align:right;" onchange="GSTvalue(this.id)" id="SGST" name="SGST" onkeypress="return isNumberKey(event)"> <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="col-md-3">
<div class="form-group"> <div class="form-group">
<b> <b>
<span for="CGST">CGST(&#8377;):</span><span style="color:red">*</span> <span for="CGST">CGST(&#8377;):</span>
</b> </b>
<input type="text" class="form-control" id="CGST" style="text-align:right;" name="CGST" onkeypress="return isNumberKey(event)"> <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="col-md-3">
<div class="form-group"> <div class="form-group">
<b> <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> </div>
</div> </div>
@ -270,8 +270,8 @@
</div></div> </div></div>
<div class="col-md-3"><div class="form-group"> <div class="col-md-3"><div class="form-group">
<b><span for="SGST">SGST(&#8377;):</span><span style="color:red">*</span></b></br></br> <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)"> <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> </div>
</div> </div>
@ -279,14 +279,14 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"><div class="form-group"> <div class="col-md-3"><div class="form-group">
<b><span for="CGST">CGST(&#8377;):</span><span style="color:red">*</span></b></br></br> <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="paymrnttotalamount();"> <input type="text" class="form-control" id="PaymentCGST" style="text-align:right;" name="PaymentCGST" onkeypress="return isNumberKey(event)" onchange="paymenttotalamount();">
</div></div> </div></div>
<div class="col-md-3"><div class="form-group"> <div class="col-md-3"><div class="form-group">
<b><span for="IGST">IGST(&#8377;):</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"> <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></div>
</div> </div>
@ -642,7 +642,7 @@ function PaymentGSTvalue(id)
$('#PaymentCGST').val(parseFloat(sgst).toFixed(2)); $('#PaymentCGST').val(parseFloat(sgst).toFixed(2));
$('#PaymentSGST').val(parseFloat(sgst).toFixed(2)); $('#PaymentSGST').val(parseFloat(sgst).toFixed(2));
$('#PaymentIGST').val('0.00'); $('#PaymentIGST').val('0.00');
paymenttotalamount() paymenttotalamount()
} }
if(id == 'PaymentIGST') if(id == 'PaymentIGST')
@ -752,7 +752,11 @@ function removeRow(input) {
var subtracttotal = $("#Paymentamount"+number).val(); var subtracttotal = $("#Paymentamount"+number).val();
var total = $('#Paymenttotalamount').val(); var total = $('#Paymenttotalamount').val();
var valuebeforegst = $('#PaymentvaluebeforegST').val();
subtracttotal = total - subtracttotal; subtracttotal = total - subtracttotal;
valuebeforegst = valuebeforegst - subtracttotal;
// var accode = $('#Paymentaccode'+number).val(); // var accode = $('#Paymentaccode'+number).val();
// temparray = jQuery.grep(temparray, function(value) { // temparray = jQuery.grep(temparray, function(value) {
@ -771,6 +775,7 @@ function removeRow(input) {
$('#Paymenttotalamount').val(subtracttotal); $('#Paymenttotalamount').val(subtracttotal);
$('#PaymentvaluebeforegST').val(valuebeforegst);
} }
@ -814,7 +819,7 @@ function paymenttotalamount(){
} }
withtax = parseFloat(total)+parseFloat(sgst)+parseFloat(cgst)+parseFloat(igst); 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)); $('#PaymentvaluebeforegST').val(parseFloat(total).toFixed(2));
$('#Paymenttotalamount').val(parseFloat(withtax).toFixed(2)); $('#Paymenttotalamount').val(parseFloat(withtax).toFixed(2));

6
application/views/cashbooklisting.php
View File

@ -232,8 +232,8 @@ $('#Add').click(function(){
if($(this).find('td').eq(2).text() == ''){ if($(this).find('td').eq(2).text() == ''){
//alert('One or More Account Name is Empty'); //alert('One or More Account Name is Empty');
//return false; //return false;
}
i++; i++;
}
}); });
if(i==0){ if(i==0){
//alert('i am not empty value'); //alert('i am not empty value');
@ -261,10 +261,6 @@ $('#Add').click(function(){
</script> </script>
<script> <script>
function validateACCODE() function validateACCODE()
{ {
var accode = []; var accode = [];

27
application/views/editincomeexpenses.php
View File

@ -86,7 +86,7 @@ if(!empty($PaymentMultiple))
<section class="content"> <section class="content">
<div style="text-align:right;"> <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> </div>
<br> <br>
@ -178,7 +178,7 @@ if(!empty($PaymentMultiple))
<div class="col-md-3"><div class="form-group"> <div class="col-md-3"><div class="form-group">
<b><span for="IGST">IGST(&#8377;):</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; ?>"> <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></div>
</div> </div>
@ -307,7 +307,7 @@ if(!empty($PaymentMultiple))
<div class="col-md-3"><div class="form-group"> <div class="col-md-3"><div class="form-group">
<b><span for="IGST">IGST(&#8377;):</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; ?>"> <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></div>
</div> </div>
@ -679,9 +679,9 @@ function validate()
var merchant = $('#merchant').val(); var merchant = $('#merchant').val();
var mergst = $('#merchantgst').val(); var mergst = $('#merchantgst').val();
var beforegst = $('#valuebeforegST').val(); var beforegst = $('#valuebeforegST').val();
var sgst = $('#SGST').val(); // var sgst = $('#SGST').val();
var cgst = $('#CGST').val(); // var cgst = $('#CGST').val();
var igst = $('#IGST').val(); // var igst = $('#IGST').val();
var total = $('#totalamount').val(); var total = $('#totalamount').val();
var errorflag = 0; var errorflag = 0;
@ -709,7 +709,7 @@ function validate()
if(gstcheck == true) if(gstcheck == true)
{ {
if((merchant == '') || (mergst == '') || (Invoiceno == '') || (beforegst == '') || (sgst == '') || (cgst == '') || (igst == '')) if((merchant == '') || (mergst == '') || (Invoiceno == '') || (beforegst == '')) /* || (sgst == '') || (cgst == '') || (igst == ''))*/
{ {
errorflag++; errorflag++;
} }
@ -1067,13 +1067,12 @@ function valid(){
return false; return false;
} }
else if($('#PaymentSGST').val() == '') // else if($('#PaymentSGST').val() == '')
{ // {
alert("Please Provide Sgst data..!"); // alert("Please Provide Sgst data..!");
$('#PaymentSGST').focus(); // $('#PaymentSGST').focus();
return false; // return false;
// }
}
else if($('#hidecounter').val() == 1){ else if($('#hidecounter').val() == 1){
if($("option:selected", $("#Paymentaccode1")).val() == '-1') if($("option:selected", $("#Paymentaccode1")).val() == '-1')

2
application/views/income_expense_list.php
View File

@ -12,7 +12,7 @@
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
<div align="right" style="padding-right:10px"> <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> --> <!-- <a href="<?php echo base_url(); ?>addNewIncomeExpenseLoad" class="btn btn-primary" align="right"style="padding-right:10px" >Add New</a> -->
</div> </div>
</div> </div>