[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=" ".$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] 169/173: Task #1907: Gestion : événement ajout de lien hyperlnk, (continued)
- [Noalyss-commit] [noalyss] 169/173: Task #1907: Gestion : événement ajout de lien hyperlnk, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 101/173: task #0001698: Problème affichage historique fiches Prevent direct use of http_request translation Cosmetic, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 152/173: Bug : filter of the search and tag, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 160/173: typo, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 159/173: Merge branch 'master' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 162/173: Merge branch 'master' into dev-8-bootstrap, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 164/173: Merge branch 'master' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 170/173: Task #1913 Correct calendar : nav button CSS esthétique, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 171/173: Cosmetic button, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 94/173: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 107/173: Merge branch 'accept7100' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 115/173: indent, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 118/173: Adapt printtva to entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 121/173: test : find the accounting with the biggest number of records, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 124/173: Merge branch 'v7110-stable' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 122/173: test : use the accounting with the biggest number of records, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 127/173: Merge branch 'dev7112' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 133/173: Test Acc_Account, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 136/173: Bug database.class.php : n'applique pas le patch, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 143/173: Merge commit '57309561191906d4099c8db08b7fa737f7c8e1e0' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 144/173: Merge commit 'b8fafe1f2b705272b9e3853a8a791200fb718fa6' into entreprise, Dany De Bontridder, 2021/03/22