[Noalyss-commit] [noalyss] 120/219: Task #0001328: Problème affichage totaux achat

[Dany De Bontridder]

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