Version 0.4.3. Fix add fermentables in products when packaging sugar was defined but no amount was yet set.

Mon, 26 Feb 2024 16:05:53 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Mon, 26 Feb 2024 16:05:53 +0100
changeset 517
64525ab563fc
parent 516
9161465e0eac
child 518
6922856f4288

Version 0.4.3. Fix add fermentables in products when packaging sugar was defined but no amount was yet set.

CMakeLists.txt file | annotate | diff | comparison | revisions
src/EditProductTab3.cpp file | annotate | diff | comparison | revisions
--- a/CMakeLists.txt	Mon Oct 23 15:55:34 2023 +0200
+++ b/CMakeLists.txt	Mon Feb 26 16:05:53 2024 +0100
@@ -9,7 +9,7 @@
 
 SET( bmsapp_VERSION_MAJOR 0 )
 SET( bmsapp_VERSION_MINOR 4 )
-SET( bmsapp_VERSION_PATCH 2 )
+SET( bmsapp_VERSION_PATCH 3 )
 
 # Compile flags
 
--- a/src/EditProductTab3.cpp	Mon Oct 23 15:55:34 2023 +0200
+++ b/src/EditProductTab3.cpp	Mon Feb 26 16:05:53 2024 +0100
@@ -684,8 +684,10 @@
     qDebug() << "Add fermentable row";
 
     for (int i = 0; i < product->fermentables.size(); i++) {
-	if (product->fermentables.at(i).amount == 0 && product->fermentables.at(i).color == 0)
-	    return;	// Add only one at a time.
+	if (product->fermentables.at(i).amount == 0 &&
+	    product->fermentables.at(i).color == 0 &&
+	    product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE)
+	    return;	// Add only one at a time. Ignore packaging sugars.
     }
 
     newf.name = "Select one";

mercurial