From f3effc5a60589ab5b03a5b48edce2b4f7e3c61a0 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sun, 19 Jan 2025 15:16:40 +0100
Subject: [PATCH] Use qu_id_purchase when adding products to the shopping list
 (closes #1355)

---
 changelog/77_UNRELEASED_xxxx-xx-xx.md | 1 +
 services/RecipesService.php           | 2 +-
 services/StockService.php             | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changelog/77_UNRELEASED_xxxx-xx-xx.md b/changelog/77_UNRELEASED_xxxx-xx-xx.md
index ec1e2de6..dd3fafa5 100644
--- a/changelog/77_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/77_UNRELEASED_xxxx-xx-xx.md
@@ -23,6 +23,7 @@
 - Added a new product option "Can't be opened"
   - When enabled the product open functionality for that product is disabled
   - Defaults to disabled, so no changed behavior when not configured
+- When products are automatically added to the shopping list (e.g. by the "below defined min. stock amount"-functionality or when adding missing recipe ingredients) the product's "Default quantity unit purchase" is now used (instead of the product's "Quantity unit stock")
 - Product barcode matching is now case-insensitive
 - Added a new column "Product picture" on the products list (master data) page (hidden by default)
 - Optimized that when navigation between the different "Group by"-variants on the stock report "Spendings", the selected date range now remains persistent
diff --git a/services/RecipesService.php b/services/RecipesService.php
index 3583216b..2af4f9dd 100644
--- a/services/RecipesService.php
+++ b/services/RecipesService.php
@@ -27,7 +27,7 @@ class RecipesService extends BaseService
 			{
 				$product = $this->getDataBase()->products($recipePosition->product_id);
 				$toOrderAmount = round(($recipePosition->missing_amount - $recipePosition->amount_on_shopping_list), 2);
-				$quId = $product->qu_id_stock;
+				$quId = $product->qu_id_purchase;
 
 				if ($recipe->not_check_shoppinglist == 1)
 				{
diff --git a/services/StockService.php b/services/StockService.php
index 415c6172..7adad17a 100644
--- a/services/StockService.php
+++ b/services/StockService.php
@@ -50,7 +50,8 @@ class StockService extends BaseService
 				$shoppinglistRow = $this->getDatabase()->shopping_list()->createRow([
 					'product_id' => $missingProduct->id,
 					'amount' => $amountToAdd,
-					'shopping_list_id' => $listId
+					'shopping_list_id' => $listId,
+					'qu_id' => $product->qu_id_purchase
 				]);
 				$shoppinglistRow->save();
 			}
@@ -75,7 +76,8 @@ class StockService extends BaseService
 				$shoppinglistRow = $this->getDatabase()->shopping_list()->createRow([
 					'product_id' => $overdueProduct->product_id,
 					'amount' => 1,
-					'shopping_list_id' => $listId
+					'shopping_list_id' => $listId,
+					'qu_id' => $product->qu_id_purchase
 				]);
 				$shoppinglistRow->save();
 			}
@@ -100,7 +102,8 @@ class StockService extends BaseService
 				$shoppinglistRow = $this->getDatabase()->shopping_list()->createRow([
 					'product_id' => $expiredProduct->product_id,
 					'amount' => 1,
-					'shopping_list_id' => $listId
+					'shopping_list_id' => $listId,
+					'qu_id' => $product->qu_id_purchase
 				]);
 				$shoppinglistRow->save();
 			}