From 99b4a3192dfe2d6031765fa0d0e6ae2f7e314f90 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 2 Nov 2015 19:48:07 +0100 Subject: [PATCH] Analytic improve ANCTAB --- include/class/class_anc_table.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/class/class_anc_table.php b/include/class/class_anc_table.php index 01ef0fac9..ae119308f 100644 --- a/include/class/class_anc_table.php +++ b/include/class/class_anc_table.php @@ -120,7 +120,7 @@ class Anc_Table extends Anc_Acc_Link bcscale(2); if ( $this->check() != 0) { - alert('Désolé mais une des dates données n\'est pas valide'); + alert(_("Date invalide")); return; } @@ -159,10 +159,12 @@ class Anc_Table extends Anc_Acc_Link { $tot_col[$x]=$amount; } - echo td(nbm($amount),' class="num" '); + $side=($amount < 0 ) ? 'D' : 'C'; + echo td(nbm(abs($amount))." ".$side,' class="num" '); $tot_row=bcadd($tot_row,$amount); } - echo td(nbm($tot_row),' class="num"'); + $side=($tot_row < 0 ) ? 'D' : 'C'; + echo td(nbm(abs($tot_row))." ".$side,' class="num"'); $tot_global=bcadd($tot_global,$tot_row); echo ''; @@ -172,7 +174,8 @@ class Anc_Table extends Anc_Acc_Link echo td('Totaux'); for ($i=0;$iaheader);$i++) { - echo td(nbm($tot_col[$i]),' class="num"'); + $side=($tot_col[$i]<0)?"D":"C"; + echo td(nbm(abs($tot_col[$i]))." ".$side,' class="num"'); } echo td(nbm($tot_global),' class="num input_text notice" '); echo '';