From 7235ad3d5c581c7d00dbea3f58e242ddbbeb8c2c Mon Sep 17 00:00:00 2001 From: HirschleM Date: Mon, 13 Apr 2026 07:46:29 +0200 Subject: [PATCH] MH: Pusteblume Einrichttungsnummer --- .../PraxisPusteblume/IfsSammelRechnung.cs | 3 +++ .../ObaSammelRechnung.Designer.cs | 24 +++++++++---------- .../PraxisPusteblume/ObaSammelRechnung.cs | 7 ++++-- .../PraxisPusteblume/ObaSammelRechnung.resx | 2 +- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs b/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs index 9bf7953c4..b586256a7 100644 --- a/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs +++ b/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs @@ -43,6 +43,9 @@ namespace PraxisPusteblume } else if (pRO.RecipientOrganisation.Contains("(MQ)")) { + if (pRO.RecipientOrganisation.Contains("Bezirk Oberbayern")) + lblEinrichtung.Text = lblEinrichtung.Text.Replace("ZE-102358", "ZE-103522"); + pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace(" (MQ)", "").Trim(); mq = true; } diff --git a/ReportImp/PraxisPusteblume/ObaSammelRechnung.Designer.cs b/ReportImp/PraxisPusteblume/ObaSammelRechnung.Designer.cs index 1ae98e1f2..94c505303 100644 --- a/ReportImp/PraxisPusteblume/ObaSammelRechnung.Designer.cs +++ b/ReportImp/PraxisPusteblume/ObaSammelRechnung.Designer.cs @@ -32,7 +32,7 @@ namespace PraxisPusteblume System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ObaSammelRechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); + this.lblRechnungsinfos = new DevExpress.XtraReports.UI.XRRichText(); this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); @@ -89,7 +89,7 @@ namespace PraxisPusteblume this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lblRechnungsinfos)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtKopfIfs)).BeginInit(); @@ -111,7 +111,7 @@ namespace PraxisPusteblume // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrRichText3, + this.lblRechnungsinfos, this.xrRichText2}); this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); @@ -119,13 +119,13 @@ namespace PraxisPusteblume this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // - // xrRichText3 + // lblRechnungsinfos // - this.xrRichText3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(355.0003F, 0F); - this.xrRichText3.Name = "xrRichText3"; - this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); - this.xrRichText3.SizeF = new System.Drawing.SizeF(284.2049F, 79.99998F); + this.lblRechnungsinfos.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.lblRechnungsinfos.LocationFloat = new DevExpress.Utils.PointFloat(355.0003F, 0F); + this.lblRechnungsinfos.Name = "lblRechnungsinfos"; + this.lblRechnungsinfos.SerializableRtfString = resources.GetString("lblRechnungsinfos.SerializableRtfString"); + this.lblRechnungsinfos.SizeF = new System.Drawing.SizeF(284.2049F, 79.99998F); // // xrRichText2 // @@ -467,7 +467,7 @@ namespace PraxisPusteblume this.xrTableCell20.StylePriority.UsePadding = false; this.xrTableCell20.StylePriority.UseTextAlignment = false; this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell20.Weight = 0.10769221860134876D; + this.xrTableCell20.Weight = 0.10769221860134875D; // // xrTableCell21 // @@ -658,7 +658,7 @@ namespace PraxisPusteblume this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; - ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lblRechnungsinfos)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rtKopfIfs)).EndInit(); @@ -698,7 +698,7 @@ namespace PraxisPusteblume private DevExpress.XtraReports.UI.XRTableCell cellPreisAmbulant; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.XRRichText xrRichText1; - private DevExpress.XtraReports.UI.XRRichText xrRichText3; + private DevExpress.XtraReports.UI.XRRichText lblRechnungsinfos; private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; private DevExpress.XtraReports.UI.XRTableCell cellPreisInvest; diff --git a/ReportImp/PraxisPusteblume/ObaSammelRechnung.cs b/ReportImp/PraxisPusteblume/ObaSammelRechnung.cs index 1dd7b704c..5eaff7f0e 100644 --- a/ReportImp/PraxisPusteblume/ObaSammelRechnung.cs +++ b/ReportImp/PraxisPusteblume/ObaSammelRechnung.cs @@ -33,9 +33,12 @@ namespace PraxisPusteblume if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) { - if (pRO.RecipientOrganisation.EndsWith(" - OBA")) + if (pRO.RecipientOrganisation.Contains("Bezirk Oberbayern - OBA (MQ)")) + lblRechnungsinfos.Text = lblRechnungsinfos.Text.Replace("ZE-102358", "ZE-103522"); + + if (pRO.RecipientOrganisation.EndsWith(" - OBA")) { - pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace(" - OBA", "").Trim(); + pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace(" - OBA", "").Trim(); } sb.AppendLine(pRO.RecipientOrganisation); } diff --git a/ReportImp/PraxisPusteblume/ObaSammelRechnung.resx b/ReportImp/PraxisPusteblume/ObaSammelRechnung.resx index cd8a6d9f1..910d76c87 100644 --- a/ReportImp/PraxisPusteblume/ObaSammelRechnung.resx +++ b/ReportImp/PraxisPusteblume/ObaSammelRechnung.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEgAZQBsAHYAZQB0AGkAYwBhAC0ATABpAGcAaAB0ADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAUgBlAGMAaABuAHUAbgBnAHMAZABhAHQAdQBtADoAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgACAAWwBJAG4AdgBvAGkAYwBlAEQAYQB0AGUAXQB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABFAGkAbgByAGkAYwBoAHQAdQBuAGcAcwBuAHUAbQBtAGUAcgA6ACAAWgBFAC0AMQAwADIAMwA1ADgAfQBcAGYAcwAyADIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAyADcANQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMgAwADAAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=