MH: Pusteblume Einrichttungsnummer

This commit is contained in:
2026-04-13 07:46:29 +02:00
parent cd53e43d34
commit 7235ad3d5c
4 changed files with 21 additions and 15 deletions

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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);
}

View File

@@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrRichText3.SerializableRtfString" xml:space="preserve">
<data name="lblRechnungsinfos.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEgAZQBsAHYAZQB0AGkAYwBhAC0ATABpAGcAaAB0ADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAUgBlAGMAaABuAHUAbgBnAHMAZABhAHQAdQBtADoAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgACAAWwBJAG4AdgBvAGkAYwBlAEQAYQB0AGUAXQB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABFAGkAbgByAGkAYwBoAHQAdQBuAGcAcwBuAHUAbQBtAGUAcgA6ACAAWgBFAC0AMQAwADIAMwA1ADgAfQBcAGYAcwAyADIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAyADcANQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMgAwADAAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
<data name="xrRichText2.SerializableRtfString" xml:space="preserve">