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

Merge branch 'main' of http://bibgit.com/sampanna/BBnepal-Accounts

Browse Source
This commit is contained in:
Raju Shrestha 2024-08-26 13:37:02 +05:45
commit a5d29a202e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,15 @@ $BIBAccounts = new BIBAccounts();
</td> </td>
</tr> </tr>
<?php
// Update column totals
$incomes_totalOpeningDr += ($group->posting_side == "DR") ? $group->opening_balance : 0;
$incomes_totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0;
$incomes_totalThisYearDr += ($group->posting_side == "DR") ? $group->regular_balance : 0;
$incomes_totalThisYearCr += ($group->posting_side == "CR") ? $group->regular_balance : 0;
$incomes_totalClosingDr += ($group->posting_side == "DR") ? $group->closing_balance : 0;
$incomes_totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
?>
<?php endforeach; ?> <?php endforeach; ?>
@ -252,7 +261,7 @@ $BIBAccounts = new BIBAccounts();
</tbody> </tbody>
<tfoot> <tfoot>
<?php $PL = $incomes_totalClosingCr - $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">
@ -311,8 +320,8 @@ $BIBAccounts = new BIBAccounts();
<?php $PL = $incomes_totalClosingCr - $totalClosingDr; ?> <?php $PL = $incomes_totalClosingCr - $totalClosingDr; ?>
<?php if ($incomes_totalClosingCr > $totalClosingDr) : ?> <?php if ($incomes_totalClosingCr > $totalClosingDr) : ?>
<tr> <tr>
<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"><?php echo myCurrency($PL); ?></th>