From 614239bc02669999aef5dcdd0396fc1c36e76fe4 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Mon, 25 Aug 2025 15:54:19 +0200
Subject: [PATCH] =?UTF-8?q?AWOMuensterlandRecklinghausen/Service/CustomAcc?=
 =?UTF-8?q?ountingService=20-=20Erweiterung=20Storno=20f=C3=BCr=20Allg=20R?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/CustomAccountingService.cs        | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Service/CustomAccountingService.cs b/ReportImp/AWOMuensterlandRecklinghausen/Service/CustomAccountingService.cs
index 3b06bb690..13fad57e9 100644
--- a/ReportImp/AWOMuensterlandRecklinghausen/Service/CustomAccountingService.cs
+++ b/ReportImp/AWOMuensterlandRecklinghausen/Service/CustomAccountingService.cs
@@ -18,13 +18,7 @@ namespace AWOMuensterlandRecklinghausen.Service
         public override ServiceInvoice ErstelleStornoRechnung(InvoiceBaseDC ibdc)
         {
             var i = base.ErstelleStornoRechnung(ibdc);
-            //if (!String.IsNullOrEmpty(i.InvoiceBase.InvoiceNumber))
-            //{
-            //    //i.InvoiceBase.InvoiceNumber = ibdc.InvoiceNumber + " Storno";
-            //    i.InvoiceBase.InvoiceNumber = i.InvoiceBase.InvoiceNumber + " Storno";
-            //}
-            int invoiceCounter = 0;
-            var inc = PluginLoader.FindClass<InvoiceNumberGenerator>();
+            //var inc = PluginLoader.FindClass<InvoiceNumberGenerator>();
             i.InvoiceBase.InvoiceNumber = i.InvoiceBase.InvoiceNumber + " Storno";
             i.InvoiceBase.InvoiceDate = DateTime.Now;
 
@@ -39,7 +33,32 @@ namespace AWOMuensterlandRecklinghausen.Service
             
             DAOFactory.GenericDAO.Insert(i);
 
-            //inc.IncreaseInvoiceNumber(1, null);
+            return i;
+        }
+
+        public override InvoiceBase ErstelleStornoAllgemeineRechnung(InvoiceBaseDC ibdc)
+        {
+            var i = base.ErstelleStornoAllgemeineRechnung(ibdc);
+            //var inc = PluginLoader.FindClass<InvoiceNumberGenerator>();
+            i.InvoiceNumber = i.InvoiceNumber + " Storno";
+            i.InvoiceDate = DateTime.Now;
+
+            if (String.IsNullOrEmpty(i.InvoiceTypeText))
+            {
+                i.InvoiceTypeText = "Storno";
+            }
+            else
+            {
+                i.InvoiceTypeText += " Storno";
+            }
+            i.StornoInvoiceBaseOid = ibdc.InvoiceBaseOid.Value;
+
+            DAOFactory.GenericDAO.Insert(i);
+
+            var original = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(ibdc.InvoiceBaseOid.Value);
+            original.StornoInvoiceBaseOid = i.Oid;
+
+            DAOFactory.GenericDAO.Update(original);
 
             return i;
         }