From 360fa51a13ac3cb9acbead80dccffe2e9acbf51f Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 31 Oct 2017 23:54:06 +0100
Subject: [PATCH] =?UTF-8?q?Task=20#0001328:=20Probl=C3=A8me=20affichage=20?=
 =?UTF-8?q?totaux=20achat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 af66acf64..5f8c0a5db 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 c18bbb8d9..e82c9abb2 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