From a90974378e1c540643515a8e478bd9a115abc168 Mon Sep 17 00:00:00 2001 From: patrick Delcroix Date: Thu, 5 Jul 2018 22:31:29 +0200 Subject: [PATCH] FIX: credit / debit --- htdocs/compta/compta-files.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/compta-files.php b/htdocs/compta/compta-files.php index d48679c5291..a04cd2a7c66 100644 --- a/htdocs/compta/compta-files.php +++ b/htdocs/compta/compta-files.php @@ -278,13 +278,15 @@ if ($result) // Balance calculation $balance = 0; foreach($TData as &$data1) { - if($data1['item']=='Invoice'||$data1['item']=='Donation' ){ - $balance += $data1['amount']; - $totalCredit+=$data1['amount']; + if($data1['item']!='Invoice'&& $data1['item']!='Donation' ){ + $data1['amount']=-$data1['amount']; + } + if ($data1['amount']>0){ + }else{ - $balance -= $data1['amount']; - $totalDebit+=$data1['amount']; + } + $balance += $data1['amount']; $data1['balance'] = $balance; } @@ -320,7 +322,7 @@ if ($result) } print ''; - print ' '; + print ' '; print ''.price($totalDebit).''; print ''.price($totalCredit).''; print ''.price(price2num($totalDebit - $totalCredit, 'MT')).'';