[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 39/65: Add the side D/C to aged balance
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 39/65: Add the side D/C to aged balance |
Date: |
Wed, 09 Sep 2015 08:27:22 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 936b14b6fca6acae0fa2bd208c002ff68a5e3280
Author: Dany De Bontridder <address@hidden>
Date: Sat Sep 5 13:14:42 2015 +0200
Add the side D/C to aged balance
---
include/template/balance_aged_result.php | 51 +++++++++++++++++++++---------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/include/template/balance_aged_result.php
b/include/template/balance_aged_result.php
index bc024ef..04e06a7 100644
--- a/include/template/balance_aged_result.php
+++ b/include/template/balance_aged_result.php
@@ -95,9 +95,14 @@ bcscale(2);
</td>
<td style="text-align: right">
<?php
+ $side=($card->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);
<td style="text-align: right">
<?php
if ($show && $card->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;
?>
</td>
<td style="text-align: right">
<?php
if ( $show &&$card->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;
?>
</td>
<td style="text-align: right">
<?php
if ( $show && $card->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;
?>
</td>
<td style="text-align: right">
<?php
if ($show && $card->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);
</td>
<td style="text-align: right">
- <?php echo nbm($sum_fin);?>
+ <?php echo nbm(abs($sum_fin));echo ($sum_fin < 0)?'C':($sum_fin ==
0)?'=':'D'; ?>
</td>
<td style="text-align: right">
- <?php echo nbm($sum_lt_30);?>
+ <?php echo nbm($sum_lt_30);echo ($sum_lt_30 < 0)?'C':($sum_lt_30
== 0)?'=':'D';?>
</td>
<td style="text-align: right">
- <?php echo nbm($sum_gt_30_lt_60);?>
+ <?php echo nbm($sum_gt_30_lt_60);echo ($sum_gt_30_lt_60 <
0)?'C':($sum_gt_30_lt_60 == 0)?'=':'D';?>
</td>
<td style="text-align: right">
- <?php echo nbm($sum_gt_60_lt_90);?>
+ <?php echo nbm($sum_gt_60_lt_90);echo ($sum_gt_60_lt_90 <
0)?'C':($sum_gt_60_lt_90 == 0)?'=':'D';?>
</td>
<td style="text-align: right">
- <?php echo nbm($sum_gt_90);?>
+ <?php echo nbm($sum_gt_90);echo ($sum_gt_90 < 0)?'C':($sum_gt_90
== 0)?'=':'D';?>
</td>
</tr>
</table>
- [Noalyss-commit] [noalyss] 22/65: Script SQL à ajouter, (continued)
- [Noalyss-commit] [noalyss] 22/65: Script SQL à ajouter, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 27/65: Better debugging : add a button to show the request $_POST and $_GET, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 25/65: insert contact, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 29/65: Bug#1158 : sign and side of Analytic accountancy, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 30/65: comment, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 31/65: Fix issue : cannot zoom an operation after saving it., Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 35/65: Esthetic : message is nothing found in menu, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 33/65: Task#1173 : create a empty database to restaure in command line, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 36/65: Missing file, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 37/65: Use the profile instead of the login name in the view, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 39/65: Add the side D/C to aged balance,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 38/65: translation, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 34/65: increase size of font in box, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 40/65: Remove ENABLE_CACHE + DB Upgrade, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 42/65: Remove ENABLE_CACHE, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 43/65: set version, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 41/65: database upgrade, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 47/65: avoid duplicate, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 45/65: database upgrade : if empty, skipped, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 46/65: drop view before recreating it, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 44/65: database upgrade, Dany De Bontridder, 2015/09/09