noalyss-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Noalyss-commit] [noalyss] 107/173: Merge branch 'accept7100' into entre


From: Dany De Bontridder
Subject: [Noalyss-commit] [noalyss] 107/173: Merge branch 'accept7100' into entreprise
Date: Mon, 22 Mar 2021 12:59:00 -0400 (EDT)

sparkyx pushed a commit to branch master
in repository noalyss.

commit 3dfe784137f6f41b965afa6edb658cbc5c4688e7
Merge: f117c84 1aa7a44
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Tue Sep 24 19:53:36 2019 +0200

    Merge branch 'accept7100' into entreprise

 include/class/fiche.class.php |  2 --
 include/impress_poste.inc.php | 18 +++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --cc include/class/fiche.class.php
index 79da560,745d3cf..6d8c5bd
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@@ -1541,9 -1510,8 +1541,8 @@@ class Fich
                        $side="&nbsp;".$this->get_amount_side($progress);
                    echo "<TR class=\"highlight\">".
                       "<TD>$old_exercice</TD>".
 -                    td('').
 +                   td('').
                      td('').
-                     td('').
                      "<TD></TD>".td().
                      "<TD>Totaux</TD>".
                              td().
@@@ -1601,11 -1559,8 +1600,10 @@@
                 td().
                 td().
                 td().
-                td().
          td(_('Totaux')).
                 td().
 +               td().
 +        "<TD></TD>".
         "<TD  style=\"text-align:right\">".nbm($sum_deb)."</TD>".
         "<TD  style=\"text-align:right\">".nbm($sum_cred)."</TD>".
          "<TD style=\"text-align:right\">".nbm($diff)."</TD>".



reply via email to

[Prev in Thread] Current Thread [Next in Thread]