From 936b14b6fca6acae0fa2bd208c002ff68a5e3280 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 5 Sep 2015 13:14:42 +0200 Subject: [PATCH] Add the side D/C to aged balance --- include/template/balance_aged_result.php | 51 +++++++++++++++++------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/include/template/balance_aged_result.php b/include/template/balance_aged_result.php index bc024efc0..04e06a798 100644 --- a/include/template/balance_aged_result.php +++ b/include/template/balance_aged_result.php @@ -95,9 +95,14 @@ bcscale(2); content[$j]['j_debit']=='t')?'D':'C'; if ( $card->content[$j]['jrn_def_type'] == 'FIN' || $card->content[$j]['jrn_def_type'] == 'ODS') : - echo nbm($card->content[$j]['j_montant']); - $sum_fin=bcadd($sum_fin,$card->content[$j]['j_montant']); + echo nbm($card->content[$j]['j_montant'])." ".$side; + if ( $card->content[$j]['j_debit']=='t'): + $sum_fin=bcadd($sum_fin,$card->content[$j]['j_montant']); + else: + $sum_fin=bcsub($sum_fin,$card->content[$j]['j_montant']); + endif; $show=false; endif; ?> @@ -105,32 +110,48 @@ bcscale(2); content[$j]['day_paid'] <= 30) : - echo nbm($card->content[$j]['j_montant']); - $sum_lt_30=bcadd($sum_lt_30,$card->content[$j]['j_montant']); + echo nbm($card->content[$j]['j_montant'])." ".$side; + if ( $card->content[$j]['j_debit']=='t'): + $sum_lt_30=bcadd($sum_lt_30,$card->content[$j]['j_montant']); + else: + $sum_lt_30=bcsub($sum_lt_30,$card->content[$j]['j_montant']); + endif; endif; ?> content[$j]['day_paid'] > 30 && $card->content[$j]['day_paid'] <= 60) : - echo nbm($card->content[$j]['j_montant']); - $sum_gt_30_lt_60=bcadd($sum_gt_30_lt_60,$card->content[$j]['j_montant']); + echo nbm($card->content[$j]['j_montant'])." ".$side; + if ( $card->content[$j]['j_debit']=='t'): + $sum_gt_30_lt_60=bcadd($sum_gt_30_lt_60,$card->content[$j]['j_montant']); + else: + $sum_gt_30_lt_60=bcsub($sum_gt_30_lt_60,$card->content[$j]['j_montant']); + endif; endif; ?> content[$j]['day_paid'] > 60 && $card->content[$j]['day_paid'] <= 90) : - echo nbm($card->content[$j]['j_montant']); - $sum_gt_60_lt_90=bcadd($sum_gt_60_lt_90,$card->content[$j]['j_montant']); + echo nbm($card->content[$j]['j_montant'])." ".$side; + if ( $card->content[$j]['j_debit']=='t'): + $sum_gt_60_lt_90=bcadd($sum_gt_60_lt_90,$card->content[$j]['j_montant']); + else: + $sum_gt_60_lt_90=bcsub($sum_gt_60_lt_90,$card->content[$j]['j_montant']); + endif; endif; ?> content[$j]['day_paid'] > 90) : - echo nbm($card->content[$j]['j_montant']); - $sum_gt_90=bcadd($sum_gt_90,$card->content[$j]['j_montant']); + echo nbm($card->content[$j]['j_montant'])." ".$side; + if ( $card->content[$j]['j_debit']=='t'): + $sum_gt_90=bcadd($sum_gt_90,$card->content[$j]['j_montant']); + else: + $sum_gt_90=bcsub($sum_gt_90,$card->content[$j]['j_montant']); + endif; endif; ?> @@ -153,19 +174,19 @@ bcscale(2); - + - + - + - + - +