diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index a2d373f339a..940b2eecba4 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -222,7 +222,7 @@ if ($socid > 0)
 		$sql.= " u.login, u.rowid as user_id";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u";
 		$sql.= " WHERE rc.fk_soc = " . $object->id;
-		$sql.= " AND rc.entity = " . $conf->entity;
+		$sql.= " AND rc.entity IN (".getEntity('discount').")";
 		$sql.= " AND u.rowid = rc.fk_user_author";
 		$sql.= " ORDER BY rc.datec DESC";
 
@@ -281,7 +281,7 @@ if ($socid > 0)
 		$sql.= " u.login, u.rowid as user_id";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_supplier as rc, ".MAIN_DB_PREFIX."user as u";
 		$sql.= " WHERE rc.fk_soc = " . $object->id;
-		$sql.= " AND rc.entity = " . $conf->entity;
+		$sql.= " AND rc.entity IN (".getEntity('discount').")";
 		$sql.= " AND u.rowid = rc.fk_user_author";
 		$sql.= " ORDER BY rc.datec DESC";
 
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index 91d3e4476ff..f16e53b966d 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -79,7 +79,7 @@ class FactureStats extends Stats
 			$this->field_line='total_ht';
 		}
 
-		$this->where = " f.fk_statut > 0";
+		$this->where = " f.fk_statut >= 0";
 		$this->where.= " AND f.entity IN (".getEntity('invoice').")";
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($mode == 'customer') $this->where.=" AND (f.fk_statut <> 3 OR f.close_code <> 'replaced')";	// Exclude replaced invoices as they are duplicated (we count closed invoices for other reasons)
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 1ef4de8ae64..f1d489751ac 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1287,7 +1287,7 @@ class Societe extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity = '.$conf->entity.')';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
 		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 6dc66a32a8e..e53305c2015 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -168,12 +168,15 @@ if ($_POST) {
 		$bulkaction = $massaction;
 		$error = 0;
 
-		$prodstatic = new Product($db);
+
 
 		$db->begin();
 
 		foreach ($toselect as $prodid) {
 
+			// need create new of Product to prevent rename dir behavior
+			$prodstatic = new Product($db);
+
 			if ($prodstatic->fetch($prodid) < 0) {
 				continue;
 			}