# HG changeset patch # User Michiel Broek # Date 1655638458 -7200 # Node ID 8021e09ab6a39a52f3998fc4a3c40d3ac11fe1f0 # Parent 180c77a81e15bf73f554d31a361c46971aa01e82 Fixed select yeasts in recipes and poducts. diff -r 180c77a81e15 -r 8021e09ab6a3 CMakeLists.txt --- a/CMakeLists.txt Sun Jun 19 11:56:02 2022 +0200 +++ b/CMakeLists.txt Sun Jun 19 13:34:18 2022 +0200 @@ -9,7 +9,7 @@ SET( bmsapp_VERSION_MAJOR 0 ) SET( bmsapp_VERSION_MINOR 2 ) -SET( bmsapp_VERSION_PATCH 10 ) +SET( bmsapp_VERSION_PATCH 11 ) # Compile flags diff -r 180c77a81e15 -r 8021e09ab6a3 src/EditProductTab6.cpp --- a/src/EditProductTab6.cpp Sun Jun 19 11:56:02 2022 +0200 +++ b/src/EditProductTab6.cpp Sun Jun 19 13:34:18 2022 +0200 @@ -769,7 +769,7 @@ */ QString sql = "SELECT name,laboratory,product_id,type,form,min_temperature,max_temperature,flocculation,attenuation," "cells,tolerance,sta1,bacteria,harvest_top,harvest_time,pitch_temperature,pofpos,zymocide," - "gr_hl_lo,sg_lo,gr_hl_hi,sg_hi,cost,inventory FROM inventoryeasts "; + "gr_hl_lo,sg_lo,gr_hl_hi,sg_hi,cost,inventory FROM inventory_yeasts "; if (instock) sql.append("WHERE inventory > 0 "); sql.append("ORDER BY laboratory,product_id,name"); @@ -886,7 +886,7 @@ this->yselectEdit->setCurrentIndex(-1); this->yselectEdit->clear(); - QString sql = "SELECT name,laboratory,product_id,inventory FROM inventoryeasts "; + QString sql = "SELECT name,laboratory,product_id,inventory FROM inventory_yeasts "; if (val) sql.append("WHERE inventory > 0 "); sql.append("ORDER BY laboratory,product_id,name"); diff -r 180c77a81e15 -r 8021e09ab6a3 src/EditRecipeTab5.cpp --- a/src/EditRecipeTab5.cpp Sun Jun 19 11:56:02 2022 +0200 +++ b/src/EditRecipeTab5.cpp Sun Jun 19 13:34:18 2022 +0200 @@ -310,7 +310,7 @@ */ QString sql = "SELECT name,laboratory,product_id,type,form,min_temperature,max_temperature,flocculation,attenuation," "cells,tolerance,sta1,bacteria,harvest_top,harvest_time,pitch_temperature,pofpos,zymocide," - "gr_hl_lo,sg_lo,gr_hl_hi,sg_hi,cost FROM inventoryeasts "; + "gr_hl_lo,sg_lo,gr_hl_hi,sg_hi,cost FROM inventory_yeasts "; if (instock) sql.append("WHERE inventory > 0 "); sql.append("ORDER BY laboratory,product_id,name"); @@ -406,7 +406,7 @@ this->yselectEdit->setCurrentIndex(-1); this->yselectEdit->clear(); - QString sql = "SELECT name,laboratory,product_id,inventory FROM inventoryeasts "; + QString sql = "SELECT name,laboratory,product_id,inventory FROM inventory_yeasts "; if (val) sql.append("WHERE inventory > 0 "); sql.append("ORDER BY laboratory,product_id,name");