From a232a19e7d7fe0f97cf2288a58d6d23cfe99b8a8 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 22 Oct 2020 15:16:33 +0200
Subject: [PATCH 1/3] FIX: virtual products: supplier discount was not applied
in component list
---
htdocs/product/composition/card.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index a3b444db6b7..a22b34d5f6f 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -365,7 +365,7 @@ if ($id > 0 || ! empty($ref))
$total+=$totalline;
print '| ';
- print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($fourn_unitprice, '', '', 0, 0, -1, $conf->currency));
+ print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($totalline, '', '', 0, 0, -1, $conf->currency));
print ' | ';
// Best selling price
From 34dd486b6cfb947cada1e1318a99736551a5ab9a Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 22 Oct 2020 16:18:37 +0200
Subject: [PATCH 2/3] FIX: virtual products: displayed value is by unit
---
htdocs/product/composition/card.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index a22b34d5f6f..0445844c7ce 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -361,11 +361,12 @@ if ($id > 0 || ! empty($ref))
$fourn_remise_percent = (!empty($product_fourn->fourn_remise_percent)?$product_fourn->fourn_remise_percent:0);
$fourn_remise = (!empty($product_fourn->fourn_remise)?$product_fourn->fourn_remise:0);
- $totalline=price2num($value['nb'] * ($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MT');
+ $unitline = price2num(($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MT');
+ $totalline = $value['nb'] * $unitline;
$total+=$totalline;
print '';
- print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($totalline, '', '', 0, 0, -1, $conf->currency));
+ print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($unitline, '', '', 0, 0, -1, $conf->currency));
print ' | ';
// Best selling price
From 3369379ba17d80de3adf4922180133378d4143a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 22 Oct 2020 16:34:23 +0200
Subject: [PATCH 3/3] Update card.php
---
htdocs/product/composition/card.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 0445844c7ce..2183fcb3121 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -361,9 +361,9 @@ if ($id > 0 || ! empty($ref))
$fourn_remise_percent = (!empty($product_fourn->fourn_remise_percent)?$product_fourn->fourn_remise_percent:0);
$fourn_remise = (!empty($product_fourn->fourn_remise)?$product_fourn->fourn_remise:0);
- $unitline = price2num(($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MT');
- $totalline = $value['nb'] * $unitline;
- $total+=$totalline;
+ $unitline = price2num(($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MU');
+ $totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MT');
+ $total += $totalline;
print '';
print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($unitline, '', '', 0, 0, -1, $conf->currency));
|