From c9231413b723d034cdf9e0e4c02071bc1baa773d Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 4 May 2026 15:29:40 +0200 Subject: [PATCH 1/5] PerspektivenEV/Export/DatevExporterBthg.cs -> Eigenen Debitor bei Eigenanteil -> Feld im HP umbenannt SupportOID=161986 --- .../Export/DatevExporterBthg.cs | 2 +- .../PerspektivenEV/PerspektivenEV.csproj | 1 + .../Translation/TranslationDictionary.cs | 26 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 ReportImp/PerspektivenEV/Translation/TranslationDictionary.cs diff --git a/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs b/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs index ca77532a2..bfd157a34 100644 --- a/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs +++ b/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs @@ -522,7 +522,7 @@ namespace PerspektivenEV.Export String sql = @" select sip.Claim, - c.DebitorNumber, + CASE WHEN ib.RecipientOrganisation = 'EIGENANTEIL' THEN c2s.KontoHilfeplan ELSE c.DebitorNumber END AS DebitorNumber, ib.InvoiceDate, ib.invoicenumber, ib.Oid AS InvoiceOID, diff --git a/ReportImp/PerspektivenEV/PerspektivenEV.csproj b/ReportImp/PerspektivenEV/PerspektivenEV.csproj index 7bda156ff..515551539 100644 --- a/ReportImp/PerspektivenEV/PerspektivenEV.csproj +++ b/ReportImp/PerspektivenEV/PerspektivenEV.csproj @@ -220,6 +220,7 @@ Teamstundenkonto.cs + diff --git a/ReportImp/PerspektivenEV/Translation/TranslationDictionary.cs b/ReportImp/PerspektivenEV/Translation/TranslationDictionary.cs new file mode 100644 index 000000000..c58f86a60 --- /dev/null +++ b/ReportImp/PerspektivenEV/Translation/TranslationDictionary.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; + +namespace PerspektivenEV.Translation +{ + public class CustomTranslationDictionary : TranslationDictionary + { + public override Dictionary GetTranslationDictionary() + { + var dict = base.GetTranslationDictionary(); + AddOrReplaceTranslation(dict, "Debitor Nr.", "Debitor Kostenträger"); + AddOrReplaceTranslation(dict, "KontoHilfeplan", "Debitor Klient"); + return dict; + } + } +} From 7f61078c5e5c7138d2fa35bb33af47d436481486 Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 4 May 2026 11:32:41 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Arya=20Steffens=20Hevia=20Therapie=20hinzug?= =?UTF-8?q?ef=C3=BCgt=20zur=20PluginLoader-Projektliste=20SupportOID=3D161?= =?UTF-8?q?657?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/Plugins/PluginLoader.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 0a35c98fb..fa15524ca 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -69,7 +69,7 @@ namespace BeWo.Service.Plugins //t = "5351926758"; // Viva a Vida //t = "2215396183"; // Diakonie Remscheid Lennep //t = "5157599087"; // SHG Schwerte - t = "4526293996"; // Fortis + //t = "4526293996"; // Fortis //t = "3647969417"; // Caritas Bottrop //t = "3057313346"; // SSB Mainz //t = "6246287823"; // BeWo Alsdorf @@ -212,7 +212,7 @@ namespace BeWo.Service.Plugins //t = "7185105541"; // Nous GmbH //t = "5022131330"; // Tabula Rasa //t = "4189934785"; // Landshuter Netzwerke - t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR + //t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR //t = "3678599942"; // VKM Rietberg //t = "4069072369"; // BeWo Dreilich&Pastor (Projekt TranskulturellesBBPastor) //t = "4160851689"; // BeWo Dreilich&Pastor (Dreilich) @@ -432,6 +432,7 @@ namespace BeWo.Service.Plugins //t = "9885937567"; // Antje Boland - BeWo Boland //t = "3829321035"; // Diakoniewerk Essen //t = "3583014513"; // Bezirksverein für soziale Rechtspflege Villingen-Schwenningen Körperschaft des öffentlichen Rechts Sebastian Kopp + //t = "1561235939"; // Arya Steffens - Hevia Therapie return t; #else From 042f1f70cf5a0ded184edf45a446a17fe1a51510 Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 5 May 2026 10:33:38 +0200 Subject: [PATCH 3/5] =?UTF-8?q?BeWoAllReports:=20fehlende=20Zeilenumbr?= =?UTF-8?q?=C3=BCche=20korrigiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWoAllReports.sln | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index 05c0d84b2..764e29722 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -12138,7 +12138,8 @@ Global {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|Mixed Platforms.Build.0 = Release|Any CPU {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|x86.ActiveCfg = Release|Any CPU - {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|x86.Build.0 = Release|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|.NET.ActiveCfg = Debug|Any CPU + {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|x86.Build.0 = Release|Any CPU + {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|.NET.ActiveCfg = Debug|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|.NET.Build.0 = Debug|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -12161,7 +12162,7 @@ Global {E23C4943-8677-40DA-A45F-1322D1AD2443}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Release|Mixed Platforms.Build.0 = Release|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Release|x86.ActiveCfg = Release|Any CPU - {E23C4943-8677-40DA-A45F-1322D1AD2443}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection From fa3b7d1c110c1350232a2566814a5d9939245873 Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 5 May 2026 10:35:36 +0200 Subject: [PATCH 4/5] =?UTF-8?q?BeWoImFlow:=20Auf=20Quittierungsbeleg=20Mon?= =?UTF-8?q?atsunterschrift=20Klient=20erg=C3=A4nzt=20SupportOID=3D162042?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BeWoImFlow/Quittierungsbeleg.Designer.cs | 89 ++++++++++++++----- 1 file changed, 67 insertions(+), 22 deletions(-) diff --git a/ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs b/ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs index 08cd17554..598e2c7c8 100644 --- a/ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs +++ b/ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs @@ -78,6 +78,8 @@ namespace BeWoImFlow this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -114,8 +116,9 @@ namespace BeWoImFlow this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -726,6 +729,9 @@ namespace BeWoImFlow // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblUnterschriftKlient, + this.xrPictureBox2, + this.xrLabel18, this.xrLabel17, this.xrPictureBox1, this.xrLabel9, @@ -743,10 +749,33 @@ namespace BeWoImFlow this.xrLabel11, this.xrLabel10, this.xrLabel1}); - this.GroupFooter1.HeightF = 270.5F; + this.GroupFooter1.HeightF = 274F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(415F, 214.5F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(120.1389F, 35.50002F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // + // xrPictureBox1 + // + this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 214.5F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // xrLabel9 // this.xrLabel9.BackColor = System.Drawing.Color.Gainsboro; @@ -1199,28 +1228,41 @@ namespace BeWoImFlow this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // xrLabel17 + // lblUnterschriftKlient // - this.xrLabel17.BackColor = System.Drawing.Color.Transparent; - this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(415F, 214.5F); - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(120.1389F, 35.50002F); - this.xrLabel17.StylePriority.UseBackColor = false; - this.xrLabel17.StylePriority.UseTextAlignment = false; - this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 250F); + this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; + this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(304.5972F, 20F); + this.lblUnterschriftKlient.StylePriority.UseBackColor = false; + this.lblUnterschriftKlient.StylePriority.UseBorders = false; + this.lblUnterschriftKlient.StylePriority.UseFont = false; + this.lblUnterschriftKlient.StylePriority.UsePadding = false; + this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; + this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; + this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // - // xrPictureBox1 + // xrPictureBox2 // - this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 214.5F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(200.236F, 214.5F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel18 + // + this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 214.5F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(105.2361F, 35.50002F); + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; // // Quittierungsbeleg // @@ -1342,5 +1384,8 @@ namespace BeWoImFlow private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; } } From ffc53dc6eace2929e7435a6dad127a99a1f7b4fb Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 5 May 2026 10:36:45 +0200 Subject: [PATCH 5/5] =?UTF-8?q?PluginLoader:=20Fehlenden=20Import=20erg?= =?UTF-8?q?=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/Plugins/PluginLoader.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index fa15524ca..a62aad18b 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Threading; +using BeWo.Data; using BS.Shared.Core; namespace BeWo.Service.Plugins