[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 35/86: RECONCILE : VAT ND not in account
From: |
dwm |
Subject: |
[Noalyss-commit] [noalyss] 35/86: RECONCILE : VAT ND not in account |
Date: |
Thu, 19 Sep 2024 02:41:52 -0400 (EDT) |
sparkyx pushed a commit to branch unstable
in repository noalyss.
commit 1949332cc08b39de734bf1e6223774ef87695904
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Wed Sep 4 23:33:50 2024 +0200
RECONCILE : VAT ND not in account
---
include/class/acc_reconciliation.class.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/class/acc_reconciliation.class.php
b/include/class/acc_reconciliation.class.php
index 2a318efb7..c532212b1 100644
--- a/include/class/acc_reconciliation.class.php
+++ b/include/class/acc_reconciliation.class.php
@@ -407,7 +407,8 @@ j1.j_poste as poste
$total_price=bcsub($total_price,$row['vat_sided']);
$total_price=bcadd($total_price,$row['nd_amount']);
$total_price=bcadd($total_price,$row['nd_tva_recup']);
-
+ $total_price=bcadd($total_price,$row['nd_tva']);
+
}
$second_amount=bcadd($second_amount,$total_price);
@@ -660,6 +661,8 @@ j1.j_poste as poste
$row=Database::fetch_array($retdb, $i);
$total_price=bcadd($row['price'],$row['vat_amount']);
$total_price=bcsub($total_price,$row['vat_sided']);
+ $total_price=bcadd($total_price,$row['nd_tva']);
+ $total_price=bcadd($total_price,$row['nd_tva_recup']);
$first_amount=bcadd($total_price,$first_amount);
}
- [Noalyss-commit] [noalyss] 12/86: Cosmetic #0002375: Menu COMPTA/LET/LETCARD : le nom de la fiche n'apparaƮt pas., (continued)
- [Noalyss-commit] [noalyss] 12/86: Cosmetic #0002375: Menu COMPTA/LET/LETCARD : le nom de la fiche n'apparaƮt pas., dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 15/86: Merge branch 'pre-stable' into stable, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 06/86: CFGMENU : bug cannot update menu, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 09/86: C0OPT1 , C1MENU : improve doc, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 16/86: wip : cosmetic, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 27/86: Cosmetic improve widget bookmark color for hover, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 32/86: RECONCILE : fix bug : sum incorrect if several items RECONCILE : remove direct access to, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 41/86: Bug : some db doesn't have the view v_quant_detail, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 42/86: Improve : creation db , mod1 , mod2 and account_repository remove the alter table disable all triggers, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 03/86: Cosmetic: without z-index, the class col is behind the autocomplete div in COMPANY, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 35/86: RECONCILE : VAT ND not in account,
dwm <=
- [Noalyss-commit] [noalyss] 31/86: RECONCILE : fix bug : sum incorrect if several items, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 07/86: C0OPT1 , C1MENU : improve doc, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 05/86: C0OPT1 , C1MENU : improve doc, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 23/86: Merge branch 'pre-stable' into stable, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 28/86: Cosmetic improve widget bookmark color for hover, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 19/86: Cosmetic, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 34/86: RECONCILE : fix bug : sum incorrect if several items, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 53/86: Merge branch 'stable' into unstable, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 59/86: Set the DB to the version 202 for NOALYSS9.3 correct make-sql, dwm, 2024/09/19
- [Noalyss-commit] [noalyss] 66/86: Cosmetic , missing bcscale and code cleaning, dwm, 2024/09/19