diff -r d3d8e3b30a34 -r 3f823bc205ca www/prod_print.php --- a/www/prod_print.php Tue Apr 13 16:55:25 2021 +0200 +++ b/www/prod_print.php Wed Apr 14 10:49:37 2021 +0200 @@ -653,8 +653,8 @@ $this->Cell(25,5,sprintf("%.1f",$row['est_abv']).'%',0,0,'L',true); $this->Cell(25,5,'('.sprintf("%.1f",$row['st_abv_min']).' - '.sprintf("%.1f",$row['st_abv_max']).'%)',0,0,'L',true); $this->Cell($vul,5,'',0,0,'L',false); - $this->Cell(35,5,'CO2',0,0,'L',true); - $this->Cell(25,5,sprintf("%.1f",$row['est_carb']).'%',0,0,'L',true); + $this->Cell(35,5,'Flessen CO2',0,0,'L',true); + $this->Cell(25,5,sprintf("%.1f",$row['bottle_carbonation']).'%',0,0,'L',true); $this->Cell(25,5,'('.sprintf("%.1f",$row['st_carb_min']).' - '.sprintf("%.1f",$row['st_carb_max']).'%)',0,0,'L',true); $this->Ln(); @@ -670,12 +670,16 @@ $this->SetTextColor(0); $this->SetFillColor(210,245,255); $this->Cell($vul,5,'',0,0,'L',false); + $this->Cell(35,5,'Fusten CO2',0,0,'L',true); + $this->Cell(25,5,sprintf("%.1f",$row['keg_carbonation']).'%',0,0,'L',true); + $this->Cell(25,5,'('.sprintf("%.1f",$row['st_carb_min']).' - '.sprintf("%.1f",$row['st_carb_max']).'%)',0,0,'L',true); + $this->Ln(); + + $this->SetX($this->TableX); $this->Cell(35,5,'Bitterheid ('.$ibumethod[$row['ibu_method']].')',0,0,'L',true); $this->Cell(25,5,sprintf("%.0f",$row['est_ibu']).' IBU',0,0,'L',true); $this->Cell(25,5,'('.$row['st_ibu_min'].' - '.$row['st_ibu_max'].' IBU)',0,0,'L',true); - $this->Ln(); - - $this->SetX($this->TableX); + $this->Cell($vul,5,'',0,0,'L',false); $cost_total = $cost_fermentables + $cost_hops + $cost_miscs + $cost_yeasts; $this->Cell(35,5,'Kosten',0,0,'L',true); $this->Cell(25,5,sprintf("%.2f",$cost_total).EURO,0,0,'L',true);