From 3180ac7922c293d7def9f399c2e157a54319f066 Mon Sep 17 00:00:00 2001
From: DanielHaefliger <dh@belevo.ch>
Date: Fri, 5 Dec 2025 14:50:01 +0100
Subject: [PATCH] no message

---
 Abrechnung/module.php | 54 +++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/Abrechnung/module.php b/Abrechnung/module.php
index 1abd764..e423a28 100644
--- a/Abrechnung/module.php
+++ b/Abrechnung/module.php
@@ -150,10 +150,10 @@ class Abrechnung extends IPSModule
         // Kopfbereich
         $html  = "
         <h1 style='text-align:center; margin-bottom:0;'>Elektro- und Nebenkostenabrechnung</h1>
-        <h3 style='text-align:center; margin-bottom:0;'>Betrifft Liegenschaft: " . $this->ReadPropertyString("PropertyText") . " </h1>
+        <h4 style='text-align:center; margin-bottom:0;'>Betrifft Liegenschaft: " . $this->ReadPropertyString("PropertyText") . " </h1>
 
         <hr>
-        <br>
+    
         <table width='100%' style='font-size:8px; margin-top:5px;'>
             <tr>
                 <td width='60%'>
@@ -218,7 +218,7 @@ class Abrechnung extends IPSModule
         // ========================= Gesamttotal =========================
         $grandTotal = $totalPower + $totalAdditional;
         $html .= "
-        <h2 style='text-align:left; margin-top 5px;; font-size:11px;'>
+        <h2 style='text-align:right; margin:5px 0 0 0; font-size:11px;'>
             Gesamttotal: <strong>" . number_format($grandTotal, 2) . " CHF</strong>
         </h2>
         ";
@@ -368,16 +368,16 @@ class Abrechnung extends IPSModule
         $html = "
 <table border='1' cellspacing='0' cellpadding='2' width='100%' style='font-size:6px;'>
 <tr style='background-color:#f0f0f0;'>
-    <th>Zähler</th>
+    <th>ID</th>
     <th>Import</th>
     <th>Export</th>
-    <th>Solarbez.</th>
-    <th>Netzbez.</th>
-    <th>Solar Eins.</th>
-    <th>Solarverk.</th>
-    <th>Solar CHF</th>
-    <th>Netz CHF</th>
-    <th>Einspeis. CHF</th>
+    <th>ZEV-Haus</th>
+    <th>Netz-Haus</th>
+    <th>Solar-Netz</th>
+    <th>Solar-ZEV</th>
+    <th>Kauf-Solar</th>
+    <th>Kauf-Netz</th>
+    <th>Verkauf</th>
     <th>Total CHF</th>
 </tr>";
 
@@ -394,16 +394,16 @@ class Abrechnung extends IPSModule
 
             $html .= "<tr>
                 <td>{$a['name']}</td>
-                <td align='right'>" . number_format($a['imp'], 3) . "</td>
-                <td align='right'>" . number_format($a['exp'], 3) . "</td>
-                <td align='right'>" . number_format($a['solar_bezug'], 3) . "</td>
-                <td align='right'>" . number_format($a['netz_bezug'], 3) . "</td>
-                <td align='right'>" . number_format($a['solareinspeisung'], 3) . "</td>
-                <td align='right'>" . number_format($a['solarverkauf'], 3) . "</td>
-                <td align='right'>" . number_format($a['cost_solar'], 2) . "</td>
-                <td align='right'>" . number_format($a['cost_grid'], 2) . "</td>
-                <td align='right'>" . number_format($a['rev_feedin'], 2) . "</td>
-                <td align='right'><b>" . number_format($subtotal, 2) . " CHF</b></td>
+                <td align='right'>" . number_format($a['imp'], 3) . " kWh</td>
+                <td align='right'>" . number_format($a['exp'], 3) . " kWh</td>
+                <td align='right'>" . number_format($a['solar_bezug'], 3) . " kWh</td>
+                <td align='right'>" . number_format($a['netz_bezug'], 3) . " kWh</td>
+                <td align='right'>" . number_format($a['solareinspeisung'], 3) . " kWh</td>
+                <td align='right'>" . number_format($a['solarverkauf'], 3) . " kWh</td>
+                <td align='right'>CHF " . number_format($a['cost_solar'], 2) . ".-</td>
+                <td align='right'>CHF " . number_format($a['cost_grid'], 2) . ".-</td>
+                <td align='right'>CHF " . number_format($a['rev_feedin'], 2) . ".-</td>
+                <td align='right'>CHF " . number_format($subtotal, 2) . ".-</td>
             </tr>";
         }
             $html .= "<tr style='background-color:#f9f9f9; font-weight:bold;'>
@@ -430,12 +430,12 @@ class Abrechnung extends IPSModule
         $html = "
 <table border='1' cellspacing='0' cellpadding='2' width='100%' style='font-size:6px;'>
 <tr style='background-color:#f0f0f0;'>
-    <th>Zähler</th>
+    <th>ID</th>
     <th>Typ</th>
-    <th>Start</th>
-    <th>Ende</th>
-    <th>Stand Start</th>
-    <th>Stand Ende</th>
+    <th>Datum von</th>
+    <th>Datum bis</th>
+    <th>Zähler Start</th>
+    <th>Zähler Ende</th>
     <th>Verbrauch</th>
     <th>Tarif</th>
     <th>Kosten CHF</th>
@@ -464,7 +464,7 @@ class Abrechnung extends IPSModule
                 <td align='right'></td>
                 <td align='right'></td>
                 <td align='right'></td>
-                <td align='right'><b>" . number_format($total, 2) . " CHF</b></td>
+                <td align='right'><b>CHF " . number_format($total, 2) . ".-</b></td>
             </tr>";
 
         if (!empty($usedTariffs)) {