From 1a2434818dff72954c1d661993af33b663728027 Mon Sep 17 00:00:00 2001
From: Alexis LAURIER <a.laurier@kreactive.com>
Date: Thu, 10 Jun 2021 18:00:49 +0200
Subject: [PATCH 1/2] remove useless check on deposit line content when
 generating pdf

---
 htdocs/core/lib/pdf.lib.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 6e4cc60ce53..0a73b062ae3 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1272,9 +1272,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 		}
 	} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
-		if ($object->type == $object::TYPE_DEPOSIT) {
-			$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
-		}
+		$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 	}
 
 	// Description short of product line

From 759472f5d1ff5c5439db59b261ba8a6dcf5f7a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 20:58:56 +0200
Subject: [PATCH 2/2] fix warning

---
 htdocs/core/class/discount.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index af336c38745..43a6bf50df6 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -519,7 +519,7 @@ class DiscountAbsolute
 			//}
 			if ($multicurrency)
 			{
-				return $obj->amount_multicurrency;
+				return $obj->multicurrency_amount;
 			}
 
 			return $obj->amount;