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

Compare commits

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

No commits in common. "a5d29a202e69f1ca6c061ab3a2ea975bd0589237" and "b1c6bad445ba46bd09203c76d3f64e51f8d83527" have entirely different histories.
a5d29a202e ... b1c6bad445

2 changed files with 22 additions and 56 deletions
Show Stats Expand all files Collapse all files

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

@ -90,36 +90,6 @@ $PL = $IncomesTotal - $ExpensesTotal;
box-shadow: inset 0 0 0 transparent;
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>
<div class="content-wrapper">
<section class="content">
@ -265,19 +235,15 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div> -->
<div class="card-body table-responsive p-0">
<?php $IncomesExpenses = $BIBAccounts->prepareIncomeExpenses() ?>
<table class="table table-bordered p-0 ">
<table class="table table-head-fixed table-bordered g-0">
<thead>
<tr>
<th class="" width="30%"><?php myLang("Cash inflow"); ?></th>
<th class="text-right" width="10%"></th>
<th class="text-right pr-1" width="10%"><?php myLang("Amount"); ?></th>
<th class="text-right pr-2" width="10%"><?php myLang("Amount"); ?></th>
<th class="pl-2" width="30%"><?php echo myLang("Cash outflow"); ?></th>
<th class="text-right" width="10%"></th>
<th class="text-right pr-1" width="10%"><?php myLang("Amount"); ?></th>
<th class="text-right pr-3" width="10%"><?php myLang("Amount"); ?></th>
</tr>
</thead>
<tbody>
@ -296,15 +262,15 @@ $PL = $IncomesTotal - $ExpensesTotal;
</tr> -->
<?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?>
<tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>">
<td class="" width="60%"><b><?php echo $Incomes['category']; ?></b></td>
<td class="pr-2" width="60%"><b><?php echo $Incomes['category']; ?></b></td>
<td width="20%"></td>
<td class="text-right " width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
<td class="text-right pr-2" width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
</tr>
<?php else : ?>
<?php $total1 += $Incomes['amount']; ?>
<tr class="collapse" data-target="#group_<?php echo $index; ?>">
<td class="" width="60%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td>
<td class="text-right " width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
<td class="pr-2" 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 width="20%"></td>
</tr>
<?php endif; ?>
@ -313,7 +279,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
</table>
</td>
<td colspan=3 class="p-0">
<table class="table p-0">
<table class="table g-0">
<?php $total = 0;
foreach ($IncomesExpenses['Expenses'] as $Expenses) {
if ($Expenses['account'] == "GROUP TOTAL") : ?>
@ -326,7 +292,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>">
<td class="" width="60%"><b><?php echo $Expenses['category']; ?></b></td>
<td width="20%"></td>
<td class="text-right " width="20%"><?php echo myCurrency($Expenses['amount']); ?></td>
<td class="text-right pr-2" width="20%"><?php echo myCurrency($Expenses['amount']); ?></td>
</tr>
<?php else : ?>
<?php $total += $Expenses['amount']; ?>
@ -342,20 +308,20 @@ $PL = $IncomesTotal - $ExpensesTotal;
</tr>
</tbody>
<tr>
<th class="p-1">Total</th>
<th>Total</th>
<td></td>
<td class="text-right text-bold"><?php echo myCurrency($total1); ?></td>
<th class="p-1">Total</th>
<td class="text-right pr-2"><?php echo myCurrency($total1); ?></td>
<th>Total</th>
<td></td>
<td class="text-right text-bold"><?php echo myCurrency($total); ?></td>
<td class="text-right"><?php echo myCurrency($total); ?></td>
</tr>
<tr>
<th></th>
<td></td>
<td class="text-right"></td>
<th class="pl-1">Net Inflow</th>
<th>Net Inflow</th>
<td></td>
<td class="text-right text-bold"><?php echo myCurrency($total1 - $total); ?></td>
<td class="text-right pr-2"><?php echo myCurrency($total1 - $total); ?></td>
</tr>
<?php $Bank = $BIBAccounts->getAccountCategoriesWithBalances(null, 2); ?>
<?php foreach ($Bank->accounts as $account) : ?>
@ -363,9 +329,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
<th></th>
<td></td>
<td class="text-right"></td>
<th class="pl-1"><?php echo $account->account_name; ?></th>
<th><?php echo $account->account_name; ?></th>
<td></td>
<td class="text-right text-bold"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td>
<td class="text-right"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td>
</tr>
<?php endforeach; ?>
<?php $Cash = $BIBAccounts->getAccountCategoriesWithBalances(null, 3); ?>
@ -374,9 +340,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
<th></th>
<td></td>
<td class="text-right"></td>
<th class="pl-1"><?php echo $account->account_name; ?></th>
<th><?php echo $account->account_name; ?></th>
<td></td>
<td class="text-right text-bold"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td>
<td class="text-right"><?php echo myCurrency($account->balances['dr_total'] - $account->balances['cr_total']); ?></td>
</tr>
<?php endforeach; ?>
</table>

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 {
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 {
padding-right: 0px!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 {
padding-right: 0!important;
}
.form-group textarea.form-control {
height: 50px !important;
}