[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 08/11: Task #1061 - Détail TVA autoliquidati
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 08/11: Task #1061 - Détail TVA autoliquidation |
Date: |
Wed, 03 Dec 2014 22:39:32 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 0041a0b157d8f7725dd4eaa7ed4dc053b79cd0dc
Author: Dany De Bontridder <address@hidden>
Date: Wed Dec 3 21:21:57 2014 +0100
Task #1061 - Détail TVA autoliquidation
---
include/template/ledger_detail_ach.php | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/template/ledger_detail_ach.php
b/include/template/ledger_detail_ach.php
index c1e74e2..d513aa2 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -195,7 +195,7 @@ $str_anc="";
$tvac = bcadd($htva, $q['qp_vat']);
$tvac = bcadd($tvac, $q['qp_nd_tva']);
$tvac = bcadd($tvac, $q['qp_nd_tva_recup']);
-
+ $tvac = bcsub ($tvac,$q['qp_vat_sided']);
if ($owner->MY_TVA_USE == 'Y')
{
@@ -204,14 +204,13 @@ $str_anc="";
if ($q['qp_vat_sided'] <> 0)
{
$class = ' style="text-decoration:line-through"';
- $tvac = bcsub($tvac, $q['qp_vat']);
}
$row.=td(nbm($tva_amount_nd), 'class="num" ' . $class);
$row.=td(nbm($q['qp_vat']), 'class="num" ' . $class);
$row.=td(nbm($tvac), 'class="num"');
}
- $total_tvac+=$tvac;
- $total_htva+=$htva;
+ $total_tvac=bcadd($total_tvac,$tvac);
+ $total_htva=bcadd($htva,$total_htva);
/* Analytic accountancy */
if ($owner->MY_ANALYTIC != "nu" /*&& $div == 'popup'*/ )
{
- [Noalyss-commit] [noalyss] branch master updated (e1b3a81 -> 658bf19), Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 01/11: Task #1059 - Stock : reprise inventaire Cosmetic : center the box + size, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 04/11: update version, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 05/11: Task #1059 - Stock : reprise inventaire Add nb row, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 03/11: bug in lettering, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 08/11: Task #1061 - Détail TVA autoliquidation,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 09/11: remove commented code, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 07/11: Task #1060 - Historique TVA autoliquidation, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 10/11: Task #1064 - VEN si autoliquidation montant incorrect remove commented code, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 11/11: Task #1062 - PRINTJRN : si autoliquidation montant incorrect remove commented code, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 06/11: Task #1045 - Amélioration apparence : Tabs no wrap, Dany De Bontridder, 2014/12/03
- [Noalyss-commit] [noalyss] 02/11: Cosmetic : center the box + size, Dany De Bontridder, 2014/12/03