diff -r d369948a3eb5 -r 448e4187cada src/EditProductTab1.cpp
--- a/src/EditProductTab1.cpp	Fri May 20 14:48:03 2022 +0200
+++ b/src/EditProductTab1.cpp	Fri May 20 20:43:33 2022 +0200
@@ -241,7 +241,20 @@
     ui->efficiencyEdit->setButtonSymbols((stage > PROD_STAGE_WAIT) ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
     ui->est_ogEdit->setReadOnly(stage > PROD_STAGE_WAIT);
     ui->est_ogEdit->setButtonSymbols((stage > PROD_STAGE_WAIT) ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
-    // Block locked if stage <= PROD_STAGE_TASTE
+    if (stage > PROD_STAGE_PACKAGE) {
+	ui->ok_pmptLabel->hide();
+	ui->ok_pmptIcon->hide();
+    } else {
+	ui->ok_pmptLabel->show();
+        ui->ok_pmptIcon->show();
+    }
+    if (stage >= PROD_STAGE_READY) {
+	ui->lockedLabel->show();
+	ui->lockedEdit->show();
+    } else {
+	ui->lockedLabel->hide();
+        ui->lockedEdit->hide();
+    }
 
     /* Tab 2, equipment */
     ui->tabWidget->setTabEnabled(1, stage < PROD_STAGE_BREW);
@@ -537,10 +550,30 @@
 	    ui->pack_ackButton->show();
     }
 
-
     /* Tab 12, tasting */
     ui->tabWidget->setTabEnabled(11, stage > PROD_STAGE_PACKAGE);
-
+    ui->taste_dateEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    if (stage == PROD_STAGE_TASTE) {
+	ui->taste_dateEdit->setMinimumDate(product->package_date.addDays(41));
+	ui->taste_dateEdit->setMaximumDate(QDate::currentDate());
+    }
+    ui->taste_dateButton->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_colorEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_transparencyEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_headEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_aromaEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_tasteEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_mouthfeelEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_aftertasteEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_notesEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    ui->taste_rateEdit->setEnabled(stage == PROD_STAGE_TASTE);
+    if ((product->taste_color != "") && (product->taste_transparency != "") && (product->taste_head != "") &&
+	(product->taste_aroma != "") && (product->taste_taste != "") && (product->taste_mouthfeel != "") &&
+	(product->taste_aftertaste != "") && (product->taste_notes != "") && (product->taste_rate > 0) &&
+	(product->taste_date.isValid()))
+	ui->taste_ackButton->show();
+    else
+	ui->taste_ackButton->hide();
 }