From a82f996fcf63d35cb3eb455635cd728f802f3eba Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 19 Dec 2019 12:04:48 +0100
Subject: [PATCH] Update to integer situation invoice

Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)

Now : Situation invoice with situation_percent  < 100 => Correct and proportional.
---
 htdocs/margin/tabs/thirdpartyMargins.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 1d0897a72b0..337190b6c15 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -147,8 +147,8 @@ if ($socid > 0)
     $sql.= " f.rowid as facid, f.ref, f.total as total_ht,";
     $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
     $sql.= " sum(d.total_ht) as selling_price,";						// may be negative or positive
-    $sql.= " sum(d.qty * d.buy_price_ht) as buying_price,";				// always positive
-    $sql.= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge";	// always positive
+    $sql.= " sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,";				// always positive
+    $sql.= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge";	// always positive
     $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
     $sql.= ", ".MAIN_DB_PREFIX."facture as f";
     $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";