From fc7c0ce52188776dd34f0aeeb8e7c4ca3ce771b7 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 24 Sep 2018 16:23:44 +0200
Subject: [PATCH 1/3] FIX : need to filter on current entity on replenish

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

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 5a9b9888470..a8721d11c90 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -185,6 +185,7 @@ if ($action == 'order' && isset($_POST['valid']))
             $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur";
             $sql.= " WHERE fk_soc = ".$suppliersid[$i];
             $sql.= " AND source = 42 AND fk_statut = 0";
+            $sql.= " AND entity = ".$conf->entity;
             $sql.= " ORDER BY date_creation DESC";
             $resql = $db->query($sql);
             if($resql && $db->num_rows($resql) > 0) {

From a9f7bdead68054eac806b328383526373f5ded42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 Sep 2018 15:22:08 +0200
Subject: [PATCH 2/3] fix Option MAIN_DISABLE_NOTES_TAB #9611

---
 htdocs/core/tpl/bloc_showhide.tpl.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
index 2fe6204f3b9..3f9c1eb0a1d 100644
--- a/htdocs/core/tpl/bloc_showhide.tpl.php
+++ b/htdocs/core/tpl/bloc_showhide.tpl.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2012       Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +43,7 @@ print '});'."\n";
 
 print '$("#show-'.$blocname.'").click(function(){'."\n";
 print '		setShowHide(1);'."\n";
-print '		$("#'.$blocname.'").show("blind", {direction: "vertical"}, 300).addClass("nohideobject");'."\n";
+print '		$("#'.$blocname.'_bloc").show("blind", {direction: "vertical"}, 300).addClass("nohideobject");'."\n";
 print '		$(this).hide();'."\n";
 print '		$("#hide-'.$blocname.'").show();'."\n";
 print '});'."\n";

From ff3f1e933ae21796a02eb5adcbc8a8a2ba3fc2b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Sep 2018 09:22:38 +0200
Subject: [PATCH 3/3] Update replenish.php

---
 htdocs/product/stock/replenish.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index a8721d11c90..891c4fab6f5 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -185,7 +185,7 @@ if ($action == 'order' && isset($_POST['valid']))
             $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur";
             $sql.= " WHERE fk_soc = ".$suppliersid[$i];
             $sql.= " AND source = 42 AND fk_statut = 0";
-            $sql.= " AND entity = ".$conf->entity;
+            $sql.= " AND entity IN (".getEntity('commande_fournisseur').")";
             $sql.= " ORDER BY date_creation DESC";
             $resql = $db->query($sql);
             if($resql && $db->num_rows($resql) > 0) {