diff -r e6a4a3a29584 -r 3b9abdae181e ui/EditProduct.ui
--- a/ui/EditProduct.ui	Sat Jun 01 15:19:08 2024 +0200
+++ b/ui/EditProduct.ui	Sat Jun 01 21:10:54 2024 +0200
@@ -95,7 +95,7 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>10</number>
+       <number>7</number>
       </property>
       <property name="elideMode">
        <enum>Qt::ElideNone</enum>
@@ -5471,7 +5471,7 @@
         <property name="geometry">
          <rect>
           <x>750</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5496,7 +5496,7 @@
         <property name="geometry">
          <rect>
           <x>670</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5521,7 +5521,7 @@
         <property name="geometry">
          <rect>
           <x>590</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5546,7 +5546,7 @@
         <property name="geometry">
          <rect>
           <x>1070</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5574,7 +5574,7 @@
         <property name="geometry">
          <rect>
           <x>910</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5599,7 +5599,7 @@
         <property name="geometry">
          <rect>
           <x>830</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5624,7 +5624,7 @@
         <property name="geometry">
          <rect>
           <x>430</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5649,7 +5649,7 @@
         <property name="geometry">
          <rect>
           <x>510</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5674,7 +5674,7 @@
         <property name="geometry">
          <rect>
           <x>250</x>
-          <y>160</y>
+          <y>220</y>
           <width>81</width>
           <height>24</height>
          </rect>
@@ -5705,7 +5705,7 @@
         <property name="geometry">
          <rect>
           <x>990</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5730,7 +5730,7 @@
         <property name="geometry">
          <rect>
           <x>350</x>
-          <y>160</y>
+          <y>220</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5755,7 +5755,7 @@
         <property name="geometry">
          <rect>
           <x>10</x>
-          <y>210</y>
+          <y>40</y>
           <width>181</width>
           <height>23</height>
          </rect>
@@ -5771,7 +5771,7 @@
         <property name="geometry">
          <rect>
           <x>990</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5796,7 +5796,7 @@
         <property name="geometry">
          <rect>
           <x>830</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5821,7 +5821,7 @@
         <property name="geometry">
          <rect>
           <x>670</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5846,7 +5846,7 @@
         <property name="geometry">
          <rect>
           <x>1070</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5874,7 +5874,7 @@
         <property name="geometry">
          <rect>
           <x>590</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5899,7 +5899,7 @@
         <property name="geometry">
          <rect>
           <x>350</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5924,7 +5924,7 @@
         <property name="geometry">
          <rect>
           <x>750</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5949,7 +5949,7 @@
         <property name="geometry">
          <rect>
           <x>430</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5974,7 +5974,7 @@
         <property name="geometry">
          <rect>
           <x>510</x>
-          <y>210</y>
+          <y>40</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -5999,7 +5999,7 @@
         <property name="geometry">
          <rect>
           <x>510</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6027,7 +6027,7 @@
         <property name="geometry">
          <rect>
           <x>990</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6052,7 +6052,7 @@
         <property name="geometry">
          <rect>
           <x>10</x>
-          <y>130</y>
+          <y>190</y>
           <width>171</width>
           <height>21</height>
          </rect>
@@ -6068,7 +6068,7 @@
         <property name="geometry">
          <rect>
           <x>910</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6096,7 +6096,7 @@
         <property name="geometry">
          <rect>
           <x>670</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6124,7 +6124,7 @@
         <property name="geometry">
          <rect>
           <x>590</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6149,7 +6149,7 @@
         <property name="geometry">
          <rect>
           <x>750</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6178,7 +6178,7 @@
         <property name="geometry">
          <rect>
           <x>350</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6206,7 +6206,7 @@
         <property name="geometry">
          <rect>
           <x>1070</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6234,7 +6234,7 @@
         <property name="geometry">
          <rect>
           <x>430</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6262,7 +6262,7 @@
         <property name="geometry">
          <rect>
           <x>830</x>
-          <y>130</y>
+          <y>190</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6291,7 +6291,7 @@
         <property name="geometry">
          <rect>
           <x>510</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6316,7 +6316,7 @@
         <property name="geometry">
          <rect>
           <x>1070</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6344,13 +6344,16 @@
         <property name="geometry">
          <rect>
           <x>10</x>
-          <y>100</y>
+          <y>130</y>
           <width>171</width>
           <height>21</height>
          </rect>
         </property>
-        <property name="text">
-         <string>Mixed water</string>
+        <property name="toolTip">
+         <string>Total brew and sparge water supply</string>
+        </property>
+        <property name="text">
+         <string>Total needed mixed water</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -6360,7 +6363,7 @@
         <property name="geometry">
          <rect>
           <x>350</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6385,7 +6388,7 @@
         <property name="geometry">
          <rect>
           <x>990</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6410,10 +6413,13 @@
         <property name="geometry">
          <rect>
           <x>250</x>
-          <y>100</y>
-          <width>71</width>
-          <height>24</height>
-         </rect>
+          <y>130</y>
+          <width>71</width>
+          <height>24</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string>Total brew and sparge water supply</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -6438,7 +6444,7 @@
         <property name="geometry">
          <rect>
           <x>670</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6463,7 +6469,7 @@
         <property name="geometry">
          <rect>
           <x>750</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6488,7 +6494,7 @@
         <property name="geometry">
          <rect>
           <x>430</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6513,7 +6519,7 @@
         <property name="geometry">
          <rect>
           <x>830</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6538,7 +6544,7 @@
         <property name="geometry">
          <rect>
           <x>590</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6563,7 +6569,7 @@
         <property name="geometry">
          <rect>
           <x>910</x>
-          <y>100</y>
+          <y>130</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6588,7 +6594,7 @@
         <property name="geometry">
          <rect>
           <x>1070</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6616,7 +6622,7 @@
         <property name="geometry">
          <rect>
           <x>350</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6641,7 +6647,7 @@
         <property name="geometry">
          <rect>
           <x>830</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6666,7 +6672,7 @@
         <property name="geometry">
          <rect>
           <x>430</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6691,7 +6697,7 @@
         <property name="geometry">
          <rect>
           <x>910</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6716,7 +6722,7 @@
         <property name="geometry">
          <rect>
           <x>990</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6741,7 +6747,7 @@
         <property name="geometry">
          <rect>
           <x>250</x>
-          <y>70</y>
+          <y>100</y>
           <width>85</width>
           <height>24</height>
          </rect>
@@ -6778,7 +6784,7 @@
         <property name="geometry">
          <rect>
           <x>670</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6803,7 +6809,7 @@
         <property name="geometry">
          <rect>
           <x>750</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6828,7 +6834,7 @@
         <property name="geometry">
          <rect>
           <x>10</x>
-          <y>70</y>
+          <y>100</y>
           <width>181</width>
           <height>23</height>
          </rect>
@@ -6844,7 +6850,7 @@
         <property name="geometry">
          <rect>
           <x>590</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6869,7 +6875,7 @@
         <property name="geometry">
          <rect>
           <x>510</x>
-          <y>70</y>
+          <y>100</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6894,7 +6900,7 @@
         <property name="geometry">
          <rect>
           <x>430</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6919,7 +6925,7 @@
         <property name="geometry">
          <rect>
           <x>510</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -6960,7 +6966,7 @@
         <property name="geometry">
          <rect>
           <x>910</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -7045,7 +7051,7 @@
         <property name="geometry">
          <rect>
           <x>990</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -7070,10 +7076,13 @@
         <property name="geometry">
          <rect>
           <x>250</x>
-          <y>40</y>
-          <width>71</width>
-          <height>24</height>
-         </rect>
+          <y>70</y>
+          <width>71</width>
+          <height>24</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string>Total brew and sparge water supply without optional dilution water</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -7101,7 +7110,7 @@
         <property name="geometry">
          <rect>
           <x>830</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -7142,7 +7151,7 @@
         <property name="geometry">
          <rect>
           <x>590</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -7167,7 +7176,7 @@
         <property name="geometry">
          <rect>
           <x>1070</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -7195,7 +7204,7 @@
         <property name="geometry">
          <rect>
           <x>10</x>
-          <y>40</y>
+          <y>70</y>
           <width>181</width>
           <height>23</height>
          </rect>
@@ -7326,7 +7335,7 @@
         <property name="geometry">
          <rect>
           <x>750</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -7351,7 +7360,7 @@
         <property name="geometry">
          <rect>
           <x>350</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -7376,7 +7385,7 @@
         <property name="geometry">
          <rect>
           <x>670</x>
-          <y>40</y>
+          <y>70</y>
           <width>71</width>
           <height>24</height>
          </rect>
@@ -7401,7 +7410,7 @@
         <property name="geometry">
          <rect>
           <x>210</x>
-          <y>40</y>
+          <y>70</y>
           <width>21</width>
           <height>21</height>
          </rect>
@@ -7423,7 +7432,7 @@
         <property name="geometry">
          <rect>
           <x>210</x>
-          <y>70</y>
+          <y>100</y>
           <width>21</width>
           <height>21</height>
          </rect>
@@ -7442,7 +7451,7 @@
         <property name="geometry">
          <rect>
           <x>210</x>
-          <y>100</y>
+          <y>130</y>
           <width>21</width>
           <height>21</height>
          </rect>
@@ -7474,7 +7483,7 @@
         <property name="geometry">
          <rect>
           <x>10</x>
-          <y>160</y>
+          <y>220</y>
           <width>171</width>
           <height>21</height>
          </rect>
@@ -10703,7 +10712,7 @@
           <double>14.000000000000000</double>
          </property>
          <property name="singleStep">
-          <double>0.010000000000000</double>
+          <double>0.100000000000000</double>
          </property>
         </widget>
         <widget class="QLineEdit" name="pack_notesEdit">