diff -r a1bcebc61ddd -r 544d7d0183b2 www/prod_print.php
--- a/www/prod_print.php	Fri May 31 22:58:03 2019 +0200
+++ b/www/prod_print.php	Sun Jun 02 12:48:54 2019 +0200
@@ -111,16 +111,17 @@
 		global $colorw;
 		global $preboil_sg;
 		global $mashkg;
-		$added = array( 'Maischen', 'Koken', 'Vergisten', 'Nagisten/lageren', 'Bottelen' );
-		$vul = $this->w - $this->rMargin - $this->lMargin - 132;
-		$this->Ln();	
-		$this->AddCol($vul,'Grondstof','L');
-		$this->AddCol(30,'Leverancier','L');
-		$this->AddCol(15,'EBC','R');
-		$this->AddCol(17,'Moment','L');
-		$this->AddCol(20,'Kg','R');
+		$added = array( 'Maischen', 'Koken 10 min', 'Vergisten', 'Nagisten/lageren', 'Bottelen' );
+		$ftype = array( 'Mout', 'Suiker', 'Vloeibaar extract', 'Droog extract', 'Ongemout graan' );
+		$mtype = array( 'Basismout', 'Geroosterde mout', 'Cara- of crystalmout', 'Geëeste mout', 'Zuurmout', 'Speciale mout', 'Geen mout' );
+		$vul = $this->w - $this->rMargin - $this->lMargin - 125;
+		$this->Ln();
+		$this->AddCol($vul,'Mout, granen en suikers','L');
 		$this->AddCol(15,'Procent','R');
 		$this->AddCol(15,'Opbr.','R');
+		$this->AddCol(25,'Soort', 'L');
+		$this->AddCol(30,'Gebruik moment','L');
+		$this->AddCol(20,'Hoeveel','R');
 		$this->AddCol(20,'Prijs','R');
 
 		$cMargin=$this->cMargin;
@@ -150,6 +151,11 @@
 			if ($item['f_graintype'] == 2)		// Crystal
 				$pCara += $percent;
 
+			if ($item['f_type'] == 0)
+				$soort = iconv('UTF-8','windows-1252',$mtype[$item['f_graintype']]);
+			else
+				$soort = iconv('UTF-8','windows-1252',$ftype[$item['f_type']]);
+
 			$cost = $amount * $costkg;
 			$cost_fermentables += $cost;
 			$total_fermentables += $amount;
@@ -163,24 +169,27 @@
 			$sugarsf += $d;
 			$colorw += ($amount * ebc_to_srm($color) / $row['batch_size']) * 8.34436;
 
-			$this->Cell($vul,5,$name,0,0,'L',true);
-			$this->Cell(30,5,$supplier,0,0,'L',true);
-			$this->Cell(15,5,sprintf("%.0f",$color),0,0,'R',true);
-			$this->Cell(17,5,$added[$item['f_added']],0,0,'L',true);
-			$this->Cell(20,5,sprintf("%8.3f",$amount),0,0,'R',true);
+			if ($amount > 100)
+				$amount = sprintf("%.1f",$amount).' kg';
+			else if ($amount > 10)
+				$amount = sprintf("%.2f",$amount).' kg';
+			else
+				$amount = sprintf("%.0f",$amount * 1000).' gr';
+			$this->Cell($vul,5,$name.' ('.$supplier.') '.sprintf("%.0f",$color).' EBC',0,0,'L',true);
 			$this->Cell(15,5,sprintf("%.1f%%",$percent),0,0,'R',true);
 			$this->Cell(15,5,sprintf("%.1f%%",$yield),0,0,'R',true);
-			$this->Cell(20,5,sprintf("%8.3f",$cost).EURO,0,0,'R',true);
+			$this->Cell(25,5,$soort,0,0,'L',true);
+			$this->Cell(30,5,$added[$item['f_added']],0,0,'L',true);
+			$this->Cell(20,5,$amount,0,0,'R',true);
+			$this->Cell(20,5,sprintf("%.3f",$cost).EURO,0,0,'R',true);
 			$this->Ln();
 		}
 
 		$row['est_og'] = estimate_sg($sugarsf, floatval($row['batch_size']));
 		$preboil_sg = estimate_sg($sugarsm, floatval($row['boil_size']));
 		$this->SetFillColor(210,245,255);
-		$this->Cell($vul+62,5,'',0,0,'L',false);
-		$this->Cell(20,5,sprintf("%8.3f",$total_fermentables),0,0,'R',true);
-		$this->Cell(30,5,'',0,0,'L',false);
-		$this->Cell(20,5,sprintf("%8.3f",$cost_fermentables).EURO,0,0,'R',true);
+		$this->Cell($vul+105,5,'',0,0,'L',false);
+		$this->Cell(20,5,sprintf("%.3f",$cost_fermentables).EURO,0,0,'R',true);
 		$this->ProcessingTable=false;
 		$this->cMargin=$cMargin;
 		$this->aCols=array();
@@ -194,15 +203,14 @@
 		global $preboil_sg;
 		$hopform = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat' );
 		$hopuse  = array( 'Maischen', 'First wort', 'Koken', 'Vlamuit', 'Whirlpool', 'Koudhop' );
-		$vul = $this->w - $this->rMargin - $this->lMargin - 135;
+		$vul = $this->w - $this->rMargin - $this->lMargin - 122;
 		$this->Ln();
 		$this->AddCol($vul,'Hop','L');
-		$this->AddCol(35,'Land','L');
-		$this->AddCol(15,'Soort','L');
-		$this->AddCol(20,'Moment','L');
 		$this->AddCol(15,'Alpha','R');
 		$this->AddCol(12,'IBU','R');
-		$this->AddCol(18,'Gram','R');
+		$this->AddCol(25,'Soort','L');
+		$this->AddCol(30,'Gebruik moment','L');
+		$this->AddCol(20,'Hoeveel','R');
 		$this->AddCol(20,'Prijs','R');
 
 		$cMargin=$this->cMargin;
@@ -218,39 +226,43 @@
 		foreach($arr as $item) { //foreach element in $arr
 			$name     = iconv('UTF-8','windows-1252',$item['h_name']);
 			$origin   = iconv('UTF-8','windows-1252',$item['h_origin']);
-			$amount   = floatval($item['h_amount']) * 1000;
-			$mass     = $amount;
+			$amount   = floatval($item['h_amount']);
+			$mass     = $amount * 1000;
 			$costkg   = floatval($item['h_cost']);
 			$time     = floatval($item['h_time']);
 			$alpha    = floatval($item['h_alpha']);
 
-			$cost = ($amount * $costkg) / 1000;
+			$cost = ($amount * $costkg);
 			$cost_hops += $cost;
 			$total_hops += $amount;
 
 			$moment = $hopuse[$item['h_useat']];
 			if ($item['h_useat'] == 2) {    // Boil
-				$moment   = "Kook@".$time;
+				$moment   = "Koken ".$time." min";
+			} else if ($item['h_useat'] == 5) {	// Dryhop
+				$moment   = 'Koudhop '.sprintf("%.0f", $time / 1440).' dagen';
 			}
 			$ibu = calc_IBU($item['h_useat'], $item['h_form'], $preboil_sg, floatval($row['batch_size']), $mass, $time, $alpha, $row['ibu_method']);
 			$total_ibus += $ibu;
 
-			$this->Cell($vul,5,$name,0,0,'L',true);
-			$this->Cell(35,5,$origin,0,0,'L',true);
-			$this->Cell(15,5,$hopform[$item['h_form']],0,0,'L',true);
-			$this->Cell(20,5,$moment,0,0,'L',true);
+			if ($amount > 1)
+				$amount = sprintf("%.3f",$amount).' kg';
+			else
+				$amount = sprintf("%.1f",$amount * 1000).' gr';
+
+			$this->Cell($vul,5,$name.' ('.$origin.')',0,0,'L',true);
 			$this->Cell(15,5,sprintf("%.1f%%",$alpha),0,0,'R',true);
 			$this->Cell(12,5,sprintf("%.1f",$ibu),0,0,'R',true);
-			$this->Cell(18,5,sprintf("%.1f",$amount),0,0,'R',true);
-			$this->Cell(20,5,sprintf("%8.3f",$cost).EURO,0,0,'R',true);
+			$this->Cell(25,5,$hopform[$item['h_form']],0,0,'L',true);
+			$this->Cell(30,5,$moment,0,0,'L',true);
+			$this->Cell(20,5,$amount,0,0,'R',true);
+			$this->Cell(20,5,sprintf("%.3f",$cost).EURO,0,0,'R',true);
 			$this->Ln();
 		}
 
 		$this->SetFillColor(210,245,255);
-		$this->Cell($vul+85,5,'',0,0,'L',false);
-		$this->Cell(12,5,sprintf("%.1f",$total_ibus),0,0,'R',true);
-		$this->Cell(18,5,sprintf("%.1f",$total_hops),0,0,'R',true);
-		$this->Cell(20,5,sprintf("%8.3f",$cost_hops).EURO,0,0,'R',true);
+		$this->Cell($vul+102,5,'',0,0,'L',false);
+		$this->Cell(20,5,sprintf("%.3f",$cost_hops).EURO,0,0,'R',true);
 		$this->ProcessingTable=false;
 		$this->cMargin=$cMargin;
 		$this->aCols=array();
@@ -262,15 +274,13 @@
 		global $svg;
 		$yeastform = array( 'Vloeibaar', 'Droog', 'Schuine buis', 'Slurry', 'Ingevroren', 'Depot' );
 		$yeastuse  = array( 'Hoofdgisting', 'Nagisting', 'Lagering', 'Bottelen' );
-		$vul = $this->w - $this->rMargin - $this->lMargin - 140;
+		$vul = $this->w - $this->rMargin - $this->lMargin - 110;
 		$this->Ln();
-		$this->AddCol(27,'Laboratorium','L');
-		$this->AddCol(18,'Product','L');
 		$this->AddCol($vul,'Gist','L');
-		$this->AddCol(20,'Gebruik','L');
 		$this->AddCol(15,'Attn','R');
-		$this->AddCol(22,'Vorm','L');
-		$this->AddCol(18,'Gram','R');
+		$this->AddCol(25,'Soort','L');
+		$this->AddCol(30,'Gebruik moment','L');
+		$this->AddCol(20,'Hoeveel','R');
 		$this->AddCol(20,'Prijs','R');
 
 		$cMargin=$this->cMargin;
@@ -300,29 +310,35 @@
 			else
 				$amount = sprintf("%.0f",floatval($item['y_amount'])*1000)." ml";
 
-			$this->Cell(27,5,$laboratory,0,0,'L',true);
-			$this->Cell(18,5,$product_id,0,0,'L',true);
-			$this->Cell($vul,5,$name,0,0,'L',true);
-			$this->Cell(20,5,$yeastuse[$item['y_use']],0,0,'L',true);
+			$this->Cell($vul,5,$laboratory.' '.$product_id.' ('.$name.')',0,0,'L',true);
 			$this->Cell(15,5,sprintf("%.1f%%",$attenuation),0,0,'R',true);
-			$this->Cell(22,5,$yeastform[$item['y_form']],0,0,'L',true);
-			$this->Cell(18,5,$amount,0,0,'R',true);
+			$this->Cell(25,5,$yeastform[$item['y_form']],0,0,'L',true);
+			$this->Cell(30,5,$yeastuse[$item['y_use']],0,0,'L',true);
+			$this->Cell(20,5,$amount,0,0,'R',true);
 			$this->Cell(20,5,sprintf("%8.3f",$cost).EURO,0,0,'R',true);
 			$this->Ln();
 		}
-		if ($row['starter_enable']) {
-			$v = floatval($row['prop1_volume']) + floatval($row['prop2_volume']) + floatval($row['prop3_volume']) + floatval($row['prop4_volume']);
-			if ($v) {
-				$this->Cell(45,5,'',0,0,'L',true);
-				$this->Cell($vul,5,"Giststarter ".sprintf("%.2f",$v)." liter",0,0,'L',true);
-				$this->Cell(20,5,"Tevoren",0,0,'L',true);
-				$this->Cell(75,5,'',0,0,'L',true);
-				$this->Ln();
-			}
+		if ($row['starter_enable'] && $row['prop1_volume']) {
+			$sv = 0;
+			$st = 0;
+        		for ($i = 1; $i < 5; $i++) {
+                		$pv = "prop".$i."_volume";
+                		if (floatval($row[$pv])) {
+					$st++;
+					if (floatval($row[$pv]) > $sv)
+                        			$sv = floatval($row[$pv]);
+                		}
+        		}
+			$this->Cell($vul,5,$st." staps giststarter",0,0,'L',true);
+			$this->Cell(40,5,'',0,0,'R',true);
+			$this->Cell(30,5,"Vooraf",0,0,'L',true);
+			$this->Cell(20,5,sprintf("%.2f",$sv)." L",0,0,'R',true);
+			$this->Cell(20,5,'',0,0,'R',true);
+			$this->Ln();
 		}
 
 		$this->SetFillColor(210,245,255);
-		$this->Cell($vul+120,5,'',0,0,'L',false);
+		$this->Cell($vul+90,5,'',0,0,'L',false);
 		$this->Cell(20,5,sprintf("%8.3f",$cost_yeasts).EURO,0,0,'R',true);
 		$this->ProcessingTable=false;
 		$this->cMargin=$cMargin;
@@ -334,14 +350,14 @@
 		global $cost_miscs;
 		$misctype = array( 'Specerij', 'Kruid', 'Smaakstof', 'Klaringsmiddel', 'Brouwzout', 'Gistvoeding', 'Anders' );
 		$miscuse  = array( 'Starter', 'Maischen', 'Koken', 'Hoofdvergisting', 'Nagisting/lagering', 'Bottelen' );
-		$vul = $this->w - $this->rMargin - $this->lMargin - 100;
+		$vul = $this->w - $this->rMargin - $this->lMargin - 95;
 		if ($this->GetY() > 200)
                         $this->AddPage();
                 else
                         $this->Ln();
 		$this->AddCol($vul,'Diversen naam','L');
-		$this->AddCol(30,'Soort','L');
-		$this->AddCol(30,'Gebruik','L');
+		$this->AddCol(25,'Soort','L');
+		$this->AddCol(30,'Gebruik moment','L');
 		$this->AddCol(20,'Hoeveel','R');
 		$this->AddCol(20,'Prijs','R');
 
@@ -382,7 +398,7 @@
 
 			$hoeveel = sprintf("%.2f %s",$amount,$aiw ? "gr":"ml");
 			$this->Cell($vul,5,$name,0,0,'L',true);
-			$this->Cell(30,5,$misctype[$type],0,0,'L',true);
+			$this->Cell(25,5,$misctype[$type],0,0,'L',true);
 			$this->Cell(30,5,$gebruik,0,0,'L',true);
 			$this->Cell(20,5,$hoeveel,0,0,'R',true);
 			$this->Cell(20,5,sprintf("%8.3f",$cost).EURO,0,0,'R',true);
@@ -390,7 +406,7 @@
 		}
 
 		$this->SetFillColor(210,245,255);
-		$this->Cell($vul+80,5,'',0,0,'L',false);
+		$this->Cell($vul+75,5,'',0,0,'L',false);
 		$this->Cell(20,5,sprintf("%8.3f",$cost_miscs).EURO,0,0,'R',true);
 
 		$this->ProcessingTable=false;
@@ -453,7 +469,76 @@
 		$this->Ln();
 	}
 
-	// Watercolor $this->SetFillColor(120,255,250);
+	function TableWaters($row) {
+
+		$vul = $this->w - $this->rMargin - $this->lMargin - 137;
+                if ($this->GetY() > 250)
+                        $this->AddPage();
+                else
+                        $this->Ln();
+                $this->AddCol($vul,'Water bron','L');
+                $this->AddCol(20,'Volume','R');
+                $this->AddCol(15,'Ca','R');
+                $this->AddCol(15,'Mg','R');
+                $this->AddCol(15,'Na','R');
+                $this->AddCol(15,'CaCO3','R');
+                $this->AddCol(15,'Cl','R');
+                $this->AddCol(15,'SO4','R');
+		$this->AddCol(15,'pH','R');
+
+		$cMargin=$this->cMargin;
+                $this->cMargin=2;
+                $this->TableX=$this->lMargin;
+                $this->TableHeader();
+                $this->ProcessingTable=true;
+
+                $this->SetFont('Helvetica','',9);
+                $this->SetFillColor(120, 255, 250);
+
+		$this->Cell($vul,5,$row['w1_name'],0,0,'L',true);
+                $this->Cell(20,5,sprintf("%.1f", $row['w1_amount']).' L',0,0,'R',true);
+		$this->Cell(15,5,sprintf("%.1f", $row['w1_calcium']),0,0,'R',true);
+		$this->Cell(15,5,sprintf("%.1f", $row['w1_magnesium']),0,0,'R',true);
+		$this->Cell(15,5,sprintf("%.1f", $row['w1_sodium']),0,0,'R',true);
+		$this->Cell(15,5,sprintf("%.1f", $row['w1_total_alkalinity']),0,0,'R',true);
+		$this->Cell(15,5,sprintf("%.1f", $row['w1_chloride']),0,0,'R',true);
+		$this->Cell(15,5,sprintf("%.1f", $row['w1_sulfate']),0,0,'R',true);
+		$this->Cell(15,5,sprintf("%.1f", $row['w1_ph']),0,0,'R',true);
+                $this->Ln();
+		$this->Cell($vul,5,$row['w2_name'],0,0,'L',true);
+                $this->Cell(20,5,sprintf("%.1f", $row['w2_amount']).' L',0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['w2_calcium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['w2_magnesium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['w2_sodium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['w2_total_alkalinity']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['w2_chloride']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['w2_sulfate']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['w2_ph']),0,0,'R',true);
+                $this->Ln();
+		$this->Cell($vul,5,'Gemengd water',0,0,'L',true);
+                $this->Cell(20,5,sprintf("%.1f", $row['wg_amount']).' L',0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wg_calcium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wg_magnesium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wg_sodium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wg_total_alkalinity']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wg_chloride']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wg_sulfate']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wg_ph']),0,0,'R',true);
+                $this->Ln();
+		$this->Cell($vul,5,'Behandeld water',0,0,'L',true);
+                $this->Cell(20,5,'',0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wb_calcium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wb_magnesium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wb_sodium']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wb_total_alkalinity']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wb_chloride']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wb_sulfate']),0,0,'R',true);
+                $this->Cell(15,5,sprintf("%.1f", $row['wb_ph']),0,0,'R',true);
+		$this->ProcessingTable=false;
+                $this->cMargin=$cMargin;
+                $this->aCols=array();
+                $this->Ln();
+	}
 
 	function TableSummary($row) {
 		global $pSugar;
@@ -718,10 +803,7 @@
 			$v = $msugars / $sugardensity + $mvol;
 			$plato = 1000 * $msugars / ($v * 10);	// deg. Plato
 			$mash_sg = plato_to_sg($plato);
-			$brix = $plato * $my_brix_correction;
-			$s = 'doel sg eind maischen: '.sprintf("%.3f",$mash_sg);
-			$s .= ' SG ('.sprintf("%.1f",$brix).' '.DEG.'Brix, '.sprintf("%.1f",$plato).' '.DEG.'P)';
-			$this->Checkline($s);
+			$this->Checkline('doel SG eind maischen: '.density_str($mash_sg));
 		}
 		if ($this->GetY() > 200)
 			$this->AddPage();
@@ -741,10 +823,7 @@
 		$s .= sprintf("%.1f",kettle_cm($row['boil_size'] * 1.04,$row['eq_kettle_volume'],$row['eq_kettle_height'])).' cm onder de rand)';
 		$this->Checkline($s);
 		$pre_sg = estimate_sg($msugars * floatval($row['efficiency']) / 100,floatval($row['boil_size']));
-		$plato = sg_to_plato($pre_sg);
-		$brix = $plato * $my_brix_correction;
-		$s = 'doel SG in kookketel: '.sprintf("%.3f",$pre_sg).' SG ('.sprintf("%.1f",$brix).' '.DEG.'Brix, '.sprintf("%.1f",$plato).' '.DEG.'P)';
-		$this->Checkline($s);
+		$this->Checkline('doel SG in kookketel: '.density_str($pre_sg));
 		$hops = json_decode($row['json_hops'], true);
 		foreach($hops as $item2) {
 			if ($item2['h_useat'] == 1) {
@@ -803,11 +882,7 @@
 		$s .= sprintf("%.1f",kettle_cm($row['batch_size']*1.04,$row['eq_kettle_volume'],$row['eq_kettle_height']));
 		$s .= ' cm onder de rand)';
 		$this->Checkline($s);
-		$plato = sg_to_plato($row['est_og']);
-		$brix = $plato * $my_brix_correction;
-		$s = 'doel SG einde koken: '.sprintf("%.3f",$row['est_og']).' SG (';
-		$s .= sprintf("%.1f",$brix).' '.DEG.'Brix, '.sprintf("%.1f",$plato).' '.DEG.'P)';
-		$this->Checkline($s);
+		$this->Checkline('doel SG einde koken: '.density_str($row['est_og']));
 		if ($this->GetY() > 200)
 			$this->AddPage();
 		else
@@ -934,37 +1009,13 @@
                 $this->Cell(50,5,$row['brew_date_end'],0,0,'L',true);
                 $this->Cell($vul,5,'',0,0,'L',false);
                 $this->Cell(35,5,'Maisch densiteit',0,0,'L',true);
-		$plato = sg_to_plato(floatval($row['brew_mash_sg']));
-                $brix = $plato * $my_brix_correction;
-                $this->Cell(50,5,sprintf("%.3f", floatval($row['brew_mash_sg']))." SG  ".sprintf("%.1f",$brix).DEG.'Brix  '.sprintf("%.1f",$plato).DEG.'P',0,0,'L',true);
+                $this->Cell(50,5,density_str(floatval($row['brew_mash_sg'])),0,0,'L',true);
                 $this->Ln();
 
-		$infuse = $mvol = floatval($row['w1_amount']) + floatval($row['w2_amount']);
-		$msugars = 0;
-		$bsugars = 0;
-		$mashkg = 0;
-		$ferms = json_decode($row['json_fermentables'], true);
-                foreach($ferms as $item) {
-                	if ($item['f_added'] == 0) {	// Mash
-                        	$msugars += floatval($item['f_amount']) * (floatval($item['f_yield']) / 100) * (1 - floatval($item['f_moisture']) / 100);
-                                $mvol += floatval($item['f_amount']) * floatval($item['f_moisture']) / 100;
-				$mashkg += floatval($item['f_amount']);
-                        }
-			if ($item['f_added'] == 1) {	// Boil
-				$bsugars += floatval($item['f_amount']) * (floatval($item['f_yield']) / 100) * (1 - floatval($item['f_moisture']) / 100);
-			}
-                }
-                $sugardensity = 1.611;
-                $v = $msugars / $sugardensity + $mvol;
-                $plato = 1000 * $msugars / ($v * 10);
-		if ($plato > 0.5)
-			$e = 100 * sg_to_plato(floatval($row['brew_mash_sg'])) / $plato;
-		else
-			$e = 0;
 		$this->SetX($this->TableX);
                 $this->Cell(85+$vul,5,'',0,0,'L',false);
                 $this->Cell(35,5,'Maisch rendement',0,0,'L',true);
-                $this->Cell(50,5,sprintf("%.1f", $e)."%",0,0,'L',true);
+                $this->Cell(50,5,sprintf("%.1f", floatval($row['brew_mash_efficiency']))."%",0,0,'L',true);
                 $this->Ln(7);
 
 		$this->SetX($this->TableX);
@@ -977,14 +1028,10 @@
 
 		$this->SetX($this->TableX);
                 $this->Cell(35,5,'Voor koken densiteit',0,0,'L',true);
-		$plato = sg_to_plato(floatval($row['brew_preboil_sg']));
-                $brix = $plato * $my_brix_correction;
-                $this->Cell(50,5,sprintf("%.3f", floatval($row['brew_preboil_sg']))." SG  ".sprintf("%.1f",$brix).DEG.'Brix  '.sprintf("%.1f",$plato).DEG.'P',0,0,'L',true);
+                $this->Cell(50,5,density_str(floatval($row['brew_preboil_sg'])),0,0,'L',true);
                 $this->Cell($vul,5,'',0,0,'L',false);
                 $this->Cell(35,5,'Na koken densiteit',0,0,'L',true);
-		$plato = sg_to_plato(floatval($row['brew_aboil_sg']));
-                $brix = $plato * $my_brix_correction;
-                $this->Cell(50,5,sprintf("%.3f", floatval($row['brew_aboil_sg']))." SG  ".sprintf("%.1f",$brix).DEG.'Brix  '.sprintf("%.1f",$plato).DEG.'P',0,0,'L',true);
+                $this->Cell(50,5,density_str(floatval($row['brew_aboil_sg'])),0,0,'L',true);
                 $this->Ln();
 
 		$this->SetX($this->TableX);
@@ -997,23 +1044,10 @@
 
 		$this->SetX($this->TableX);
                 $this->Cell(35,5,'Voor koken rendement',0,0,'L',true);
-		$tot = sg_to_plato(floatval($row['brew_preboil_sg'])) * (floatval($row['brew_preboil_volume']) / 1.04) * floatval($row['brew_preboil_sg']) * 10 / 1000;
-		$result = 0;
-		if ($msugars > 0)
-			$result = (($tot / $msugars * 100) * 10) / 10;
-		if ($result < 0)
-			$result = 0;
-                $this->Cell(50,5,sprintf("%.1f", $result)."%",0,0,'L',true);
+                $this->Cell(50,5,sprintf("%.1f", floatval($row['brew_preboil_efficiency']))."%",0,0,'L',true);
                 $this->Cell($vul,5,'',0,0,'L',false);
                 $this->Cell(35,5,'Na koken rendement',0,0,'L',true);
-		$tot = sg_to_plato(floatval($row['brew_aboil_sg'])) * (floatval($row['brew_aboil_volume']) / 1.04) * floatval($row['brew_aboil_sg']) * 10 / 1000;
-		$tot -= $bsugars;
-		$result = 0;
-		if ($msugars > 0)
-                        $result = (($tot / $msugars * 100) * 10) / 10;
-                if ($result < 0)
-                        $result = 0;
-                $this->Cell(50,5,sprintf("%.1f", $result)."%",0,0,'L',true);
+                $this->Cell(50,5,sprintf("%.1f", floatval($row['brew_aboil_efficiency']))."%",0,0,'L',true);
                 $this->Ln(7);
 
 		$coolingtype = array( '-', 'Dompelkoeler', 'Tegenstroomkoeler', 'Au bain marie', 'Laten afkoelen' );
@@ -1025,10 +1059,9 @@
                 $this->Cell(50,5,$coolingtype[$row['brew_cooling_method']],0,0,'L',true);
                 $this->Ln();
 
-		$spoelw = (floatval($row['boil_size']) - $infuse + ($mashkg * $my_grain_absorbtion) + floatval($row['eq_lauter_deadspace'])) * 1.03;
 		$this->SetX($this->TableX);
-                $this->Cell(35,5,'Spoelwater volume',0,0,'L',true);
-                $this->Cell(50,5,sprintf("%.1f", $spoelw).' liter',0,0,'L',true);
+                $this->Cell(35,5,'Spoelwater geschat',0,0,'L',true);
+                $this->Cell(50,5,sprintf("%.1f", floatval($row['brew_sparge_est'])).' liter',0,0,'L',true);
                 $this->Cell($vul,5,'',0,0,'L',false);
                 $this->Cell(35,5,'Koel temperatuur',0,0,'L',true);
                 $this->Cell(50,5,sprintf("%.1f", floatval($row['brew_cooling_to'])).DEG.'C',0,0,'L',true);
@@ -1071,7 +1104,7 @@
                 $this->Cell(50,5,sprintf("%.0f", $row['brew_whirlpool2']).' minuten',0,0,'L',true);
                 $this->Cell($vul,5,'',0,0,'L',false);
                 $this->Cell(35,5,'Densiteit in gistvat',0,0,'L',true);
-                $this->Cell(50,5,sprintf("%.3f", floatval($row['brew_fermenter_sg'])).' SG',0,0,'L',true);
+                $this->Cell(50,5,density_str(floatval($row['brew_fermenter_sg'])),0,0,'L',true);
                 $this->Ln(7);
 
 		$aerationtype = array( 'Geen', 'Lucht', 'Zuurstof' );
@@ -1134,6 +1167,7 @@
 $pdf->TableYeasts($row);
 $pdf->TableMiscs($row);
 $pdf->TableMashs($row);
+$pdf->TableWaters($row);
 $pdf->TableSummary($row);
 if (strlen($row['notes'])) {
 	if ($pdf->GetY() > 200)