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

Compare commits

base: sampanna:b1c6bad445ba46bd09203c76d3f64e51f8d83527
Branches Tags
sampanna:main sampanna:BBnepal_roshan
...
compare: sampanna:main
Branches Tags
sampanna:BBnepal_roshan sampanna:main

4 Commits
b1c6bad445 ... main

Author SHA1 Message Date
Sampanna Rimal
497f567cba balancesheet 2024-08-26 17:17:43 +05:45
Raju Shrestha
31e7f8de87 edit 2024-08-26 13:39:34 +05:45
Raju Shrestha
a5d29a202e Merge branch 'main' of http://bibgit.com/sampanna/BBnepal-Accounts 2024-08-26 13:37:02 +05:45
Raju Shrestha
4109787bc4 cash flow 2024-08-26 13:36:59 +05:45
4 changed files with 125 additions and 35 deletions
Expand all files Collapse all files

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

@@ -191,7 +191,7 @@ $BIBAccounts = new BIBAccounts();
<!-- <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> -->
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-body pl-2 pr-2"> <div class="card-body pl-2 ">
<div class="row"> <div class="row">
<?php <?php
@@ -205,9 +205,9 @@ $BIBAccounts = new BIBAccounts();
?> ?>
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(2); ?> <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(2); ?>
<?php $Side1Total = 0; ?> <?php $Side1Total = 0; ?>
<div class="col-6 p-0"> <div class="col-6 p-0 m-0 gy-0">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table mb-0 pb-0">
<thead> <thead>
<tr> <tr>
<th class="group-name pl-1">Particulars</th> <th class="group-name pl-1">Particulars</th>
@@ -281,9 +281,9 @@ $BIBAccounts = new BIBAccounts();
</table> </table>
</div> </div>
</div> </div>
<div class="col-6 p-0"> <div class="col-6 p-0 m-0">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table mt-0 pt-0">
<thead> <thead>
<tr> <tr>
<th class="group-name pl-1">Particulars</th> <th class="group-name pl-1">Particulars</th>
@@ -305,7 +305,7 @@ $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"><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 pr-2"><?php echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td> <td class="group-total text-right "><?php echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td>
</tr> </tr>
<tr> <tr>
<td colspan="7" class="group-details p-0"> <td colspan="7" class="group-details p-0">
@@ -332,8 +332,6 @@ $BIBAccounts = new BIBAccounts();
</table> </table>
</div> </div>
</div> </div>
<div class="col-12 p-0">
<table class="table">
<?php <?php
// pre($BIBAccounts->getAccountGroupsWithBalances(4)); // pre($BIBAccounts->getAccountGroupsWithBalances(4));
$TotalIncomes = $BIBAccounts->getAccountGroupsWithBalances(3)[0]->closing_balance; $TotalIncomes = $BIBAccounts->getAccountGroupsWithBalances(3)[0]->closing_balance;
@@ -341,6 +339,61 @@ $BIBAccounts = new BIBAccounts();
$PL = $TotalIncomes - $TotalExpenses; $PL = $TotalIncomes - $TotalExpenses;
$Side1Total += $PL; $Side1Total += $PL;
?> ?>
<div class="col-6 p-0 m-0 gy-0">
<table class="table">
<tr>
<td><b> Profit/Loss</b></td>
<td class="cr closing-cr"><?php echo myCurrency($PL); ?></td>
</tr>
<tr>
<td colspan="2" class="p-0">
<table class="table">
<tr>
<th class="pl-1">Total Amount</th>
<th class="cr closing-cr">
<?php echo myCurrency($Side1Total); ?>
</th>
</tr>
</table>
</td>
</tr>
</table>
</div>
<div class="col-6 p-0 m-0 gy-0">
<table class="table">
<tr>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
<tr>
<td colspan="2" class="p-0">
<table class="table">
<tr>
<th class="pl-1">Total Amount</th>
<th class="dr closing-dr">
<?php echo myCurrency($totalClosingDr); ?>
</th>
</tr>
</table>
</td>
</tr>
</table>
</div>
<!-- <div class="col-12 p-0">
<table class="table">
<?php
// pre($BIBAccounts->getAccountGroupsWithBalances(4));
// $TotalIncomes = $BIBAccounts->getAccountGroupsWithBalances(3)[0]->closing_balance;
// $TotalExpenses = $BIBAccounts->getAccountGroupsWithBalances(4)[0]->closing_balance;
// $PL = $TotalIncomes - $TotalExpenses;
// $Side1Total += $PL;
?>
<tr> <tr>
<td>Total Profit/Loss</td> <td>Total Profit/Loss</td>
<td class="cr closing-cr"><?php echo myCurrency($PL); ?></td> <td class="cr closing-cr"><?php echo myCurrency($PL); ?></td>
@@ -369,7 +422,7 @@ $BIBAccounts = new BIBAccounts();
</td> </td>
</tr> </tr>
</table> </table>
</div> </div> -->

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

@@ -90,6 +90,36 @@ $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;
} }
.table1 {
border: 0px !important;
padding: 0;
margin: 10 !important;
width: 100%;
vertical-align: middle;
}
.table-responsive {
overflow-x: auto;
}
.card-body {
-webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto;
flex: 1 1 auto;
min-height: 1px;
padding: 0;
}
table {
border: 1px solid #ddd;
border-collapse: collapse;
}
.card-body.p-0 .table tbody>tr>td:last-of-type, .card-body.p-0 .table tbody>tr>th:last-of-type, .card-body.p-0 .table tfoot>tr>td:last-of-type, .card-body.p-0 .table tfoot>tr>th:last-of-type, .card-body.p-0 .table thead>tr>td:last-of-type, .card-body.p-0 .table thead>tr>th:last-of-type {
padding-right:0!important;
}
.text-bold{
font-weight: 900;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<section class="content"> <section class="content">
@@ -235,15 +265,19 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div> --> </div> -->
<div class="card-body table-responsive p-0"> <div class="card-body table-responsive p-0">
<?php $IncomesExpenses = $BIBAccounts->prepareIncomeExpenses() ?> <?php $IncomesExpenses = $BIBAccounts->prepareIncomeExpenses() ?>
<table class="table table-head-fixed table-bordered g-0">
<table class="table table-bordered p-0 ">
<thead> <thead>
<tr> <tr>
<th class="" width="30%"><?php myLang("Cash inflow"); ?></th> <th class="" width="30%"><?php myLang("Cash inflow"); ?></th>
<th class="text-right" width="10%"></th> <th class="text-right" width="10%"></th>
<th class="text-right pr-2" width="10%"><?php myLang("Amount"); ?></th> <th class="text-right pr-1" width="10%"><?php myLang("Amount"); ?></th>
<th class="pl-2" width="30%"><?php echo myLang("Cash outflow"); ?></th> <th class="pl-2" width="30%"><?php echo myLang("Cash outflow"); ?></th>
<th class="text-right" width="10%"></th> <th class="text-right" width="10%"></th>
<th class="text-right pr-3" width="10%"><?php myLang("Amount"); ?></th> <th class="text-right pr-1" width="10%"><?php myLang("Amount"); ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -262,15 +296,15 @@ $PL = $IncomesTotal - $ExpensesTotal;
</tr> --> </tr> -->
<?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?> <?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?>
<tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>"> <tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>">
<td class="pr-2" width="60%"><b><?php echo $Incomes['category']; ?></b></td> <td class="" width="60%"><b><?php echo $Incomes['category']; ?></b></td>
<td width="20%"></td> <td width="20%"></td>
<td class="text-right pr-2" width="20%"><?php echo myCurrency($Incomes['amount']); ?></td> <td class="text-right " width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
</tr> </tr>
<?php else : ?> <?php else : ?>
<?php $total1 += $Incomes['amount']; ?> <?php $total1 += $Incomes['amount']; ?>
<tr class="collapse" data-target="#group_<?php echo $index; ?>"> <tr class="collapse" data-target="#group_<?php echo $index; ?>">
<td class="pr-2" width="60%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td> <td class="" width="60%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td>
<td class="text-right pr-2" width="20%"><?php echo myCurrency($Incomes['amount']); ?></td> <td class="text-right " width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
<td width="20%"></td> <td width="20%"></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
@@ -279,7 +313,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
</table> </table>
</td> </td>
<td colspan=3 class="p-0"> <td colspan=3 class="p-0">
<table class="table g-0"> <table class="table p-0">
<?php $total = 0; <?php $total = 0;
foreach ($IncomesExpenses['Expenses'] as $Expenses) { foreach ($IncomesExpenses['Expenses'] as $Expenses) {
if ($Expenses['account'] == "GROUP TOTAL") : ?> if ($Expenses['account'] == "GROUP TOTAL") : ?>
@@ -292,7 +326,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>"> <tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>">
<td class="" width="60%"><b><?php echo $Expenses['category']; ?></b></td> <td class="" width="60%"><b><?php echo $Expenses['category']; ?></b></td>
<td width="20%"></td> <td width="20%"></td>
<td class="text-right pr-2" width="20%"><?php echo myCurrency($Expenses['amount']); ?></td> <td class="text-right " width="20%"><?php echo myCurrency($Expenses['amount']); ?></td>
</tr> </tr>
<?php else : ?> <?php else : ?>
<?php $total += $Expenses['amount']; ?> <?php $total += $Expenses['amount']; ?>
@@ -308,20 +342,20 @@ $PL = $IncomesTotal - $ExpensesTotal;
</tr> </tr>
</tbody> </tbody>
<tr> <tr>
<th>Total</th> <th class="p-1">Total</th>
<td></td> <td></td>
<td class="text-right pr-2"><?php echo myCurrency($total1); ?></td> <td class="text-right text-bold"><?php echo myCurrency($total1); ?></td>
<th>Total</th> <th class="p-1">Total</th>
<td></td> <td></td>
<td class="text-right"><?php echo myCurrency($total); ?></td> <td class="text-right text-bold"><?php echo myCurrency($total); ?></td>
</tr> </tr>
<tr> <tr>
<th></th> <th></th>
<td></td> <td></td>
<td class="text-right"></td> <td class="text-right"></td>
<th>Net Inflow</th> <th class="pl-1">Net Inflow</th>
<td></td> <td></td>
<td class="text-right pr-2"><?php echo myCurrency($total1 - $total); ?></td> <td class="text-right text-bold"><?php echo myCurrency($total1 - $total); ?></td>
</tr> </tr>
<?php $Bank = $BIBAccounts->getAccountCategoriesWithBalances(null, 2); ?> <?php $Bank = $BIBAccounts->getAccountCategoriesWithBalances(null, 2); ?>
<?php foreach ($Bank->accounts as $account) : ?> <?php foreach ($Bank->accounts as $account) : ?>
@@ -329,9 +363,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
<th></th> <th></th>
<td></td> <td></td>
<td class="text-right"></td> <td class="text-right"></td>
<th><?php echo $account->account_name; ?></th> <th class="pl-1"><?php echo $account->account_name; ?></th>
<td></td> <td></td>
<td class="text-right"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td> <td class="text-right text-bold"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<?php $Cash = $BIBAccounts->getAccountCategoriesWithBalances(null, 3); ?> <?php $Cash = $BIBAccounts->getAccountCategoriesWithBalances(null, 3); ?>
@@ -340,9 +374,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
<th></th> <th></th>
<td></td> <td></td>
<td class="text-right"></td> <td class="text-right"></td>
<th><?php echo $account->account_name; ?></th> <th class="pl-1"><?php echo $account->account_name; ?></th>
<td></td> <td></td>
<td class="text-right"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td> <td class="text-right text-bold"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>

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

@@ -112,6 +112,9 @@ $BIBAccounts = new BIBAccounts();
border: 1px solid #ddd; border: 1px solid #ddd;
border-collapse: collapse; border-collapse: collapse;
} }
.text-bold{
font-weight: 900;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
@@ -264,7 +267,7 @@ $BIBAccounts = new BIBAccounts();
<?php $PL = $incomes_totalClosingCr - $incomes_totalClosingDr; ?> <?php $PL = $incomes_totalClosingCr - $incomes_totalClosingDr; ?>
<tr> <tr>
<th class="p-1">Total Incomes</th> <th class="p-1">Total Incomes</th>
<th class="cr closing-cr"> <th class="cr closing-cr text-bold">
<?php if ($PL > 0) : ?> <?php if ($PL > 0) : ?>
<?php echo myCurrency($incomes_totalClosingCr); ?> <?php echo myCurrency($incomes_totalClosingCr); ?>
<?php else : ?> <?php else : ?>
@@ -323,7 +326,7 @@ $BIBAccounts = new BIBAccounts();
<!-- <th></th> <!-- <th></th>
<th></th> --> <th></th> -->
<th class="pl-1">Total Profit</th> <th class="pl-1">Total Profit</th>
<th class="cr closing-cr text-right"><?php echo myCurrency($PL); ?></th> <th class="cr closing-cr text-right text-bold"><?php echo myCurrency($PL); ?></th>
</tr> </tr>
@@ -331,7 +334,7 @@ $BIBAccounts = new BIBAccounts();
</tbody> </tbody>
<tfoot> <tfoot>
<th class="pl-1">Total Expenses</th> <th class="pl-1">Total Expenses</th>
<th class="dr closing-dr"> <th class="dr closing-dr text-bold">
<?php if ($PL > 0) : ?> <?php if ($PL > 0) : ?>
<?php echo myCurrency($totalClosingDr + abs($PL)); ?> <?php echo myCurrency($totalClosingDr + abs($PL)); ?>

6
account/dist/css/bbnepalcustom.css vendored
View File

@@ -123,9 +123,9 @@ margin-bottom: .5rem;
.select2-container--default .select2-selection--single .select2-selection__arrow b { .select2-container--default .select2-selection--single .select2-selection__arrow b {
margin-top: 0 !important; margin-top: 0 !important;
} }
.card-body.p-0 .table tbody>tr>td:last-of-type, .card-body.p-0 .table tbody>tr>th:last-of-type, .card-body.p-0 .table tfoot>tr>td:last-of-type, .card-body.p-0 .table tfoot>tr>th:last-of-type, .card-body.p-0 .table thead>tr>td:last-of-type, .card-body.p-0 .table thead>tr>th:last-of-type { /* .card-body.p-0 .table tbody>tr>td:last-of-type, .card-body.p-0 .table tbody>tr>th:last-of-type, .card-body.p-0 .table tfoot>tr>td:last-of-type, .card-body.p-0 .table tfoot>tr>th:last-of-type, .card-body.p-0 .table thead>tr>td:last-of-type, .card-body.p-0 .table thead>tr>th:last-of-type {
padding-right: 0!important; padding-right: 0px!important;
} } */
.form-group textarea.form-control { .form-group textarea.form-control {
height: 50px !important; height: 50px !important;
} }