[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 08/33: Operation details : calcul correctemen
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 08/33: Operation details : calcul correctement la différence avec les opérations extournées |
Date: |
Thu, 11 Nov 2021 06:02:44 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 92797fd9b4e6fcac6bfe5e6b0d272a9e428ad467
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Fri Oct 1 13:56:58 2021 +0200
Operation details : calcul correctement la différence avec les opérations
extournées
---
include/template/ledger_detail_bottom.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/template/ledger_detail_bottom.php
b/include/template/ledger_detail_bottom.php
index 11bd287..30cf76b 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -187,7 +187,7 @@ if ($aRap != null ) {
$opRap=new Acc_Operation($cn);
$opRap->jr_id=$aRap[$e];
$internal=$opRap->get_internal();
- $array_jr=$cn->get_array('select
jr_date,jr_pj_number,jr_montant,jr_comment , jr_internal
+ $array_jr=$cn->get_array('select
jr_date,jr_pj_number,jr_montant,jr_comment , jr_internal ,jr_optype
from jrn where jr_id=$1',
array($aRap[$e]));
$amount=$array_jr[0]['jr_montant'];
@@ -229,7 +229,7 @@ if ($aRap != null ) {
td($pj_nb).
td($comment).
td(_('montant').'='.nbm($amount)).
- td(_('delta').'='.nbm(bcsub($amount_tva_include,$total_rec))).
+
td(_('delta').'='.nbm(bcsub(abs($amount_tva_include),abs($total_rec)))).
td($remove),' id = "row'.$e.'"');
}
echo '</table>';
- [Noalyss-commit] [noalyss] branch master updated (8b28b18 -> 2b1bcd5), Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 04/33: Sale & Purchase Quantity with 2 dec., Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 01/33: Cosmetic : move dialog horizontally and vertically, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 02/33: Cosmetic : add button close for filter, dialog box search operation, TVA, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 09/33: Rounded for currency, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 08/33: Operation details : calcul correctement la différence avec les opérations extournées,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 12/33: Button close for new card, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 06/33: Bug rounded : show amount in currency with 4 dec., Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 10/33: For Misc Operation in currency , show the currency amount / row, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 11/33: Bug for reversed operation when currency are used, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 03/33: Improve HttpInput::extract , the array is set and not passed anymore, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 05/33: Bug : pour non-assujetti , pas de calcul en devise, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 07/33: Bug for reversed operation when currency are used, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 14/33: Typo, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 13/33: Compute.php it happens that the argument are not numeric, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 16/33: Documentation, Dany De Bontridder, 2021/11/11