[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 38/54: Merge branch 'accept7100' into entrepr
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 38/54: Merge branch 'accept7100' into entreprise |
Date: |
Sat, 11 Jul 2020 13:26:57 -0400 (EDT) |
sparkyx pushed a commit to annotated tag entreprise-0500
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=" ".$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>".
- [Noalyss-commit] [noalyss] 27/54: Merge branch 'accept7100' into entreprise, (continued)
- [Noalyss-commit] [noalyss] 27/54: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 28/54: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 30/54: Merge branch 'Cosmetic-7100' into 'entreprise', Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 29/54: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 31/54: Merge branch 'entreprise' of gitlab.noalyss.eu:noalyss/noalyss into entreprise * index.css logo size, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 33/54: Task #0001698: Problème affichage historique fiches, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 26/54: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 32/54: task #0001698: Problème affichage historique fiches Prevent direct use of http_request translation Cosmetic, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 34/54: Task #0001703: Faciliter effacement montants dans les filtres, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 35/54: Improve PHPUNIT Test for phpunit7 and phpunit8, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 38/54: Merge branch 'accept7100' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 39/54: Bug with p_jrn, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 40/54: Task #1759 = PRINTBAL sur 4 colonnes, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 44/54: gitlab #5 Achat propose l'anc pour toutes les lignes, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 36/54: documentation + traduction, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 37/54: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 41/54: Merge branch 'bug-printtva' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 42/54: If currency not given then supposed to be the default one (id=0), Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 43/54: Save_form_plan must use the array, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 49/54: Adapt printtva to entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 52/54: test : find the accounting with the biggest number of records, Dany De Bontridder, 2020/07/11