From 9852d470ec5c2ad8d1b9fd7a055d9684ec9c69e6 Mon Sep 17 00:00:00 2001
From: antonin_tdj <50403308+ibuiv@users.noreply.github.com>
Date: Sat, 26 Nov 2022 00:23:29 +0100
Subject: [PATCH 1/2] Fix #20533 Dispatch Tab Quantity
Fix #20533
Dispatch Tab Total Quantity now considers services (and the configuration option to manage stocks on services)
---
htdocs/core/lib/fourn.lib.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 8ba05557220..b4b116c5c6b 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -178,7 +178,10 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
$sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty'];
}
for ($line = 0 ; $line < $nbLinesOrdered; $line++) {
- $sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;
+ //If line is a product of conf to manage stocks for services
+ if($object->lines[$line]->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)){
+ $sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;
+ }
}
$head[$h][1] .= ''.price2num($sumQtyAllreadyDispatched, 'MS').' / '.price2num($sumQtyOrdered, 'MS').'';
}
From ebae1c024f66d76a77df7d90b6d69be5644d8d50 Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Fri, 25 Nov 2022 23:24:17 +0000
Subject: [PATCH 2/2] Fixing style errors.
---
htdocs/core/lib/fourn.lib.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index b4b116c5c6b..93ac290e08c 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -179,7 +179,7 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
}
for ($line = 0 ; $line < $nbLinesOrdered; $line++) {
//If line is a product of conf to manage stocks for services
- if($object->lines[$line]->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)){
+ if ($object->lines[$line]->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
$sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;
}
}