From fb9827694ab59e4b28952672a293ec37edc5452f Mon Sep 17 00:00:00 2001
From: mapiolca <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 10 Jan 2019 13:19:26 +0100
Subject: [PATCH 1/2] Correction pour Multicompany
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affiche les factures de l'entité courante plutôt que de celle qui a créé le tiers.
---
 htdocs/margin/tabs/productMargins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 1d922473036..7f86a4f0713 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -144,7 +144,7 @@ if ($id > 0 || ! empty($ref))
             if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql.= " WHERE f.fk_soc = s.rowid";
             $sql.= " AND f.fk_statut > 0";
-            $sql.= " AND s.entity = ".$conf->entity;
+            $sql.= " AND f.entity = ".$conf->entity;
             $sql.= " AND d.fk_facture = f.rowid";
             $sql.= " AND d.fk_product =".$object->id;
             if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;

From 320467d7914ce9b45a59074d2cefd1d3045e7228 Mon Sep 17 00:00:00 2001
From: mapiolca <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 10 Jan 2019 13:56:41 +0100
Subject: [PATCH 2/2] Update productMargins.php

---
 htdocs/margin/tabs/productMargins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 7f86a4f0713..171c699fe24 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -144,7 +144,7 @@ if ($id > 0 || ! empty($ref))
             if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql.= " WHERE f.fk_soc = s.rowid";
             $sql.= " AND f.fk_statut > 0";
-            $sql.= " AND f.entity = ".$conf->entity;
+            $sql.= " AND f.entity IN (".getEntity('invoice').");
             $sql.= " AND d.fk_facture = f.rowid";
             $sql.= " AND d.fk_product =".$object->id;
             if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;