diff --git a/Abrechnung/module.php b/Abrechnung/module.php
index 591341e..f015a5d 100644
--- a/Abrechnung/module.php
+++ b/Abrechnung/module.php
@@ -135,7 +135,7 @@ public function GenerateInvoices()
         $html = "
         <h2>Rechnung für {$user['name']}</h2>
         <p>{$user['address']}<br>{$user['city']}</p>
-        <table border='1' cellpadding='5'>
+    <table border='1' cellpadding='3' style='font-size:8px;'>
         <tr style='background-color:#e0e0e0;'>
             <th>Zähler</th>
             <th>Typ</th>
@@ -241,71 +241,62 @@ private function GetValueAt(int $varId, int $timestamp, bool $nearestAfter = fal
 
 private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
 {
-    $startValTotal = $this->GetValueAt($meter['var_consumption'], $from, false); // letzter Wert ≤ Start
-    $endValTotal   = $this->GetValueAt($meter['var_consumption'], $to,   true);  // erster Wert ≥ Ende
-
-    IPS_LogMessage('Abrechnung', "Meter {$meter['name']} ($type) von " . date('d.m.Y H:i', $from) . " bis " . date('d.m.Y H:i', $to) . ": start=$startValTotal, end=$endValTotal");
-
-    if ($startValTotal === null || $endValTotal === null) return ['row' => '', 'value' => 0];
-
-    $totalDiff = max(0, $endValTotal - $startValTotal);
-    if ($totalDiff <= 0) return ['row' => '', 'value' => 0];
-
     $rows = '';
     $totalCost = 0.0;
 
-    foreach ($tariffs as $t) {
-        if (strtolower($t['unit_type']) != strtolower($type)) continue;
+    $currentTime = $from;
+    $startValTotal = $this->GetValueAt($meter['var_consumption'], $from, false);
 
-        $tariffStart = strtotime($t['start']);
-        $tariffEnd   = strtotime($t['end']);
+    IPS_LogMessage('Abrechnung', "Starte Abrechnung für Meter {$meter['name']} ($type) von " . date('d.m.Y H:i', $from) . " bis " . date('d.m.Y H:i', $to));
 
-        // Überschneidung mit Abrechnungszeitraum
-        $sectionStart = max($from, $tariffStart);
-        $sectionEnd   = min($to, $tariffEnd);
-        if ($sectionEnd <= $sectionStart) continue;
+    while ($currentTime < $to) {
+        // 1. Tarif zum aktuellen Zeitpunkt ermitteln
+        $activeTariff = null;
+        foreach ($tariffs as $t) {
+            if (strtolower($t['unit_type']) != strtolower($type)) continue;
+            $tStart = strtotime($t['start']);
+            $tEnd   = strtotime($t['end']);
+            if ($currentTime >= $tStart && $currentTime < $tEnd) {
+                $activeTariff = $t;
+                break;
+            }
+        }
 
-        // Verbrauch anteilig
-        $sectionFraction = ($sectionEnd - $sectionStart) / ($to - $from);
-        $sectionDiff = $totalDiff * $sectionFraction;
+        if ($activeTariff === null) {
+            IPS_LogMessage('Abrechnung', "⚠ Kein aktiver Tarif gefunden für $type am " . date('d.m.Y H:i', $currentTime));
+            break; // Kein Tarif → Stop
+        }
 
-        // Start-/Endwert für diese Tarifzeit berechnen
-        $sectionStartVal = $startValTotal + $totalDiff * (($sectionStart - $from) / ($to - $from));
-        $sectionEndVal   = $sectionStartVal + $sectionDiff;
+        // 2. Zeitraum für diesen Tarif
+        $periodStart = $currentTime;
+        $periodEnd   = min($to, strtotime($activeTariff['end']));
 
-        $tariffRp = floatval($t['price']);
-        $costCHF  = ($tariffRp / 100) * $sectionDiff;
+        // 3. Zählerstände für diesen Zeitraum ermitteln
+        $startVal = ($periodStart == $from) ? $startValTotal : $this->GetValueAt($meter['var_consumption'], $periodStart, false);
+        $endVal   = $this->GetValueAt($meter['var_consumption'], $periodEnd, true);
 
+        $diff = max(0, $endVal - $startVal);
+        $tariffRp = floatval($activeTariff['price']);
+        $costCHF = ($tariffRp / 100) * $diff;
+
+        // 4. Zeile für PDF
         $rows .= "
         <tr>
             <td>{$meter['name']}</td>
             <td>$type</td>
-            <td>" . date('d.m.Y H:i', $sectionStart) . "</td>
-            <td>" . date('d.m.Y H:i', $sectionEnd) . "</td>
-            <td>" . number_format($sectionStartVal, 2) . "</td>
-            <td>" . number_format($sectionEndVal, 2) . "</td>
-            <td>" . number_format($sectionDiff, 2) . "</td>
+            <td>" . date('d.m.Y H:i', $periodStart) . "</td>
+            <td>" . date('d.m.Y H:i', $periodEnd) . "</td>
+            <td>" . number_format($startVal, 2) . "</td>
+            <td>" . number_format($endVal, 2) . "</td>
+            <td>" . number_format($diff, 2) . "</td>
             <td>" . number_format($tariffRp, 2) . "</td>
             <td>" . number_format($costCHF, 2) . "</td>
         </tr>";
 
         $totalCost += $costCHF;
-    }
 
-    // Fallback, falls kein Tarif passt
-    if ($rows === '') {
-        $rows .= "
-        <tr>
-            <td>{$meter['name']}</td>
-            <td>$type</td>
-            <td>" . date('d.m.Y H:i', $from) . "</td>
-            <td>" . date('d.m.Y H:i', $to) . "</td>
-            <td>" . number_format($startValTotal, 2) . "</td>
-            <td>" . number_format($endValTotal, 2) . "</td>
-            <td>" . number_format($totalDiff, 2) . "</td>
-            <td>0</td>
-            <td>0.00</td>
-        </tr>";
+        // 5. Zum nächsten Tarif springen
+        $currentTime = $periodEnd;
     }
 
     return ['row' => $rows, 'value' => $totalCost];
@@ -313,4 +304,5 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
 
 
 
+
 }
\ No newline at end of file