[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 227/238: Merge branch 'accept7100' into entre
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 227/238: Merge branch 'accept7100' into entreprise |
Date: |
Sat, 26 Oct 2019 04:41:12 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 3dfe784137f6f41b965afa6edb658cbc5c4688e7
Merge: f117c84 1aa7a44
Author: Dany De Bontridder <address@hidden>
Date: 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] 214/238: Merge branch 'accept7100' into entreprise, (continued)
- [Noalyss-commit] [noalyss] 214/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 207/238: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 190/238: translate, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 222/238: Task #0001698: Problème affichage historique fiches, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 215/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 231/238: If currency not given then supposed to be the default one (id=0), Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 233/238: gitlab #5 Achat propose l'anc pour toutes les lignes, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 232/238: Save_form_plan must use the array, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 238/238: Adapt printtva to entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 225/238: documentation + traduction, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 227/238: Merge branch 'accept7100' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 236/238: Merge branch 'dev7102' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 230/238: Merge branch 'bug-printtva' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 200/238: Merge branch 'master' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 204/238: Cosmetic, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 211/238: Improve appearance, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 219/238: Merge branch 'Cosmetic-7100' into 'entreprise', Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 226/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 235/238: indent, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 153/238: Fix problem with total in balance export, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 202/238: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2019/10/26