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

change in cashbook and dashboard

Browse Source
This commit is contained in:
saravanakumar_kandasami 2017-12-08 12:43:59 +05:30
parent 04d89f3518
commit 1afc5d2c76
7 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/views/cashbooklisting.php
View File

@ -12,24 +12,24 @@
<form role="form" id="cashbookform" action="<?php echo base_url()?>" method="post" enctype="multipart/form-data">
<div class="container-fluid">
<div class="row">
<div class="col-xs-12 col-md-12">
<div class="col-xs-12 col-md-12" style="font-size:14px;">
<legend>Cash book / Account details</legend>
<div class="col-md-12">
<div class="col-md-3"><span>Account Type :</span>&nbsp;&nbsp;<span style="color:#ff6347;">*</span><br>
<div class="col-md-3"><strong>Account Type :</strong>&nbsp;&nbsp;<strong style="color:#ff6347;">*</strong><br>
<input type="radio" name="accounttype" id="accounttype" value="INCOME" checked> Income<br>
<input type="radio" name="accounttype" id="accounttype" value="EXPENSE"> Expense<br>
</div><p style="color:red"></p>
<div class="col-md-3 pad"><span>Account Code :</span>&nbsp;&nbsp;<span style="color:#ff6347;">*</span>
<div class="col-md-3 pad"><strong>Account Code :</strong>&nbsp;&nbsp;<strong style="color:#ff6347;">*</strong>
<input type="text" name="accountcode" id="accountcode" onchange="validateACCODE();" class="form-control" requried placeholder="Account Code" title="Account Code is requried">
</div><p style="color:red"></p>
<div class="col-md-3 pad"><span>Account Name :</span>&nbsp;&nbsp;<sapn style="color:#ff6347;">*</span>
<div class="col-md-3 pad"><strong>Account Name :</strong>&nbsp;&nbsp;<sapn style="color:#ff6347;">*</strong>
<input type="text" name="accountname" id="accountname" class="form-control" placeholder="Account Name" title="Account Name is requried" class="tooltip" onfocus="theFocus(this);" onblur="theBlur(this);">
</div><p style="color:red"></p>
<div class="col-md-3 pad"><span>Description :</span>
<div class="col-md-3 pad"><strong>Description :</strong>
<input type="email" name="description" id="description" class="form-control" placeholder="Account Description">
</div>
<input type="hidden" id="accountstate" name="accountstate" class="form-control" value="Yes" >

75
application/views/cashbookmonthlyexpenses.php
View File

@ -52,46 +52,41 @@ if(!empty($monthlyincreport))
<div class="btn-group btn-group-justified no-margin">
<div>
<table class="table table-bordered table-hover" id="req" style="font-size:13px;">
<thead>
<tr>
<th>Date</th>
<!--<th>Account Code</th>-->
<th>Paid To</th>
<th>Paid Type</th>
<th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
<!--<th>Description</th>-->
</tr>
</thead>
<tbody>
<?php if(!empty($monthlyreport)){
foreach($monthlyreport as $mr)
{
?>
<tr>
<td><span><?php echo $mr->date?></span></td>
<!--<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo $mr->account_code;?>"><span><?php echo $mr->account_code?></span></a></td>-->
<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo $mr->account_code;?>&d=<?php echo $mr->month?>"><span><?php echo $mr->name?></span></a></td>
<td align="left"><span><?php echo $mr->type?></span></td>
<td align="right"><span><?php echo number_format($mr->total,2,'.','');?></span></td>
<!--<td align="left"><span><?php echo $mr->account_code?></span></td>-->
<!--<td align="left"><span><?php echo $mr->description?></span></td>-->
</tr>
<?php
}
}
?>
</tbody>
</table>
<table class="table table-bordered table-hover" id="req">
<thead>
<tr>
<th>Paid To</th>
<th>Paid Type</th>
<th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
</tr>
</thead>
<tbody>
<?php if(!empty($monthlyreport)){
foreach($monthlyreport as $mr)
{
?>
<tr>
<!--<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo $mr->account_code;?>"><span><?php echo $mr->account_code?></span></a></td>-->
<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo $mr->account_code;?>&d=<?php echo $mr->month?>"><span><?php echo $mr->name?></span></a></td>
<td align="left"><span><?php echo $mr->type?></span></td>
<td align="right"><span><?php echo number_format($mr->total,2,'.','');?></span></td>
<!--<td align="left"><span><?php echo $mr->account_code?></span></td>-->
<!--<td align="left"><span><?php echo $mr->description?></span></td>-->
</tr>
<?php
}
}
?>
</tbody>
</table>
</div>
</div>
</div>

11
application/views/dashboard.php
View File

@ -26,7 +26,7 @@ if(!empty($EmpCount))
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<center><h1> Accounts Department Dashboard</h1> </center>
<center><h1> Accounts Department </h1> </center>
</section>
<!-- Main content -->
<section class="content">
@ -47,10 +47,7 @@ if(!empty($EmpCount))
</div>
</center>
<div>
<marquee direction="up" scrollamount="2" height="150px;"> <font color="Brown"> <h1><b>Guidelines:</b></h1><h3> # PaySlip menu in header has two sub menu ( 1.Upload Salary , 2.PaySlip Generator)<br/><br/>
# Upload salary menu is used to upload the Salary Excel file into the database<br/><br/>
# Payslip generator menu is to generate the salary slip for individual Employess or All Employees</h3>
</center> </font></marquee>
</div>
</section>
</div>
@ -102,7 +99,7 @@ if(!empty($EmpCount))
<!-- Dashboard for Manager department-->
<?php
if($role == ROLE_MANAGER && $DEPCode != MANAGEMENT)
if($role == ROLE_MANAGER && $DEPCode != MANAGEMENT && $DEPCode != FINANCE)
{
?>
<div class="content-wrapper">
@ -129,7 +126,7 @@ if(!empty($EmpCount))
</div>
</center>
<div>
<marquee direction="up" scrollamount="2" height="150px;">Hi This Is Manager Login </marquee>
</div>
</section>
</div>

2
application/views/includes/header.php
View File

@ -118,7 +118,7 @@ $(function() {
background:#ad9271 !important;
}
legend{
color:#ef980e !important;
color:#5d0411 !important;
}
</style>

6
application/views/income_expense_list.php
View File

@ -17,7 +17,7 @@
<table id="inexlist" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<table id="inexlist" class="table table-bordered table-hover" style="background-color:#fff;">
<div align="right" style="padding-right:10px">
<div id="content" > </div>
<div class="modal fade" role="dialog">
@ -41,7 +41,7 @@
{
?>
<tr> <td><?php echo '<a href="'.$base.'cashbook/incomeExpenseList/'.$l->id.'">'.$l->type.'</a>';?></td> <td style="text-align:right;"><?php echo date_format(date_create($l->date),'d-m-Y');?></td> <td><?php echo $l->name;?></td> <td style="text-align:right;"><?php echo $l->total;?></td> <td><?php echo $l->description;?></td></tr>
<tr> <td><?php echo '<a href="'.$base.'cashbook/incomeExpenseList/'.$l->id.'">'.$l->type.'</a>';?></td> <td style="text-align:right;"><?php echo date_format(date_create($l->date),'d-m-Y');?></td> <td><?php echo $l->name;?></td> <td style="text-align:right;"><?php echo number_format($l->total,2,'.','');?></td> <td><?php echo $l->description;?></td></tr>
<?php
}
@ -61,7 +61,7 @@
</div>
</div> </section>
</div>
<script>

4
application/views/reportcashbook.php
View File

@ -136,8 +136,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
}
</style>
<div class="content-wrapper">>
<div class="content-wrapper">
<p>&nbsp;</p>
<!-- Main content -->

2
application/views/viewIndIncomeExpense.php
View File

@ -72,7 +72,7 @@ if(!empty($data))
<tr> <td ><h4>CGST </h4></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td> <td>: <?php if(!empty($data[0]->cgst)){echo $data[0]->cgst;}?></td></tr>
<tr> <td ><h4>IGST </h4></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td> <td >: <?php if(!empty($data[0]->igst)){echo $data[0]->igst;}?></td></tr>
<?php }?>
<tr> <td ><h4>Total Amount </h4></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td> <td >: <?php if(!empty($data[0]->total)){echo $data[0]->total;}?></td></tr>
<tr> <td ><h4>Total Amount </h4></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td> <td >: <?php if(!empty($data[0]->total)){echo number_format($data[0]->total,2,'.','');}?></td></tr>
<tr> <td ><h4>Description </h4></td> <td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td >: <?php if(!empty($data[0]->description)){echo $data[0]->description;}?></td></tr>
</tbody>
</table>