From 5d1f91f8ac7e390b130d1a4cd84f0e20e5d93b18 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Thu, 27 Feb 2020 17:37:36 +0100
Subject: [PATCH] FIX: muticurrency columns: remove useless column totals that
 mix currencies together

---
 htdocs/commande/list.php       |  6 ------
 htdocs/compta/facture/list.php | 10 ----------
 2 files changed, 16 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 2acd1af7c2a..ed069552464 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1190,24 +1190,18 @@ if ($resql)
 		{
 			  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
 			  if (!$i) $totalarray['nbfield']++;
-			  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.multicurrency_total_ht';
-			  $totalarray['val']['c.multicurrency_total_ht'] += $obj->multicurrency_total_ht;
 		}
 		// Amount VAT
 		if (!empty($arrayfields['c.multicurrency_total_vat']['checked']))
 		{
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
 			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.multicurrency_total_vat';
-			$totalarray['val']['c.multicurrency_total_vat'] += $obj->multicurrency_total_vat;
 		}
 		// Amount TTC
 		if (!empty($arrayfields['c.multicurrency_total_ttc']['checked']))
 		{
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
 			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.multicurrency_total_ttc';
-			$totalarray['val']['c.multicurrency_total_ttc'] += $obj->multicurrency_total_ttc;
 		}
 
 		$userstatic->id = $obj->fk_user_author;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index c4563742812..82f92085abf 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1419,31 +1419,23 @@ if ($resql)
 			{
 				  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
 				  if (!$i) $totalarray['nbfield']++;
-				  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.multicurrency_total_ht';
-				  $totalarray['val']['f.multicurrency_total_ht'] += $obj->multicurrency_total_ht;
 			}
 			// Amount VAT
 			if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))
 			{
 				print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
 				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.multicurrency_total_vat';
-				$totalarray['val']['f.multicurrency_total_vat'] += $obj->multicurrency_total_vat;
 			}
 			// Amount TTC
 			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))
 			{
 				print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
 				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.multicurrency_total_ttc';
-				$totalarray['val']['f.multicurrency_total_ttc'] += $obj->multicurrency_total_ttc;
 			}
 			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked']))
 			{
 				print '<td class="right nowrap">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
 				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalam';
-				$totalarray['val']['multicurrency_totalam'] += $multicurrency_totalpay;
 			}
 
 			// Pending amount
@@ -1453,8 +1445,6 @@ if ($resql)
 				print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
 				print '</td>'; // TODO Use a denormalized field
 				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'multicurrency_rtp';
-				$totalarray['val']['multicurrency_rtp'] += $multicurrency_remaintopay;
 			}
 
 			// Extra fields