iobroker.utility-monitor 1.4.2 → 1.4.4

package/README.md

@@ -230,6 +230,22 @@ Der Adapter setzt Zähler automatisch zurück:
 
 ### **WORK IN PROGRESS**
 
+### 1.4.4 (2026-01-18)
+
+- **FIX:** 🐛 **lastYearStart Recalculation Bug** - Fixed incorrect month count in paidTotal:
+    - `lastYearStart` is now always recalculated from `contractStart` on adapter initialization
+    - Fixes cases where `lastYearStart` was set incorrectly (e.g., 01.01.2026 instead of contract date)
+    - Ensures `monthsSinceYearStart` is always calculated correctly based on actual contract date
+    - Resolves issue where `paidTotal` showed only 1 month payment instead of correct accumulated amount
+
+### 1.4.3 (2026-01-18)
+
+- **FIX:** 🐛 **Critical paidTotal Calculation Bug** - Fixed incorrect paidTotal after sensor updates:
+    - `paidTotal` was stored as string instead of timestamp, causing parsing errors in `updateCosts()`
+    - Changed `lastYearStart`, `lastMonthStart`, `lastDayStart` to store timestamps (number) instead of formatted strings
+    - Now correctly calculates `paidTotal = monthlyPayment × monthsSinceYearStart` for both adapter restart and sensor updates
+    - Backward compatible: existing string values auto-convert to timestamps on next update
+
 ### 1.4.2 (2026-01-18)
 
 - **FIX:** 🔧 **TypeScript Errors Resolved** - All TypeScript compilation errors fixed:
@@ -290,91 +306,6 @@ Der Adapter setzt Zähler automatisch zurück:
 - **IMPROVED:** 🔍 **Debug-Logging** - Hilfreiche Debug-Logs für Troubleshooting (nur in Debug-Modus sichtbar)
 - **CLEANUP:** 🧹 Repository aufgeräumt - Alte Backup-Dateien und temporäre Scripts entfernt
 
-### 1.3.5 (2026-01-11)
-
-- **NEW:** **Monatlicher Status-Bericht** - Optionaler monatlicher Bericht per Benachrichtigung.
-- **NEW:** Datenpunkte `statistics.lastDay` (Verbrauch gestern) für alle Typen und `lastDayVolume` (Gas) hinzugefügt.
-- **FIX:** **PV-Reset Bug** behoben (Tages- und Monatswerte wurden nicht zurückgesetzt).
-- **FIX:** Schema-Validierung für Preisfelder korrigiert (Fix für Kommastellen).
-- **FIX:** HT/NT-Anzeige korrigiert.
-- **IMPROVED:** **Admin-UI Info-Tab** komplett optimiert (Sauberes Markdown & Layout).
-- **IMPROVED:** Einheitliche Rundung berechneter Werte auf **2 Nachkommastellen** (daily, monthly, yearly).
-- **ROBUSTNESS:** ioBroker Bot Compliance Check (Grid-Attribute in Admin-UI vereinheitlicht).
-
-### 1.3.4 (2026-01-10)
-
-- **FIX:** Kritischer Fix: Kommastellen für Gebühren-Felder (Grundgebühr, Arbeitspreis) werden nun korrekt gespeichert (Erlaubt 4 Nachkommastellen).
-
-### 1.3.3 (2026-01-09)
-
-- **IMPROVED:** Konfigurations-Reihenfolge optimiert (Gebühren logisch gruppiert).
-- **NEW:** **PV-Benachrichtigungen** - Erhalte Erinnerungen auch für deine PV-Anlage (Abrechnung/Vertrag).
-
-### 1.3.2 (2026-01-09)
-
-- **NEW:** **PV / Einspeise-Unterstützung** ☀️ - Neuer Tab für Photovoltaik:
-    - Überwache deine Netzeinspeisung (kWh).
-    - Berechne deine Vergütung (Earnings) automatisch.
-    - Volle Unterstützung für Zählerstände, Abrechnungszeiträume und Historie.
-
-### 1.3.1 (2026-01-09)
-
-- **FIX:** Kritischer Fehler behoben: HT/NT-Datenpunkte wurden aufgrund eines internen Namensfehlers (electricity vs. strom) nicht angelegt.
-- **FIX:** Warnungen im Log "State ... has no existing object" beseitigt.
-
-### 1.3.0 (2026-01-09)
-
-- **NEW:** **Differenzierte Benachrichtigungen** - Zwei getrennte Erinnerungstypen:
-    - **Abrechnungsende**: Erinnerung zum Zählerstand ablesen (z.B. 7 Tage vorher).
-    - **Vertragswechsel**: Erinnerung zum Tarif-Check / Kündigen (z.B. 60 Tage vorher).
-- **NEW:** **Interaktives Benachrichtigungs-Feedback** - Der Test-Button zeigt nun direkt Erfolgs- oder Fehlermeldungen via Popup an (inkl. SMTP-Fehler vom Email-Adapter).
-- **NEW:** **Live-Test ohne Speichern** - Benachrichtigungen können jetzt sofort getestet werden, ohne die Konfiguration vorher speichern zu müssen.
-- **NEW:** **Modularer Code-Aufbau** - Umstellung auf eine moderne Architektur mit spezialisierten Managern für bessere Performance und Wartbarkeit.
-- **IMPROVED:** **Responsives Admin-UI** - Kompakteres Button-Design und optimierte Darstellung auf mobilen Geräten.
-- **FIX:** Redundante Volumen-Datenpunkte (`dailyVolume` etc.) für Strom und Wasser entfernt, um Log-Warnungen zu vermeiden.
-- **FIX:** Mandatory bot requirements (Changelog header, News cleanup).
-
-### 1.2.7 (2026-01-08)
-
-- **NEW:** Universelles Benachrichtigungssystem für Abrechnungszeitraum-Erinnerungen (Telegram, Pushover, Email, etc.)
-- **NEW:** Optionale PayPal-Unterstützung (Links in README und Config)
-- **FIX:** Dezimalstellen für Tagesverbrauch auf 3 erhöht (bessere Unterstützung für Sensoren mit kleinen Deltas wie Shelly)
-- **FIX:** Erlauben von leeren Preisen/Gebühren in der Konfiguration (verhindert Speicher-Fehler)
-
-### 1.2.6 (2026-01-08)
-
-- **FIX:** Erlaube leere Felder für Grundgebühr/Jahresgebühr/Abschlag in der Konfiguration (verhindert Speicher-Block im Admin-UI)
-
-### 1.2.5 (2026-01-08)
-
-- **NEW:** Transparente Anzeige des Vertragsbeginns bei jedem Adapter-Start im Log
-- **NEW:** Unterstützung für zusätzliche **Jahresgebühren** (z.B. Zählermiete)
-- **NEW:** Datenpunkt `costs.totalYearly` für die echten Gesamtkosten
-- **FIX:** Kritischer Fehler in der Verbrauchs-Delta-Berechnung behoben (v1.2.4)
-- **FIX:** Arbeitspreis-Anzeige bei Strom korrigiert
-- **FIX:** Gas m³ → kWh Umrechnung für Anpassungswerte
-- **FIX:** Korrekte Initialisierung des Vertragsjahres bei Neustart
-- **FIX:** Vereinheitlichung der Konfigurationsschlüssel (`wasserInitialReading`)
-- **ROBUSTNESS:** Schutz vor Datenverlust bei Adapter-Neustart (Zählerstand-Persistierung)
-- **ROBUSTNESS:** Integration von manuellen Anpassungen in die HT/NT-Kostenrechnung
-- **NEW:** Volle Unterstützung für **HT/NT-Tarife** für alle Energieträger (Strom, Gas, Wasser)
-- **NEW:** Automatische Archivierung von HT/NT-Verbräuchen und Kosten in der Historie
-- **DOCS:** Internationalisierung von Titel und Beschreibung
-
-### 1.2.2 (2026-01-08)
-
-- **NEW:** Manuelle Anpassung für Sensor-Abdrift-Korrektur
-- **NEW:** Abrechnungszeitraum-Management mit automatischer Archivierung
-- **NEW:** Unterstützung für zusätzliche **Jahresgebühren** (z.B. Zählermiete)
-- **NEW:** Datenpunkt `costs.totalYearly` für die echten Gesamtkosten
-- **FIX:** Arbeitspreis-Anzeige bei Strom korrigiert
-- **FIX:** Gas m³ → kWh Umrechnung für Anpassungswerte
-- **DOCS:** Internationalisierung von Titel und Beschreibung
-
----
-
-- Initial release
-
 ---
 
 ## License

package/admin/jsonConfig.json

@@ -1455,18 +1455,52 @@
                 }
             }
         },
+        "tabImport": {
+            "type": "panel",
+            "label": "📥 Import",
+            "items": {
+                "_importInfo": {
+                    "type": "header",
+                    "text": "CSV-Daten importieren",
+                    "size": 3
+                },
+                "_importLink": {
+                    "type": "staticLink",
+                    "label": "🚀 Import-Seite öffnen",
+                    "button": true,
+                    "variant": "contained",
+                    "color": "primary",
+                    "href": "/adapter/utility-monitor/tab-import.html",
+                    "target": "_blank",
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4
+                },
+                "_importDescription": {
+                    "type": "staticText",
+                    "text": "Klicke auf den Button oben, um die Import-Seite in einem neuen Tab zu öffnen. Dort kannst du CSV-Dateien mit historischen Zählerständen hochladen.",
+                    "newLine": true,
+                    "sm": 12,
+                    "style": {
+                        "fontSize": "0.9em",
+                        "color": "#666",
+                        "marginTop": "20px"
+                    }
+                }
+            }
+        },
         "tabInfo": {
             "type": "panel",
             "label": "ℹ️ Info & Hilfe",
             "items": {
                 "_infoHeader": {
                     "type": "header",
-                    "text": "Nebenkosten-Monitor",
+                    "text": "Utility Monitor",
                     "size": 3
                 },
                 "_infoVersion": {
                     "type": "staticText",
-                    "text": "**Version:** 1.4.0\n\n**Autor:** fischi87",
+                    "text": "**Version:** 1.4.4\n\n**Autor:** fischi87",
                     "sm": 12,
                     "xs": 12,
                     "md": 12,
@@ -1475,7 +1509,7 @@
                 },
                 "donation": {
                     "type": "staticText",
-                    "text": "☕ [PayPal Spenden](https://paypal.me/bigplay87) | 📁 [GitHub Repository](https://github.com/fischi87/ioBroker.nebenkosten-monitor)",
+                    "text": "☕ [PayPal Spenden](https://paypal.me/bigplay87) | 📁 [GitHub Repository](https://github.com/fischi87/ioBroker.utility-monitor)",
                     "xs": 12,
                     "sm": 12,
                     "md": 12,

package/admin/tab_m.html

@@ -0,0 +1,305 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" type="text/css" href="../../lib/css/materialize.css">
+    <link rel="stylesheet" type="text/css" href="../../css/adapter.css"/>
+    <script type="text/javascript" src="../../lib/js/jquery-3.2.1.min.js"></script>
+    <script type="text/javascript" src="../../socket.io/socket.io.js"></script>
+    <script type="text/javascript" src="../../js/adapter-settings.js"></script>
+    <style>
+        body {
+            padding: 20px;
+            background: transparent;
+        }
+        .import-container {
+            max-width: 800px;
+            margin: 0 auto;
+        }
+        .section {
+            margin-bottom: 30px;
+            padding: 20px;
+            border-radius: 4px;
+            background: var(--color-background-box, #fff);
+        }
+        .section h2 {
+            margin-top: 0;
+            font-size: 1.5em;
+            font-weight: 500;
+        }
+        .section h3 {
+            font-size: 1.2em;
+            font-weight: 500;
+            margin-bottom: 10px;
+        }
+        .help-text {
+            color: #666;
+            font-size: 0.9em;
+            margin-bottom: 15px;
+        }
+        .code-block {
+            background: #f5f5f5;
+            padding: 10px;
+            border-radius: 4px;
+            font-family: monospace;
+            white-space: pre;
+            margin: 10px 0;
+        }
+        .input-field {
+            margin-bottom: 20px;
+        }
+        .input-field label {
+            display: block;
+            margin-bottom: 5px;
+            font-weight: 500;
+        }
+        .input-field select,
+        .input-field input[type="file"] {
+            width: 100%;
+            padding: 8px;
+            border: 1px solid #ddd;
+            border-radius: 4px;
+        }
+        .btn {
+            padding: 10px 20px;
+            border: none;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 1em;
+            font-weight: 500;
+        }
+        .btn-primary {
+            background: #2196F3;
+            color: white;
+        }
+        .btn-primary:hover {
+            background: #1976D2;
+        }
+        .btn-primary:disabled {
+            background: #ccc;
+            cursor: not-allowed;
+        }
+        .message {
+            padding: 15px;
+            border-radius: 4px;
+            margin: 15px 0;
+            display: none;
+        }
+        .message.success {
+            background: #4CAF50;
+            color: white;
+        }
+        .message.error {
+            background: #f44336;
+            color: white;
+        }
+        .message.info {
+            background: #2196F3;
+            color: white;
+        }
+        .spinner {
+            display: none;
+            margin-left: 10px;
+        }
+    </style>
+</head>
+<body>
+    <div class="import-container">
+        <div class="section">
+            <h2>📥 CSV-Daten importieren</h2>
+            <p class="help-text">
+                Importiere historische Zählerstände aus einer CSV-Datei.
+                Die Daten werden unter <strong>history.csv</strong> gespeichert und überschreiben keine bestehenden Daten.
+            </p>
+        </div>
+
+        <div class="section">
+            <h3>CSV-Format</h3>
+            <p class="help-text">Erwartetes Format:</p>
+            <div class="code-block">Datum;Zaehlerstand
+01.01.2024;10250.5
+01.02.2024;10285.3
+01.03.2024;10320.8</div>
+            <ul class="help-text">
+                <li>Trennzeichen: Semikolon (<code>;</code>)</li>
+                <li>Dezimaltrennzeichen: Komma (<code>,</code>) oder Punkt (<code>.</code>)</li>
+                <li>Datumsformat: <code>DD.MM.YYYY</code> oder <code>DD.MM.YY</code></li>
+                <li>Der Verbrauch wird automatisch aus der Differenz berechnet</li>
+            </ul>
+        </div>
+
+        <div class="section">
+            <h3>Import durchführen</h3>
+
+            <div class="input-field">
+                <label for="medium">Medium auswählen:</label>
+                <select id="medium">
+                    <option value="">-- Bitte wählen --</option>
+                    <option value="gas">🔥 Gas</option>
+                    <option value="water">💧 Wasser</option>
+                    <option value="electricity">⚡ Strom</option>
+                    <option value="pv">☀️ PV</option>
+                </select>
+            </div>
+
+            <div class="input-field">
+                <label for="csvFile">CSV-Datei auswählen:</label>
+                <input type="file" id="csvFile" accept=".csv,.txt" />
+                <p class="help-text">Wähle eine CSV-Datei von deinem Computer aus (max. 1 MB)</p>
+            </div>
+
+            <button id="importBtn" class="btn btn-primary" disabled>
+                📤 CSV importieren
+                <span class="spinner">⏳</span>
+            </button>
+
+            <div id="message" class="message"></div>
+        </div>
+
+        <div class="section">
+            <h3>Nach dem Import</h3>
+            <p class="help-text">Die importierten Daten findest du unter:</p>
+            <ul class="help-text">
+                <li><code>{medium}.history.csv.{Jahr}.{Monat}.reading</code> - Zählerstand</li>
+                <li><code>{medium}.history.csv.{Jahr}.{Monat}.consumption</code> - Verbrauch</li>
+                <li><code>{medium}.history.csv.{Jahr}.{Monat}.date</code> - Ablesedatum</li>
+            </ul>
+        </div>
+    </div>
+
+    <script>
+        let socket;
+        let instance;
+
+        // Initialize socket connection
+        function initSocket() {
+            socket = io.connect('/', {
+                path: '/socket.io',
+                reconnection: true
+            });
+
+            socket.on('connect', function() {
+                console.log('Socket connected');
+
+                // Get instance number from URL
+                const match = window.location.search.match(/instance=(\d+)/);
+                instance = match ? parseInt(match[1]) : 0;
+                console.log('Instance:', instance);
+            });
+
+            socket.on('disconnect', function() {
+                console.log('Socket disconnected');
+            });
+        }
+
+        // Enable/disable import button based on form validity
+        function updateImportButton() {
+            const medium = $('#medium').val();
+            const file = $('#csvFile')[0].files[0];
+            $('#importBtn').prop('disabled', !medium || !file);
+        }
+
+        // Show message
+        function showMessage(text, type = 'info') {
+            const $msg = $('#message');
+            $msg.removeClass('success error info');
+            $msg.addClass(type);
+            $msg.text(text);
+            $msg.show();
+
+            if (type === 'success' || type === 'error') {
+                setTimeout(() => $msg.fadeOut(), 5000);
+            }
+        }
+
+        // Hide message
+        function hideMessage() {
+            $('#message').hide();
+        }
+
+        // Import CSV
+        function importCSV() {
+            const medium = $('#medium').val();
+            const file = $('#csvFile')[0].files[0];
+
+            if (!medium || !file) {
+                showMessage('Bitte Medium und Datei auswählen!', 'error');
+                return;
+            }
+
+            // Check file size (max 1 MB)
+            if (file.size > 1048576) {
+                showMessage('Datei ist zu groß! Maximum: 1 MB', 'error');
+                return;
+            }
+
+            // Show loading
+            $('#importBtn').prop('disabled', true);
+            $('.spinner').show();
+            showMessage('CSV wird importiert...', 'info');
+
+            // Read file
+            const reader = new FileReader();
+            reader.onload = function(e) {
+                const content = e.target.result;
+
+                console.log('Sending import request:', {
+                    medium: medium,
+                    fileLength: content.length
+                });
+
+                // Send to adapter
+                socket.emit('sendTo', 'utility-monitor.' + instance, 'importCSV', {
+                    medium: medium,
+                    file: content
+                }, function(result) {
+                    console.log('Import result:', result);
+
+                    $('#importBtn').prop('disabled', false);
+                    $('.spinner').hide();
+
+                    if (result.error) {
+                        showMessage('❌ Fehler: ' + result.error, 'error');
+                    } else if (result.success) {
+                        showMessage(
+                            `✅ Import erfolgreich! ${result.imported} von ${result.total} Einträgen importiert. ` +
+                            `Jahre: ${result.years.join(', ')}`,
+                            'success'
+                        );
+
+                        // Reset form
+                        $('#csvFile').val('');
+                        updateImportButton();
+                    } else {
+                        showMessage('❌ Unbekannter Fehler beim Import', 'error');
+                    }
+                });
+            };
+
+            reader.onerror = function() {
+                $('#importBtn').prop('disabled', false);
+                $('.spinner').hide();
+                showMessage('❌ Fehler beim Lesen der Datei', 'error');
+            };
+
+            reader.readAsText(file);
+        }
+
+        // Document ready
+        $(document).ready(function() {
+            console.log('Import page loaded');
+
+            // Initialize socket
+            initSocket();
+
+            // Event listeners
+            $('#medium').on('change', updateImportButton);
+            $('#csvFile').on('change', updateImportButton);
+            $('#importBtn').on('click', importCSV);
+
+            // Initial button state
+            updateImportButton();
+        });
+    </script>
+</body>
+</html>

package/io-package.json

@@ -1,8 +1,34 @@
 {
     "common": {
         "name": "utility-monitor",
-        "version": "1.4.2",
+        "version": "1.4.4",
         "news": {
+            "1.4.4": {
+                "en": "Fix: lastYearStart now always recalculated from contract date on adapter start - fixes wrong month count in paidTotal",
+                "de": "Fix: lastYearStart wird jetzt immer aus Vertragsbeginn neu berechnet - behebt falsche Monatszahl in paidTotal",
+                "ru": "Исправление: lastYearStart теперь всегда пересчитывается из даты договора при запуске - исправляет неправильный подсчет месяцев в paidTotal",
+                "pt": "Correção: lastYearStart agora sempre recalculado da data do contrato na inicialização - corrige contagem incorreta de meses em paidTotal",
+                "nl": "Fix: lastYearStart nu altijd herberekend vanaf contractdatum bij start - lost onjuiste maandtelling in paidTotal op",
+                "fr": "Correction: lastYearStart maintenant toujours recalculé à partir de la date du contrat au démarrage - corrige le comptage incorrect des mois dans paidTotal",
+                "it": "Correzione: lastYearStart ora sempre ricalcolato dalla data contratto all'avvio - corregge conteggio errato mesi in paidTotal",
+                "es": "Corrección: lastYearStart ahora siempre recalculado desde fecha contrato al iniciar - corrige recuento incorrecto meses en paidTotal",
+                "pl": "Naprawa: lastYearStart teraz zawsze przeliczany z daty umowy przy starcie - naprawia błędne liczenie miesięcy w paidTotal",
+                "uk": "Виправлення: lastYearStart тепер завжди перераховується з дати договору при запуску - виправляє неправильний підрахунок місяців у paidTotal",
+                "zh-cn": "修复：lastYearStart现在在启动时始终从合同日期重新计算 - 修复paidTotal中的错误月数计数"
+            },
+            "1.4.3": {
+                "en": "Fix: Critical paidTotal calculation bug - now correctly calculates (monthly payment × months) after sensor updates",
+                "de": "Fix: Kritischer paidTotal-Berechnungsfehler - berechnet jetzt korrekt (monatlicher Abschlag × Monate) nach Sensor-Updates",
+                "ru": "Исправление: Критическая ошибка расчета paidTotal - теперь правильно вычисляет (ежемесячный платеж × месяцы) после обновлений датчика",
+                "pt": "Correção: Bug crítico de cálculo paidTotal - agora calcula corretamente (pagamento mensal × meses) após atualizações do sensor",
+                "nl": "Fix: Kritieke paidTotal-berekeningsfout - berekent nu correct (maandelijkse betaling × maanden) na sensor-updates",
+                "fr": "Correction: Bug critique de calcul paidTotal - calcule maintenant correctement (paiement mensuel × mois) après les mises à jour du capteur",
+                "it": "Correzione: Bug critico calcolo paidTotal - ora calcola correttamente (pagamento mensile × mesi) dopo aggiornamenti sensore",
+                "es": "Corrección: Bug crítico de cálculo paidTotal - ahora calcula correctamente (pago mensual × meses) después de actualizaciones del sensor",
+                "pl": "Naprawa: Krytyczny błąd obliczania paidTotal - teraz poprawnie oblicza (płatność miesięczna × miesiące) po aktualizacjach czujnika",
+                "uk": "Виправлення: Критична помилка розрахунку paidTotal - тепер правильно обчислює (щомісячний платіж × місяці) після оновлень датчика",
+                "zh-cn": "修复：关键的paidTotal计算错误 - 现在在传感器更新后正确计算（月付款×月数）"
+            },
             "1.4.2": {
                 "en": "Fix: Critical multi-meter balance bug (hardcoded 12 months). Fix: TypeScript errors resolved. New: Enhanced input validation. New: Extended constants. New: Error handling wrapper.",
                 "de": "Fix: Kritischer Multi-Meter Balance-Bug (hardcodierte 12 Monate). Fix: TypeScript-Fehler behoben. Neu: Erweiterte Eingabevalidierung. Neu: Erweiterte Konstanten. Neu: Fehlerbehandlungs-Wrapper.",
@@ -41,45 +67,6 @@
                 "pl": "Nowe: Obsługa Wielu Liczników! Dodaj nieograniczoną liczbę niestandardowych liczników dla każdego typu mediów (gaz, woda, prąd). Automatyczne obliczanie sum. Pełna kompatybilność wsteczna.",
                 "uk": "Нове: Підтримка кількох лічильників! Додайте необмежену кількість власних лічильників для кожного типу комунальних послуг (газ, вода, електрика). Автоматичний розрахунок підсумків. Повна зворотна сумісність.",
                 "zh-cn": "新增：多表支持！为每种公用事业类型（燃气、水、电）添加无限的自定义计量表。自动总计计算。完全向后兼容。"
-            },
-            "1.3.5": {
-                "en": "New: Monthly Status Report. New: Added lastDay statistics. Fix: PV period reset bug. Fix: Schema validation for prices. Improved: Admin UI Info-Tab optimized. Improved: Consistent rounding (2 decimals). Improved: Bot compliance grid attributes.",
-                "de": "Neu: Monatlicher Status-Bericht. Neu: lastDay-Statistiken hinzugefügt. Fix: PV Perioden-Reset Fehler behoben. Fix: Schema-Validierung für Preisfelder. Verbessert: Admin-UI Info-Tab optimiert. Verbessert: Einheitliche Rundung (2 Stellen). Verbessert: Bot-Compliance Grid-Attribute.",
-                "ru": "Новое: Ежемесячный отчет о состоянии. Новое: Добавлена статистика lastDay. Исправление: Ошибка сброса периода PV. Исправление: Проверка схемы для цен. Улучшено: Оптимизирована вкладка информации Admin UI. Улучшено: Последовательное округление (2 знака). Улучшено: Атрибуты сетки соответствия ботов.",
-                "pt": "Novo: Relatório de Status Mensal. Novo: Adicionadas estatísticas lastDay. Correção: Bug de redefinição de período PV. Correção: Validação de esquema para preços. Melhorado: Guia de informações da Admin UI otimizada. Melhorado: Arredondamento consistente (2 decimais). Melhorado: Atributos de grade de conformidade do bot.",
-                "nl": "Nieuw: Maandelijks statusrapport. Nieuw: lastDay statistieken toegevoegd. Fix: PV periode reset bug. Fix: Schema validatie voor prijzen. Verbeterd: Admin UI Info-Tab geoptimaliseerd. Verbeterd: Consistente afronding (2 decimalen). Verbeterd: Bot compliance grid attributen.",
-                "fr": "Nouveau: Rapport d'état mensuel. Nouveau: Ajout de statistiques lastDay. Correction: Bug de réinitialisation de période PV. Correction: Validation de schéma pour les prix. Amélioré: Onglet d'informations Admin UI optimisé. Amélioré: Arrondi cohérent (2 décimales). Amélioré: Attributs de grille de conformité des bots.",
-                "it": "Nuovo: Rapporto di stato mensile. Nuovo: Aggiunte statistiche lastDay. Correzione: Bug di reset periodo PV. Correzione: Convalida dello schema per i prezzi. Migliorato: Scheda informazioni Admin UI ottimizzata. Migliorato: Arrotondamento coerente (2 decimali). Migliorato: Attributi griglia conformità bot.",
-                "es": "Nuevo: Informe de Estado Mensual. Nuevo: Agregadas estadísticas lastDay. Corrección: Error de reinicio de período PV. Corrección: Validación de esquema para precios. Mejorado: Pestaña de información de Admin UI optimizada. Mejorado: Redondeo consistente (2 decimales). Mejorado: Atributos de cuadrícula de cumplimiento de bots.",
-                "pl": "Nowe: Miesięczny raport statusu. Nowe: Dodano statystyki lastDay. Naprawa: Błąd resetowania okresu PV. Naprawa: Walidacja schematu dla cen. Ulepszone: Zoptymalizowana zakładka informacji Admin UI. Ulepszone: Spójne zaokrąglanie (2 miejsca dziesiętne). Ulepszone: Atrybuty siatki zgodności botów.",
-                "uk": "Нове: Щомісячний звіт про стан. Нове: Додано статистику lastDay. Виправлення: Помилка скидання періоду PV. Виправлення: Перевірка схеми для цін. Покращено: Оптимізовано вкладку інформації Admin UI. Покращено: Послідовне округлення (2 знаки). Покращено: Атрибути сітки відповідності ботів.",
-                "zh-cn": "新增：每月状态报告。新增：添加了lastDay统计信息。修复：PV周期重置错误。修复：价格架构验证。改进：优化了Admin UI信息选项卡。改进：一致的四舍五入（2位小数）。改进：机器人合规网格属性。"
-            },
-            "1.3.3": {
-                "en": "New: PV/Feed-in integration! Monitor your solar feed-in and earnings. New: Notifications for PV. Improved: Reorganized config UI.",
-                "de": "Neu: PV/Einspeise-Integration! Überwache deine Solareinspeisung und Vergütung. Neu: Benachrichtigungen für PV. Verbessert: Aufgeräumte Konfigurations-Oberfläche.",
-                "ru": "Новое: Интеграция PV/Feed-in! Отслеживайте свою солнечную подачу и доходы. Новое: Уведомления для PV. Улучшено: Реорганизован интерфейс конфигурации.",
-                "pt": "Novo: Integração PV/Feed-in! Monitore sua alimentação solar e ganhos. Novo: Notificações para PV. Melhorado: IU de configuração reorganizada.",
-                "nl": "Nieuw: PV/Feed-in integratie! Monitor je zonne-invoeding en inkomsten. Nieuw: Meldingen voor PV. Verbeterd: Gereorganiseerde configuratie-UI.",
-                "fr": "Nouveau: Intégration PV/Feed-in! Surveillez votre injection solaire et vos revenus. Nouveau: Notifications pour PV. Amélioré: Interface de configuration réorganisée.",
-                "it": "Nuovo: Integrazione PV/Feed-in! Monitora il tuo immissione solare e i guadagni. Nuovo: Notifiche per PV. Migliorato: IU di configurazione riorganizzata.",
-                "es": "Nuevo: Integración PV/Feed-in! Monitorea tu alimentación solar y ganancias. Nuevo: Notificaciones para PV. Mejorado: IU de configuración reorganizada.",
-                "pl": "Nowe: Integracja PV/Feed-in! Monitoruj swoje zasilanie słoneczne i zarobki. Nowe: Powiadomienia dla PV. Ulepszone: Zreorganizowany interfejs konfiguracji.",
-                "uk": "Нове: Інтеграція PV/Feed-in! Відстежуйте своє сонячне живлення та доходи. Нове: Сповіщення для PV. Покращено: Реорганізований інтерфейс конфігурації.",
-                "zh-cn": "新增：PV/Feed-in集成！监控您的太阳能馈入和收益。新增：PV通知。改进：重新组织的配置界面。"
-            },
-            "1.3.2": {
-                "en": "New: Initial support for PV integration.",
-                "de": "Neu: Erste Unterstützung für PV-Integration.",
-                "ru": "Новое: Начальная поддержка интеграции PV.",
-                "pt": "Novo: Suporte inicial para integração PV.",
-                "nl": "Nieuw: Initiële ondersteuning voor PV-integratie.",
-                "fr": "Nouveau: Support initial pour l'intégration PV.",
-                "it": "Nuovo: Supporto iniziale per l'integrazione PV.",
-                "es": "Nuevo: Soporte inicial para integración PV.",
-                "pl": "Nowe: Wstępne wsparcie dla integracji PV.",
-                "uk": "Нове: Початкова підтримка інтеграції PV.",
-                "zh-cn": "新增：PV集成的初始支持。"
             }
         },
         "titleLang": {

package/lib/billingManager.js

@@ -438,7 +438,7 @@ class BillingManager {
             const configType = this.adapter.consumptionManager.getConfigType(type);
             contractStartDate = this.adapter.config[`${configType}ContractStart`];
         } else {
-            contractStartDate = meter.config?.vertragsbeginn;
+            contractStartDate = meter.config?.contractStart;
         }
 
         if (!contractStartDate) {
@@ -587,7 +587,7 @@ class BillingManager {
                         contractStartDate = this.adapter.config[`${configType}ContractStart`];
                     } else {
                         // Additional meter: use meter's individual config
-                        contractStartDate = meter.config?.vertragsbeginn;
+                        contractStartDate = meter.config?.contractStart;
                     }
 
                     if (contractStartDate) {
@@ -665,6 +665,18 @@ class BillingManager {
                 await this.adapter.setStateAsync(`${basePath}.consumption.dailyVolume`, 0, true);
             }
 
+            // Reset HT/NT daily counters if enabled
+            const configType = this.adapter.consumptionManager.getConfigType(type);
+            const htNtEnabled = this.adapter.config[`${configType}HtNtEnabled`] || false;
+            if (htNtEnabled) {
+                const dailyHT = await this.adapter.getStateAsync(`${basePath}.consumption.dailyHT`);
+                const dailyNT = await this.adapter.getStateAsync(`${basePath}.consumption.dailyNT`);
+                await this.adapter.setStateAsync(`${basePath}.statistics.lastDayHT`, dailyHT?.val || 0, true);
+                await this.adapter.setStateAsync(`${basePath}.statistics.lastDayNT`, dailyNT?.val || 0, true);
+                await this.adapter.setStateAsync(`${basePath}.consumption.dailyHT`, 0, true);
+                await this.adapter.setStateAsync(`${basePath}.consumption.dailyNT`, 0, true);
+            }
+
             await this.adapter.setStateAsync(`${basePath}.costs.daily`, 0, true);
 
             // Update lastDayStart timestamp
@@ -715,6 +727,14 @@ class BillingManager {
                 await this.adapter.setStateAsync(`${basePath}.consumption.monthlyVolume`, 0, true);
             }
 
+            // Reset HT/NT monthly counters if enabled
+            const configType = this.adapter.consumptionManager.getConfigType(type);
+            const htNtEnabled = this.adapter.config[`${configType}HtNtEnabled`] || false;
+            if (htNtEnabled) {
+                await this.adapter.setStateAsync(`${basePath}.consumption.monthlyHT`, 0, true);
+                await this.adapter.setStateAsync(`${basePath}.consumption.monthlyNT`, 0, true);
+            }
+
             await this.adapter.setStateAsync(`${basePath}.costs.monthly`, 0, true);
 
             // Update lastMonthStart timestamp

package/lib/consumptionManager.js

@@ -244,7 +244,7 @@ class ConsumptionManager {
         const lastValue = this.lastSensorValues[sensorDP];
         this.lastSensorValues[sensorDP] = consumption;
 
-        if (lastValue === undefined || consumption <= lastValue) {
+        if (lastValue === undefined || consumption < lastValue) {
             if (lastValue !== undefined && consumption < lastValue) {
                 this.adapter.log.warn(
                     `${type}: Sensor value decreased (${lastValue} -> ${consumption}). Assuming meter reset or replacement.`,

package/lib/importManager.js

@@ -0,0 +1,344 @@
+/**
+ * ImportHandler - Handles CSV import of historical meter readings
+ *
+ * Features:
+ * - Parse CSV files with date and meter readings
+ * - Automatically calculate consumption from reading differences
+ * - Create states under history.csv.{year}.{month}
+ * - Support for all utility types (gas, water, electricity, pv)
+ */
+
+class ImportManager {
+    constructor(adapter, calculator) {
+        this.adapter = adapter;
+        this.calculator = calculator;
+
+        this.monthNames = [
+            'january', 'february', 'march', 'april', 'may', 'june',
+            'july', 'august', 'september', 'october', 'november', 'december'
+        ];
+    }
+
+    /**
+     * Main entry point for CSV import
+     * @param {string} medium - Utility type (gas, water, electricity, pv)
+     * @param {string} content - CSV file content
+     * @returns {Promise<object>} Import result
+     */
+    async importCSV(medium, content) {
+        try {
+            this.adapter.log.info(`Starting CSV import for ${medium}...`);
+
+            // Validate medium
+            if (!['gas', 'water', 'electricity', 'pv'].includes(medium)) {
+                throw new Error(`Ungültiges Medium: ${medium}`);
+            }
+
+            // Parse CSV
+            const entries = this.parseCSV(content);
+
+            if (entries.length === 0) {
+                throw new Error('Keine gültigen Einträge in der CSV gefunden');
+            }
+
+            this.adapter.log.info(`Parsed ${entries.length} entries from CSV`);
+
+            // Group by year and month
+            const grouped = this.groupByYearMonth(entries);
+
+            // Create states
+            const importedCount = await this.createStates(medium, grouped);
+
+            this.adapter.log.info(`✅ Import erfolgreich: ${importedCount} Einträge importiert`);
+
+            return {
+                success: true,
+                imported: importedCount,
+                total: entries.length,
+                years: Object.keys(grouped)
+            };
+
+        } catch (error) {
+            this.adapter.log.error(`CSV Import Fehler: ${error.message}`);
+            throw error;
+        }
+    }
+
+    /**
+     * Parse CSV content
+     * Expected format:
+     * Datum;Zaehlerstand
+     * 01.01.2024;10250.5
+     * 01.02.2024;10285.3
+     *
+     * Also supports comma as decimal separator: 10250,5
+     */
+    parseCSV(content) {
+        const lines = content.trim().split('\n');
+
+        if (lines.length < 2) {
+            throw new Error('CSV muss mindestens 2 Zeilen haben (Header + Daten)');
+        }
+
+        // Parse header
+        const header = lines[0].toLowerCase().split(';').map(h => h.trim());
+        const dateIndex = header.findIndex(h => h === 'datum' || h === 'date');
+        const readingIndex = header.findIndex(h =>
+            h === 'zaehlerstand' || h === 'zählerstand' || h === 'reading' || h === 'stand'
+        );
+
+        if (dateIndex === -1) {
+            throw new Error('CSV muss eine "Datum" Spalte enthalten');
+        }
+        if (readingIndex === -1) {
+            throw new Error('CSV muss eine "Zaehlerstand" Spalte enthalten');
+        }
+
+        const entries = [];
+        const errors = [];
+
+        for (let i = 1; i < lines.length; i++) {
+            const lineNum = i + 1;
+            const line = lines[i].trim();
+
+            if (!line) continue; // Skip empty lines
+
+            const values = line.split(';').map(v => v.trim());
+
+            if (values.length < Math.max(dateIndex, readingIndex) + 1) {
+                errors.push(`Zeile ${lineNum}: Nicht genügend Spalten`);
+                continue;
+            }
+
+            const dateStr = values[dateIndex];
+            const readingStr = values[readingIndex];
+
+            if (!dateStr || !readingStr) {
+                errors.push(`Zeile ${lineNum}: Datum oder Zählerstand fehlt`);
+                continue;
+            }
+
+            // Parse date (supports DD.MM.YYYY, DD.MM.YY, YYYY-MM-DD)
+            const date = this.parseDate(dateStr);
+            if (!date || isNaN(date.getTime())) {
+                errors.push(`Zeile ${lineNum}: Ungültiges Datum: ${dateStr}`);
+                continue;
+            }
+
+            // Parse reading (supports both , and . as decimal separator)
+            const reading = this.parseNumber(readingStr);
+            if (isNaN(reading) || reading < 0) {
+                errors.push(`Zeile ${lineNum}: Ungültiger Zählerstand: ${readingStr}`);
+                continue;
+            }
+
+            entries.push({ date, reading, line: lineNum });
+        }
+
+        // Log errors if any
+        if (errors.length > 0) {
+            this.adapter.log.warn(`Import-Warnungen:\n${errors.join('\n')}`);
+        }
+
+        // Sort by date (oldest first)
+        entries.sort((a, b) => a.date.getTime() - b.date.getTime());
+
+        return entries;
+    }
+
+    /**
+     * Parse date string (supports multiple formats)
+     */
+    parseDate(dateStr) {
+        // Try German format first (DD.MM.YYYY or DD.MM.YY)
+        const germanMatch = dateStr.match(/^(\d{1,2})\.(\d{1,2})\.(\d{2,4})$/);
+        if (germanMatch) {
+            let day = parseInt(germanMatch[1]);
+            let month = parseInt(germanMatch[2]) - 1; // 0-indexed
+            let year = parseInt(germanMatch[3]);
+
+            // Handle 2-digit year
+            if (year < 100) {
+                year += year < 50 ? 2000 : 1900;
+            }
+
+            const date = new Date(year, month, day, 12, 0, 0);
+            return date;
+        }
+
+        // Try ISO format (YYYY-MM-DD)
+        const isoMatch = dateStr.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+        if (isoMatch) {
+            const year = parseInt(isoMatch[1]);
+            const month = parseInt(isoMatch[2]) - 1;
+            const day = parseInt(isoMatch[3]);
+            return new Date(year, month, day, 12, 0, 0);
+        }
+
+        return null;
+    }
+
+    /**
+     * Parse number (supports comma and dot as decimal separator)
+     */
+    parseNumber(str) {
+        // Replace comma with dot
+        const normalized = str.replace(',', '.');
+        return parseFloat(normalized);
+    }
+
+    /**
+     * Group entries by year and month, calculate consumption
+     */
+    groupByYearMonth(entries) {
+        const grouped = {};
+        let previousReading = null;
+
+        for (const entry of entries) {
+            const year = entry.date.getFullYear();
+            const month = entry.date.getMonth();
+            const monthName = this.monthNames[month];
+
+            if (!grouped[year]) {
+                grouped[year] = {};
+            }
+
+            // Calculate consumption (difference to previous reading)
+            const consumption = previousReading !== null ?
+                entry.reading - previousReading : null;
+
+            grouped[year][monthName] = {
+                date: entry.date,
+                reading: entry.reading,
+                consumption: consumption,
+                sourceLine: entry.line
+            };
+
+            previousReading = entry.reading;
+        }
+
+        return grouped;
+    }
+
+    /**
+     * Create states for imported data
+     */
+    async createStates(medium, grouped) {
+        let count = 0;
+
+        // Determine unit based on medium
+        const unit = this.getUnit(medium);
+
+        for (const [year, months] of Object.entries(grouped)) {
+            for (const [monthName, data] of Object.entries(months)) {
+                const basePath = `${medium}.history.csv.${year}.${monthName}`;
+
+                // Create reading state
+                await this.adapter.setObjectNotExistsAsync(`${basePath}.reading`, {
+                    type: 'state',
+                    common: {
+                        name: {
+                            en: `Meter Reading ${monthName} ${year}`,
+                            de: `Zählerstand ${monthName} ${year}`,
+                            ru: `Показание счетчика ${monthName} ${year}`,
+                            pt: `Leitura do Medidor ${monthName} ${year}`,
+                            nl: `Meterstand ${monthName} ${year}`,
+                            fr: `Relevé du Compteur ${monthName} ${year}`,
+                            it: `Lettura Contatore ${monthName} ${year}`,
+                            es: `Lectura del Medidor ${monthName} ${year}`,
+                            pl: `Odczyt Licznika ${monthName} ${year}`,
+                            uk: `Показник лічильника ${monthName} ${year}`,
+                            'zh-cn': `仪表读数 ${monthName} ${year}`
+                        },
+                        type: 'number',
+                        role: 'value',
+                        read: true,
+                        write: false,
+                        unit: unit
+                    },
+                    native: {}
+                });
+                await this.adapter.setStateAsync(`${basePath}.reading`, data.reading, true);
+
+                // Create date state
+                await this.adapter.setObjectNotExistsAsync(`${basePath}.date`, {
+                    type: 'state',
+                    common: {
+                        name: {
+                            en: `Date ${monthName} ${year}`,
+                            de: `Datum ${monthName} ${year}`,
+                            ru: `Дата ${monthName} ${year}`,
+                            pt: `Data ${monthName} ${year}`,
+                            nl: `Datum ${monthName} ${year}`,
+                            fr: `Date ${monthName} ${year}`,
+                            it: `Data ${monthName} ${year}`,
+                            es: `Fecha ${monthName} ${year}`,
+                            pl: `Data ${monthName} ${year}`,
+                            uk: `Дата ${monthName} ${year}`,
+                            'zh-cn': `日期 ${monthName} ${year}`
+                        },
+                        type: 'string',
+                        role: 'date',
+                        read: true,
+                        write: false
+                    },
+                    native: {}
+                });
+                await this.adapter.setStateAsync(`${basePath}.date`,
+                    this.calculator.formatDateString(data.date), true);
+
+                // Create consumption state (if calculable)
+                if (data.consumption !== null) {
+                    await this.adapter.setObjectNotExistsAsync(`${basePath}.consumption`, {
+                        type: 'state',
+                        common: {
+                            name: {
+                                en: `Consumption ${monthName} ${year}`,
+                                de: `Verbrauch ${monthName} ${year}`,
+                                ru: `Потребление ${monthName} ${year}`,
+                                pt: `Consumo ${monthName} ${year}`,
+                                nl: `Verbruik ${monthName} ${year}`,
+                                fr: `Consommation ${monthName} ${year}`,
+                                it: `Consumo ${monthName} ${year}`,
+                                es: `Consumo ${monthName} ${year}`,
+                                pl: `Zużycie ${monthName} ${year}`,
+                                uk: `Споживання ${monthName} ${year}`,
+                                'zh-cn': `消费 ${monthName} ${year}`
+                            },
+                            type: 'number',
+                            role: 'value',
+                            read: true,
+                            write: false,
+                            unit: unit
+                        },
+                        native: {}
+                    });
+                    await this.adapter.setStateAsync(`${basePath}.consumption`,
+                        this.calculator.round(data.consumption, 2), true);
+                }
+
+                count++;
+            }
+        }
+
+        return count;
+    }
+
+    /**
+     * Get unit for medium
+     */
+    getUnit(medium) {
+        switch (medium) {
+            case 'gas':
+            case 'water':
+                return 'm³';
+            case 'electricity':
+            case 'pv':
+                return 'kWh';
+            default:
+                return '';
+        }
+    }
+}
+
+module.exports = ImportManager;

package/lib/messagingHandler.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const ImportManager = require('./importManager');
+
 /**
  * MessagingHandler handles all incoming adapter messages
  * and outgoing notifications.
@@ -10,6 +12,7 @@ class MessagingHandler {
      */
     constructor(adapter) {
         this.adapter = adapter;
+        this.importManager = null; // Lazy initialization
     }
 
     /**
@@ -136,6 +139,65 @@ class MessagingHandler {
                     );
                 }
             }
+        } else if (obj.command === 'importCSV') {
+            this.adapter.log.info(`[importCSV] Received import request`);
+
+            try {
+                // Lazy initialize importManager
+                if (!this.importManager) {
+                    const calculator = this.adapter.consumptionManager.calculator;
+                    this.importManager = new ImportManager(this.adapter, calculator);
+                }
+
+                // Extract data from obj.message, obj directly, or config (fallback)
+                // jsonConfig sometimes doesn't resolve ${data.xxx} variables in sendTo buttons
+                let medium = obj.message?.medium || obj.medium || this.adapter.config.importMedium;
+                let file = obj.message?.file || obj.file || this.adapter.config.importFileContent;
+
+                // Handle unresolved placeholders
+                if (medium && medium.includes('${data.')) {
+                    medium = this.adapter.config.importMedium;
+                }
+                if (file && file.includes('${data.')) {
+                    file = this.adapter.config.importFileContent;
+                }
+
+                this.adapter.log.debug(`[importCSV] Medium: ${medium}, File length: ${file?.length || 0}`);
+
+                if (!medium || !file) {
+                    this.adapter.sendTo(
+                        obj.from,
+                        obj.command,
+                        { error: 'Bitte Medium auswählen, CSV-Inhalt einfügen und dann SPEICHERN klicken, bevor du importierst!' },
+                        obj.callback,
+                    );
+                    return;
+                }
+
+                // File comes as data URL (data:text/csv;base64,...)
+                let content;
+                if (file.includes('base64,')) {
+                    // Extract base64 content
+                    const base64Content = file.split('base64,')[1];
+                    content = Buffer.from(base64Content, 'base64').toString('utf-8');
+                } else {
+                    // Plain text
+                    content = file;
+                }
+
+                // Import the CSV
+                const result = await this.importManager.importCSV(medium, content);
+
+                this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+            } catch (error) {
+                this.adapter.log.error(`[importCSV] Error: ${error.message}`);
+                this.adapter.sendTo(
+                    obj.from,
+                    obj.command,
+                    { error: error.message },
+                    obj.callback,
+                );
+            }
         } else {
             this.adapter.log.warn(`[onMessage] Unknown command: ${obj.command}`);
             if (obj.callback) {

package/lib/multiMeterManager.js

@@ -221,43 +221,46 @@ class MultiMeterManager {
         }
 
         // Initialize period start timestamps
-        const nowIso = calculator.formatDateString(new Date());
         const timestampRoles = ['lastDayStart', 'lastMonthStart', 'lastYearStart'];
 
         for (const role of timestampRoles) {
             const statePath = `${basePath}.statistics.${role}`;
             const state = await this.adapter.getStateAsync(statePath);
 
-            if (!state || !state.val || typeof state.val === 'number') {
-                if (role === 'lastYearStart' && (!state || !state.val)) {
-                    const contractStart = calculator.parseGermanDate(config.contractStart);
-                    let yearStartDate;
-
-                    if (contractStart && !isNaN(contractStart.getTime())) {
-                        const now = new Date();
-                        yearStartDate = new Date(
-                            now.getFullYear(),
-                            contractStart.getMonth(),
-                            contractStart.getDate(),
-                            12,
-                            0,
-                            0,
-                        );
-
-                        if (yearStartDate > now) {
-                            yearStartDate.setFullYear(now.getFullYear() - 1);
-                        }
-                    }
+            if (role === 'lastYearStart') {
+                // Calculate expected yearStart based on contract
+                const contractStart = calculator.parseGermanDate(config.contractStart);
+                let expectedYearStart;
+
+                if (contractStart && !isNaN(contractStart.getTime())) {
+                    const now = new Date();
+                    expectedYearStart = new Date(
+                        now.getFullYear(),
+                        contractStart.getMonth(),
+                        contractStart.getDate(),
+                        12,
+                        0,
+                        0,
+                    );
 
-                    if (!yearStartDate) {
-                        yearStartDate = new Date(new Date().getFullYear(), 0, 1, 12, 0, 0);
+                    if (expectedYearStart > now) {
+                        expectedYearStart.setFullYear(now.getFullYear() - 1);
                     }
-                    await this.adapter.setStateAsync(statePath, calculator.formatDateString(yearStartDate), true);
-                } else if (typeof state?.val === 'number') {
-                    await this.adapter.setStateAsync(statePath, calculator.formatDateString(new Date(state.val)), true);
-                } else {
-                    await this.adapter.setStateAsync(statePath, nowIso, true);
                 }
+
+                if (!expectedYearStart) {
+                    expectedYearStart = new Date(new Date().getFullYear(), 0, 1, 12, 0, 0);
+                }
+
+                // Always set to expected value (fixes mismatches from config changes)
+                await this.adapter.setStateAsync(statePath, expectedYearStart.getTime(), true);
+            } else {
+                // For lastDayStart and lastMonthStart
+                if (!state || !state.val || typeof state.val === 'string') {
+                    // Initialize with current timestamp (convert string to number if needed)
+                    await this.adapter.setStateAsync(statePath, Date.now(), true);
+                }
+                // If already a valid number, no action needed (already correct in state)
             }
         }
 
@@ -553,8 +556,9 @@ class MultiMeterManager {
         let annualFeeAccumulated = 0;
 
         if (yearStartState && yearStartState.val) {
-            const yearStartDate = calculator.parseDateString(yearStartState.val);
-            if (yearStartDate && !isNaN(yearStartDate.getTime())) {
+            // yearStartState.val is a timestamp (number)
+            const yearStartDate = new Date(yearStartState.val);
+            if (!isNaN(yearStartDate.getTime())) {
                 const now = new Date();
                 const yearStartTime = yearStartDate.getTime();
                 const nowTime = now.getTime();
@@ -572,8 +576,9 @@ class MultiMeterManager {
 
         // Calculate balance and total yearly costs
         if (yearStartState && yearStartState.val) {
-            const yearStartDate = calculator.parseDateString(yearStartState.val);
-            if (yearStartDate && !isNaN(yearStartDate.getTime())) {
+            // yearStartState.val is a timestamp (number)
+            const yearStartDate = new Date(yearStartState.val);
+            if (!isNaN(yearStartDate.getTime())) {
                 const now = new Date();
                 // Calculate paid total based on started months (not just completed months)
                 // If current month has started, count it as paid

package/lib/stateManager.js

@@ -718,6 +718,37 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
         native: {},
     });
 
+    // HT/NT lastDay states - only create if HT/NT tariff is enabled
+    if (_config[htNtEnabledKey]) {
+        await adapter.setObjectNotExistsAsync(`${type}.statistics.lastDayHT`, {
+            type: 'state',
+            common: {
+                name: `Verbrauch gestern HT (${label.unit})`,
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: label.unit,
+                def: 0,
+            },
+            native: {},
+        });
+
+        await adapter.setObjectNotExistsAsync(`${type}.statistics.lastDayNT`, {
+            type: 'state',
+            common: {
+                name: `Verbrauch gestern NT (${label.unit})`,
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: label.unit,
+                def: 0,
+            },
+            native: {},
+        });
+    }
+
     if (type === 'gas') {
         await adapter.setObjectNotExistsAsync(`${type}.statistics.lastDayVolume`, {
             type: 'state',

package/main.js

@@ -1,7 +1,7 @@
 'use strict';
 
 /*
- * ioBroker Nebenkosten-Monitor Adapter
+ * ioBroker Utility Monitor Adapter
  * Monitors gas, water, and electricity consumption with cost calculation
  */
 
@@ -11,14 +11,14 @@ const BillingManager = require('./lib/billingManager');
 const MessagingHandler = require('./lib/messagingHandler');
 const MultiMeterManager = require('./lib/multiMeterManager');
 
-class NebenkostenMonitor extends utils.Adapter {
+class UtilityMonitor extends utils.Adapter {
     /**
      * @param {Partial<utils.AdapterOptions>} [options] - Adapter options
      */
     constructor(options) {
         super({
             ...options,
-            name: 'nebenkosten-monitor',
+            name: 'utility-monitor',
         });
         this.on('ready', this.onReady.bind(this));
         this.on('stateChange', this.onStateChange.bind(this));
@@ -290,8 +290,8 @@ if (require.main !== module) {
     /**
      * @param {Partial<utils.AdapterOptions>} [options] - Adapter options
      */
-    module.exports = options => new NebenkostenMonitor(options);
+    module.exports = options => new UtilityMonitor(options);
 } else {
     // otherwise start the instance directly
-    new NebenkostenMonitor();
+    new UtilityMonitor();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.utility-monitor",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Monitor gas, water, and electricity consumption with cost calculation",
   "author": {
     "name": "fischi87",