From cda68e73bd381d87732bbcd320e41b6129cd50c5 Mon Sep 17 00:00:00 2001 From: DanielHaefliger Date: Mon, 29 Jun 2026 19:18:16 +0200 Subject: [PATCH] no message --- Abrechnung/module.php | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/Abrechnung/module.php b/Abrechnung/module.php index 40aee87..d6fffa0 100644 --- a/Abrechnung/module.php +++ b/Abrechnung/module.php @@ -1605,16 +1605,14 @@ public function GenerateInvoices() $this->FormatCurrency($row['rev_zev'], false), $this->FormatCurrency($row['subtotal'], false) ]); - $this->PdfTableRow($pdf, [ - ['width' => 154, 'align' => 'R'], - ['width' => 26, 'align' => 'R'] - ], [ - 'Zwischentotal ' . $row['name'], - $this->FormatCurrency($row['subtotal'], false) - ], true, true); } $this->PdfTableRow($pdf, $amountColumns, [ - 'Zwischentotal Elektrizität', '', '', '', '', $this->FormatCurrency($result['sum'], false) + 'Zwischentotal Elektrizität', + $this->FormatCurrency($result['totals']['cost_solar'], false), + $this->FormatCurrency($result['totals']['cost_grid'], false), + $this->FormatCurrency($result['totals']['rev_feedin'], false), + $this->FormatCurrency($result['totals']['rev_zev'], false), + $this->FormatCurrency($result['sum'], false) ], true, true); } @@ -1646,13 +1644,6 @@ public function GenerateInvoices() number_format($row['tariff_price'], 3, '.', "'"), $this->FormatCurrency($row['cost'], false) ]); - $this->PdfTableRow($pdf, [ - ['width' => 158, 'align' => 'R'], - ['width' => 22, 'align' => 'R'] - ], [ - 'Zwischentotal ' . $row['name'], - $this->FormatCurrency($row['cost'], false) - ], true, true); } }