diff --git a/cookbook/helper/shopping_helper.py b/cookbook/helper/shopping_helper.py
index 3a91a1949..c994cf667 100644
--- a/cookbook/helper/shopping_helper.py
+++ b/cookbook/helper/shopping_helper.py
@@ -65,7 +65,13 @@ class RecipeShoppingEditor():
try:
self.servings = float(self._kwargs.get('servings', None))
except (ValueError, TypeError):
- self.servings = getattr(self._shopping_list_recipe, 'servings', None) or getattr(self.mealplan, 'servings', None) or getattr(self.recipe, 'servings', None)
+ self.servings = getattr(self.recipe, 'servings', None)
+
+ if hasattr(self,'mealplan') and getattr(self.mealplan, 'servings', None):
+ self.servings = getattr(self.mealplan, 'servings', None)
+ if hasattr(self, '_shopping_list_recipe') and getattr(self._shopping_list_recipe, 'servings', None):
+ self.servings = getattr(self._shopping_list_recipe, 'servings', None)
+
@property
def _recipe_servings(self):
@@ -108,6 +114,7 @@ class RecipeShoppingEditor():
if servings := kwargs.get('servings', None):
self.servings = float(servings)
+ self.mealplan = None
if mealplan := kwargs.get('mealplan', None): # it appears this code is never called just init is used, no time to validate
self.mealplan = MealPlan.objects.filter(id=mealplan['id'], space=self.space).fist()
elif recipe := kwargs.get('recipe', None):
diff --git a/vue/src/apps/MealPlanView/MealPlanView.vue b/vue/src/apps/MealPlanView/MealPlanView.vue
index c71d23f69..7d4f09b9d 100644
--- a/vue/src/apps/MealPlanView/MealPlanView.vue
+++ b/vue/src/apps/MealPlanView/MealPlanView.vue
@@ -100,7 +100,9 @@
{{ plan.note }}
- {{ plan.meal_type_name }}
+
+
+ {{ plan.meal_type_name }}
- {{ plan.recipe.working_time + plan.recipe.waiting_time }} {{ $t('min') }}