iobroker.utility-monitor 1.4.5 → 1.4.6

package/README.md

@@ -61,10 +61,55 @@ Gefällt dir dieser Adapter? Du kannst mich gerne mit einem Kaffee unterstützen
 
 ---
 
+## ⚠️ Breaking Changes in Version 1.4.6
+
+**WICHTIG:** Version 1.4.6 ändert die State-Struktur grundlegend!
+
+### Was hat sich geändert?
+
+**Vorher (bis 1.4.5):**
+```
+gas.consumption.daily
+gas.costs.monthly
+wasser.consumption.daily
+```
+
+**Jetzt (ab 1.4.6):**
+```
+gas.main.consumption.daily          ← Hauptzähler mit Namen "main"
+gas.main.costs.monthly
+wasser.main.consumption.daily
+```
+
+### 🔧 Migration erforderlich
+
+1. **Config öffnen**: Neue Felder "Name des Hauptzählers" für Gas/Wasser/Strom/PV
+2. **Namen eingeben**: Standard ist "main" (empfohlen), oder eigener Name wie "wohnung", "haus"
+3. **Skripte anpassen**: Alle Verweise auf States müssen angepasst werden
+   ```javascript
+   // Alt:
+   getState('utility-monitor.0.gas.consumption.daily')
+
+   // Neu:
+   getState('utility-monitor.0.gas.main.consumption.daily')
+   ```
+4. **Visualisierungen updaten**: VIS, Grafana, etc. auf neue Pfade anpassen
+
+### 💡 Warum diese Änderung?
+
+- **Konsistenz**: Alle Zähler (Haupt + Zusätzlich) verwenden jetzt die gleiche Struktur
+- **Flexibilität**: Hauptzähler kann jetzt frei benannt werden (z.B. "erdgeschoss", "gesamt")
+- **Klarheit**: Keine Special-Case Logik mehr im Code
+- **Multi-Meter**: Bessere Unterstützung für mehrere Zähler pro Typ
+
+---
+
 ## 📊 Datenpunkte erklärt
 
 Für jede aktivierte Verbrauchsart (Gas/Wasser/Strom/PV) werden folgende Ordner angelegt:
 
+**Wichtig:** Seit Version 1.4.6 beinhalten alle Pfade den Zähler-Namen (z.B. `gas.main.*` statt `gas.*`)
+
 ### 🗂️ **consumption** (Verbrauch)
 
 | Datenpunkt      | Beschreibung                                          | Beispiel         |
@@ -229,6 +274,33 @@ Der Adapter setzt Zähler automatisch zurück:
 
 ## Changelog
 
+### 1.4.6 (2026-01-20)
+
+- **⚠️ BREAKING CHANGE:** 🔄 **Main Meter Naming** - Hauptzähler benötigt jetzt einen Namen:
+    - **State-Pfade geändert**: `gas.*` → `gas.METER_NAME.*` (z.B. `gas.main.*`)
+    - **Neue Config-Felder**: "Name des Hauptzählers" für Gas/Wasser/Strom/PV
+    - **Default-Name**: "main" (wird automatisch verwendet wenn leer gelassen)
+    - **Konsistente Struktur**: Alle Zähler (Haupt + Zusätzlich) verwenden jetzt `type.meterName.*`
+    - **Flexibilität**: Hauptzähler kann jetzt frei benannt werden (z.B. "wohnung", "erdgeschoss", "gesamt")
+    - **Keine Special-Cases**: Vereinfachter Code ohne `meterName === 'main'` Bedingungen
+- **NEW:** 🔔 **Smart Notifications** - Zählerauswahl für Benachrichtigungen:
+    - Wähle pro Utility-Typ aus, welche Zähler benachrichtigt werden sollen
+    - Multi-Select Dropdown zeigt alle konfigurierten Zähler
+    - Wenn leer: Alle Zähler werden benachrichtigt (Standard)
+    - Wenn ausgewählt: Nur gewählte Zähler erhalten Benachrichtigungen
+    - Gilt für Abrechnungsende, Vertragswechsel und monatliche Berichte
+- **IMPROVED:** 🏗️ **Code-Architektur** - Entfernung von 19 Special-Case Checks in 7 Dateien:
+    - Vereinfachte basePath-Berechnungen in multiMeterManager, billingManager, stateManager
+    - Vereinheitlichter Config-Zugriff (alle Meter nutzen `meter.config.contractStart`)
+    - HT/NT-Logik basiert jetzt auf `config.htNtEnabled` statt Meter-Name
+    - Button-Trigger erkennt nur noch einheitliche Pfadstruktur
+    - Legacy-Code entfernt: updateBillingCountdown, updateCurrentPrice jetzt per-meter
+- **MIGRATION:** 📋 **Upgrade-Hinweise**:
+    - Bei Neuinstallation: Namen für Hauptzähler eingeben (oder "main" akzeptieren)
+    - Bei Upgrade: Adapter neu konfigurieren + Skripte/Visualisierungen anpassen
+    - History: Alte States bleiben erhalten, neue States werden parallel erstellt
+    - Empfehlung: "main" als Namen verwenden für einfachere Migration
+
 ### 1.4.5 (2026-01-20)
 
 - **FIX:** 🐛 **Critical Multi-Meter Cost Calculation Bugs** - Comprehensive fixes for multi-meter functionality:

package/admin/jsonConfig.json

@@ -21,6 +21,19 @@
                     "lg": 6,
                     "xl": 6
                 },
+                "gasMainMeterName": {
+                    "type": "text",
+                    "label": "📝 Name des Hauptzählers",
+                    "placeholder": "z.B. main, wohnung, haus, gesamt",
+                    "help": "Technischer Name für den Hauptzähler. Wird Teil des State-Pfads (gas.DIESER_NAME.*). Nur Kleinbuchstaben und Zahlen, max 20 Zeichen.",
+                    "default": "main",
+                    "hidden": "!data.gasAktiv",
+                    "sm": 12,
+                    "md": 6,
+                    "xs": 12,
+                    "lg": 6,
+                    "xl": 4
+                },
                 "_gasSensorHeader": {
                     "type": "header",
                     "text": "Sensor-Konfiguration",
@@ -451,6 +464,19 @@
                     "lg": 6,
                     "xl": 6
                 },
+                "wasserMainMeterName": {
+                    "type": "text",
+                    "label": "📝 Name des Hauptzählers",
+                    "placeholder": "z.B. main, wohnung, haus, gesamt",
+                    "help": "Technischer Name für den Hauptzähler. Wird Teil des State-Pfads (wasser.DIESER_NAME.*). Nur Kleinbuchstaben und Zahlen, max 20 Zeichen.",
+                    "default": "main",
+                    "hidden": "!data.wasserAktiv",
+                    "sm": 12,
+                    "md": 6,
+                    "xs": 12,
+                    "lg": 6,
+                    "xl": 4
+                },
                 "_wasserSensorHeader": {
                     "type": "header",
                     "text": "Sensor-Konfiguration",
@@ -745,6 +771,19 @@
                     "lg": 6,
                     "xl": 6
                 },
+                "stromMainMeterName": {
+                    "type": "text",
+                    "label": "📝 Name des Hauptzählers",
+                    "placeholder": "z.B. main, wohnung, haus, gesamt",
+                    "help": "Technischer Name für den Hauptzähler. Wird Teil des State-Pfads (strom.DIESER_NAME.*). Nur Kleinbuchstaben und Zahlen, max 20 Zeichen.",
+                    "default": "main",
+                    "hidden": "!data.stromAktiv",
+                    "sm": 12,
+                    "md": 6,
+                    "xs": 12,
+                    "lg": 6,
+                    "xl": 4
+                },
                 "_stromSensorHeader": {
                     "type": "header",
                     "text": "Sensor-Konfiguration",
@@ -1132,6 +1171,19 @@
                     "lg": 6,
                     "xl": 6
                 },
+                "pvMainMeterName": {
+                    "type": "text",
+                    "label": "📝 Name des Hauptzählers",
+                    "placeholder": "z.B. main, einspeisung, pv",
+                    "help": "Technischer Name für den Hauptzähler. Wird Teil des State-Pfads (pv.DIESER_NAME.*). Nur Kleinbuchstaben und Zahlen, max 20 Zeichen.",
+                    "default": "main",
+                    "hidden": "!data.pvAktiv",
+                    "sm": 12,
+                    "md": 6,
+                    "xs": 12,
+                    "lg": 6,
+                    "xl": 4
+                },
                 "_pvSensorHeader": {
                     "type": "header",
                     "text": "Sensor-Konfiguration",
@@ -1423,6 +1475,20 @@
                     "lg": 4,
                     "xl": 4
                 },
+                "notificationGasMeters": {
+                    "type": "selectSendTo",
+                    "label": "Welche Gas-Zähler benachrichtigen?",
+                    "command": "getMeters",
+                    "jsonData": "{\"type\": \"gas\"}",
+                    "multiple": true,
+                    "help": "Wähle die Zähler aus, für die du Benachrichtigungen erhalten möchtest. Wenn leer, werden ALLE Zähler benachrichtigt.",
+                    "hidden": "!data.notificationEnabled || !data.notificationGasEnabled || !data.gasAktiv",
+                    "sm": 12,
+                    "md": 8,
+                    "xs": 12,
+                    "lg": 8,
+                    "xl": 8
+                },
                 "notificationWasserEnabled": {
                     "type": "checkbox",
                     "label": "Wasser-Erinnerung",
@@ -1433,6 +1499,20 @@
                     "lg": 4,
                     "xl": 4
                 },
+                "notificationWasserMeters": {
+                    "type": "selectSendTo",
+                    "label": "Welche Wasser-Zähler benachrichtigen?",
+                    "command": "getMeters",
+                    "jsonData": "{\"type\": \"water\"}",
+                    "multiple": true,
+                    "help": "Wähle die Zähler aus, für die du Benachrichtigungen erhalten möchtest. Wenn leer, werden ALLE Zähler benachrichtigt.",
+                    "hidden": "!data.notificationEnabled || !data.notificationWasserEnabled || !data.wasserAktiv",
+                    "sm": 12,
+                    "md": 8,
+                    "xs": 12,
+                    "lg": 8,
+                    "xl": 8
+                },
                 "notificationStromEnabled": {
                     "type": "checkbox",
                     "label": "Strom-Erinnerung",
@@ -1443,6 +1523,20 @@
                     "lg": 4,
                     "xl": 4
                 },
+                "notificationStromMeters": {
+                    "type": "selectSendTo",
+                    "label": "Welche Strom-Zähler benachrichtigen?",
+                    "command": "getMeters",
+                    "jsonData": "{\"type\": \"electricity\"}",
+                    "multiple": true,
+                    "help": "Wähle die Zähler aus, für die du Benachrichtigungen erhalten möchtest. Wenn leer, werden ALLE Zähler benachrichtigt.",
+                    "hidden": "!data.notificationEnabled || !data.notificationStromEnabled || !data.stromAktiv",
+                    "sm": 12,
+                    "md": 8,
+                    "xs": 12,
+                    "lg": 8,
+                    "xl": 8
+                },
                 "notificationPVEnabled": {
                     "type": "checkbox",
                     "label": "PV-Erinnerung",
@@ -1452,6 +1546,20 @@
                     "xs": 12,
                     "lg": 4,
                     "xl": 4
+                },
+                "notificationPVMeters": {
+                    "type": "selectSendTo",
+                    "label": "Welche PV-Zähler benachrichtigen?",
+                    "command": "getMeters",
+                    "jsonData": "{\"type\": \"pv\"}",
+                    "multiple": true,
+                    "help": "Wähle die Zähler aus, für die du Benachrichtigungen erhalten möchtest. Wenn leer, werden ALLE Zähler benachrichtigt.",
+                    "hidden": "!data.notificationEnabled || !data.notificationPVEnabled || !data.pvAktiv",
+                    "sm": 12,
+                    "md": 8,
+                    "xs": 12,
+                    "lg": 8,
+                    "xl": 8
                 }
             }
         },
@@ -1466,7 +1574,7 @@
                 },
                 "_infoVersion": {
                     "type": "staticText",
-                    "text": "**Version:** 1.4.0\n\n**Autor:** fischi87",
+                    "text": "**Version:** 1.4.6\n\n**Autor:** fischi87\n\n⚠️ **Breaking Change in v1.4.6:** State-Pfade haben sich geändert! Siehe unten.",
                     "sm": 12,
                     "xs": 12,
                     "md": 12,
@@ -1492,7 +1600,7 @@
                 },
                 "_features": {
                     "type": "staticText",
-                    "text": "📊 **Verbrauchsüberwachung** - Gas, Wasser, Strom & PV/Einspeisung\n\n💰 **Automatische Kostenberechnung** - Mit Arbeitspreis & Grundgebühren\n\n☀️ **PV-Integration** - Überwachung von Einspeisung & Vergütung\n\n💳 **Abschlagsüberwachung** - Direkter Vergleich: Bezahlt vs. Verbraucht\n\n🔄 **Gas-Spezial** - Automatische m³ zu kWh Umrechnung\n\n⚡ **HT/NT-Unterstützung** - Volle Unterstützung für Doppeltarife\n\n📅 **Jahres-Historie** - Automatische Archivierung zum Vertragsbeginn",
+                    "text": "📊 **Verbrauchsüberwachung** - Gas, Wasser, Strom & PV/Einspeisung\n\n🔢 **Multi-Meter Support** *(NEU in 1.4.6)* - Mehrere Zähler pro Typ (z.B. Haus + Werkstatt)\n\n📛 **Konfigurierbare Namen** *(NEU in 1.4.6)* - Gib jedem Zähler einen individuellen Namen\n\n💰 **Automatische Kostenberechnung** - Mit Arbeitspreis & Grundgebühren\n\n☀️ **PV-Integration** - Überwachung von Einspeisung & Vergütung\n\n💳 **Abschlagsüberwachung** - Direkter Vergleich: Bezahlt vs. Verbraucht\n\n🔄 **Gas-Spezial** - Automatische m³ zu kWh Umrechnung\n\n⚡ **HT/NT-Unterstützung** - Volle Unterstützung für Doppeltarife\n\n📅 **Jahres-Historie** - Automatische Archivierung zum Vertragsbeginn\n\n🔔 **Smart Notifications** - Wähle für welche Zähler du benachrichtigt werden möchtest",
                     "sm": 12,
                     "xs": 12,
                     "md": 12,
@@ -1502,14 +1610,31 @@
                 "_divider2": {
                     "type": "divider"
                 },
+                "_breakingHeader": {
+                    "type": "header",
+                    "text": "⚠️ Breaking Changes v1.4.6",
+                    "size": 4
+                },
+                "_breakingChanges": {
+                    "type": "staticText",
+                    "text": "**State-Pfade haben sich geändert:**\n\n**Vorher:** `gas.consumption.daily`, `gas.costs.yearly`\n\n**Neu:** `gas.METER_NAME.consumption.daily`, `gas.METER_NAME.costs.yearly`\n\n**Standardname:** Wenn du keinen Namen vergibst, wird automatisch \"main\" verwendet.\n\n**Was du tun musst:**\n• Skripte anpassen die States verwenden\n• Visualisierungen (VIS, Grafana) aktualisieren\n• History-Adapter neu konfigurieren\n\n**Mehrere Zähler:** Bei mehreren Zählern wird automatisch eine `totals/` Struktur mit Summen erstellt.",
+                    "sm": 12,
+                    "xs": 12,
+                    "md": 12,
+                    "lg": 12,
+                    "xl": 12
+                },
+                "_divider2a": {
+                    "type": "divider"
+                },
                 "_usageHeader": {
                     "type": "header",
-                    "text": "Benachrichtigungen (Neu)",
+                    "text": "📬 Benachrichtigungen",
                     "size": 4
                 },
                 "_usage": {
                     "type": "staticText",
-                    "text": "**1. Abrechnungsende** 📅\n• Erinnert dich (z.B. 7 Tage vorher) daran, den Zählerstand abzulesen und den Zeitraum abzuschließen.\n\n**2. Vertragswechsel** 📋\n• Erinnert dich frühzeitig (z.B. 60 Tage vorher) daran, Tarife zu vergleichen oder die Kündigungsfrist zu prüfen.\n\n**3. Monatlicher Bericht** 📈\n• Optionaler Status-Bericht am 1. jedes Monats via Benachrichtigung.\n\n**💡 Tipp:** Nutze den **Test-Button** zum Prüfen deiner Einstellungen. Du bekommst sofort ein Popup mit dem Ergebnis!",
+                    "text": "**1. Abrechnungsende** 📅\n• Erinnert dich (z.B. 7 Tage vorher) daran, den Zählerstand abzulesen und den Zeitraum abzuschließen.\n\n**2. Vertragswechsel** 📋\n• Erinnert dich frühzeitig (z.B. 60 Tage vorher) daran, Tarife zu vergleichen oder die Kündigungsfrist zu prüfen.\n\n**3. Monatlicher Bericht** 📈\n• Optionaler Status-Bericht am 1. jedes Monats via Benachrichtigung.\n\n**4. Zählerauswahl** 🎯 *(NEU in 1.4.6)*\n• Wähle aus, für welche Zähler du Benachrichtigungen erhalten möchtest\n• Wenn leer: Alle Zähler werden benachrichtigt\n\n**💡 Tipp:** Nutze den **Test-Button** zum Prüfen deiner Einstellungen. Du bekommst sofort ein Popup mit dem Ergebnis!",
                     "sm": 12,
                     "xs": 12,
                     "md": 12,
@@ -1526,7 +1651,7 @@
                 },
                 "_statesInfo": {
                     "type": "staticText",
-                    "text": "**📅 billing/** (Abrechnung)\n• **daysRemaining** - Tage bis zum Ende\n• **closePeriod** - Button zum Abschluss\n\n**💰 costs/** (Kosten)\n• **balance** - 🎯 Aktuelle Bilanz (Guthaben/Nachzahlung)\n• **totalYearly** - Prognose Gesamtkosten inkl. Gebühren\n\n**📈 statistics/** (Statistiken)\n• **lastDay** - Verbrauch gestern (kWh)\n• **lastDayVolume** - Verbrauch gestern in m³ (Gas)\n\n**☀️ PV / Einspeisung**\n• **earnings.totalYearly** - Akkumulierte Vergütung\n• **consumption.yearly** - Gesamte Einspeisung",
+                    "text": "**⚠️ Neue Struktur ab v1.4.6:**\n\nAlle Datenpunkte sind jetzt unter `TYPE.METER_NAME.*` zu finden!\n\n**Beispiel Single-Meter:**\n• `gas.main.consumption.daily`\n• `gas.main.costs.totalYearly`\n• `gas.main.billing.closePeriod`\n\n**Beispiel Multi-Meter:**\n• `gas.haus.consumption.yearly` ← Zähler 1\n• `gas.werkstatt.consumption.yearly` ← Zähler 2\n• `gas.totals.consumption.yearly` ← Summe\n\n**📅 billing/** (Abrechnung)\n• **daysRemaining** - Tage bis zum Vertragsende\n• **closePeriod** - Button zum Zeitraum-Abschluss\n• **endReading** - Hier Endzählerstand eintragen\n\n**💰 costs/** (Kosten)\n• **balance** - Aktuelle Bilanz (Nachzahlung/Guthaben)\n• **totalYearly** - Gesamtkosten inkl. Gebühren\n• **yearly** - Nur Verbrauchskosten\n\n**📈 statistics/** (Statistiken)\n• **lastDay** - Gestern-Verbrauch\n• **averageDaily** - Durchschnitt pro Tag\n• **averageMonthly** - Durchschnitt pro Monat",
                     "sm": 12,
                     "xs": 12,
                     "md": 12,

package/io-package.json

@@ -1,8 +1,12 @@
 {
     "common": {
         "name": "utility-monitor",
-        "version": "1.4.5",
+        "version": "1.4.6",
         "news": {
+            "1.4.6": {
+                "en": "Breaking Change: Main meter now requires a name (default: 'main'). State paths changed from 'gas.*' to 'gas.METER_NAME.*'. All meters now use consistent naming structure.",
+                "de": "Breaking Change: Hauptzähler benötigt jetzt einen Namen (Standard: 'main'). State-Pfade geändert von 'gas.*' zu 'gas.METER_NAME.*'. Alle Zähler nutzen jetzt konsistente Namensstruktur."
+            },
             "1.4.5": {
                 "en": "Fix: Critical multi-meter cost calculation bugs (main meter sync, basicCharge/paidTotal accumulation, annualFee as fixed yearly value). Fix: Balance formula corrected. Fix: Removed duplicate initialization causing sync issues.",
                 "de": "Fix: Kritische Multi-Meter Kostenberechnungsfehler (Hauptzähler-Sync, basicCharge/paidTotal Akkumulation, Jahresgebühr als fester Jahreswert). Fix: Balance-Formel korrigiert. Fix: Doppelte Initialisierung entfernt.",
@@ -91,6 +95,7 @@
     },
     "native": {
         "gasAktiv": false,
+        "gasMainMeterName": "main",
         "gasSensorDP": "",
         "gasOffset": 0,
         "gasInitialReading": 0,
@@ -100,6 +105,7 @@
         "gasGrundgebuehr": 0,
         "gasAbschlag": 0,
         "wasserAktiv": false,
+        "wasserMainMeterName": "main",
         "wasserSensorDP": "",
         "wasserOffset": 0,
         "wasserInitialReading": 0,
@@ -107,6 +113,7 @@
         "wasserGrundgebuehr": 0,
         "wasserAbschlag": 0,
         "stromAktiv": false,
+        "stromMainMeterName": "main",
         "stromSensorDP": "",
         "stromOffset": 0,
         "stromInitialReading": 0,
@@ -114,6 +121,7 @@
         "stromGrundgebuehr": 0,
         "stromAbschlag": 0,
         "pvAktiv": false,
+        "pvMainMeterName": "main",
         "pvSensorDP": "",
         "pvOffset": 0,
         "pvInitialReading": 0,
@@ -125,8 +133,13 @@
         "notificationInstance": "",
         "notificationDaysBefore": 30,
         "notificationGasEnabled": false,
+        "notificationGasMeters": [],
         "notificationWasserEnabled": false,
+        "notificationWasserMeters": [],
         "notificationStromEnabled": false,
+        "notificationStromMeters": [],
+        "notificationPVEnabled": false,
+        "notificationPVMeters": [],
         "notificationBillingEnabled": true,
         "notificationBillingDays": 7,
         "notificationChangeDays": 60

package/lib/billingManager.js

@@ -422,7 +422,7 @@ class BillingManager {
      * @param {object} meter - Meter object from multiMeterManager
      */
     async closeBillingPeriodForMeter(type, meter) {
-        const basePath = meter.name === 'main' ? type : `${type}.${meter.name}`;
+        const basePath = `${type}.${meter.name}`;
         const label = meter.displayName || meter.name;
 
         this.adapter.log.info(`🔔 Schließe Abrechnungszeitraum für ${basePath} (${label})...`);
@@ -438,14 +438,8 @@ class BillingManager {
             return;
         }
 
-        // Get contract date for THIS meter
-        let contractStartDate;
-        if (meter.name === 'main') {
-            const configType = this.adapter.consumptionManager.getConfigType(type);
-            contractStartDate = this.adapter.config[`${configType}ContractStart`];
-        } else {
-            contractStartDate = meter.config?.contractStart;
-        }
+        // Get contract date for THIS meter (all meters have config.contractStart)
+        const contractStartDate = meter.config?.contractStart;
 
         if (!contractStartDate) {
             this.adapter.log.error(`❌ Kein Vertragsbeginn für ${basePath} konfiguriert.`);
@@ -497,42 +491,49 @@ class BillingManager {
     }
 
     /**
-     * Updates billing countdown
+     * Updates billing countdown for all meters of a type
+     * NOTE: Since v1.4.6, this updates ALL meters (main + additional)
      *
      * @param {string} type - Utility type
      */
     async updateBillingCountdown(type) {
-        const configType = this.adapter.consumptionManager.getConfigType(type);
-        const contractStart = this.adapter.config[`${configType}ContractStart`];
+        // Get all meters for this type
+        const meters = this.adapter.multiMeterManager?.getMetersForType(type) || [];
 
-        if (!contractStart) {
-            return;
-        }
+        // Update countdown for each meter based on its contract date
+        for (const meter of meters) {
+            const contractStart = meter.config?.contractStart;
 
-        const startDate = calculator.parseGermanDate(contractStart);
-        if (!startDate) {
-            return;
-        }
+            if (!contractStart) {
+                continue;
+            }
 
-        const today = new Date();
-        const nextAnniversary = new Date(startDate);
-        nextAnniversary.setFullYear(today.getFullYear());
+            const startDate = calculator.parseGermanDate(contractStart);
+            if (!startDate) {
+                continue;
+            }
 
-        if (nextAnniversary < today) {
-            nextAnniversary.setFullYear(today.getFullYear() + 1);
-        }
+            const today = new Date();
+            const nextAnniversary = new Date(startDate);
+            nextAnniversary.setFullYear(today.getFullYear());
 
-        const msPerDay = 1000 * 60 * 60 * 24;
-        const daysRemaining = Math.ceil((nextAnniversary.getTime() - today.getTime()) / msPerDay);
-        const displayPeriodEnd = new Date(nextAnniversary);
-        displayPeriodEnd.setDate(displayPeriodEnd.getDate() - 1);
+            if (nextAnniversary < today) {
+                nextAnniversary.setFullYear(today.getFullYear() + 1);
+            }
 
-        await this.adapter.setStateAsync(`${type}.billing.daysRemaining`, daysRemaining, true);
-        await this.adapter.setStateAsync(
-            `${type}.billing.periodEnd`,
-            displayPeriodEnd.toLocaleDateString('de-DE'),
-            true,
-        );
+            const msPerDay = 1000 * 60 * 60 * 24;
+            const daysRemaining = Math.ceil((nextAnniversary.getTime() - today.getTime()) / msPerDay);
+            const displayPeriodEnd = new Date(nextAnniversary);
+            displayPeriodEnd.setDate(displayPeriodEnd.getDate() - 1);
+
+            const basePath = `${type}.${meter.name}`;
+            await this.adapter.setStateAsync(`${basePath}.billing.daysRemaining`, daysRemaining, true);
+            await this.adapter.setStateAsync(
+                `${basePath}.billing.periodEnd`,
+                displayPeriodEnd.toLocaleDateString('de-DE'),
+                true,
+            );
+        }
     }
 
     /**
@@ -580,21 +581,14 @@ class BillingManager {
             // YEARLY RESET: Each meter resets individually based on ITS contract date
             const meters = this.adapter.multiMeterManager?.getMetersForType(type) || [];
             for (const meter of meters) {
-                const basePath = meter.name === 'main' ? type : `${type}.${meter.name}`;
+                const basePath = `${type}.${meter.name}`;
                 const lastYearStartState = await this.adapter.getStateAsync(`${basePath}.statistics.lastYearStart`);
 
                 if (lastYearStartState?.val) {
                     const lastYearStartDate = new Date(lastYearStartState.val);
 
-                    // Get contract date for THIS specific meter
-                    let contractStartDate;
-                    if (meter.name === 'main') {
-                        // Main meter: use adapter config
-                        contractStartDate = this.adapter.config[`${configType}ContractStart`];
-                    } else {
-                        // Additional meter: use meter's individual config
-                        contractStartDate = meter.config?.contractStart;
-                    }
+                    // Get contract date for THIS specific meter (all meters have config.contractStart)
+                    const contractStartDate = meter.config?.contractStart;
 
                     if (contractStartDate) {
                         const contractStart = calculator.parseGermanDate(contractStartDate);
@@ -650,7 +644,7 @@ class BillingManager {
 
         // Reset each meter
         for (const meter of meters) {
-            const basePath = meter.name === 'main' ? type : `${type}.${meter.name}`;
+            const basePath = `${type}.${meter.name}`;
             const label = meter.displayName || meter.name;
 
             this.adapter.log.debug(`Resetting daily counter for ${basePath} (${label})`);
@@ -719,7 +713,7 @@ class BillingManager {
 
         // Reset each meter
         for (const meter of meters) {
-            const basePath = meter.name === 'main' ? type : `${type}.${meter.name}`;
+            const basePath = `${type}.${meter.name}`;
             const label = meter.displayName || meter.name;
 
             this.adapter.log.debug(`Resetting monthly counter for ${basePath} (${label})`);
@@ -777,7 +771,7 @@ class BillingManager {
 
         // Reset each meter
         for (const meter of meters) {
-            const basePath = meter.name === 'main' ? type : `${type}.${meter.name}`;
+            const basePath = `${type}.${meter.name}`;
             const label = meter.displayName || meter.name;
 
             this.adapter.log.debug(`Resetting yearly counter for ${basePath} (${label})`);
@@ -809,7 +803,7 @@ class BillingManager {
      * @param {object} meter - Meter object from multiMeterManager
      */
     async resetYearlyCountersForMeter(type, meter) {
-        const basePath = meter.name === 'main' ? type : `${type}.${meter.name}`;
+        const basePath = `${type}.${meter.name}`;
         const label = meter.displayName || meter.name;
 
         this.adapter.log.debug(`Resetting yearly counter for ${basePath} (${label})`);

package/lib/consumptionManager.js

@@ -47,8 +47,8 @@ class ConsumptionManager {
 
         this.adapter.log.info(`Initializing ${type} monitoring...`);
 
-        // Create state structure
-        await stateManager.createUtilityStateStructure(this.adapter, type, this.adapter.config);
+        // State structure is now created by MultiMeterManager per meter (v1.4.6)
+        // Old createUtilityStateStructure removed - states are created under type.meterName.*
 
         const configType = this.getConfigType(type);
         const sensorDPKey = `${configType}SensorDP`;
@@ -56,7 +56,7 @@ class ConsumptionManager {
 
         if (!sensorDP) {
             this.adapter.log.warn(`${type} is active but no sensor datapoint configured!`);
-            await this.adapter.setStateAsync(`${type}.info.sensorActive`, false, true);
+            // Note: sensorActive state is now created per meter by MultiMeterManager
             return;
         }
 
@@ -69,91 +69,34 @@ class ConsumptionManager {
             this.adapter.log.info(`${type}: Managed with contract start: ${contractStartDateStr}`);
         }
 
-        // Subscribe to sensor datapoint
-        this.adapter.subscribeForeignStates(sensorDP);
-        await this.adapter.setStateAsync(`${type}.info.sensorActive`, true, true);
-        this.adapter.log.debug(`Subscribed to ${type} sensor: ${sensorDP}`);
+        // Sensor subscription is now handled by MultiMeterManager per meter
+        this.adapter.log.debug(`${type} sensor will be subscribed by MultiMeterManager: ${sensorDP}`);
 
         // Initialize all meters (main + additional) via MultiMeterManager
+        // This handles everything now: state creation, sensor subscription, costs calculation
         if (this.adapter.multiMeterManager) {
             await this.adapter.multiMeterManager.initializeType(type);
         }
 
-        // Restore last sensor value from persistent state to prevent delta loss
-        const lastReading = await this.adapter.getStateAsync(`${type}.info.meterReading`);
-        if (lastReading && typeof lastReading.val === 'number') {
-            this.lastSensorValues[sensorDP] = lastReading.val;
-            this.adapter.log.debug(`${type}: Restored last sensor value: ${lastReading.val}`);
-        }
-
-        // Initialize with current sensor value
-        try {
-            const sensorState = await this.adapter.getForeignStateAsync(sensorDP);
-            if (sensorState && sensorState.val !== null && typeof sensorState.val === 'number') {
-                await this.handleSensorUpdate(type, sensorDP, sensorState.val);
-            }
-        } catch (error) {
-            this.adapter.log.warn(`Could not read initial value from ${sensorDP}: ${error.message}`);
-        }
-
-        // Initialize period start timestamps if not set
-        const now = Date.now();
-        const dayStart = await this.adapter.getStateAsync(`${type}.statistics.lastDayStart`);
-        if (!dayStart || !dayStart.val) {
-            await this.adapter.setStateAsync(`${type}.statistics.lastDayStart`, now, true);
-        }
-
-        const monthStart = await this.adapter.getStateAsync(`${type}.statistics.lastMonthStart`);
-        if (!monthStart || !monthStart.val) {
-            await this.adapter.setStateAsync(`${type}.statistics.lastMonthStart`, now, true);
-        }
-
-        const yearStart = await this.adapter.getStateAsync(`${type}.statistics.lastYearStart`);
-        if (!yearStart || !yearStart.val) {
-            // Determine year start based on contract date or January 1st
-            const contractStartKey = `${configType}ContractStart`;
-            const contractStartDateStr = this.adapter.config[contractStartKey];
-
-            let yearStartDate;
-            if (contractStartDateStr) {
-                const contractStart = calculator.parseGermanDate(contractStartDateStr);
-                if (contractStart && !isNaN(contractStart.getTime())) {
-                    // Calculate last anniversary
-                    const nowDate = new Date(now);
-                    const currentYear = nowDate.getFullYear();
-                    yearStartDate = new Date(currentYear, contractStart.getMonth(), contractStart.getDate(), 12, 0, 0);
-
-                    // If anniversary is in the future this year, take last year
-                    if (yearStartDate > nowDate) {
-                        yearStartDate.setFullYear(currentYear - 1);
-                    }
-                }
-            }
-
-            if (!yearStartDate) {
-                // Fallback: January 1st of current year
-                const nowDate = new Date(now);
-                yearStartDate = new Date(nowDate.getFullYear(), 0, 1, 12, 0, 0);
-                this.adapter.log.info(
-                    `${type}: No contract start found. Setting initial year start to January 1st: ${yearStartDate.toLocaleDateString('de-DE')}`,
-                );
-            }
-
-            await this.adapter.setStateAsync(`${type}.statistics.lastYearStart`, yearStartDate.getTime(), true);
-        }
-        // Update current price
-        await this.updateCurrentPrice(type);
-
-        // Initial cost calculation (wichtig! Sonst bleiben Kosten bei 0)
-        if (typeof this.adapter.updateCosts === 'function') {
-            await this.adapter.updateCosts(type);
-        }
+        // Note: All initialization moved to MultiMeterManager in v1.4.6:
+        // - Sensor value restoration (per meter)
+        // - Period start timestamps (per meter)
+        // - Current price updates (per meter)
+        // - Cost calculations (per meter)
+        // Old type-level states (gas.info.*, gas.statistics.*) are no longer used
 
         // Initialize yearly consumption from initial reading if set
+        // NOTE: This is now handled per meter by MultiMeterManager in v1.4.6
+        // This legacy code path should not execute for new setups, but is kept for safety
         const initialReadingKey = `${configType}InitialReading`;
         const initialReading = this.adapter.config[initialReadingKey] || 0;
 
-        if (initialReading > 0) {
+        if (initialReading > 0 && sensorDP) {
+            // Get the main meter name to use the correct path
+            const mainMeterNameKey = `${configType}MainMeterName`;
+            const mainMeterName = this.adapter.config[mainMeterNameKey] || 'main';
+            const basePath = `${type}.${mainMeterName}`;
+
             const sensorState = await this.adapter.getForeignStateAsync(sensorDP);
             if (sensorState && typeof sensorState.val === 'number') {
                 let currentRaw = sensorState.val;
@@ -173,7 +116,7 @@ class ConsumptionManager {
                     const zZahl = this.adapter.config.gasZahl || 0.95;
                     const yearlyVolume = yearlyConsumption;
                     yearlyConsumption = calculator.convertGasM3ToKWh(yearlyConsumption, brennwert, zZahl);
-                    await this.adapter.setStateAsync(`${type}.consumption.yearlyVolume`, yearlyVolume, true);
+                    await this.adapter.setStateAsync(`${basePath}.consumption.yearlyVolume`, yearlyVolume, true);
                     this.adapter.log.info(
                         `Init yearly ${type}: ${yearlyConsumption.toFixed(2)} kWh = ${(currentRaw - initialReading).toFixed(2)} m³ (current: ${currentRaw.toFixed(2)} m³, initial: ${initialReading} m³)`,
                     );
@@ -183,17 +126,15 @@ class ConsumptionManager {
                     );
                 }
 
-                await this.adapter.setStateAsync(`${type}.consumption.yearly`, yearlyConsumption, true);
+                await this.adapter.setStateAsync(`${basePath}.consumption.yearly`, yearlyConsumption, true);
                 if (typeof this.adapter.updateCosts === 'function') {
                     await this.adapter.updateCosts(type);
                 }
             }
         }
 
-        // Update billing countdown
-        if (typeof this.adapter.updateBillingCountdown === 'function') {
-            await this.adapter.updateBillingCountdown(type);
-        }
+        // Note: Billing countdown is now handled per meter by billingManager.updateBillingCountdown()
+        // which is called during checkPeriodResets()
 
         this.adapter.log.debug(`Initial cost calculation completed for ${type}`);
     }
@@ -201,17 +142,25 @@ class ConsumptionManager {
     /**
      * Handles sensor value updates
      *
+     * NOTE: This method is DEPRECATED since v1.4.6!
+     * All sensor updates are now handled by MultiMeterManager.handleSensorUpdate()
+     * This method remains only as fallback but should NEVER be called in normal operation.
+     *
      * @param {string} type - Utility type
      * @param {string} sensorDP - Sensor datapoint ID
      * @param {number} value - New sensor value
      */
     async handleSensorUpdate(type, sensorDP, value) {
+        this.adapter.log.warn(
+            `consumptionManager.handleSensorUpdate() called - this is deprecated! All sensors should be handled by MultiMeterManager.`,
+        );
+
         if (typeof value !== 'number' || value < 0) {
             this.adapter.log.warn(`Invalid sensor value for ${type}: ${value}`);
             return;
         }
 
-        this.adapter.log.debug(`Sensor update for ${type}: ${value}`);
+        this.adapter.log.debug(`[DEPRECATED] Sensor update for ${type}: ${value}`);
 
         const now = Date.now();
         let consumption = value;
@@ -371,36 +320,47 @@ class ConsumptionManager {
     }
 
     /**
-     * Updates the current price display
+     * Updates the current price display for all meters of a type
+     * NOTE: Since v1.4.6, this updates ALL meters (main + additional)
+     * Only main meters support HT/NT, additional meters have fixed price
      *
      * @param {string} type - Utility type
      */
     async updateCurrentPrice(type) {
         const configType = this.getConfigType(type);
 
-        // Check for HT/NT
-        const htNtEnabledKey = `${configType}HtNtEnabled`;
-        const htNtEnabled = this.adapter.config[htNtEnabledKey] || false;
+        // Get all meters for this type
+        const meters = this.adapter.multiMeterManager?.getMetersForType(type) || [];
 
-        let tariffName = 'Standard';
-        let activePrice = 0;
+        for (const meter of meters) {
+            let tariffName = 'Standard';
+            let activePrice = 0;
 
-        if (htNtEnabled) {
-            const isHT = calculator.isHTTime(this.adapter.config, configType);
-            if (isHT) {
-                activePrice = this.adapter.config[`${configType}HtPrice`] || 0;
-                tariffName = 'Haupttarif (HT)';
+            // Check if this meter has HT/NT enabled
+            const htNtEnabled = meter.config?.htNtEnabled || false;
+
+            if (htNtEnabled) {
+                const isHT = calculator.isHTTime(this.adapter.config, configType);
+                if (isHT) {
+                    activePrice = this.adapter.config[`${configType}HtPrice`] || 0;
+                    tariffName = 'Haupttarif (HT)';
+                } else {
+                    activePrice = this.adapter.config[`${configType}NtPrice`] || 0;
+                    tariffName = 'Nebentarif (NT)';
+                }
             } else {
-                activePrice = this.adapter.config[`${configType}NtPrice`] || 0;
-                tariffName = 'Nebentarif (NT)';
+                // Use meter's configured price
+                activePrice = meter.config?.preis || 0;
             }
-        } else {
-            const priceKey = `${configType}Preis`;
-            activePrice = this.adapter.config[priceKey] || 0;
-        }
 
-        await this.adapter.setStateAsync(`${type}.info.currentPrice`, calculator.roundToDecimals(activePrice, 4), true);
-        await this.adapter.setStateAsync(`${type}.info.currentTariff`, tariffName, true);
+            const basePath = `${type}.${meter.name}`;
+            await this.adapter.setStateAsync(
+                `${basePath}.info.currentPrice`,
+                calculator.roundToDecimals(activePrice, 4),
+                true,
+            );
+            await this.adapter.setStateAsync(`${basePath}.info.currentTariff`, tariffName, true);
+        }
     }
 }
 

package/lib/messagingHandler.js

@@ -24,7 +24,36 @@ class MessagingHandler {
 
         this.adapter.log.debug(`[onMessage] Received command: ${obj.command} from ${obj.from}`);
 
-        if (obj.command === 'getInstances') {
+        if (obj.command === 'getMeters') {
+            try {
+                // Get the utility type from the message
+                const type = obj.message?.type;
+
+                if (!type) {
+                    this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
+                    return;
+                }
+
+                // Get all meters for this type from multiMeterManager
+                const meters = this.adapter.multiMeterManager?.getMetersForType(type) || [];
+
+                if (meters.length === 0) {
+                    this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
+                    return;
+                }
+
+                // Build options array: [{ value: "main", label: "Hauptzähler (main)" }, ...]
+                const result = meters.map(meter => ({
+                    value: meter.name,
+                    label: meter.displayName ? `${meter.displayName} (${meter.name})` : meter.name,
+                }));
+
+                this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+            } catch (error) {
+                this.adapter.log.error(`Error in getMeters callback: ${error.message}`);
+                this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
+            }
+        } else if (obj.command === 'getInstances') {
             try {
                 const instances = await this.adapter.getForeignObjectsAsync('system.adapter.*', 'instance');
                 const messengerTypes = [
@@ -163,43 +192,66 @@ class MessagingHandler {
                 continue;
             }
 
-            // Get current days remaining
-            const daysRemainingState = await this.adapter.getStateAsync(`${type}.billing.daysRemaining`);
-            const daysRemaining = typeof daysRemainingState?.val === 'number' ? daysRemainingState.val : 999;
-            const periodEndState = await this.adapter.getStateAsync(`${type}.billing.periodEnd`);
-            const periodEnd = periodEndState?.val || '--.--.----';
-
-            // 1. BILLING END REMINDER (Zählerstand ablesen)
-            if (this.adapter.config.notificationBillingEnabled) {
-                const billingSent = await this.adapter.getStateAsync(`${type}.billing.notificationSent`);
-                const billingDaysThreshold = this.adapter.config.notificationBillingDays || 7;
-
-                if (billingSent?.val !== true && daysRemaining <= billingDaysThreshold) {
-                    const message =
-                        `🔔 *Nebenkosten-Monitor: Zählerstand ablesen*\n\n` +
-                        `Dein Abrechnungszeitraum für *${typesDe[type]}* endet in ${daysRemaining} Tagen!\n\n` +
-                        `📅 Datum: ${periodEnd}\n\n` +
-                        `Bitte trage den Zählerstand rechtzeitig ein:\n` +
-                        `1️⃣ Datenpunkt: ${type}.billing.endReading\n` +
-                        `2️⃣ Zeitraum abschließen: ${type}.billing.closePeriod = true`;
-
-                    await this.sendNotification(type, message, 'billing');
-                }
+            // Get all meters for this type (main + additional)
+            const allMeters = this.adapter.multiMeterManager?.getMetersForType(type) || [];
+            if (allMeters.length === 0) {
+                continue;
+            }
+
+            // Filter meters based on configuration
+            // If notificationXXXMeters is empty or undefined, notify ALL meters
+            const configKey = `notification${configType.charAt(0).toUpperCase() + configType.slice(1)}Meters`;
+            const selectedMeters = this.adapter.config[configKey];
+
+            let metersToNotify = allMeters;
+            if (selectedMeters && Array.isArray(selectedMeters) && selectedMeters.length > 0) {
+                // Filter: only notify selected meters
+                metersToNotify = allMeters.filter(meter => selectedMeters.includes(meter.name));
             }
 
-            // 2. CONTRACT CHANGE REMINDER (Tarif wechseln / Kündigungsfrist)
-            if (this.adapter.config.notificationChangeEnabled) {
-                const changeSent = await this.adapter.getStateAsync(`${type}.billing.notificationChangeSent`);
-                const changeDaysThreshold = this.adapter.config.notificationChangeDays || 60;
+            // Check notifications for each meter individually
+            for (const meter of metersToNotify) {
+                const basePath = `${type}.${meter.name}`;
+                const meterLabel = meter.displayName || meter.name;
+
+                // Get current days remaining for THIS meter
+                const daysRemainingState = await this.adapter.getStateAsync(`${basePath}.billing.daysRemaining`);
+                const daysRemaining = typeof daysRemainingState?.val === 'number' ? daysRemainingState.val : 999;
+                const periodEndState = await this.adapter.getStateAsync(`${basePath}.billing.periodEnd`);
+                const periodEnd = periodEndState?.val || '--.--.----';
+
+                // 1. BILLING END REMINDER (Zählerstand ablesen)
+                if (this.adapter.config.notificationBillingEnabled) {
+                    const billingSent = await this.adapter.getStateAsync(`${basePath}.billing.notificationSent`);
+                    const billingDaysThreshold = this.adapter.config.notificationBillingDays || 7;
+
+                    if (billingSent?.val !== true && daysRemaining <= billingDaysThreshold) {
+                        const message =
+                            `🔔 *Nebenkosten-Monitor: Zählerstand ablesen*\n\n` +
+                            `Dein Abrechnungszeitraum für *${typesDe[type]} (${meterLabel})* endet in ${daysRemaining} Tagen!\n\n` +
+                            `📅 Datum: ${periodEnd}\n\n` +
+                            `Bitte trage den Zählerstand rechtzeitig ein:\n` +
+                            `1️⃣ Datenpunkt: ${basePath}.billing.endReading\n` +
+                            `2️⃣ Zeitraum abschließen: ${basePath}.billing.closePeriod = true`;
+
+                        await this.sendNotification(basePath, message, 'billing');
+                    }
+                }
+
+                // 2. CONTRACT CHANGE REMINDER (Tarif wechseln / Kündigungsfrist)
+                if (this.adapter.config.notificationChangeEnabled) {
+                    const changeSent = await this.adapter.getStateAsync(`${basePath}.billing.notificationChangeSent`);
+                    const changeDaysThreshold = this.adapter.config.notificationChangeDays || 60;
 
-                if (changeSent?.val !== true && daysRemaining <= changeDaysThreshold) {
-                    const message =
-                        `💡 *Nebenkosten-Monitor: Tarif-Check*\n\n` +
-                        `Dein Vertrag für *${typesDe[type]}* endet am ${periodEnd}.\n\n` +
-                        `⏰ Noch ${daysRemaining} Tage bis zum Ende des Zeitraums.\n\n` +
-                        `Jetzt ist ein guter Zeitpunkt, um Preise zu vergleichen oder die Kündigungsfrist zu prüfen! 💸`;
+                    if (changeSent?.val !== true && daysRemaining <= changeDaysThreshold) {
+                        const message =
+                            `💡 *Nebenkosten-Monitor: Tarif-Check*\n\n` +
+                            `Dein Vertrag für *${typesDe[type]} (${meterLabel})* endet am ${periodEnd}.\n\n` +
+                            `⏰ Noch ${daysRemaining} Tage bis zum Ende des Zeitraums.\n\n` +
+                            `Jetzt ist ein guter Zeitpunkt, um Preise zu vergleichen oder die Kündigungsfrist zu prüfen! 💸`;
 
-                    await this.sendNotification(type, message, 'change');
+                        await this.sendNotification(basePath, message, 'change');
+                    }
                 }
             }
         }
@@ -258,16 +310,24 @@ class MessagingHandler {
                 // Multi-meter: use totals
                 yearlyState = await this.adapter.getStateAsync(`${type}.totals.consumption.yearly`);
                 totalYearlyState = await this.adapter.getStateAsync(`${type}.totals.costs.totalYearly`);
-                // Balance/paidTotal not available in totals, use main meter as representative
-                paidTotalState = await this.adapter.getStateAsync(`${type}.costs.paidTotal`);
-                balanceState = await this.adapter.getStateAsync(`${type}.costs.balance`);
+                // Balance/paidTotal not available in totals, use first meter as representative
+                const firstMeter = meters[0];
+                if (firstMeter) {
+                    paidTotalState = await this.adapter.getStateAsync(`${type}.${firstMeter.name}.costs.paidTotal`);
+                    balanceState = await this.adapter.getStateAsync(`${type}.${firstMeter.name}.costs.balance`);
+                }
                 message += `(${meters.length} Zähler gesamt)\\n`;
+            } else if (meters.length === 1) {
+                // Single meter: use first meter values (new path structure)
+                const meter = meters[0];
+                const basePath = `${type}.${meter.name}`;
+                yearlyState = await this.adapter.getStateAsync(`${basePath}.consumption.yearly`);
+                totalYearlyState = await this.adapter.getStateAsync(`${basePath}.costs.totalYearly`);
+                paidTotalState = await this.adapter.getStateAsync(`${basePath}.costs.paidTotal`);
+                balanceState = await this.adapter.getStateAsync(`${basePath}.costs.balance`);
             } else {
-                // Single meter: use main meter values
-                yearlyState = await this.adapter.getStateAsync(`${type}.consumption.yearly`);
-                totalYearlyState = await this.adapter.getStateAsync(`${type}.costs.totalYearly`);
-                paidTotalState = await this.adapter.getStateAsync(`${type}.costs.paidTotal`);
-                balanceState = await this.adapter.getStateAsync(`${type}.costs.balance`);
+                // No meters configured - skip this type
+                continue;
             }
 
             let val = yearlyState?.val || 0;
@@ -310,14 +370,14 @@ class MessagingHandler {
     /**
      * Helper to send notification and mark as sent
      *
-     * @param {string} type - gas, water, electricity
+     * @param {string} pathOrType - Full path like "gas.main" or just "system" for reports
      * @param {string} message - Message text
      * @param {string} reminderType - billing, change, or report
      */
-    async sendNotification(type, message, reminderType) {
+    async sendNotification(pathOrType, message, reminderType) {
         try {
             const instance = this.adapter.config.notificationInstance;
-            this.adapter.log.info(`Sending ${reminderType} notification for ${type} via ${instance}`);
+            this.adapter.log.info(`Sending ${reminderType} notification for ${pathOrType} via ${instance}`);
 
             await this.adapter.sendToAsync(instance, 'send', {
                 text: message,
@@ -326,12 +386,13 @@ class MessagingHandler {
             });
 
             // Mark as sent (only for billing/change)
+            // pathOrType is now the full path like "gas.main" or "gas.werkstatt"
             if (reminderType !== 'report') {
                 const stateKey = reminderType === 'change' ? 'notificationChangeSent' : 'notificationSent';
-                await this.adapter.setStateAsync(`${type}.billing.${stateKey}`, true, true);
+                await this.adapter.setStateAsync(`${pathOrType}.billing.${stateKey}`, true, true);
             }
         } catch (error) {
-            this.adapter.log.error(`Failed to send ${reminderType} notification for ${type}: ${error.message}`);
+            this.adapter.log.error(`Failed to send ${reminderType} notification for ${pathOrType}: ${error.message}`);
         }
     }
 }

package/lib/multiMeterManager.js

@@ -70,8 +70,14 @@ class MultiMeterManager {
         // Main meter (always present if type is active)
         const mainActive = this.adapter.config[`${configType}Aktiv`];
         if (mainActive) {
+            // Get main meter name from config and normalize
+            const mainMeterName = this.adapter.config[`${configType}MainMeterName`] || 'main';
+            const normalizedName = this.normalizeMeterName(mainMeterName);
+            const displayName = mainMeterName; // Original name for display
+
             meters.push({
-                name: 'main',
+                name: normalizedName,
+                displayName: displayName,
                 config: {
                     sensorDP: this.adapter.config[`${configType}SensorDP`],
                     preis: parseConfigNumber(this.adapter.config[`${configType}Preis`], 0),
@@ -173,7 +179,7 @@ class MultiMeterManager {
      * @returns {Promise<void>}
      */
     async initializeMeter(type, meterName, config, displayName) {
-        const basePath = meterName === 'main' ? type : `${type}.${meterName}`;
+        const basePath = `${type}.${meterName}`;
         const label = displayName || meterName;
 
         this.adapter.log.info(`Initializing ${type} meter: ${label}`);
@@ -349,7 +355,7 @@ class MultiMeterManager {
             return;
         }
 
-        const basePath = meterName === 'main' ? type : `${type}.${meterName}`;
+        const basePath = `${type}.${meterName}`;
         this.adapter.log.debug(`Sensor update for ${basePath}: ${value}`);
 
         // Get meter config
@@ -491,14 +497,14 @@ class MultiMeterManager {
      * @param {object} config - Meter configuration
      */
     async updateCurrentPrice(type, meterName, config) {
-        const basePath = meterName === 'main' ? type : `${type}.${meterName}`;
+        const basePath = `${type}.${meterName}`;
         const configType = this.getConfigType(type);
 
         let tariffName = 'Standard';
         let activePrice = config.preis || 0;
 
-        // Only main meter supports HT/NT
-        if (meterName === 'main' && config.htNtEnabled) {
+        // Only meters with HT/NT enabled support it
+        if (config.htNtEnabled) {
             const isHT = calculator.isHTTime(this.adapter.config, configType);
             if (isHT) {
                 activePrice = this.adapter.config[`${configType}HtPrice`] || 0;
@@ -526,7 +532,7 @@ class MultiMeterManager {
      * @param {object} config - Meter configuration
      */
     async updateCosts(type, meterName, config) {
-        const basePath = meterName === 'main' ? type : `${type}.${meterName}`;
+        const basePath = `${type}.${meterName}`;
 
         // Get consumption values
         const daily = (await this.adapter.getStateAsync(`${basePath}.consumption.daily`))?.val || 0;
@@ -626,7 +632,7 @@ class MultiMeterManager {
         let totalCostsYearly = 0;
 
         for (const meter of meters) {
-            const basePath = meter.name === 'main' ? type : `${type}.${meter.name}`;
+            const basePath = `${type}.${meter.name}`;
 
             totalDaily += (await this.adapter.getStateAsync(`${basePath}.consumption.daily`))?.val || 0;
             totalMonthly += (await this.adapter.getStateAsync(`${basePath}.consumption.monthly`))?.val || 0;

package/lib/stateManager.js

@@ -817,11 +817,12 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
 async function createMeterStructure(adapter, type, meterName, _config = {}) {
     const isGas = type === 'gas';
 
+    // All meters now include the meter name in labels for consistency
     const labels = {
-        gas: { name: meterName === 'main' ? 'Gas' : `Gas (${meterName})`, unit: 'kWh', volumeUnit: 'm³' },
-        water: { name: meterName === 'main' ? 'Wasser' : `Wasser (${meterName})`, unit: 'm³', volumeUnit: 'm³' },
-        electricity: { name: meterName === 'main' ? 'Strom' : `Strom (${meterName})`, unit: 'kWh', volumeUnit: 'kWh' },
-        pv: { name: meterName === 'main' ? 'PV' : `PV (${meterName})`, unit: 'kWh', volumeUnit: 'kWh' },
+        gas: { name: `Gas (${meterName})`, unit: 'kWh', volumeUnit: 'm³' },
+        water: { name: `Wasser (${meterName})`, unit: 'm³', volumeUnit: 'm³' },
+        electricity: { name: `Strom (${meterName})`, unit: 'kWh', volumeUnit: 'kWh' },
+        pv: { name: `PV (${meterName})`, unit: 'kWh', volumeUnit: 'kWh' },
     };
 
     const label = labels[type];
@@ -832,7 +833,7 @@ async function createMeterStructure(adapter, type, meterName, _config = {}) {
         // Fallback to prevent crash
         return;
     }
-    const basePath = meterName === 'main' ? type : `${type}.${meterName}`;
+    const basePath = `${type}.${meterName}`;
 
     // Create main channel
     await adapter.setObjectNotExistsAsync(basePath, {

package/main.js

@@ -195,20 +195,15 @@ class UtilityMonitor extends utils.Adapter {
         if (id.includes('.billing.closePeriod') && state.val === true && !state.ack) {
             const parts = id.split('.');
 
-            // Parse state ID: nebenkosten-monitor.0.gas.erdgeschoss.billing.closePeriod
-            // Remove adapter prefix: gas.erdgeschoss.billing.closePeriod
+            // Parse state ID: nebenkosten-monitor.0.gas.meterName.billing.closePeriod
+            // Remove adapter prefix: gas.meterName.billing.closePeriod
             const statePathParts = parts.slice(2); // Remove "nebenkosten-monitor" and "0"
 
-            // Determine if this is main meter or additional meter
-            if (statePathParts.length === 3) {
-                // Main meter: gas.billing.closePeriod
-                const type = statePathParts[0];
-                this.log.info(`User triggered billing period closure for ${type} (main meter)`);
-                await this.closeBillingPeriod(type);
-            } else if (statePathParts.length === 4) {
-                // Additional meter: gas.erdgeschoss.billing.closePeriod
+            // All meters now use: gas.meterName.billing.closePeriod (length === 4)
+            if (statePathParts.length === 4) {
                 const type = statePathParts[0];
                 const meterName = statePathParts[1];
+
                 this.log.info(`User triggered billing period closure for ${type}.${meterName}`);
 
                 // Find the meter object from multiMeterManager
@@ -221,24 +216,42 @@ class UtilityMonitor extends utils.Adapter {
                     this.log.error(`Meter "${meterName}" not found for type ${type}!`);
                     await this.setStateAsync(`${type}.${meterName}.billing.closePeriod`, false, true);
                 }
+            } else {
+                // Invalid path format
+                this.log.warn(`Invalid billing period closure trigger: ${id}`);
             }
             return;
         }
 
         // Check if this is an adjustment value change
+        // New structure: gas.meterName.adjustment.value (4 parts after namespace)
         if (id.includes('.adjustment.value') && !state.ack) {
             const parts = id.split('.');
-            const type = parts[parts.length - 3];
-            this.log.info(`Adjustment value changed for ${type}: ${state.val}`);
-            await this.setStateAsync(`${type}.adjustment.applied`, Date.now(), true);
+            // Parse: nebenkosten-monitor.0.gas.meterName.adjustment.value
+            const statePathParts = parts.slice(2); // Remove "nebenkosten-monitor" and "0"
 
-            // Update costs for all meters of this type
-            await this.updateCosts(type);
-            return;
+            if (statePathParts.length === 3) {
+                // New structure: gas.meterName.adjustment.value
+                const type = statePathParts[0];
+                const meterName = statePathParts[1];
+
+                this.log.info(`Adjustment value changed for ${type}.${meterName}: ${state.val}`);
+                await this.setStateAsync(`${type}.${meterName}.adjustment.applied`, Date.now(), true);
+
+                // Update costs for THIS specific meter
+                if (this.multiMeterManager) {
+                    const meters = this.multiMeterManager.getMetersForType(type);
+                    const meter = meters.find(m => m.name === meterName);
+                    if (meter) {
+                        await this.multiMeterManager.updateCosts(type, meterName, meter.config);
+                    }
+                }
+                return;
+            }
         }
 
         // Determine which utility this sensor belongs to
-        // First check if it's a multi-meter sensor (additional meters)
+        // All meters (including main) are now handled by multiMeterManager
         if (this.multiMeterManager) {
             const meterInfo = this.multiMeterManager.findMeterBySensor(id);
             if (meterInfo && typeof state.val === 'number') {
@@ -246,19 +259,6 @@ class UtilityMonitor extends utils.Adapter {
                 return;
             }
         }
-
-        // Check main meter sensors
-        const types = ['gas', 'water', 'electricity', 'pv'];
-        for (const type of types) {
-            const configType = this.consumptionManager.getConfigType(type);
-
-            if (this.config[`${configType}Aktiv`] && this.config[`${configType}SensorDP`] === id) {
-                if (typeof state.val === 'number') {
-                    await this.handleSensorUpdate(type, id, state.val);
-                }
-                return;
-            }
-        }
     }
 
     /**

package/package.json

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