From acadef72c1d8bd734573e3afdadff24271f70818 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 14 May 2021 18:01:22 +0200
Subject: [PATCH 1/2] Fix use supplier relative discount in replenish order
 creation

---
 htdocs/product/stock/replenish.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index dbf07c92d01..5d8e1f4a790 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -211,7 +211,9 @@ if ($action == 'order' && isset($_POST['valid']))
             if ($resql && $db->num_rows($resql) > 0) {
                 $obj = $db->fetch_object($resql);
                 $order->fetch($obj->rowid);
+				$order->fetch_thirdparty();
                 foreach ($supplier['lines'] as $line) {
+                	if(empty($line->remise_percent)) $line->remise_percent = $order->thirdparty->remise_supplier_percent;
                     $result = $order->addline(
                         $line->desc,
                         $line->subprice,
@@ -248,6 +250,7 @@ if ($action == 'order' && isset($_POST['valid']))
                 //trick to know which orders have been generated this way
                 $order->source = 42;
                 foreach ($supplier['lines'] as $line) {
+					if(empty($line->remise_percent)) $line->remise_percent = $order->thirdparty->remise_supplier_percent;
                     $order->lines[] = $line;
                 }
                 $order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;

From f923c70f380d4145153b20bcbb8037caf7ea7a4c Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Mon, 17 May 2021 10:17:54 +0200
Subject: [PATCH 2/2] Fix: Before there was no mistake

---
 htdocs/admin/dict.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index fbe7d924cbc..648537ec3f8 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
  * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2021	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -777,10 +777,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
             }
-			elseif ($keycode == 'localtax2') {
-				$sql .= "'".GETPOST($keycode, 'alpha')."'";
-			}
-            else {
+			else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }
 
@@ -846,9 +843,6 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             elseif (in_array($keycode, array('private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
             }
-			elseif ($keycode == 'localtax2') {
-				$sql .= "'".GETPOST($keycode, 'alpha')."'";
-			}
             else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }