sampanna/BBnepal-Accounts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

salesvspurchase and final accounts pages change

Browse Source
This commit is contained in:
Sampanna Rimal 2024-08-05 13:13:06 +05:45
parent c16163bf01
commit d164f3139d
18 changed files with 743 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account/application/controllers/accounts/Vouchers.php
View File

@ -264,7 +264,7 @@ class Vouchers extends CI_Controller
$entry_no++;
echo json_encode(['status' => 'success']);
// echo json_encode(['status' => 'success']);
loadview("accounts/vouchers/create", $data);
break;
}

6
account/application/controllers/inventory/Items.php
View File

@ -60,8 +60,10 @@ class Items extends CI_Controller
$item_code = filter_var($_POST['item_code']);
$this->db->where('status',1);
$this->db->where('item_id !=', $id);
$this->db->where('title',$title);
$this->db->or_where('item_code',$item_code);
$this->db->group_start();
$this->db->where('title', $title);
$this->db->or_where('item_code', $item_code);
$this->db->group_end();
$query = $this->db->get('tbl_items');
if($query->num_rows() > 0){

2
account/application/helpers/bibhelper_helper.php
View File

@ -153,7 +153,7 @@ function showCreateButton($url, $text = "Create")
function showDetailsButton($url, $text = "Details")
{
?>
<a href="<?php echo site_url($url); ?>" class="btn btn-primary btn-xs" title="<?php echo myLang($text); ?>"><i class="fas fa-glasses"></i> <?php //echo myLang($text);
<a href="<?php echo site_url($url); ?>" class="btn btn-primary btn-xs" title="<?php echo myLang($text); ?>"><i class="fas fa-eye"></i> <?php //echo myLang($text);
?></a>
<?php
}

4
account/application/views/accounts/accountheads/edit.php
View File

@ -180,7 +180,9 @@
</div>
<!--COL END-->
</div>
<button type="reset" class="btn btn-default btn-sm">Reset</button> <button class="btn btn-primary btn-sm" type="submit" name="submit">Save</button>
<p align="right">
<button style="padding: 6px 24px; border-radius: 2px; border: 1px solid DodgerBlue" class="btn btn-default btn-sm">Reset</button> <button style="padding: 6px 24px; border-radius: 2px;" class="btn btn-primary btn-sm" type="submit" name="submit">Save</button>
</p>
</form>
</div>
</div>

23
account/application/views/accounts/accountheads/list.php
View File

@ -40,47 +40,31 @@
<div class="row" id="additionalFields" style="display: none;">
<!-- Additional Fields for Sundry Debtors or Sundry Creditors -->
<div class="row">
<div class="col">
<div class="form-group">
<label for="account_partyaddress">Address</label>
<input type="text" class="form-control" id="account_partyaddress" name="account_partyaddress">
</div>
</div>
<div class="col">
<div class="form-group">
<label for="account_partypan">PAN No.</label>
<input type="text" class="form-control" id="account_partypan" name="account_partypan">
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="form-group">
<label for="account_partycontact">Phone No.</label>
<input type="text" class="form-control" id="account_partycontact" name="account_partycontact">
</div>
</div>
<div class="col">
<div class="form-group">
<label for="account_partyemail">Email</label>
<input type="email" class="form-control" id="account_partyemail" name="account_partyemail">
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="form-group">
<label for="account_partycontactperson">Contact Person Name</label>
<input type="text" class="form-control" id="account_partycontactperson" name="account_partycontactperson">
</div>
</div>
<div class="col">
<div class="form-group">
<label for="account_partycontactpersoncontact">Contact Person No.</label>
<input type="text" class="form-control" id="account_partycontactpersoncontact" name="account_partycontactpersoncontact">
</div>
</div>
</div>
</div>
@ -91,13 +75,12 @@
<label for="account_number">Account No.</label>
<input type="text" class="form-control" id="account_number" name="account_number">
</div>
</div>
<div class="col">
<div class="form-group">
<label for="account_branch">Branch</label>
<label for="account_branch">Account Branch</label>
<input type="text" class="form-control" id="account_branch" name="account_branch">
</div>
</div>
</div>
<div class="row">
@ -204,7 +187,7 @@
echo ($TableRow->cr_opening_balance > 0) ? myCurrency($TableRow->cr_opening_balance) : ""; ?></td>
<td class="text-center">
<a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-primary btn-xs" title="View"><i class="fas fa-copy"></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 onClick="javascript:doDelete(<?php echo $id; ?>);" class="btn btn-danger btn-xs" title="Delete"><i class="fas fa-trash"></i> </a>
</td>

190
account/application/views/accounts/balancesheet_new.php
View File

@ -4,58 +4,71 @@ $BIBAccounts = new BIBAccounts();
?>
<style>
table,
table,
td,
tr {
padding: 0px;
margin: 0px;
}
.group-name {
width: 40%;
font-weight: 600px;
}
.group-total {
width: 10%;
}
.table-gray {
background-color: #eee;
}
.table td,
.table th {
padding: 0px;
margin: 0px;
}
.bg-darker {
background-color: #ddd;
}
td .table {
border: 0px !important;
margin-bottom: 0rem;
}
table td:first-child {
padding-left: 5px;
}
.table-bordered.vertical-borders td,
.table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6;
}
.table-bordered.vertical-borders thead th {
padding: 0.25rem;
border-top: none;
border-bottom: 2px solid #dee2e6;
}
.table-bordered.vertical-borders tfoot th {
padding: 0.25rem;
border-top: 2px solid #dee2e6;
border-bottom: none;
}
.currency{
font-weight: normal !important;
}
.underline{
text-decoration: underline;
}
.currency {
font-weight: normal !important;
}
.underline {
text-decoration: underline;
}
.form-control {
display: block;
width: 100%;
@ -75,23 +88,99 @@ $BIBAccounts = new BIBAccounts();
</style>
<div class="content-wrapper">
<section class="content">
<div class="container-fluid">
<div class="card card-primary ">
<div class="card-header">
<h3 class="card-title"><?php echo $pageTitle; ?> </h3>
<div class="container-fluid">
<div class="card card-primary card-outline">
<div class="card-header">
<h3 class="card-title"><?php echo $pageTitle; ?> </h3>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
</button>
<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>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-danger 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 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> -->
</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>
<!-- /.card-tools -->
</div>
<!-- /.card-tools -->
</div>
<div class="card-body">
<form method="post" action="" id="FilterForm">
<!-- <div class="card-body">
<form method="post" action="" id="FilterForm">
<div class="row align-items-end">
<div class="col-2">
<div class="form-group">
@ -108,13 +197,13 @@ $BIBAccounts = new BIBAccounts();
<div class="col-1 text-center">
<div class="form-group">
<label for="showOB"><?php myLang("Opening"); ?></label>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "" : "CHECKED"; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<label for="showClosing"><?php myLang("Closing"); ?></label>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "" : "CHECKED"; ?>>
</div>
</div>
<div class="col-1 text-center">
@ -125,42 +214,43 @@ $BIBAccounts = new BIBAccounts();
</div>
<div class="col">
<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-success mr-2">Export</button>
<button type="button" class="btn btn-warning" onclick="resetForm()">Reset</button>
</div>
</div>
</div>
</form>
<script>
function resetForm() {
document.getElementById("fromDate").value = "2078-4-1";
document.getElementById("toDate").value = "2079-3-32";
document.getElementById("showOB").checked = false;
document.getElementById("showClosing").checked = false;
document.getElementById("FilterForm").submit();
}
</script>
<script>
function resetForm() {
document.getElementById("fromDate").value = "2078-4-1";
document.getElementById("toDate").value = "2079-3-32";
document.getElementById("showOB").checked = false;
document.getElementById("showClosing").checked = false;
document.getElementById("FilterForm").submit();
}
</script>
</div>
</div> -->
</div>
</div><!-- /.container-fluid -->
</section>
</div>
</div><!-- /.container-fluid -->
</section>
<div class="content">
<div class="container-fluid">
<div class="row">
<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
Collapse</button>
<div class="card card-primary card-outline">
<div class="card-body p-0">
<!-- <button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle
Collapse</button> -->
<?php
// echo $_POST['showClosing'];
@ -171,7 +261,7 @@ $BIBAccounts = new BIBAccounts();
'showPeriod' => false,
);
?>
<table class="table table-bordered">
<thead>
<tr>
@ -202,15 +292,15 @@ $BIBAccounts = new BIBAccounts();
?>
<?php foreach ($AccountGroups as $group) : ?>
<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>
<td colspan="7" class="group-details p-0">
<div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
<?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
</div>
</td>
</tr>
@ -355,7 +445,8 @@ $BIBAccounts = new BIBAccounts();
</table>
<?php //pre($BIBAccounts->getAccountGroupsWithBalances($acgroup_id = null)); ?>
<?php //pre($BIBAccounts->getAccountGroupsWithBalances($acgroup_id = null));
?>
@ -377,10 +468,11 @@ function footerfunctions()
document.getElementById("toggleShowAll").click();
});
document.getElementById("toggleShowAll").addEventListener("click", function() {
document.getElementById("toggleShowAll").addEventListener("click", function(e) {
e.preventDefault();
var nestedRows = document.getElementsByClassName("collapse");
for (var i = 0; i < nestedRows.length; i++) {
if (nestedRows[i].classList.contains("show")) {

128
account/application/views/accounts/cash_flow.php
View File

@ -101,18 +101,94 @@ $PL = $IncomesTotal - $ExpensesTotal;
<section class="content">
<div class="container-fluid">
<div class="card card-primary ">
<div class="card-header">
<h3 class="card-title">Receipts And Payments <?php //echo $pageTitle;
?> </h3>
<div class="card card-primary card-outline">
<div class="card-header ">
<h3 class="card-title">Cash Flow<?php //echo $pageTitle;
?> </h3>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
</button>
<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>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-danger 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 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> -->
</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>
<!-- /.card-tools -->
</div>
<div class="card-body">
<!-- <div class="card-body">
<form method="post" action="" id="FilterForm">
<div class="row align-items-end">
<div class="col-2">
@ -130,13 +206,13 @@ $PL = $IncomesTotal - $ExpensesTotal;
<div class="col-1 text-center">
<div class="form-group">
<label for="showOB"><?php myLang("Opening"); ?></label>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : "CHECKED"; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<label for="showClosing"><?php myLang("Closing"); ?></label>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : "CHECKED"; ?>>
</div>
</div>
<div class="col-1 text-center">
@ -167,13 +243,15 @@ $PL = $IncomesTotal - $ExpensesTotal;
}
</script>
</div>
</div> -->
</div>
<div class="card">
<div class="card-header">
<!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
<div class="card card-primary card-outline">
<!-- <div class="card-header">
<h4 class="card-title">Cash Flow</h4>
</div>
</div> -->
<div class="card-body table-responsive p-0">
@ -295,19 +373,19 @@ $PL = $IncomesTotal - $ExpensesTotal;
</tr>
<?php endforeach; ?>
<?php $Cash = $BIBAccounts->getAccountCategoriesWithBalances(null, 3); ?>
<?php foreach ($Cash->accounts as $account) : ?>
<tr>
<th></th>
<td></td>
<td class="text-right"></td>
<th><?php echo $account->account_name; ?></th>
<td></td>
<td class="text-right"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td>
</tr>
<?php endforeach; ?>
<?php foreach ($Cash->accounts as $account) : ?>
<tr>
<th></th>
<td></td>
<td class="text-right"></td>
<th><?php echo $account->account_name; ?></th>
<td></td>
<td class="text-right"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td>
</tr>
<?php endforeach; ?>
</table>
<?php //pre($IncomesExpenses);

208
account/application/views/accounts/pl_new.php
View File

@ -9,57 +9,70 @@ $BIBAccounts = new BIBAccounts();
<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>
<style>
table,
table,
td,
tr {
padding: 0px;
margin: 0px;
}
.group-name {
width: 40%;
width: 40%;
}
.group-total {
width: 10%;
}
.table-gray {
background-color: #eee;
}
.table td,
.table th {
padding: 0px;
margin: 0px;
}
.bg-darker {
background-color: #ddd;
}
td .table {
border: 0px !important;
margin-bottom: 0rem;
}
table td:first-child {
padding-left: 5px;
}
.table-bordered.vertical-borders td,
.table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6;
}
.table-bordered.vertical-borders thead th {
padding: 0.25rem;
border-top: none;
border-bottom: 2px solid #dee2e6;
}
.table-bordered.vertical-borders tfoot th {
padding: 0.25rem;
border-top: 2px solid #dee2e6;
border-bottom: none;
}
.currency{
font-weight: normal !important;
}
.underline{
text-decoration: underline;
}
.currency {
font-weight: normal !important;
}
.underline {
text-decoration: underline;
}
.form-control {
display: block;
width: 100%;
@ -80,88 +93,106 @@ $BIBAccounts = new BIBAccounts();
<div class="content-wrapper">
<div class="content">
<div class="content">
<div class="container-fluid">
<div class="card card-primary ">
<div class="card card-primary card-outline ">
<div class="card-header">
<h3 class="card-title"><?php echo $pageTitle; ?> </h3>
<div class="card-header">
<h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
</button>
</div>
<!-- /.card-tools -->
</div>
<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="card-body">
<form method="post" action="" id="FilterForm">
<div class="row align-items-end">
<div class="col-2">
<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 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>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="col-2">
<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 class="btn-group">
<button type="submit" class="btn btn-danger 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>
<div class="col-1 text-center">
<div class="form-group">
<label for="showOB"><?php myLang("Opening"); ?></label>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<label for="showClosing"><?php myLang("Closing"); ?></label>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<label for="showPeriod"><?php myLang("Period"); ?></label>
<input type="checkbox" class="form-control " name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
</div>
</div>
<div class="col">
<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-success mr-2">Export</button>
<button type="button" class="btn btn-warning" onclick="resetForm()">Reset</button>
</div>
</div>
</div>
</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>
<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> -->
</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>
</div>
<div class="content">
<div class="container-fluid">
<div class="row">
<div class="col">
<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 Collapse</button>
<div class="card card-primary card-outline ">
<div class="card-body p-0">
<?php
@ -179,7 +210,7 @@ $BIBAccounts = new BIBAccounts();
<thead>
<tr>
<th class="group-name" width="85%">Particulars</th>
<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-total text-center" width="15%">Amount</th>
@ -205,16 +236,18 @@ $BIBAccounts = new BIBAccounts();
?>
<?php foreach ($AccountGroups as $group) : ?>
<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; ?></b></td>
<td class="group-name"><b><?php //echo $group->acgroup_name;
?></b></td>
<td class="group-total text-right"><?php //echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td>
<td class="group-total text-right"><?php //echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0);
?></td>
</tr>
<tr>
<td colspan="7" class="group-details p-0" width="85%">
<div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
<?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
</div>
</td>
</tr>
@ -234,7 +267,7 @@ $BIBAccounts = new BIBAccounts();
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(4); ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<?php
// Initialize variables for column totals
$totalOpeningDr = 0;
@ -246,14 +279,16 @@ $BIBAccounts = new BIBAccounts();
?>
<?php foreach ($AccountGroups as $group) : ?>
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
<td class="group-name" width="85%"> <?php //echo $group->acgroup_name; ?></td>
<td class="group-total" width="15%"><?php //echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td>
<td class="group-name" width="85%"> <?php //echo $group->acgroup_name;
?></td>
<td class="group-total" width="15%"><?php //echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0);
?></td>
</tr>
<tr>
<td colspan="7" class="group-details p-0">
<div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
<i> <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
<i> <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
</i>
</div>
</td>
@ -291,7 +326,7 @@ $BIBAccounts = new BIBAccounts();
</tr>
<?php else : ?>
<tr>
<td colspan="2" class="p-0">
<td colspan="2" class="p-0">
<table class="table table-bordered">
<tr>
<th>Total Loss</th>
@ -306,7 +341,7 @@ $BIBAccounts = new BIBAccounts();
</tr>
<?php endif; ?>
<tr>
<td colspan="2" class="p-0">
<td colspan="2" class="p-0">
<table class="table table-bordered">
<tr>
<th>Total Incomes</th>
@ -327,12 +362,12 @@ $BIBAccounts = new BIBAccounts();
<tr>
<th>Total Expenses</th>
<th class="dr closing-dr">
<?php if ($PL > 0) : ?>
<?php if ($PL > 0) : ?>
<?php echo myCurrency($totalClosingDr + abs($PL)); ?>
<?php else : ?>
<?php echo myCurrency($totalClosingDr); ?>
<?php endif; ?>
</th>
</tr>
@ -360,9 +395,6 @@ function footerfunctions()
{
?>
<script>
document.addEventListener("DOMContentLoaded", function() {
// Trigger click event on page load
document.getElementById("toggleShowAll").click();

144
account/application/views/accounts/receipt_and_payment.php
View File

@ -11,57 +11,70 @@ $PL = $IncomesTotal - $ExpensesTotal;
?>
<style>
table,
table,
td,
tr {
padding: 0px;
margin: 0px;
}
.group-name {
width: 40%;
}
.group-total {
width: 10%;
}
.table-gray {
background-color: #eee;
}
.table td,
.table th {
padding: 0px;
margin: 0px;
}
.bg-darker {
background-color: #ddd;
}
td .table {
border: 0px !important;
margin-bottom: 0rem;
}
table td:first-child {
padding-left: 5px;
}
.table-bordered.vertical-borders td,
.table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6;
}
.table-bordered.vertical-borders thead th {
padding: 0.25rem;
border-top: none;
border-bottom: 2px solid #dee2e6;
}
.table-bordered.vertical-borders tfoot th {
padding: 0.25rem;
border-top: 2px solid #dee2e6;
border-bottom: none;
}
.currency{
font-weight: normal !important;
}
.underline{
text-decoration: underline;
}
.currency {
font-weight: normal !important;
}
.underline {
text-decoration: underline;
}
.form-control {
display: block;
width: 100%;
@ -85,25 +98,102 @@ $PL = $IncomesTotal - $ExpensesTotal;
<div class="content-wrapper">
<section class="content">
<div class="container-fluid">
<div class="card card-primary ">
<div class="card card-primary card-outline ">
<div class="card-header">
<h3 class="card-title">Receipts And Payments <?php //echo $pageTitle; ?> </h3>
<div class="card-header">
<h3 class="card-title">Receipts And Payments <?php //echo $pageTitle;
?> </h3>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
</button>
<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>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-danger 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 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> -->
</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>
<!-- /.card-tools -->
</div>
<!-- /.card-tools -->
</div>
<div class="card-body">
<form method="post" action="" id="FilterForm">
<!-- <div class="card-body">
<form method="post" action="" id="FilterForm">
<div class="row align-items-end">
<div class="col-2">
<div class="form-group">
@ -120,13 +210,13 @@ $PL = $IncomesTotal - $ExpensesTotal;
<div class="col-1 text-center">
<div class="form-group">
<label for="showOB"><?php myLang("Opening"); ?></label>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : "CHECKED"; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<label for="showClosing"><?php myLang("Closing"); ?></label>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : "CHECKED"; ?>>
</div>
</div>
<div class="col-1 text-center">
@ -144,7 +234,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div>
</div>
</div>
</form>
<script>
@ -157,12 +247,12 @@ $PL = $IncomesTotal - $ExpensesTotal;
}
</script>
</div>
</div> -->
</div>
<div class="card">
<div class="card-body table-responsive p-0">
<div class="card card-primary card-outline">
<?php $IncomesExpenses = $BIBAccounts->prepareIncomeExpenses() ?>
<table class="table table-head-fixed table-bordered g-0">
<thead>
@ -248,7 +338,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
</td>
</tr>
<?php $balance_fi = $total1 - $total; ?>
<?php if ($balance_fi < 0) : $total1 +=$balance_fi; ?>
<?php if ($balance_fi < 0) : $total1 += $balance_fi; ?>
<tr>
<th><?php echo myLang("Closing Balance"); ?></th>
<th></th>
@ -257,7 +347,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<th></th>
<td></td>
</tr>
<?php elseif ($balance_fi > 0) : $total +=$balance_fi; ?>
<?php elseif ($balance_fi > 0) : $total += $balance_fi; ?>
<tr>
<th></th>
<th></th>

365
account/application/views/accounts/trialbalance_new.php
View File

@ -14,51 +14,64 @@ $BIBAccounts = new BIBAccounts();
padding: 0px;
margin: 0px;
}
.group-name {
width: 40%;
}
.group-total {
width: 10%;
}
.table-gray {
background-color: #eee;
}
.table td,
.table th {
padding: 0px;
margin: 0px;
}
.bg-darker {
background-color: #ddd;
}
td .table {
border: 0px !important;
margin-bottom: 0rem;
}
table td:first-child {
padding-left: 5px;
}
.table-bordered.vertical-borders td,
.table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6;
}
.table-bordered.vertical-borders thead th {
padding: 0.25rem;
border-top: none;
border-bottom: 2px solid #dee2e6;
}
.table-bordered.vertical-borders tfoot th {
padding: 0.25rem;
border-top: 2px solid #dee2e6;
border-bottom: none;
}
.currency{
font-weight: normal !important;
}
.underline{
text-decoration: underline;
}
.currency {
font-weight: normal !important;
}
.underline {
text-decoration: underline;
}
.form-control {
display: block;
width: 100%;
@ -79,72 +92,90 @@ $BIBAccounts = new BIBAccounts();
<div class="content-wrapper">
<div class="content">
<div class="container-fluid">
<div class="card card-primary ">
<div class="card-header">
<h3 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h3>
<div class="card card-primary card-outline">
<div class="card-header">
<h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
</button>
</div>
<!-- /.card-tools -->
</div>
<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="card-body">
<form method="post" action="" id="FilterForm">
<div class="row align-items-end">
<div class="col-2">
<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 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>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="col-2">
<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 class="btn-group">
<button type="submit" class="btn btn-danger 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>
<div class="col-1 text-center">
<div class="form-group">
<label for="showOB"><?php myLang("Opening"); ?></label>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<label for="showClosing"><?php myLang("Closing"); ?></label>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<label for="showPeriod"><?php myLang("Period"); ?></label>
<input type="checkbox" class="form-control " name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
</div>
</div>
<div class="col">
<div class="form-group d-flex justify-content-end">
<button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</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="button" class="btn btn-warning" onclick="resetForm()">Reset</button>
</div>
</div>
</div>
</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>
<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>
</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>
@ -158,108 +189,115 @@ $BIBAccounts = new BIBAccounts();
<h5 class="m-0"><?php echo $pageTitle; ?> </h5>
</div> -->
<div class="card-body p-0">
<?php
// echo $_POST['showClosing'];
$ReportOptions = array(
'showZeroBalances' => true,
'showOB' => (isset($_POST['showOB'])) ? true : false,
'showClosing' => (isset($_POST['showClosing'])) ? true : false,
'showPeriod' => (isset($_POST['showPeriod'])) ? true : true,
);
$showZeroBalances = false;
?>
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(); ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<thead class="bg-gray">
<tr>
<th rowspan="2">Particulars</th>
<?php if ($ReportOptions['showOB']) : ?>
<th colspan="2" class="text-center">Opening</th>
<?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?>
<th colspan="2" class="text-center">Current Period</th>
<?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?>
<th colspan="2" class="text-center">Closing</th>
<?php endif; ?>
</tr>
<tr>
<?php if ($ReportOptions['showOB']) : ?>
<th class="dr opening-dr text-center">Dr</th>
<th class="cr opening-cr text-center">Cr</th>
<?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?>
<th class="dr this-year-dr text-center">Dr</th>
<th class="cr this-year-cr text-center">Cr</th>
<?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?>
<th class="dr closing-dr text-center">Dr</th>
<th class="cr closing-cr text-center">Cr</th>
<?php endif; ?>
</tr>
</thead>
<?php
// echo $_POST['showClosing'];
$ReportOptions = array(
'showZeroBalances' => true,
'showOB' => (isset($_POST['showOB'])) ? true : false,
'showClosing' => (isset($_POST['showClosing'])) ? true : false,
'showPeriod' => (isset($_POST['showPeriod'])) ? true : true,
);
$showZeroBalances = false;
// Initialize variables for column totals
$totalOpeningDr = 0;
$totalOpeningCr = 0;
$totalThisYearDr = 0;
$totalThisYearCr = 0;
$totalClosingDr = 0;
$totalClosingCr = 0;
?>
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(); ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<thead class="bg-gray">
<tr>
<th rowspan="2">Particulars</th>
<?php if ($ReportOptions['showOB']) : ?>
<th colspan="2" class="text-center">Opening</th>
<?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?>
<th colspan="2" class="text-center">Current Period</th>
<?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?>
<th colspan="2" class="text-center">Closing</th>
<?php endif; ?>
</tr>
<tr>
<?php if ($ReportOptions['showOB']) : ?>
<th class="dr opening-dr text-center" >Dr</th>
<th class="cr opening-cr text-center">Cr</th>
<?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?>
<th class="dr this-year-dr text-center">Dr</th>
<th class="cr this-year-cr text-center">Cr</th>
<?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?>
<th class="dr closing-dr text-center">Dr</th>
<th class="cr closing-cr text-center">Cr</th>
<?php endif; ?>
</tr>
</thead>
<?php foreach ($AccountGroups as $group) : ?>
<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;
?></b></td>
<?php if ($ReportOptions['showOB']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->opening_balance : 0);
?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->opening_balance : 0);
?></td>
<?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->regular_balance : 0);
?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->regular_balance : 0);
?></td>
<?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0);
?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0);
?></td>
<?php endif; ?>
</tr>
<tr>
<td colspan="7" class="group-details p-0">
<div id="group_<?php echo $group->acgroup_id; ?>" class=" ">
<?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
</div>
</td>
</tr>
<?php
// Initialize variables for column totals
$totalOpeningDr = 0;
$totalOpeningCr = 0;
$totalThisYearDr = 0;
$totalThisYearCr = 0;
$totalClosingDr = 0;
$totalClosingCr = 0;
// Update column totals
$totalOpeningDr += ($group->posting_side == "DR") ? $group->opening_balance : 0;
$totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0;
$totalThisYearDr += ($group->posting_side == "DR") ? $group->regular_balance : 0;
$totalThisYearCr += ($group->posting_side == "CR") ? $group->regular_balance : 0;
$totalClosingDr += ($group->posting_side == "DR") ? $group->closing_balance : 0;
$totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
?>
<?php foreach ($AccountGroups as $group) : ?>
<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; ?></b></td>
<?php if ($ReportOptions['showOB']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->opening_balance : 0); ?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->opening_balance : 0); ?></td>
<?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->regular_balance : 0); ?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->regular_balance : 0); ?></td>
<?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td>
<?php endif; ?>
</tr>
<tr>
<td colspan="7" class="group-details p-0">
<div id="group_<?php echo $group->acgroup_id; ?>" class="collapse ">
<?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
</div>
</td>
</tr>
<?php
// Update column totals
$totalOpeningDr += ($group->posting_side == "DR") ? $group->opening_balance : 0;
$totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0;
$totalThisYearDr += ($group->posting_side == "DR") ? $group->regular_balance : 0;
$totalThisYearCr += ($group->posting_side == "CR") ? $group->regular_balance : 0;
$totalClosingDr += ($group->posting_side == "DR") ? $group->closing_balance : 0;
$totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
?>
<?php endforeach; ?>
<tfoot>
<tr>
<th>Total Amount</th>
<?php if ($ReportOptions['showOB']) : ?>
<th class="dr opening-dr"><?php echo myCurrency($totalOpeningDr); ?></th>
<th class="cr opening-cr"><?php echo myCurrency($totalOpeningCr); ?></th>
<?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?>
<th class="dr this-year-dr"><?php echo myCurrency($totalThisYearDr); ?></th>
<th class="cr this-year-cr"><?php echo myCurrency($totalThisYearCr); ?></th>
<?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?>
<th class="dr closing-dr"><?php echo myCurrency($totalClosingDr); ?></th>
<th class="cr closing-cr"><?php echo myCurrency($totalClosingCr); ?></th>
<?php endif; ?>
</tr>
</tfoot>
</table>
<?php endforeach; ?>
<tfoot>
<tr>
<th>Total Amount</th>
<?php if ($ReportOptions['showOB']) : ?>
<th class="dr opening-dr"><?php echo myCurrency($totalOpeningDr); ?></th>
<th class="cr opening-cr"><?php echo myCurrency($totalOpeningCr); ?></th>
<?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?>
<th class="dr this-year-dr"><?php echo myCurrency($totalThisYearDr); ?></th>
<th class="cr this-year-cr"><?php echo myCurrency($totalThisYearCr); ?></th>
<?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?>
<th class="dr closing-dr"><?php echo myCurrency($totalClosingDr); ?></th>
<th class="cr closing-cr"><?php echo myCurrency($totalClosingCr); ?></th>
<?php endif; ?>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
@ -291,6 +329,7 @@ function footerfunctions()
}
}
});
function exportTableToCSV(filename) {
var csv = [];
var rows = document.querySelectorAll("table tr:not(.hide)");

2
account/application/views/fiscalyear/list.php
View File

@ -92,7 +92,7 @@
<!-- <h3>Currently Selected Fiscal Year ID is: <?php //echo $this->session->userdata("FiscalYearID");
?></h3> -->
<?php $TableData = $this->db->query("select * from tbl_fiscalyear where status<>-1")->result(); ?>
<table class="table table-bordered table-striped dataTable">
<table class="table table-bordered table-striped longdataTable">
<thead>
<tr>
<th>Fiscal Year </th>

2
account/application/views/inventory/items/list.php
View File

@ -79,7 +79,7 @@
<!--COL START-->
<div class="col">
<div class="form-group">
<label for="description"><?php myLang('Description'); ?></label>
<label for="description"><?php myLang('Remarks'); ?></label>
<textarea class="form-control" id="description" name="description"><?php echo isset($item) ? $item->description : ''; ?></textarea>
</div>
</div>

4
account/application/views/inventory/purchases/view.php
View File

@ -38,10 +38,10 @@
<p><strong>Quantity</strong></p>
</div>
<div class="col">
<p><strong>Price</strong></p>
<p class="text-right"><strong>Price</strong></p>
</div>
<div class="col">
<p><strong>Total</strong></p>
<p class="text-right"><strong>Total</strong></p>
</div>
</div>
</div>

73
account/application/views/inventory/reports/purchase_vs_sales.php
View File

@ -18,7 +18,7 @@
<div class="container-fluid">
<div class="row">
<div class="col">
<div class="card card-primary card-outline">
<!-- <div class="card card-primary card-outline">
<div class="card-header">
Purchase Vs Sales
</div>
@ -111,7 +111,7 @@
</div>
</div>
</div>
</div>
</div> -->
<!-- New Table -->
<div class="card card-primary card-outline">
<div class="card-header">
@ -126,23 +126,26 @@
<th rowspan="2" width="30" valign="middle"><?php myLang('S.No.'); ?></th>
<th rowspan="2"><?php myLang('Item'); ?></th>
<th rowspan="2"><?php myLang('Units'); ?></th>
<th colspan="2" class="text-center"><?php myLang('Opening Stock'); ?></th>
<th colspan="3" class="text-center"><?php myLang('Purchase'); ?></th>
<th colspan="3" class="text-center"><?php myLang('Sales'); ?></th>
<th rowspan="2" class="text-center"><?php myLang('Sold Inventory %'); ?></th>
<th rowspan="2" class="text-center"><?php myLang('Remaining Inventory %'); ?></th>
<th colspan="2" class="text-center"><?php myLang('Remaining Inventory'); ?></th>
<th rowspan="2" class="text-center"><?php myLang('Cost of Goods Sold'); ?></th>
<th rowspan="2" class="text-right"><?php myLang('Cost of Goods Sold'); ?></th>
<th rowspan="2" class="text-center"><?php myLang('Gross Profit Margin'); ?></th>
</tr>
<tr>
<th class="text-center"><?php myLang('Qty'); ?></th>
<th class="text-center"><?php myLang('Avg. Rate'); ?></th>
<th class="text-center"><?php myLang('Amount'); ?></th>
<th class="text-center"><?php myLang('Qty'); ?></th>
<th class="text-center"><?php myLang('Avg. Rate'); ?></th>
<th class="text-center"><?php myLang('Amount'); ?></th>
<th class="text-center"><?php myLang('Qty'); ?></th>
<th class="text-center"><?php myLang('Value'); ?></th>
<th class="text-right"><?php myLang('Qty'); ?></th>
<th class="text-right"><?php myLang('Value'); ?></th>
<th class="text-right"><?php myLang('Qty'); ?></th>
<th class="text-right"><?php myLang('Avg. Rate'); ?></th>
<th class="text-right"><?php myLang('Amount'); ?></th>
<th class="text-right"><?php myLang('Qty'); ?></th>
<th class="text-right"><?php myLang('Avg. Rate'); ?></th>
<th class="text-right"><?php myLang('Amount'); ?></th>
<th class="text-right"><?php myLang('Qty'); ?></th>
<th class="text-right"><?php myLang('Value'); ?></th>
</tr>
</thead>
@ -167,11 +170,13 @@
<td class="text-center">100%</td>
</tr> -->
<?php
$spuramount = 0;
$ssalamount = 0;
$sclqty = 0;
$sclamount = 0;
$scogs = 0;
$sumpuramount = 0;
$sumsaleamount = 0;
$sumclqty = 0;
$sumoqty = 0;
$sumoamount = 0;
$sumclamount = 0;
$sumcogs = 0;
?>
<?php $a = 0;
foreach ($StockItems as $Stock) : $a++; ?>
@ -179,16 +184,18 @@
<td><?php echo $a; ?></td>
<td><?php echo $Stock->Item->title; ?></td>
<td><?php echo $Stock->Summary->Unit->title; ?></td>
<td class="text-right"><?php echo $oqty = $Stock->Summary->Opening->qty; ?></td>
<td class="text-right"><?php echo myCurrency($oamount = $Stock->Summary->Opening->amount); ?></td>
<td class="text-right"><?php echo $Stock->Summary->Purchase->qty; ?></td>
<td class="text-right"><?php echo myCurrency($Stock->Summary->Purchase->rate); ?></td>
<td class="text-right"><?php echo myCurrency($puramount=$Stock->Summary->Purchase->amount); ?></td>
<td class="text-right"><?php echo $Stock->Summary->Sales->qty; ?></td>
<td class="text-right"><?php echo myCurrency($Stock->Summary->Sales->rate); ?></td>
<td class="text-right"><?php echo myCurrency($salamount = $Stock->Summary->Sales->amount); ?></td>
<?php $soldinventory = ((($Stock->Summary->Opening->qty)-($Stock->Summary->Closing->qty))/($Stock->Summary->Opening->qty))*100; ?>
<td class="text-center"><?php echo $soldinventory . "%"; ?></td>
<?php $soldinventory = ((($Stock->Summary->Opening->qty)+($Stock->Summary->Purchase->qty)-($Stock->Summary->Closing->qty))/(($Stock->Summary->Opening->qty)+($Stock->Summary->Purchase->qty)))*100; ?>
<td class="text-center"><?php echo number_format($soldinventory, 2). "%"; ?></td>
<?php $remaininventory = 100 - $soldinventory; ?>
<td class="text-center"><?php echo $remaininventory . "%"; ?></td>
<td class="text-center"><?php echo number_format($remaininventory, 2) . "%"; ?></td>
<td class="text-right"><?php echo $clqty = $Stock->Summary->Closing->qty; ?></td>
<td class="text-right"><?php echo myCurrency($clamount = $Stock->Summary->Closing->amount); ?></td>
<?php $cogs = ($Stock->Summary->Sales->qty) * ($Stock->Summary->Purchase->rate); ?>
@ -199,11 +206,13 @@
<td></td>
<?php
$spuramount += $puramount;
$ssalamount += $salamount;
$sclqty += $clqty;
$sclamount += $clamount;
$scogs += $cogs;
$sumoqty += $oqty;
$sumoamount += $oamount;
$sumpuramount += $puramount;
$sumsaleamount += $salamount;
$sumclqty += $clqty;
$sumclamount += $clamount;
$sumcogs += $cogs;
?>
</tr>
@ -212,16 +221,20 @@
</tbody>
<tfoot>
<tr>
<td colspan="5" class="text-right text-bold">Grand Total</td>
<td class="text-right text-bold"><?php echo $spuramount ?></td>
<td colspan="3" class="text-right text-bold">Grand Total</td>
<td class="text-right text-bold"><?php echo $sumoqty ?></td>
<td class="text-right text-bold"><?php echo number_format($sumoamount, 2) ?></td>
<td class="text-right text-bold"></td>
<td class="text-right text-bold"></td>
<td class="text-right text-bold"><?php echo $ssalamount ?></td>
<td class="text-right text-bold"><?php echo number_format($sumpuramount, 2) ?></td>
<td class="text-right text-bold"></td>
<td class="text-right text-bold"></td>
<td class="text-right text-bold"><?php echo $sclqty ?></td>
<td class="text-right text-bold"><?php echo $sclamount ?></td>
<td class="text-right text-bold"><?php echo $scogs ?></td>
<td class="text-right text-bold"><?php echo number_format($sumsaleamount, 2) ?></td>
<td class="text-right text-bold"></td>
<td class="text-right text-bold"></td>
<td class="text-right text-bold"><?php echo $sumclqty ?></td>
<td class="text-right text-bold"><?php echo number_format($sumclamount, 2) ?></td>
<td class="text-right text-bold"><?php echo number_format($sumcogs, 2) ?></td>
<td class="text-right text-bold"></td>
</tr>

2
account/application/views/inventory/stocks/summary.php
View File

@ -155,7 +155,7 @@
</div>
</div>
<div class="dropdown-divider"></div>
<buttom type="submit" class="btn btn-primary mr-2 text-center">Search Now</buttom>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="btn-group">

BIN
account/pdf/ledgers/ledger_1.wpdf
View File

Binary file not shown.

BIN
account/pdf/ledgers/ledger_28.wpdf
View File

Binary file not shown.

BIN
account/pdf/vouchers/Voucher_3.pdf
View File

Binary file not shown.