From 1bacd8e13d1a3e854473d474dd8da9010d9c3f9c Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Wed, 14 Jul 2021 18:15:02 +0200 Subject: [PATCH] Typo / added missing changelog --- changelog/62_UNRELEASED_xxxx-xx-xx.md | 3 ++- migrations/0148.sql | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog/62_UNRELEASED_xxxx-xx-xx.md b/changelog/62_UNRELEASED_xxxx-xx-xx.md index 12fa6f92..b7c4f867 100644 --- a/changelog/62_UNRELEASED_xxxx-xx-xx.md +++ b/changelog/62_UNRELEASED_xxxx-xx-xx.md @@ -47,7 +47,7 @@ - Fixed that the store information on a stock entry was lost when transferring a partial amount to a different location - Fixed that the "Spoil rate" on the product card was wrong in some cases - Fixed that the stock journal showed always the products default location (instead of the location of the transaction) - - Fixed that the aggregated amount of parent products was wrong when indirect quantity unit conversions were used +- Fixed that the aggregated amount of parent products was wrong when indirect quantity unit conversions were used ### Shopping list improvements/fixes - The amount now defaults to `1` for adding items quicker @@ -70,6 +70,7 @@ - Fixed that the amount of self produced products with tare weight handling enabled was wrong ("Produces product" recipe option) - Fixed that the ingredient amount calculation for included/nested recipes was (for most cases) wrong - Fixed that the ingredient amount was wrong when using a to the product indirectly related quantity unit +- Fixed that the calories amount calculation was wrong when quantity unit conversions were involved ### Meal plan improvements/fixes - Improved the meal plan page loading time (drastically when having a big history of meal plan entries) diff --git a/migrations/0148.sql b/migrations/0148.sql index 4736848b..aa95c819 100644 --- a/migrations/0148.sql +++ b/migrations/0148.sql @@ -36,7 +36,7 @@ JOIN quantity_units qu_from ON p.qu_id_purchase = qu_from.id JOIN quantity_units qu_to ON p.qu_id_stock = qu_to.id -WHERE p.qu_id_stock != p.qu_id_purchase -- => Only when QU stock ist not the same as QU purchase +WHERE p.qu_id_stock != p.qu_id_purchase -- => Only when QU stock st not the same as QU purchase UNION