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

reports list changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-12-06 19:11:39 +05:30
parent 1cd1b7c4e1
commit 9295a00a4c
19 changed files with 64 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/config/routes.php
View File

@ -227,6 +227,11 @@ $route['Report_cumulative'] = "report/cumulative";
$route['cashbookreport']="report/cashbook";
$route['cashbookmonthlyexpenses']="report/monthexpenses";
$route['cashbookyearlyexpenses']="report/yearexpenses";
$route['Report_purchase_inward'] = "report/ipurchase";
$route['Report_year_wise_inward'] = "report/iyear_wise";
$route['Report_supplier_inward'] = "report/ipurchase_supplier";
$route['Report_consolidate_inward'] = "report/iconsolidate";
$route['Report_cumulative_inward'] = "report/icumulative";
// Company Information
$route['companyview'] = 'companycontroller/companyview';

2
application/controllers/payslip.php
View File

@ -5,7 +5,7 @@ require APPPATH . '/third_party/mpdf/mpdf.php';
/**
* Class : Employee (Employee Controller)
* Class : payslip (Pay Slip - Controller)
* User Class to control all user related operations.
* @author : Venba Info Tech
* @version : 1.1

2
application/controllers/user.php
View File

@ -51,7 +51,7 @@ class user extends BaseController
$data['totalservicepo']=$this->dahsboard_Model->totalservicepo();
$data['totalrevenuepo']=$this->dahsboard_Model->totalrevenuepo();
$data['totalimportpo']=$this->dahsboard_Model->totalimportpo();
$data['totalcapitalpo']=$this->dahsboard_Model->totalcapitalpo();
//$data['totalcapitalpo']=$this->dahsboard_Model->totalcapitalpo();
$data['details']=$this->dahsboard_Model->reqdetail();

10
application/views/Report_cumulative_day.php
View File

@ -60,7 +60,7 @@ if(!empty($mms))
<tbody>
<?php if(!empty($cum_day)){
$tqt=0;
$tvt=0;
$tvt=0.00;
$d=date('Y-m-d');
foreach($cum_day as $rel)
@ -75,9 +75,8 @@ if(!empty($mms))
$tqt= $tqt + round($rel->tquantity);
echo round($rel->tquantity);?></span></td>
<td style="text-align:right"><span><?php
$tvt= $tvt + round($rel->ttotal);
echo round($rel->ttotal);?></span></td>
$tvt= $tvt + number_format($rel->ttotal,2,'.','');
echo number_format($rel->ttotal,2,'.','');?></span></td>
</tr>
<?php
@ -113,7 +112,8 @@ if(!empty($mms))
<strong>
<?php
{
echo $tvt;
echo number_format($tvt,2,'.','');
}
?>

11
application/views/Report_cumulative_month.php
View File

@ -61,7 +61,7 @@ if(!empty($mms))
<tbody>
<?php if(!empty($cum_month)){
$tqt=0;
$tvt=0;
$tvt=0.00;
if (date('m') >= 4) {
$yearl = date('Y').'-'.(date('Y')+1);
} else {
@ -82,9 +82,10 @@ if(!empty($mms))
$tqt= $tqt + round($rel->tquantity);
echo round($rel->tquantity);?></span></td>
<td style="text-align:right"><span><?php
$tvt= $tvt + round($rel->ttotal);
echo round($rel->ttotal);?></span></td>
$tvt= $tvt + number_format($rel->ttotal,2,'.','');
echo number_format($rel->ttotal,2,'.','');?></span></td>
</tr>
<?php
@ -120,7 +121,7 @@ if(!empty($mms))
<strong>
<?php
{
echo $tvt;
echo number_format($tvt,2,'.','');
}
?>

6
application/views/Report_cumulative_year.php
View File

@ -88,8 +88,8 @@ if(!empty($mms))
$tqt= $tqt + round($rel->tquantity);
echo round($rel->tquantity);?></span></td>
<td style="text-align:right"><span><?php
$tvt= $tvt + round($rel->ttotal);
echo round($rel->ttotal);?></span></td>
$tvt= $tvt + number_format($rel->ttotal,2,'.','');
echo number_format($rel->ttotal,2,'.','');?></span></td>
</tr>
@ -126,7 +126,7 @@ if(!empty($mms))
<strong>
<?php
{
echo $tvt;
echo number_format($tvt,2,'.','');
}
?>

6
application/views/Report_month_wise.php
View File

@ -72,8 +72,8 @@ if(!empty($mms))
$tr3= $tr3 + round($rel->quantity);
echo $rel->quantity;?></span></td>
<td style="text-align:right"><span><?php
$tr4= $tr4 + $rel->total;
echo $rel->total;?></span></td>
$tr4= $tr4 + number_format($rel->total,2,'.','');
echo number_format($rel->total,2,'.','');?></span></td>
</tr>
<?php
}
@ -102,7 +102,7 @@ if(!empty($mms))
<strong>
<?php
{
echo $tr4;
echo number_format($tr4,2,'.','');
}
?>

2
application/views/Report_openorder.php
View File

@ -83,7 +83,7 @@ if(!empty($open_po))
<td><span><?php echo $rel->CreatedDate?></span></td>
<td><span><?php echo $rel->ApprovedDate?></span></td>
<td><span><?php echo $rel->Dept_Name?></span></td>
<td align="right"><span><?php echo $rel->TotalOrderValue?></span></td>
<td align="right"><span><?php echo number_format($rel->TotalOrderValue,2,'.','')?></span></td>
</tr>

23
application/views/Report_purchase.php
View File

@ -97,7 +97,7 @@ if(!empty($mms))
</select>
</div>
</div>
<br><br><br><br>
<div class="col-md-2">
<label for="to_date">
<?php echo 'Year'; ?>
@ -167,7 +167,8 @@ if(!empty($mms))
</div>
</div>
<div class="col-md-2 col-md-offset-10" style="padding:3%;">
<div class="col-md-2 col-md-offset-2"><br>
<input type="submit" class="btn btn-success" name="btn_submit"
value="View Report">
@ -263,7 +264,7 @@ if(!empty($mms))
echo $rel->Package;?></span></td>
<td style="text-align:right"><span><?php
$tot_tot= $tot_tot + round($rel->total,2);
echo round($rel->total,2);?></span></td>
echo number_format($rel->total,2,'.','');?></span></td>
@ -312,7 +313,7 @@ if(!empty($mms))
<strong>
<?php
{
echo $tot_value;
echo number_format($tot_value,2,'.','');
}
?>
@ -332,7 +333,9 @@ if(!empty($mms))
<strong>
<?php
{
echo $tot_SCGT;
echo number_format($tot_SCGT,2,'.','');
}
?>
@ -362,7 +365,8 @@ if(!empty($mms))
<strong>
<?php
{
echo $tot_dis;
//echo $tot_dis;
echo number_format($tot_dis,2,'.','');
}
@ -372,7 +376,8 @@ if(!empty($mms))
<strong>
<?php
{
echo $tot_frg;
//echo $tot_frg;
echo number_format($tot_frg,2,'.','');
}
@ -382,7 +387,7 @@ if(!empty($mms))
<strong>
<?php
{
echo $tot_pac;
echo number_format($tot_pac,2,'.','');
}
@ -392,7 +397,7 @@ if(!empty($mms))
<strong>
<?php
{
echo $tot_tot;
echo number_format($tot_tot,2,'.','');//echo $tot_tot;
}

19
application/views/Report_year_wise.php
View File

@ -46,6 +46,7 @@ if(!empty($mms))
<center>
<div class="panel-body">
<form method="post" action=" ">
<div class="col-md-8">
<select class="form-control" id="financialyear" name="financialyear">
<option value="">Select Year</option>
<?php
@ -62,11 +63,11 @@ if(!empty($mms))
</select>
<p>&nbsp;</p>
<input type="submit" class="btn btn-success" id="year" name="btn_submit"
value="View Report">
</form>
</div>
<div class="col-md-2">
<input type="submit" class="btn btn-success" id="year" name="btn_submit" value="View Report">
</div>
</form>
</div>
</center>
@ -112,8 +113,8 @@ if(!empty($mms))
$tr3= $tr3 + $rel->quantity;
echo round($rel->quantity);?></span></td>
<td style="text-align:right"><span><?php
$tr4= $tr4 + $rel->total;
echo $rel->total;?></span></td>
$tr4= $tr4 + number_format($rel->total,2,'.','');
echo number_format($rel->total,2,'.','');?></span></td>
@ -146,8 +147,8 @@ if(!empty($mms))
<strong>
<?php
{
echo $tr4;
//echo $tr4;
echo number_format($tr4,2,'.','');
}
?>
</strong>

6
application/views/Report_year_wise_total.php
View File

@ -71,8 +71,8 @@ if(!empty($mms))
$tr3= $tr3 + round($rel->quantity);
echo round($rel->quantity);?></span></td>
<td style="text-align:right"><span><?php
$tr4= $tr4 + $rel->total;
echo $rel->total;?></span></td>
$tr4= $tr4 + number_format($rel->total,2,'.','');
echo number_format($rel->total,2,'.','');?></span></td>
</tr>
<?php
}
@ -102,7 +102,7 @@ if(!empty($mms))
<strong>
<?php
{
echo $tr4;
echo number_format($tr4,2,'.','');
}
?>

4
application/views/Reportcashbook.php
View File

@ -160,7 +160,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
<div class="info-box">
<span class="info-box-icon bg-aqua" style="height: 90px;padding:25px;"><i<i class="fa fa-spinner"></span>
<div class="info-box-content">
<span class="info-box-number"><a href="<?php echo base_url().'report/monthexpenses' ?>" data-toggle="tooltip" title="Click here to View Monthly Payments details"><?php echo "Monthly Payments" ?></a></span>
<span class="info-box-number"><a href="<?php echo base_url().'report/monthexpenses' ?>" data-toggle="tooltip" title="Click here to View Monthly Payments details"><?php echo "Monthly Payments" ?></a></span>
<span class="info-box-text text-center"><?php echo "Receipt :".$inrsymbol.number_format($month_in,2,'.',''); ?></span>
<span class="info-box-text text-center"><?php echo "Payments :".$inrsymbol.number_format($month_ex,2,'.',''); ?></span>
</div>
@ -173,7 +173,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
<div class="info-box">
<span class="info-box-icon bg-green" style="height: 90px;padding:25;"><i class="fa fa-industry" style="padding: 5px;"></i></span>
<div class="info-box-content">
<span class="info-box-number"><?php echo "year Payments" ?></span>
<span class="info-box-number"><a href="<?php echo base_url().'report/yearexpenses' ?>" data-toggle="tooltip" title="Click here to View Yearly Payment details"><?php echo "Year Payments" ?></a></span>
<span class="info-box-text text-center"><?php echo "Receipt :".$inrsymbol.number_format($year_in,2,'.',''); ?></span>
<span class="info-box-text text-center"><?php echo "Payments :".$inrsymbol.number_format($year_ex,2,'.',''); ?></span>
</div>

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

@ -642,99 +642,8 @@ $(function() {
<i class="fa fa-dashboard"></i> <span>Advance Request</span>
</a>
</li>
<?php } ?>
<?php
if($DEPCode == MANAGEMENT)
{ ?>
<li class="treeview">
<span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Reports <span class="caret"></span></span>
<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
<li class="treeview">
<a href="<?php echo base_url(); ?>reportpending">
<i class="fa fa-dashboard"></i> <span>Pending Requistion - Age wise</span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>releasedpo">
<i class="fa fa-keyboard-o"></i>
<span>Order value - Released</span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>openOrder">
<i class="fa fa-keyboard-o"></i>
<span>Open orders - Pending</span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>TotalOrder">
<i class="fa fa-keyboard-o"></i>
<span>Total orders </span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_costcenter">
<i class="fa fa-keyboard-o"></i>
<span>Cost Center </span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_Material_Supplier">
<i class="fa fa-keyboard-o"></i>
<span>Material Master - Supplier Wise </span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_Material_Item">
<i class="fa fa-keyboard-o"></i>
<span>Material Master - Item wise </span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_Material_ReceiptValue">
<i class="fa fa-keyboard-o"></i>
<span>Material Master - Receipt value </span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_purchase">
<i class="fa fa-keyboard-o"></i>
<span>Purchase</span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_year_wise">
<i class="fa fa-keyboard-o"></i>
<span>Year-wise</span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_supplier">
<i class="fa fa-keyboard-o"></i>
<span>Purchase Supplier-wise</span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_consolidate">
<i class="fa fa-keyboard-o"></i>
<span>Consolidate Report</span>
</a>
</li>
<li class="treeview">
<a href="<?php echo base_url(); ?>Report_cumulative">
<i class="fa fa-keyboard-o"></i>
<span>Cumulative Report</span>
</a>
</li>
</ul>
</li>
<?php } ?>
<?php
<?php }
if($DEPCode == MANAGEMENT)
{ ?>
@ -745,6 +654,7 @@ $(function() {
</li>
<?php } ?>
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<?php if($this->profilepic != '') { ?>

3
application/views/monthlypayinputs.php
View File

@ -49,7 +49,8 @@ $('html').bind('keypress', function(e)
<!--<center><h3 class="box-title">-->
<div class="box-tools">
<!-- <form action="<?php echo base_url() ?>assetListing" method="POST" id="searchList">-->
<form action="<?php echo base_url() ?>monthlypay/monthlyListing" method="POST" id="searchList">
<p><b>The <span style="background-color:#ff4d4d;">Red</span> highlighted Employee have loan to pay. Put <span style="background-color:#66ff33;">'NA'</span> for Skip Current Month Loan Due.</b></p>
<form action="<?php echo base_url() ?>monthlypay/monthlyListing" method="POST" id="searchList">
</form>
</div><!--</h3></center>-->

2
application/views/payslipeditable.php
View File

@ -82,7 +82,7 @@ $("#Employee").empty();
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Siddharth Industries - PaySlip Create and Update</center>
<center>Resico Industries - PaySlip Create and Update</center>
</h1>
</section>

2
application/views/payslipgenerate.php
View File

@ -189,7 +189,7 @@ $(function() {
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Siddharth Industries - PaySlip Generator</center>
<center>Resico Industries - PaySlip Generator</center>
</h1>
</section>

2
application/views/payslipgenerateprint.php
View File

@ -189,7 +189,7 @@ if($RecCount > 0)
<td colspan="1" style="background:#2c0000;" width="15%"> <center> <img width="80" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11JREFUeNrsnT9IHEEYxWfFw8rgpUhlo5URi2gTbIUUSrq1ui4oRLRIY9JIKrGKTQrBgJLuuutEi4CtSSOpPIuATdIEcid2YpN9C3sc8c6bf7uZmX0P7k7ultm7337zzXxvZjGaiaIfQoiqoHTUHk6eniSPUbLQUmUoebojB23dDZGBmQiQAAmQAAmQIkACJEACpAiweA3bbvDV5mb6+iKOxfTc3MDjf15dicbBQfr3591d7wBGM1H0J3l9bNLI84UFsby6mkIzFWACJMCafJ9PJyfSx29vbHQuoqJaxl34zc5O+mVtwIPi5EIcXV52IjnoLvx+by/9wXkIF8aHbq0dgYi4vOB1Q7QV2c4BXM4Z3r+RGBTAR9VqmqhVBoZnIyOdx9taTXqQGJ+YUDqXFwBV4WGU69aXRkNsr69LtyEzHfIKIKJCVl9PT3u+/63P+6bnC64SuWm3jdsYn5xkKcdamCJAAiwjQJcHAC8ATs/OBg1Qy0y4ub6WPhb1cuPwUFycn9/77OPWlvXzeQGw2QPGQ9o/PhZrS0v3IPpooFrpwgChYniidq6fnTnvrBSaA3Uc3A/1uvPuSmEA0f0uFLsyBKcZDjaisvSj8DsFW6pbcHPQpV12WQoBCHhri4taEOGwhJAXjeeBgFebn1eyp0LKi1Ym0rCsXieRqLk06HVetFqJwHmWnRz3yotHzabT9n0hpRxGZ0SjjpGKCEQkxgUtWDlbCyMfIi/qTHMgrDf7srCem5mQDS5YQNKRD2vCuQLMhCVM3bwIiK4PLIUYqrp5EXPFeGWFALO8CEdGddId7NYOHWFQUa1cUO4Fty78/fZW6tFrjx7gqfqAT0PbmWAqVCwq+bDUOxMeyokh6L8B1J1kE2BgIkACJMDyAbSx56/cACV3CoyOjfX9rNSrcrI7E/qVYYCnYhKY3LXkJECVOdx+Us51m6Nwm7HVQyUCf4UGEJuFZPMgIhC+XlYfw21WWQ/GxXJ50q09iBS1MSjYW73ww3SXMVXOobsk4MU80GQZc5DQbl5tOzWRRpS8nJqy1tUAzWZ7ecvKDdfdggWfTV0GbdnA4JB1UdhbHjo0LesAS6YWa2GaCQRIgARIESABEiABUgRIgARYRoAVYtBWBfcL/xb8hwS6av8VYADVjF2M5sTWJAAAAABJRU5ErkJggg=="></center>
</td>
<td colspan="10">
<center><b>SIDDHARTH INDUSTRIES</b><br/> Survey No: 168/1C3,Pennalur Pet Road,Goonipalyam village, <br/>Uthukottai Taluk,Tiruvallur Dist, Chennai,Tamilnadu,Pin code : 602026. <br/> PaySlip for the Month of <?php echo $PayOn ?></center>
<center><b> INDUSTRIES</b><br/> Survey No: 168/1C3,Pennalur Pet Road,Goonipalyam village, <br/>Uthukottai Taluk,Tiruvallur Dist, Chennai,Tamilnadu,Pin code : 602026. <br/> PaySlip for the Month of <?php echo $PayOn ?></center>
</td>
</tr>
<tr>

2
application/views/payslipupload.php
View File

@ -21,7 +21,7 @@
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Siddharth Industries PaySlip Upload</center>
<center>Resico Industries PaySlip Upload</center>
</h1>
</section>

2
application/views/payslipupload2.php
View File

@ -38,7 +38,7 @@ function checkYearMonthAsEmpty()
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Siddharth Industries - Monthly Pay Inputs Upload</center>
<center>Resico Industries - Monthly Pay Inputs Upload</center>
</h1>
</section>