This commit is contained in:
Raju Shrestha 2024-08-08 18:24:25 +05:45
parent 9f5ba32db2
commit c30c5ddcb2
16 changed files with 233 additions and 239 deletions

View File

@ -34,7 +34,7 @@
<div class="form-group"> <div class="form-group">
<?php <?php
// $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under", "parent_category_id", "status=1", $default = "", $CSSclass = ""); // $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under", "parent_category_id", "status=1", $default = "", $CSSclass = "");
echo isset($AccountCategory) ? fillComboWithValue("parent_category_id", "Under", "parent_category_id", "tbl_accategories", "accategory_name", "accategory_id", $default = $AccountCategory->parent_category_id, $CSSclass = "", $multiple = false, $condition = "status=1") : $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under", "parent_category_id", "status=1", $default = "", $CSSclass = ""); echo isset($AccountCategory) ? fillComboWithValue("parent_category_id", "Under", "parent_category_id", "tbl_accategories", "accategory_name", "accategory_id", $default = $AccountCategory->parent_category_id, $CSSclass = "", $multiple = false, $condition = "status=1") : $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under <span style='color:#ff0000'>*</span>", "parent_category_id", "status=1", $default = "", $CSSclass = "");
?> ?>
@ -77,8 +77,8 @@
<!-- <th class="col-3">Category</th> --> <!-- <th class="col-3">Category</th> -->
<th class="col-3"><?php myLang("Group Name"); ?></th> <th class="col-3"><?php myLang("Group Name"); ?></th>
<th class="col-3"><?php myLang("Under"); ?></th> <th class="col-3"><?php myLang("Under"); ?></th>
<th class="col-3"><?php myLang('Remarks');?></th> <th class="col-4"><?php myLang('Remarks');?></th>
<th class="col-2 text-center">Action</th> <th class="col-1 text-center">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

View File

@ -31,7 +31,7 @@
<div class="form-group"> <div class="form-group">
<?php <?php
// Assuming this PHP function shows a dropdown for account categories // Assuming this PHP function shows a dropdown for account categories
$this->myaccounts->showAccountsCategoriesWithParentsCombo("accategory_id", "Under", "accategory_id", "status=1", "", "select2", "required"); $this->myaccounts->showAccountsCategoriesWithParentsCombo("accategory_id", "Under <span class='text-danger'>*</span>", "accategory_id", "status=1", "", "select2", "required");
?> ?>
</div> </div>
</div> </div>
@ -191,7 +191,7 @@
echo ($TableRow->cr_opening_balance > 0) ? myCurrency($TableRow->cr_opening_balance) : ""; ?></td> echo ($TableRow->cr_opening_balance > 0) ? myCurrency($TableRow->cr_opening_balance) : ""; ?></td>
<td class="text-center"> <td class="text-center">
<a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-primary btn-xs" title="View"><i class="fas fa-eye"></i> </a> <!-- <a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-primary btn-xs" title="View"><i class="fas fa-eye"></i> </a> -->
<a href="<?php echo site_url("accounts/accountheads/edit/$id"); ?>" class="btn btn-info btn-xs" title="Edit"><i class="fas fa-edit"></i> </a> <a href="<?php echo site_url("accounts/accountheads/edit/$id"); ?>" class="btn btn-info btn-xs" title="Edit"><i class="fas fa-edit"></i> </a>
<a onClick="javascript:doDelete(<?php echo $id; ?>);" class="btn btn-danger btn-xs" title="Delete"><i class="fas fa-trash"></i> </a> <a onClick="javascript:doDelete(<?php echo $id; ?>);" class="btn btn-danger btn-xs" title="Delete"><i class="fas fa-trash"></i> </a>
</td> </td>

View File

@ -2,7 +2,6 @@
$this->load->library("BIBAccounts"); $this->load->library("BIBAccounts");
$BIBAccounts = new BIBAccounts(); $BIBAccounts = new BIBAccounts();
?> ?>
<style> <style>
table, table,
td, td,
@ -86,34 +85,26 @@ $BIBAccounts = new BIBAccounts();
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
} }
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<section class="content"> <section class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-header"> <div class="card-header">
<h3 class="card-title"><?php echo $pageTitle; ?> </h3> <h3 class="card-title mt-1"><?php echo $pageTitle; ?> </h3>
<div class="card-tools"> <div class="card-tools">
<form method="post" action="" id="FilterForm"> <form method="post" action="" id="FilterForm">
<!-- button with a dropdown --> <!-- button with a dropdown -->
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52"> <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters Filters
</button> </button>
<div class="dropdown-menu" role="menu"> <div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0"> <div class="form-group p-2 pb-0">
<div class="col"> <div class="col">
<div class="form-group"> <div class="form-group">
<label for="fromDate"><?php myLang("Starting Period"); ?></label> <label for="fromDate"><?php myLang("Starting Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period"> <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="toDate"><?php myLang("Ending Period"); ?></label> <label for="toDate"><?php myLang("Ending Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period"> <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
@ -121,7 +112,6 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox"> <input class="form-check-input" type="checkbox">
<label class="form-check-label">Select <label class="form-check-label">Select
All</label> All</label>
@ -144,15 +134,16 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button> <div class="form-group p-2 pb-0">
<button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
<button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
</div>
</div> </div>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52"> <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
Export Export
</button> </button>
<!-- <div class="dropdown-menu" role="menu"> <!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a> <a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a> <a href="#" class="dropdown-item">Pdf</a>
@ -160,10 +151,8 @@ $BIBAccounts = new BIBAccounts();
<a href="#" class="dropdown-item">View calendar</a> <a href="#" class="dropdown-item">View calendar</a>
</div> --> </div> -->
</div> </div>
<button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button>
<!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> --> <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
</form> </form>
<script> <script>
function resetForm() { function resetForm() {
@ -177,8 +166,6 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
<!-- /.card-tools --> <!-- /.card-tools -->
</div> </div>
<!-- <div class="card-body"> <!-- <div class="card-body">
<form method="post" action="" id="FilterForm"> <form method="post" action="" id="FilterForm">
<div class="row align-items-end"> <div class="row align-items-end">
@ -214,16 +201,13 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
<div class="col"> <div class="col">
<div class="form-group d-flex justify-content-end"> <div class="form-group d-flex justify-content-end">
<button type="submit" class="btn btn-primary mr-2">Filter</button> <button type="submit" class="btn btn-primary mr-2">Filter</button>
<button type="submit" class="btn btn-success mr-2">Export</button> <button type="submit" class="btn btn-success mr-2">Export</button>
<button type="button" class="btn btn-warning" onclick="resetForm()">Reset</button> <button type="button" class="btn btn-warning" onclick="resetForm()">Reset</button>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<script> <script>
function resetForm() { function resetForm() {
document.getElementById("fromDate").value = "2078-4-1"; document.getElementById("fromDate").value = "2078-4-1";
@ -233,26 +217,20 @@ $BIBAccounts = new BIBAccounts();
document.getElementById("FilterForm").submit(); document.getElementById("FilterForm").submit();
} }
</script> </script>
</div> --> </div> -->
</div> </div>
</div><!-- /.container-fluid --> </div><!-- /.container-fluid -->
</section> </section>
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<!-- <button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button> --> <!-- <button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button> -->
<button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle
Collapse</button> Collapse</button>
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-body p-0"> <div class="card-body p-0">
<?php <?php
// echo $_POST['showClosing']; // echo $_POST['showClosing'];
$ReportOptions = array( $ReportOptions = array(
'showZeroBalances' => false, 'showZeroBalances' => false,
@ -261,7 +239,6 @@ $BIBAccounts = new BIBAccounts();
'showPeriod' => false, 'showPeriod' => false,
); );
?> ?>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
@ -269,10 +246,7 @@ $BIBAccounts = new BIBAccounts();
<td class="group-total text-right pr-2 "><b>Amount</b></td> <td class="group-total text-right pr-2 "><b>Amount</b></td>
<td class="group-name"><b>Particulars</b></td> <td class="group-name"><b>Particulars</b></td>
<td class="group-total text-right pr-2"><b>Amount</b></td> <td class="group-total text-right pr-2"><b>Amount</b></td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
@ -280,7 +254,6 @@ $BIBAccounts = new BIBAccounts();
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(2); ?> <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(2); ?>
<?php $Side1Total = 0; ?> <?php $Side1Total = 0; ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable"> <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<?php <?php
// Initialize variables for column totals // Initialize variables for column totals
$incomes_totalOpeningDr = 0; $incomes_totalOpeningDr = 0;
@ -293,7 +266,6 @@ $BIBAccounts = new BIBAccounts();
<?php foreach ($AccountGroups as $group) : ?> <?php foreach ($AccountGroups as $group) : ?>
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>"> <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
<td><b><?php echo $group->acgroup_name; ?></b></td> <td><b><?php echo $group->acgroup_name; ?></b></td>
<td width="20%"><?php echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td> <td width="20%"><?php echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td>
</tr> </tr>
<tr> <tr>
@ -310,11 +282,8 @@ $BIBAccounts = new BIBAccounts();
?> ?>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(5); ?> <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(5); ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable"> <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<?php <?php
// Initialize variables for column totals // Initialize variables for column totals
$incomes_totalOpeningDr = 0; $incomes_totalOpeningDr = 0;
@ -327,7 +296,6 @@ $BIBAccounts = new BIBAccounts();
<?php foreach ($AccountGroups as $group) : ?> <?php foreach ($AccountGroups as $group) : ?>
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>"> <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
<td class="group-name"><?php echo $group->acgroup_name; ?></td> <td class="group-name"><?php echo $group->acgroup_name; ?></td>
<td class="group-total"><?php echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td> <td class="group-total"><?php echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td>
</tr> </tr>
<tr> <tr>
@ -347,9 +315,7 @@ $BIBAccounts = new BIBAccounts();
</td> </td>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(1); ?> <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(1); ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable"> <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<?php <?php
// Initialize variables for column totals // Initialize variables for column totals
$totalOpeningDr = 0; $totalOpeningDr = 0;
@ -382,21 +348,16 @@ $BIBAccounts = new BIBAccounts();
$totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0; $totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
?> ?>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
</td> </td>
</tr> </tr>
<?php <?php
// pre($BIBAccounts->getAccountGroupsWithBalances(4)); // pre($BIBAccounts->getAccountGroupsWithBalances(4));
$TotalIncomes = $BIBAccounts->getAccountGroupsWithBalances(3)[0]->closing_balance; $TotalIncomes = $BIBAccounts->getAccountGroupsWithBalances(3)[0]->closing_balance;
$TotalExpenses = $BIBAccounts->getAccountGroupsWithBalances(4)[0]->closing_balance; $TotalExpenses = $BIBAccounts->getAccountGroupsWithBalances(4)[0]->closing_balance;
$PL = $TotalIncomes - $TotalExpenses; $PL = $TotalIncomes - $TotalExpenses;
$Side1Total += $PL; $Side1Total += $PL;
?> ?>
<tr> <tr>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
<table class="table table-bordered"> <table class="table table-bordered">
@ -405,54 +366,36 @@ $BIBAccounts = new BIBAccounts();
<td class="cr closing-cr"><?php echo myCurrency($PL); ?></td> <td class="cr closing-cr"><?php echo myCurrency($PL); ?></td>
</tr> </tr>
</table> </table>
</td> </td>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th>Total Amount</th> <th>Total Amount</th>
<th class="cr closing-cr"> <th class="cr closing-cr">
<?php echo myCurrency($Side1Total); ?> <?php echo myCurrency($Side1Total); ?>
</th> </th>
</tr> </tr>
</table> </table>
</td> </td>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th>Total Amount</th> <th>Total Amount</th>
<th class="dr closing-dr"> <th class="dr closing-dr">
<?php echo myCurrency($totalClosingDr); ?> <?php echo myCurrency($totalClosingDr); ?>
</th> </th>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<?php //pre($BIBAccounts->getAccountGroupsWithBalances($acgroup_id = null)); <?php //pre($BIBAccounts->getAccountGroupsWithBalances($acgroup_id = null));
?> ?>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -466,11 +409,7 @@ function footerfunctions()
<script> <script>
$(document).ready(function() { $(document).ready(function() {
document.getElementById("toggleShowAll").click(); document.getElementById("toggleShowAll").click();
}); });
document.getElementById("toggleShowAll").addEventListener("click", function(e) { document.getElementById("toggleShowAll").addEventListener("click", function(e) {
e.preventDefault(); e.preventDefault();
var nestedRows = document.getElementsByClassName("collapse"); var nestedRows = document.getElementsByClassName("collapse");
@ -490,27 +429,21 @@ function footerfunctions()
function exportTableToCSV(filename) { function exportTableToCSV(filename) {
var csv = []; var csv = [];
var rows = document.querySelectorAll("table tr:not(.hide)"); var rows = document.querySelectorAll("table tr:not(.hide)");
for (var i = 0; i < rows.length; i++) { for (var i = 0; i < rows.length; i++) {
var row = []; var row = [];
var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)"); var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
// Check if the parent row is collapsed or hidden // Check if the parent row is collapsed or hidden
var parentRow = rows[i].closest(".collapse"); var parentRow = rows[i].closest(".collapse");
var isParentCollapsed = parentRow && (!parentRow.classList.contains("show")); var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
if (isParentCollapsed) { if (isParentCollapsed) {
continue; // Skip child table rows if parent is collapsed continue; // Skip child table rows if parent is collapsed
} }
for (var j = 0; j < cols.length; j++) { for (var j = 0; j < cols.length; j++) {
var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
row.push(cellValue); row.push(cellValue);
} }
csv.push(row.join(",")); csv.push(row.join(","));
} }
// Create a CSV file // Create a CSV file
var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n"); var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
var encodedUri = encodeURI(csvContent); var encodedUri = encodeURI(csvContent);
@ -521,6 +454,5 @@ function footerfunctions()
link.click(); link.click();
} }
</script> </script>
<?php <?php
} }

View File

@ -103,7 +103,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-header "> <div class="card-header ">
<h3 class="card-title">Cash Flow<?php //echo $pageTitle; <h3 class="card-title mt-1">Cash Flow<?php //echo $pageTitle;
?> </h3> ?> </h3>
<div class="card-tools"> <div class="card-tools">
@ -155,11 +155,14 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div> </div>
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button> <div class="form-group p-2 pb-0">
<button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
<button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
</div>
</div> </div>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52"> <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
Export Export
</button> </button>
@ -171,7 +174,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<a href="#" class="dropdown-item">View calendar</a> <a href="#" class="dropdown-item">View calendar</a>
</div> --> </div> -->
</div> </div>
<button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> <!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> -->
<!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> --> <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->

View File

@ -5,7 +5,80 @@
<div class="col"> <div class="col">
<div class="card card-primary card-outline "> <div class="card card-primary card-outline ">
<div class="card-header bg-primary disabled color-palette"> <div class="card-header bg-primary disabled color-palette">
<h3 class="card-title"><?php echo $pageTitle; ?> </h3> <h3 class="card-title mt-1"><?php echo $pageTitle; ?> </h3>
<div class="card-tools">
<form method="post" action="" id="FilterForm">
<!-- button with a dropdown -->
<div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters
</button>
<div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0">
<div class="col">
<div class="form-group">
<label for="fromDate"><?php myLang("Starting Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
</div>
<div class="form-group">
<label for="toDate"><?php myLang("Ending Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
</div>
</div>
<div class="dropdown-divider"></div>
<div class="form-check">
<input class="form-check-input" type="checkbox">
<label class="form-check-label">Select
All</label>
</div>
<div class="form-check">
<input type="hidden" name="showOB" value="not">
<input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<!-- <input class="form-check-input" type="checkbox"> -->
<label class="form-check-label">Opening</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox"> -->
<input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<label class="form-check-label">Closing</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox" checked> -->
<input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
<label class="form-check-label">Period</label>
</div>
</div>
<div class="dropdown-divider"></div>
<div class="form-group p-2 pb-0">
<button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
<button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
</div>
</div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
Export
</button>
<!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">View calendar</a>
</div> -->
</div>
<!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
</form>
<script>
function resetForm() {
document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
document.getElementById("showOB").checked = <?php echo "false"; ?>;
document.getElementById("showClosing").checked = <?php echo "false"; ?>;
document.getElementById("FilterForm").submit();
}
</script>
</div>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -35,7 +108,7 @@
$html = ""; $html = "";
$html .= "<table class='table table-bordered table-striped longdataTable'>"; $html .= "<table class='table table-bordered table-striped longdataTable'>";
$html .= "<thead>"; $html .= "<thead>";
$html .= "<tr><th class='text-center'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center'>Action</th></tr>"; $html .= "<tr><th class='text-center'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center '>Action</th></tr>";
$html .= "</thead><tbody>"; $html .= "</thead><tbody>";
$sn = 0; $sn = 0;
$BalanceTotal = 0; $BalanceTotal = 0;
@ -43,7 +116,7 @@
$balance = getBalance($Account->account_id); $balance = getBalance($Account->account_id);
$BalanceTotal += $balance; $BalanceTotal += $balance;
// pre($Account); // pre($Account);
$html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td>" . $Account->account_name . "</td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-2 text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>"; $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td>" . $Account->account_name . "</td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-1 text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
endforeach; endforeach;
$html .= "</tbody><tfoot>"; $html .= "</tbody><tfoot>";
$html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>"; $html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>";

View File

@ -6,6 +6,79 @@
<div class="card card-primary card-outline "> <div class="card card-primary card-outline ">
<div class="card-header bg-primary disabled color-palette"> <div class="card-header bg-primary disabled color-palette">
<h3 class="card-title"><?php echo $pageTitle; ?> </h3> <h3 class="card-title"><?php echo $pageTitle; ?> </h3>
<div class="card-tools">
<form method="post" action="" id="FilterForm">
<!-- button with a dropdown -->
<div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters
</button>
<div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0">
<div class="col">
<div class="form-group">
<label for="fromDate"><?php myLang("Starting Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
</div>
<div class="form-group">
<label for="toDate"><?php myLang("Ending Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
</div>
</div>
<div class="dropdown-divider"></div>
<div class="form-check">
<input class="form-check-input" type="checkbox">
<label class="form-check-label">Select
All</label>
</div>
<div class="form-check">
<input type="hidden" name="showOB" value="not">
<input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<!-- <input class="form-check-input" type="checkbox"> -->
<label class="form-check-label">Opening</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox"> -->
<input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<label class="form-check-label">Closing</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox" checked> -->
<input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
<label class="form-check-label">Period</label>
</div>
</div>
<div class="dropdown-divider"></div>
<div class="form-group p-2 pb-0">
<button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
<button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
</div>
</div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
Export
</button>
<!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">View calendar</a>
</div> -->
</div>
<!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
</form>
<script>
function resetForm() {
document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
document.getElementById("showOB").checked = <?php echo "false"; ?>;
document.getElementById("showClosing").checked = <?php echo "false"; ?>;
document.getElementById("FilterForm").submit();
}
</script>
</div>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -16,12 +89,12 @@
<?php <?php
$accategory_id = 3; $accategory_id = 3;
$CI = &get_instance(); $CI = &get_instance();
// $CI->db->where("status", 1)->where("(accategory_id = 2 OR accategory_id = 3)"); // $CI->db->where("status", 1)->where("(accategory_id = 2 OR accategory_id = 3)");
$CI->db->where("status", 1)->where("accategory_id = 3"); $CI->db->where("status", 1)->where("accategory_id = 3");
$CI->db->order_by("account_name ASC"); $CI->db->order_by("account_name ASC");
$Accounts = $CI->db->get("tbl_accounts")->result(); $Accounts = $CI->db->get("tbl_accounts")->result();
foreach ($Accounts as $Account) { foreach ($Accounts as $Account) {
$Account->Group = $CI->db->query("select * from tbl_acgroups where acgroup_id=(select acgroup_id from tbl_accategories where accategory_id = $Account->accategory_id)")->row(); $Account->Group = $CI->db->query("select * from tbl_acgroups where acgroup_id=(select acgroup_id from tbl_accategories where accategory_id = $Account->accategory_id)")->row();
$Account->Category = $CI->db->query("select * from tbl_accategories where accategory_id = $Account->accategory_id")->row(); $Account->Category = $CI->db->query("select * from tbl_accategories where accategory_id = $Account->accategory_id")->row();
@ -36,7 +109,7 @@
$html = ""; $html = "";
$html .= "<table class='table table-bordered table-striped longdataTable'>"; $html .= "<table class='table table-bordered table-striped longdataTable'>";
$html .= "<thead>"; $html .= "<thead>";
$html .= "<tr><th class='text-center'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center'>Action</th></tr>"; $html .= "<tr><th class='text-center' width='25'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center' width='25'>Action</th></tr>";
$html .= "</thead><tbody>"; $html .= "</thead><tbody>";
$sn = 0; $sn = 0;
$BalanceTotal = 0; $BalanceTotal = 0;
@ -44,7 +117,7 @@
$balance = getBalance($Account->account_id); $balance = getBalance($Account->account_id);
$BalanceTotal += $balance; $BalanceTotal += $balance;
// pre($Account); // pre($Account);
$html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td>" . $Account->account_name . "</td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-2 text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>"; $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td>" . $Account->account_name . "</td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-1 text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
endforeach; endforeach;
$html .= "</tbody><tfoot>"; $html .= "</tbody><tfoot>";
$html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>"; $html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>";

View File

@ -4,7 +4,6 @@ $BIBAccounts = new BIBAccounts();
?> ?>
<!-- Include jQuery --> <!-- Include jQuery -->
<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script> <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<!-- Include jQuery UI --> <!-- Include jQuery UI -->
<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script> <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
@ -90,36 +89,27 @@ $BIBAccounts = new BIBAccounts();
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
} }
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary card-outline "> <div class="card card-primary card-outline ">
<div class="card-header"> <div class="card-header">
<h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2> <h2 class="card-title mt-1"><?php echo $pageTitle; ?> <?php //myLang("Report");
?></h2>
<div class="card-tools"> <div class="card-tools">
<form method="post" action="" id="FilterForm"> <form method="post" action="" id="FilterForm">
<!-- button with a dropdown --> <!-- button with a dropdown -->
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52"> <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters Filters
</button> </button>
<div class="dropdown-menu" role="menu"> <div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0"> <div class="form-group p-2 pb-0">
<div class="col"> <div class="col">
<div class="form-group"> <div class="form-group">
<label for="fromDate"><?php myLang("Starting Period"); ?></label> <label for="fromDate"><?php myLang("Starting Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period"> <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="toDate"><?php myLang("Ending Period"); ?></label> <label for="toDate"><?php myLang("Ending Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period"> <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
@ -127,7 +117,6 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox"> <input class="form-check-input" type="checkbox">
<label class="form-check-label">Select <label class="form-check-label">Select
All</label> All</label>
@ -150,15 +139,16 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button> <div class="form-group p-2 pb-0">
<button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
<button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
</div>
</div> </div>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52"> <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
Export Export
</button> </button>
<!-- <div class="dropdown-menu" role="menu"> <!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a> <a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a> <a href="#" class="dropdown-item">Pdf</a>
@ -166,10 +156,8 @@ $BIBAccounts = new BIBAccounts();
<a href="#" class="dropdown-item">View calendar</a> <a href="#" class="dropdown-item">View calendar</a>
</div> --> </div> -->
</div> </div>
<button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button>
<!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> --> <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
</form> </form>
<script> <script>
function resetForm() { function resetForm() {
@ -185,18 +173,14 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
<div class="card card-primary card-outline "> <div class="card card-primary card-outline ">
<div class="card-body p-0"> <div class="card-body p-0">
<?php <?php
// echo $_POST['showClosing']; // echo $_POST['showClosing'];
$ReportOptions = array( $ReportOptions = array(
'showZeroBalances' => false, 'showZeroBalances' => false,
@ -213,18 +197,13 @@ $BIBAccounts = new BIBAccounts();
<th class="group-total text-center" width="10%">Amount</th> <th class="group-total text-center" width="10%">Amount</th>
<th class="group-name" width="85%">Particulars</th> <th class="group-name" width="85%">Particulars</th>
<th class="group-total text-center" width="15%">Amount</th> <th class="group-total text-center" width="15%">Amount</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(3); ?> <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(3); ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable"> <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<?php <?php
// Initialize variables for column totals // Initialize variables for column totals
$incomes_totalOpeningDr = 0; $incomes_totalOpeningDr = 0;
@ -238,7 +217,6 @@ $BIBAccounts = new BIBAccounts();
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>"> <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
<td class="group-name"><b><?php //echo $group->acgroup_name; <td class="group-name"><b><?php //echo $group->acgroup_name;
?></b></td> ?></b></td>
<td class="group-total text-right"><?php //echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); <td class="group-total text-right"><?php //echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0);
?></td> ?></td>
</tr> </tr>
@ -247,7 +225,6 @@ $BIBAccounts = new BIBAccounts();
<div id="group_<?php echo $group->acgroup_id; ?>" class="collapse"> <div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
<?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?> <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?> <?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
</div> </div>
</td> </td>
</tr> </tr>
@ -265,9 +242,7 @@ $BIBAccounts = new BIBAccounts();
</td> </td>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(4); ?> <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(4); ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable"> <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<?php <?php
// Initialize variables for column totals // Initialize variables for column totals
$totalOpeningDr = 0; $totalOpeningDr = 0;
@ -303,17 +278,13 @@ $BIBAccounts = new BIBAccounts();
$totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0; $totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
?> ?>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
</td> </td>
</tr> </tr>
<?php $PL = $incomes_totalClosingCr - $totalClosingDr; ?> <?php $PL = $incomes_totalClosingCr - $totalClosingDr; ?>
<?php if ($incomes_totalClosingCr > $totalClosingDr) : ?> <?php if ($incomes_totalClosingCr > $totalClosingDr) : ?>
<tr> <tr>
<td colspan="2" width="15%"> <td colspan="2" width="15%">
</td> </td>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
<table class="table table-bordered"> <table class="table table-bordered">
@ -333,10 +304,8 @@ $BIBAccounts = new BIBAccounts();
<th class="cr closing-cr"><?php echo myCurrency(abs($PL)); ?></th> <th class="cr closing-cr"><?php echo myCurrency(abs($PL)); ?></th>
</tr> </tr>
</table> </table>
</td> </td>
<td colspan="2"> <td colspan="2">
</td> </td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
@ -345,7 +314,6 @@ $BIBAccounts = new BIBAccounts();
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th>Total Incomes</th> <th>Total Incomes</th>
<th class="cr closing-cr"> <th class="cr closing-cr">
<?php if ($PL > 0) : ?> <?php if ($PL > 0) : ?>
<?php echo myCurrency($incomes_totalClosingCr); ?> <?php echo myCurrency($incomes_totalClosingCr); ?>
@ -355,7 +323,6 @@ $BIBAccounts = new BIBAccounts();
</th> </th>
</tr> </tr>
</table> </table>
</td> </td>
<td colspan="2" class="p-0"> <td colspan="2" class="p-0">
<table class="table table-bordered"> <table class="table table-bordered">
@ -367,23 +334,13 @@ $BIBAccounts = new BIBAccounts();
<?php else : ?> <?php else : ?>
<?php echo myCurrency($totalClosingDr); ?> <?php echo myCurrency($totalClosingDr); ?>
<?php endif; ?> <?php endif; ?>
</th> </th>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -418,27 +375,21 @@ function footerfunctions()
function exportTableToCSV(filename) { function exportTableToCSV(filename) {
var csv = []; var csv = [];
var rows = document.querySelectorAll("table tr:not(.hide)"); var rows = document.querySelectorAll("table tr:not(.hide)");
for (var i = 0; i < rows.length; i++) { for (var i = 0; i < rows.length; i++) {
var row = []; var row = [];
var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)"); var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
// Check if the parent row is collapsed or hidden // Check if the parent row is collapsed or hidden
var parentRow = rows[i].closest(".collapse"); var parentRow = rows[i].closest(".collapse");
var isParentCollapsed = parentRow && (!parentRow.classList.contains("show")); var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
if (isParentCollapsed) { if (isParentCollapsed) {
continue; // Skip child table rows if parent is collapsed continue; // Skip child table rows if parent is collapsed
} }
for (var j = 0; j < cols.length; j++) { for (var j = 0; j < cols.length; j++) {
var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
row.push(cellValue); row.push(cellValue);
} }
csv.push(row.join(",")); csv.push(row.join(","));
} }
// Create a CSV file // Create a CSV file
var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n"); var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
var encodedUri = encodeURI(csvContent); var encodedUri = encodeURI(csvContent);
@ -449,6 +400,5 @@ function footerfunctions()
link.click(); link.click();
} }
</script> </script>
<?php <?php
} }

View File

@ -91,6 +91,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
box-shadow: inset 0 0 0 transparent; box-shadow: inset 0 0 0 transparent;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
} }
.table.table-head-fixed thead tr:nth-child(1) th{
padding-left: 6px;;
}
</style> </style>
@ -104,7 +107,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<div class="card card-primary card-outline "> <div class="card card-primary card-outline ">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Receipts And Payments <?php //echo $pageTitle; <h3 class="card-title mt-1">Receipts And Payments <?php //echo $pageTitle;
?> </h3> ?> </h3>
<div class="card-tools"> <div class="card-tools">
@ -156,7 +159,10 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div> </div>
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button> <div class="form-group p-2 pb-0">
<button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
<button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
</div>
</div> </div>
</div> </div>
<div class="btn-group"> <div class="btn-group">
@ -172,7 +178,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<a href="#" class="dropdown-item">View calendar</a> <a href="#" class="dropdown-item">View calendar</a>
</div> --> </div> -->
</div> </div>
<button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> <!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> -->
<!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> --> <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
@ -259,10 +265,10 @@ $PL = $IncomesTotal - $ExpensesTotal;
<tr> <tr>
<th class="" width="35%"><?php myLang("Receipts"); ?></th> <th class="" width="35%"><?php myLang("Receipts"); ?></th>
<th class="text-right" width="15%"></th> <th class="text-right" width="15%"></th>
<th class="text-right" width="15%"><?php myLang("Amount"); ?></th> <th class="text-right pr-2" width="15%"><?php myLang("Amount"); ?></th>
<th class="" width="35%"><?php echo myLang("Payments"); ?></th> <th class="" width="35%"><?php echo myLang("Payments"); ?></th>
<th class="text-right" width="15%"></th> <th class="text-right" width="15%"></th>
<th class="text-right" width="15%"><?php myLang("Amount"); ?></th> <th class="text-right pr-2" width="15%"><?php myLang("Amount"); ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -282,15 +288,15 @@ $PL = $IncomesTotal - $ExpensesTotal;
<?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?> <?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?>
<tr> <tr>
<td class="" width="70%"><b><?php echo $Incomes['category']; ?></b></td> <td class="" width="70%"><b><?php echo $Incomes['category']; ?></b></td>
<td class="text-right" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td> <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
<td width="15%"></td> <td width="15%"></td>
</tr> </tr>
<?php else : ?> <?php else : ?>
<?php $total1 += $Incomes['amount']; ?> <?php $total1 += $Incomes['amount']; ?>
<tr> <tr>
<td class="" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td> <td class="pr-2" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td>
<td width="15%"></td> <td width="15%"></td>
<td class="text-right" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td> <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
@ -313,8 +319,8 @@ $PL = $IncomesTotal - $ExpensesTotal;
</tr--> </tr-->
<?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?> <?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?>
<tr> <tr>
<td class="" width="70%"><b><?php echo $Expenses['category']; ?></b></td> <td class="pr-2" width="70%"><b><?php echo $Expenses['category']; ?></b></td>
<td class="text-right" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td> <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
<td width="15%"></td> <td width="15%"></td>
</tr> </tr>
@ -324,7 +330,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<tr> <tr>
<td class="" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Expenses['account']; ?></td> <td class="" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Expenses['account']; ?></td>
<td width="15%"></td> <td width="15%"></td>
<td class="text-right" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td> <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
</tr> </tr>
@ -340,9 +346,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
<?php $balance_fi = $total1 - $total; ?> <?php $balance_fi = $total1 - $total; ?>
<?php if ($balance_fi < 0) : $total1 += $balance_fi; ?> <?php if ($balance_fi < 0) : $total1 += $balance_fi; ?>
<tr> <tr>
<th><?php echo myLang("Closing Balance"); ?></th> <th class="pl-2"><?php echo myLang("Closing Balance"); ?></th>
<th></th> <th></th>
<td><span class="text-red"><?php echo myCurrency($balance_fi); ?></span></td> <td><span class="text-red pr-2"><?php echo myCurrency($balance_fi); ?></span></td>
<th></th> <th></th>
<th></th> <th></th>
<td></td> <td></td>
@ -352,20 +358,20 @@ $PL = $IncomesTotal - $ExpensesTotal;
<th></th> <th></th>
<th></th> <th></th>
<td></td> <td></td>
<th><?php echo myLang("Closing Balance"); ?></th> <th class="pl-2"><?php echo myLang("Closing Balance"); ?></th>
<th></th> <th></th>
<td><?php echo myCurrency($balance_fi); ?></td> <td class="pr-2"><?php echo myCurrency($balance_fi); ?></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<tr> <tr>
<th>Total</th> <th class="pl-2">Total</th>
<th></th> <th></th>
<td><?php echo myCurrency($total1); ?></td> <td class="pr-2"><?php echo myCurrency($total1); ?></td>
<th>Total</th> <th class="pl-2">Total</th>
<th></th> <th></th>
<td><?php echo myCurrency($total); ?></td> <td class="pr-2"><?php echo myCurrency($total); ?></td>
</tr> </tr>
</tbody> </tbody>

View File

@ -37,12 +37,12 @@
<table class="table table-bordered table-striped dataTable"> <table class="table table-bordered table-striped dataTable">
<thead> <thead>
<tr> <tr>
<th>Sn</th> <th >Sn</th>
<th>Voucher Name</th> <th class="col-2">Voucher Name</th>
<th>Default Debits</th> <th class="col-4">Default Debits</th>
<th>Default Credits</th> <th class="col-4">Default Credits</th>
<th>Voucher Color</th> <th class="col-1 text-center">Voucher Color</th>
<th class="table-col col-2">Action</th> <th class="table-col col-1 text-center">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -57,8 +57,8 @@
<td><?php echo showAccountCategoriesByIds(($TableRow->default_credits!="")?explode(",",$TableRow->default_credits):array()); ?></td> <td><?php echo showAccountCategoriesByIds(($TableRow->default_credits!="")?explode(",",$TableRow->default_credits):array()); ?></td>
<td><span class="inline-block" style="padding:0px 8px;border:1px solid <?php echo $TableRow->voucher_color; ?>;background:<?php echo $TableRow->voucher_color; ?>">&nbsp;</span> </td> <td class="text-center"><span class="inline-block " style="padding:0px 8px;text-align:center;border:1px solid <?php echo $TableRow->voucher_color; ?>;background:<?php echo $TableRow->voucher_color; ?>">&nbsp;</span> </td>
<td> <td class="text-center">
<?php showEditButton($commandURL = "accounts/setup/editvouchertype/" . $TableRow->vouchertype_id , "Edit", ""); ?> <?php showEditButton($commandURL = "accounts/setup/editvouchertype/" . $TableRow->vouchertype_id , "Edit", ""); ?>
</td> </td>

View File

@ -94,7 +94,7 @@ $BIBAccounts = new BIBAccounts();
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-header"> <div class="card-header">
<h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2> <h2 class="card-title mt-1"><?php echo $pageTitle; ?> <?php //myLang("Report"); ?></h2>
<div class="card-tools"> <div class="card-tools">
<form method="post" action="" id="FilterForm"> <form method="post" action="" id="FilterForm">
@ -145,11 +145,14 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button> <div class="form-group p-2 pb-0">
<button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
<button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
</div>
</div> </div>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52"> <button type="submit" class="btn btn-warning btn-sm" data-toggle="dropdown" data-offset="-52">
Export Export
</button> </button>
@ -161,7 +164,7 @@ $BIBAccounts = new BIBAccounts();
<a href="#" class="dropdown-item">View calendar</a> <a href="#" class="dropdown-item">View calendar</a>
</div> --> </div> -->
</div> </div>
<button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> <!-- <button type="button" class="btn btn-info btn-sm" onclick="resetForm()">Reset</button> -->
<button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>

View File

@ -1,121 +1,82 @@
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content-header"> <div class="content-header">
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-sm-6"> <div class="col-sm-6">
<h1 class="m-0"> <h1 class="m-0">
<?php echo $pageTitle; ?></h1> <?php echo $pageTitle; ?></h1>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<ol class="breadcrumb float-sm-right"> <ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="<?php echo base_url(); ?>"> <a href="<?php echo base_url(); ?>">
Dashboard</a> Dashboard</a>
</li> </li>
<li class="breadcrumb-item active"> <li class="breadcrumb-item active">
<?php echo $pageTitle; ?></li> <?php echo $pageTitle; ?></li>
</ol> </ol>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-header"> <div class="card-header">
<h5 class="m-0"> <h5 class="m-0">
<?php echo $pageTitle; ?> <a href="<?php echo site_url("accounts/vouchers/" . $VoucherType->voucher_alias . "/create"); ?>" class="btn btn-sm btn-primary float-right"> <?php echo $pageTitle; ?> <a href="<?php echo site_url("accounts/vouchers/" . $VoucherType->voucher_alias . "/create"); ?>" class="btn btn-sm btn-primary float-right">
Create New <?php echo $pageTitle; ?></a></h5> Create New <?php echo $pageTitle; ?></a></h5>
</div> </div>
<div class="card-body"> <div class="card-body">
<?php $TableData = $Vouchers ?> <?php $TableData = $Vouchers ?>
<table class="table table-bordered table-striped" id="voucherList"> <table class="table table-bordered table-striped" id="voucherList">
<thead> <thead>
<tr> <tr>
<th>ID#</th> <th>ID#</th>
<th>Voucher No</th> <th>Voucher No</th>
<th>Voucher Date</th> <th>Voucher Date</th>
<th>Voucher Type</th> <th>Voucher Type</th>
<th>Voucher State</th> <th>Voucher State</th>
<th class="table-col col-2">Action</th> <th class="table-col col-2">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $a=0; foreach ($TableData as $TableRow) : $a++; ?> <?php $a = 0;
foreach ($TableData as $TableRow) : $a++; ?>
<?php foreach ($TableRow as $cols) : $id = $cols; <?php foreach ($TableRow as $cols) : $id = $cols;
break; break;
endforeach; ?><tr data-id="<?php echo $TableRow->voucher_id; ?>" class="<?php echo ($TableRow->voucher_state == "Reversed") ? "table-danger" : ""; ?>"> endforeach; ?><tr data-id="<?php echo $TableRow->voucher_id; ?>" class="<?php echo ($TableRow->voucher_state == "Reversed") ? "table-danger" : ""; ?>">
<td><?php echo $TableRow->voucher_id; ?></td> <td><?php echo $TableRow->voucher_id; ?></td>
<td><?php echo $TableRow->voucher_no; ?></td> <td><?php echo $TableRow->voucher_no; ?></td>
<td><?php echo $TableRow->voucher_date; ?></td> <td><?php echo $TableRow->voucher_date; ?></td>
<td><?php echo $TableRow->voucher_type; ?></td> <td><?php echo $TableRow->voucher_type; ?></td>
<td><?php echo $TableRow->voucher_state; ?></td> <td><?php echo $TableRow->voucher_state; ?></td>
<td class="col-1"> <td class="col-1">
<a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-success btn-xs" title="View Details"> <a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-success btn-xs" title="View Details">
<i class="fa fa-eye"> <i class="fa fa-eye">
</i></a> </i></a>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<tbody> <tbody>
</table> </table>
<div class="modal fade" id="voucherdetails_box" tabindex="-1" role="dialog" aria-labelledby="voucherdetails_box" aria-hidden="true"> <div class="modal fade" id="voucherdetails_box" tabindex="-1" role="dialog" aria-labelledby="voucherdetails_box" aria-hidden="true">
<div class="modal-dialog modal-xl" role="document"> <div class="modal-dialog modal-xl" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"> <h5 class="modal-title" id="exampleModalLabel">
Voucher Details</h5> Voucher Details</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true"> <span aria-hidden="true">
&times;</span> &times;</span>
</button> </button>
</div> </div>
<div class="modal-body" id="details_container"> <div class="modal-body" id="details_container">
Voucher Details Goes Here Voucher Details Goes Here
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" onClick='reversalEntry()' id="reversalBtn" class="btn btn-secondary" data-dismiss="modal" data-id=""> <button type="button" onClick='reversalEntry()' id="reversalBtn" class="btn btn-secondary" data-dismiss="modal" data-id="">
Revarsal Entry</button> Revarsal Entry</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"> <button type="button" class="btn btn-secondary" data-dismiss="modal">
@ -138,7 +99,6 @@
function reversalEntry() { function reversalEntry() {
var id = $("#reversalBtn").data("id"); var id = $("#reversalBtn").data("id");
if (confirm("Are you sure you want to post reversal for this voucher?")) { if (confirm("Are you sure you want to post reversal for this voucher?")) {
window.location = "<?php echo site_url("accounts/vouchers/reversal/"); ?>" + id; window.location = "<?php echo site_url("accounts/vouchers/reversal/"); ?>" + id;
} }
@ -158,7 +118,6 @@ function footerfunctions()
<script> <script>
$(document).ready(function() { $(document).ready(function() {
var table = $('#voucherList').DataTable(); var table = $('#voucherList').DataTable();
var tableRows = $('table#voucherList tbody').find('tr'); var tableRows = $('table#voucherList tbody').find('tr');
tableRows.each(function() { tableRows.each(function() {
async: false; async: false;
@ -169,8 +128,6 @@ function footerfunctions()
Transactions = getVoucherDetails(id); Transactions = getVoucherDetails(id);
row.child(Transactions).show(); row.child(Transactions).show();
}); });
}); });
function getVoucherDetails(id) { function getVoucherDetails(id) {

View File

@ -81,7 +81,7 @@ button:hover {
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<!-- <div class="card-header" style="background-color: <?php echo $VoucherType->voucher_color; ?>;"> <!-- <div class="card-header" style="background-color: <?php //echo $VoucherType->voucher_color; ?>;">
<h5 class="m-0"> <h5 class="m-0">
<?php //echo $pageTitle; <?php //echo $pageTitle;
?> ?>

View File

@ -4,7 +4,6 @@ $param = $this->uri->segment(2);
$subparam = $this->uri->segment(3); $subparam = $this->uri->segment(3);
$subparam2 = $this->uri->segment(4); $subparam2 = $this->uri->segment(4);
?> ?>
<!-- Main Sidebar Container --> <!-- Main Sidebar Container -->
<aside class="main-sidebar main-sidebar-custom sidebar-dark-primary elevation-4"> <aside class="main-sidebar main-sidebar-custom sidebar-dark-primary elevation-4">
<!-- Brand Logo --> <a href="<?php echo base_url(); ?>" class="brand-link"> <img src="<?php echo base_url(); ?>dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3" style="opacity: .8"> <span class="brand-text font-weight-light"> <!-- Brand Logo --> <a href="<?php echo base_url(); ?>" class="brand-link"> <img src="<?php echo base_url(); ?>dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3" style="opacity: .8"> <span class="brand-text font-weight-light">
@ -16,7 +15,6 @@ $subparam2 = $this->uri->segment(4);
<div class="user-panel mt-3 pb-3 mb-3 d-flex"> <div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image"> <img src="<?php echo base_url(); ?>dist/img/user2-160x160.jpg" class="img-circle elevation-2" alt="User Image"> </div> <div class="image"> <img src="<?php echo base_url(); ?>dist/img/user2-160x160.jpg" class="img-circle elevation-2" alt="User Image"> </div>
<div class="info"> <a href="#" class="d-block"><?php echo $this->session->userdata("CompanyName"); ?> (<?php echo ($this->session->userdata("FiscalYear")->fiscalyear_year); ?>)</a></div> <div class="info"> <a href="#" class="d-block"><?php echo $this->session->userdata("CompanyName"); ?> (<?php echo ($this->session->userdata("FiscalYear")->fiscalyear_year); ?>)</a></div>
</div> <!-- SidebarSearch Form --> </div> <!-- SidebarSearch Form -->
<div class="form-inline pb-2"> <div class="form-inline pb-2">
<div class="input-group" data-widget="sidebar-search"> <div class="input-group" data-widget="sidebar-search">
@ -74,7 +72,7 @@ $subparam2 = $this->uri->segment(4);
<?php if ($LoggedUser == "admin") : ?> <?php if ($LoggedUser == "admin") : ?>
<?php //showMenu("Create New Ledger", "accounts/accountheads/add"); <?php //showMenu("Create New Ledger", "accounts/accountheads/add");
?> ?>
<?php showMenu("List of Ledgers", "accounts/accountheads/list"); ?> <?php showMenu("Ledgers", "accounts/accountheads/list"); ?>
<?php endif; ?> <?php endif; ?>
</ul> </ul>
</li> </li>
@ -140,7 +138,6 @@ $subparam2 = $this->uri->segment(4);
<?php if ($LoggedUser == "admin") : <?php if ($LoggedUser == "admin") :
// showMenu("Inventory Stock", "inventory/stocks/list"); // showMenu("Inventory Stock", "inventory/stocks/list");
showMenu("Stock Report", "inventory/stocks/summary"); showMenu("Stock Report", "inventory/stocks/summary");
showMenu("Sales Register", "inventory/sales/sales_register"); showMenu("Sales Register", "inventory/sales/sales_register");
showMenu("Purchase Register", "inventory/purchases/purchase_register"); showMenu("Purchase Register", "inventory/purchases/purchase_register");
showMenu("Purchase Vs Sales", "inventory/reports/purchase_vs_sales"); showMenu("Purchase Vs Sales", "inventory/reports/purchase_vs_sales");
@ -163,7 +160,7 @@ $subparam2 = $this->uri->segment(4);
showMenu("Profit and Loss Statement", "accounts/reports/pl"); showMenu("Profit and Loss Statement", "accounts/reports/pl");
showMenu("Balance Sheet", "accounts/reports/balance_sheet"); showMenu("Balance Sheet", "accounts/reports/balance_sheet");
// showMenu("Balance Sheet (Vertical)", "accounts/reports/balance_sheet_vertical"); // showMenu("Balance Sheet (Vertical)", "accounts/reports/balance_sheet_vertical");
showMenu("Receipt And Payments", "accounts/reports/receipt_and_payment"); showMenu("Receipt And Payment", "accounts/reports/receipt_and_payment");
// showMenu("Income And Expenses", "accounts/reports/incomes_and_expenses"); // showMenu("Income And Expenses", "accounts/reports/incomes_and_expenses");
showMenu("Cash Flow", "accounts/reports/cash_flow"); showMenu("Cash Flow", "accounts/reports/cash_flow");
showMenu("Ratio Analysis", "accounts/reports/ratio_analysis"); showMenu("Ratio Analysis", "accounts/reports/ratio_analysis");
@ -189,7 +186,6 @@ $subparam2 = $this->uri->segment(4);
// showMenu("Group Summary", "accounts/ledger/partyledger"); // showMenu("Group Summary", "accounts/ledger/partyledger");
showMenu("Group Summary", "accounts/reports/balance_by_group"); showMenu("Group Summary", "accounts/reports/balance_by_group");
// showMenu("Balance by Category", "accounts/reports/balance_by_category"); // showMenu("Balance by Category", "accounts/reports/balance_by_category");
showMenu("Accounts Receivables", "accounts/ledger/receiveables"); showMenu("Accounts Receivables", "accounts/ledger/receiveables");
showMenu("Accounts Payables", "accounts/ledger/payables"); showMenu("Accounts Payables", "accounts/ledger/payables");
showMenu("Purchase Summary", "inventory/purchases/list"); showMenu("Purchase Summary", "inventory/purchases/list");

View File

@ -38,7 +38,7 @@
<!--COL START--> <!--COL START-->
<div class="col-6"> <div class="col-6">
<div class="form-group"> <div class="form-group">
<?php fillComboWithValue("units_id", "Units", "units_id", "tbl_units", "title", "unit_id", isset($item) ? $item->units_id : '',); ?> <?php fillComboWithValue("units_id", "Units <span class='text-danger'>*</span>", "units_id", "tbl_units", "title", "unit_id", isset($item) ? $item->units_id : '',); ?>
</div> </div>
</div> </div>
<!--COL END--> <!--COL END-->
@ -47,7 +47,7 @@
<!--COL START--> <!--COL START-->
<div class="col"> <div class="col">
<div class="form-group"> <div class="form-group">
<?php fillComboWithValue("itemcategories_id", "Group", "itemcategories_id", "tbl_itemcategories", "title", "itemcategory_id", isset($item) ? $item->itemcategories_id : ''); ?> <?php fillComboWithValue("itemcategories_id", "Group <span class='text-danger'>*</span>", "itemcategories_id", "tbl_itemcategories", "title", "itemcategory_id", isset($item) ? $item->itemcategories_id : ''); ?>
</div> </div>
</div> </div>
<!--COL END--> <!--COL END-->

View File

@ -159,7 +159,7 @@
</div> </div>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52"> <button type="button" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
Export Export
</button> </button>
<!-- <div class="dropdown-menu" role="menu"> <!-- <div class="dropdown-menu" role="menu">
@ -177,6 +177,7 @@
<table class="table table-bordered table-striped dataTable"> <table class="table table-bordered table-striped dataTable">
<thead> <thead>
<tr> <tr>
<th rowspan="2" width="40"><?php myLang('S.No.'); ?></th>
<th rowspan="2"><?php myLang('Item'); ?></th> <th rowspan="2"><?php myLang('Item'); ?></th>
<th rowspan="2" width="80"><?php myLang('Units'); ?></th> <th rowspan="2" width="80"><?php myLang('Units'); ?></th>
@ -210,7 +211,7 @@
<?php $Total = 0;$PTotal=0;$STotal=0;$CTotal=0; <?php $Total = 0;$PTotal=0;$STotal=0;$CTotal=0;
foreach ($StockRecords as $TableRow) : ?> foreach ($StockRecords as $TableRow) : ?>
<tr> <tr>
<td></td>
<td><?php echo ($TableRow->Item)?$TableRow->Item->title:"N/A"; ?></td> <td><?php echo ($TableRow->Item)?$TableRow->Item->title:"N/A"; ?></td>
<td><?php echo getFieldfromValue("tbl_units", "title", "unit_id", $TableRow->Item->units_id); ?></td> <td><?php echo getFieldfromValue("tbl_units", "title", "unit_id", $TableRow->Item->units_id); ?></td>
<td class="text-right"><?php echo $TableRow->Summary->Opening->qty; ?></td> <td class="text-right"><?php echo $TableRow->Summary->Opening->qty; ?></td>

View File

@ -1,5 +1,5 @@
APP_NAME="BIB-Accounts" APP_NAME="BIB-Accounts"
APP_URL=http://localhost/School-With-Accounts/account/ APP_URL=http://localhost/bbnepal/BBnepal-Accounts
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_HOST=127.0.0.1:3309 DB_HOST=127.0.0.1:3309
DB_PORT=3309 DB_PORT=3309