From b1c6bad445ba46bd09203c76d3f64e51f8d83527 Mon Sep 17 00:00:00 2001
From: Sampanna Rimal <smpnnrml51@gmail.com>
Date: Mon, 26 Aug 2024 13:08:50 +0545
Subject: [PATCH] profitloss

---
 account/application/views/accounts/pl_new.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/account/application/views/accounts/pl_new.php b/account/application/views/accounts/pl_new.php
index 4924e44..262e5b3 100644
--- a/account/application/views/accounts/pl_new.php
+++ b/account/application/views/accounts/pl_new.php
@@ -245,6 +245,15 @@ $BIBAccounts = new BIBAccounts();
                                                     </td>
                                                     
                                                 </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; ?>   
                                                       
@@ -252,7 +261,7 @@ $BIBAccounts = new BIBAccounts();
 
                                             </tbody>
                                             <tfoot>
-                                            <?php $PL = $incomes_totalClosingCr - $totalClosingDr; ?>
+                                            <?php $PL = $incomes_totalClosingCr - $incomes_totalClosingDr; ?>
                                                 <tr>
                                                     <th class="p-1">Total Incomes</th>
                                                     <th class="cr closing-cr">
@@ -311,8 +320,8 @@ $BIBAccounts = new BIBAccounts();
                                                 <?php $PL = $incomes_totalClosingCr - $totalClosingDr; ?>
                                     <?php if ($incomes_totalClosingCr > $totalClosingDr) : ?>
                                         <tr>
-                                           <th></th>
-                                           <th></th>
+                                           <!-- <th></th>
+                                           <th></th> -->
                                             <th class="pl-1">Total Profit</th>
                                             <th class="cr closing-cr text-right"><?php echo myCurrency($PL); ?></th>