From 9a65cbeab7de73ecf6f25c7b0d55503c24b43307 Mon Sep 17 00:00:00 2001
From: henrynopo <henrynopo@hotmail.com>
Date: Mon, 16 Aug 2021 09:39:09 +0800
Subject: [PATCH 1/4] Customer Invoice - Multicurrency Remaining to Pay

Added the remainder to be paid in multicurrency mode.
---
 htdocs/compta/facture/card.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5c21f2b9539..4c11bb595cb 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5077,6 +5077,16 @@ if ($action == 'create') {
 		print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
 		print '<td class="nowrap">&nbsp;</td></tr>';
 
+		// Remainder to pay Multicurrency
+        if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+            print '<tr><td colspan="'.$nbcols.'" class="right">';
+            print '<span class="opacitymedium">';
+            print $langs->trans('MulticurrencyRemainderToPay');
+            print '</span>';
+            print '</td>';
+            print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td>';
+        }
+		
 		// Retained warranty : usualy use on construction industry
 		if (!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty) {
 			// Billed - retained warranty

From 76c39a86a03eda2952e0b296ca6cc6df24fb9e60 Mon Sep 17 00:00:00 2001
From: henrynopo <henrynopo@hotmail.com>
Date: Mon, 16 Aug 2021 09:44:09 +0800
Subject: [PATCH 2/4] Supplier Invoice - Multicurrency remainder to pay

Added multicurrency remainder to be paid.
---
 htdocs/fourn/facture/card.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6b67d0a2dcf..5d6a5c0dea2 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3237,6 +3237,17 @@ if ($action == 'create') {
 			print '</span>';
 			print '</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
+			
+			// Remainder to pay Multicurrency
+            if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+                print '<tr><td colspan="'.$nbcols.'" class="right">';
+                print '<span class="opacitymedium">';
+               	print $langs->trans('MulticurrencyRemainderToPay');
+                print '</span>';
+                print '</td>';
+                print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td>';
+            }
+			
 			print '<td class="nowrap">&nbsp;</td></tr>';
 		} else // Credit note
 		{

From ee65860b270304f814827547cd913e99d1c7ab79 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 16 Aug 2021 01:45:33 +0000
Subject: [PATCH 3/4] Fixing style errors.

---
 htdocs/fourn/facture/card.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 5d6a5c0dea2..b39041542eb 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3237,17 +3237,17 @@ if ($action == 'create') {
 			print '</span>';
 			print '</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
-			
+
 			// Remainder to pay Multicurrency
-            if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
-                print '<tr><td colspan="'.$nbcols.'" class="right">';
-                print '<span class="opacitymedium">';
-               	print $langs->trans('MulticurrencyRemainderToPay');
-                print '</span>';
-                print '</td>';
-                print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td>';
-            }
-			
+			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+				print '<tr><td colspan="'.$nbcols.'" class="right">';
+				print '<span class="opacitymedium">';
+				print $langs->trans('MulticurrencyRemainderToPay');
+				print '</span>';
+				print '</td>';
+				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td>';
+			}
+
 			print '<td class="nowrap">&nbsp;</td></tr>';
 		} else // Credit note
 		{

From b92fe38bc0157a6ef8f15c6117a66e67cac55f01 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 16 Aug 2021 01:47:49 +0000
Subject: [PATCH 4/4] Fixing style errors.

---
 htdocs/compta/facture/card.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 4c11bb595cb..5d81da90088 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5078,15 +5078,15 @@ if ($action == 'create') {
 		print '<td class="nowrap">&nbsp;</td></tr>';
 
 		// Remainder to pay Multicurrency
-        if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
-            print '<tr><td colspan="'.$nbcols.'" class="right">';
-            print '<span class="opacitymedium">';
-            print $langs->trans('MulticurrencyRemainderToPay');
-            print '</span>';
-            print '</td>';
-            print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td>';
-        }
-		
+		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+			print '<tr><td colspan="'.$nbcols.'" class="right">';
+			print '<span class="opacitymedium">';
+			print $langs->trans('MulticurrencyRemainderToPay');
+			print '</span>';
+			print '</td>';
+			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td>';
+		}
+
 		// Retained warranty : usualy use on construction industry
 		if (!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty) {
 			// Billed - retained warranty