[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 120/219: Task #0001328: Problème affichage t
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 120/219: Task #0001328: Problème affichage totaux achat |
Date: |
Mon, 18 Dec 2017 13:22:48 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 360fa51a13ac3cb9acbead80dccffe2e9acbf51f
Author: Dany De Bontridder <address@hidden>
Date: Tue Oct 31 23:54:06 2017 +0100
Task #0001328: Problème affichage totaux achat
---
include/class/acc_ledger_purchase.class.php | 20 ++++++++++++++++++++
include/class/acc_ledger_sold.class.php | 20 +++++++++++++++++++-
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/include/class/acc_ledger_purchase.class.php
b/include/class/acc_ledger_purchase.class.php
index af66acf..5f8c0a5 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -1551,6 +1551,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$tot=nbm($tot);
$str_tot=_('Totaux');
$tot_amount=nbm($tot_amount);
+ if ( $g_parameter->MY_TVA_USE == 'Y') {
$r.=<<<EOF
<tr class="highlight">
{$decalage}
@@ -1567,6 +1568,25 @@ class Acc_Ledger_Purchase extends Acc_Ledger
{$tot}
</td>
EOF;
+ } else {
+ $r.=<<<EOF
+<tr class="highlight">
+ {$decalage}
+ <td>
+ {$str_tot}
+ </td>
+ <td class="num">
+ {$tot_amount}
+ </td>
+ <td class="num">
+
+ </td>
+ <td class="num">
+ {$tot}
+ </td>
+EOF;
+
+ }
$r.='</table>';
$r.='</p>';
diff --git a/include/class/acc_ledger_sold.class.php
b/include/class/acc_ledger_sold.class.php
index c18bbb8..e82c9ab 100644
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@ -826,6 +826,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$tot=nbm($tot);
$str_tot=_('Totaux');
$tot_amount=nbm($tot_amount);
+if ( $g_parameter->MY_TVA_USE=="Y") {
$r.=<<<EOF
<tr class="highlight">
{$decalage}
@@ -842,7 +843,24 @@ class Acc_Ledger_Sold extends Acc_Ledger {
{$tot}
</td>
EOF;
-
+ } else {
+ $r.=<<<EOF
+<tr class="highlight">
+ {$decalage}
+ <td>
+ {$str_tot}
+ </td>
+ <td class="num">
+
+ </td>
+ <td class="num">
+
+ </td>
+ <td class="num">
+ {$tot}
+ </td>
+EOF;
+ }
$r.='</table>';
$r.='</p>';
if ($g_parameter->MY_ANALYTIC != 'nu' && ! $p_summary) // use of AA
- [Noalyss-commit] [noalyss] 66/219: CFGSEC : action and ledger are set thanks ajax Inplace_Switch : new class for ajax with a swith button, (continued)
- [Noalyss-commit] [noalyss] 66/219: CFGSEC : action and ledger are set thanks ajax Inplace_Switch : new class for ajax with a swith button, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 96/219: esthetic style-r692 : size icon, arrow ..., Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 04/219: Translation, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 01/219: new coding convention , Change File name : class_ becomes file.class.php, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 37/219: Task #0001411: Faire des boutons du menu des... boutons Ajout nouveau style-r692, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 57/219: New : inplace_edit permit the developer to create easily a "inplace" edit field, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 93/219: Change background title inner_box, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 118/219: Task #0001297: Perfectionnement menu COMPTA/ADV/OPEN Improve operation message, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 74/219: Security : SQL use directly $_SESSION, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 103/219: Réécriture de CFGPCMN pour utiliser ManageTable Ajout bouton ajout dans menu, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 120/219: Task #0001328: Problème affichage totaux achat,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 119/219: Task #0001297: Perfectionnement menu COMPTA/ADV/OPEN Improve operation message, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 80/219: Bug : export_document the parameters id, ag_id and value are optionnal, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 45/219: Improve SQL class generation, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 101/219: Réécriture de CFGPCMN pour utiliser ManageTable, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 17/219: Add test for Manage_Table_SQL, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 127/219: Task #0001484: CA : opération diverses , possibilité d'ajouter une fiche Add card to misc operation ANC, - implemented also in Printing : balance , History , General Ledger..., Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 144/219: ANC : Bouton "recherche" sont des loupes, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 25/219: Ajout des ASBL, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 53/219: typo, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 28/219: Task #0001447: Solde des opérations rapprochées Take in account the VAT autopurged, Dany De Bontridder, 2017/12/18