LebenshilfeKusel: Adressierung GkvBegleitzettel angepasst

SupportOID=157241
This commit is contained in:
2026-06-25 20:58:18 +02:00
parent f8b555c558
commit 1680a181bb
2 changed files with 34 additions and 58 deletions

View File

@@ -1,5 +1,5 @@
using BeWo.Report.ReportObjects;
namespace LebenshilfeKusel
namespace BeWo.Report.DefaultReports.Invoices
{
partial class GkvBegleitzettel
{
@@ -117,13 +117,11 @@ namespace LebenshilfeKusel
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowReceiverContactPerson = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableRowReceiverOrganisation = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell72 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowReceiverDatenannahmestelle = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell75 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowAnnahmestellenInfo = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell70 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowReceiverDivision = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell75 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowReceiverContactPerson = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell78 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowReceiverStreet = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell81 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -903,7 +901,7 @@ namespace LebenshilfeKusel
// xrLabel2
//
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Underline);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 56F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -916,88 +914,65 @@ namespace LebenshilfeKusel
// xrTable1
//
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 72.00005F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.00005F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
this.xrTable1.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.ResizeCellsEqually;
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowReceiverContactPerson,
this.xrTableRowReceiverDatenannahmestelle,
this.xrTableRowAnnahmestellenInfo,
this.xrTableRowReceiverOrganisation,
this.xrTableRowReceiverDivision,
this.xrTableRowReceiverContactPerson,
this.xrTableRowReceiverStreet,
this.xrTableRowReceiverPostCodeTown});
this.xrTable1.SizeF = new System.Drawing.SizeF(341.7074F, 108F);
this.xrTable1.SizeF = new System.Drawing.SizeF(341.7074F, 90F);
this.xrTable1.StylePriority.UseFont = false;
//
// xrTableRowReceiverContactPerson
// xrTableRowReceiverOrganisation
//
this.xrTableRowReceiverContactPerson.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableRowReceiverOrganisation.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell72});
this.xrTableRowReceiverContactPerson.Name = "xrTableRowReceiverContactPerson";
this.xrTableRowReceiverContactPerson.Weight = 0.71999956054714331D;
this.xrTableRowReceiverOrganisation.Name = "xrTableRowReceiverOrganisation";
this.xrTableRowReceiverOrganisation.Weight = 0.71999956054714331D;
//
// xrTableCell72
//
this.xrTableCell72.Multiline = true;
this.xrTableCell72.Name = "xrTableCell72";
this.xrTableCell72.StylePriority.UseTextAlignment = false;
this.xrTableCell72.Text = "[ReceiverContactPerson]";
this.xrTableCell72.Text = "[ReceiverOrganisation]";
this.xrTableCell72.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell72.Visible = false;
this.xrTableCell72.Weight = 1.3569801834867468D;
//
// xrTableRowReceiverDatenannahmestelle
// xrTableRowReceiverDivision
//
this.xrTableRowReceiverDatenannahmestelle.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableRowReceiverDivision.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell75});
this.xrTableRowReceiverDatenannahmestelle.Name = "xrTableRowReceiverDatenannahmestelle";
this.xrTableRowReceiverDatenannahmestelle.Weight = 0.7199995605471432D;
this.xrTableRowReceiverDivision.Name = "xrTableRowReceiverDivision";
this.xrTableRowReceiverDivision.Weight = 0.7199995605471432D;
//
// xrTableCell75
//
this.xrTableCell75.Multiline = true;
this.xrTableCell75.Name = "xrTableCell75";
this.xrTableCell75.StylePriority.UseTextAlignment = false;
this.xrTableCell75.Text = "[ReceiverDatenannahmestelle]";
this.xrTableCell75.Text = "[ReceiverDivision]";
this.xrTableCell75.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell75.Weight = 1.3569801834867468D;
//
// xrTableRowAnnahmestellenInfo
// xrTableRowReceiverContactPerson
//
this.xrTableRowAnnahmestellenInfo.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell70});
this.xrTableRowAnnahmestellenInfo.Name = "xrTableRowAnnahmestellenInfo";
this.xrTableRowAnnahmestellenInfo.Weight = 0.71999956054714331D;
//
// xrTableCell70
//
this.xrTableCell70.ExpressionBindings.AddRange(new DevExpress.XtraReports.UI.ExpressionBinding[] {
new DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[KrankenkasseName]")});
this.xrTableCell70.Multiline = true;
this.xrTableCell70.Name = "xrTableCell70";
this.xrTableCell70.StylePriority.UseTextAlignment = false;
this.xrTableCell70.Text = "xrTableCell70";
this.xrTableCell70.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell70.TextFormatString = "(Datenannahmestelle {0})";
this.xrTableCell70.Visible = false;
this.xrTableCell70.Weight = 1.3569801834867468D;
//
// xrTableRowReceiverDivision
//
this.xrTableRowReceiverDivision.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableRowReceiverContactPerson.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell78});
this.xrTableRowReceiverDivision.Name = "xrTableRowReceiverDivision";
this.xrTableRowReceiverDivision.Weight = 0.71999956054714331D;
this.xrTableRowReceiverContactPerson.Name = "xrTableRowReceiverContactPerson";
this.xrTableRowReceiverContactPerson.Weight = 0.71999956054714331D;
//
// xrTableCell78
//
this.xrTableCell78.Multiline = true;
this.xrTableCell78.Name = "xrTableCell78";
this.xrTableCell78.StylePriority.UseTextAlignment = false;
this.xrTableCell78.Text = "[ReceiverDivision]";
this.xrTableCell78.Text = "[ReceiverContactPerson]";
this.xrTableCell78.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell78.Visible = false;
this.xrTableCell78.Weight = 1.3569801834867468D;
//
// xrTableRowReceiverStreet
@@ -1047,7 +1022,7 @@ namespace LebenshilfeKusel
this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 72F, 148.9951F, 71F);
this.PageHeight = 1169;
this.PageWidth = 826;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
@@ -1148,13 +1123,11 @@ namespace LebenshilfeKusel
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowReceiverContactPerson;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowReceiverOrganisation;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell72;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowReceiverDatenannahmestelle;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell75;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowAnnahmestellenInfo;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell70;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowReceiverDivision;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell75;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowReceiverContactPerson;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell78;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowReceiverStreet;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell81;

View File

@@ -7,7 +7,7 @@ using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace LebenshilfeKusel
namespace BeWo.Report.DefaultReports.Invoices
{
public partial class GkvBegleitzettel : XtraReport, IBeWoReport<GkvAbrechnungRO>
{
@@ -36,12 +36,15 @@ namespace LebenshilfeKusel
if (pRO.SenderWebsite.ToNullIfEmpty() is null)
xrTableRowSenderWebsite.Visible = false;
if (pRO.ReceiverContactPerson.ToNullIfEmpty() is null)
xrTableRowReceiverContactPerson.Visible = false;
if (pRO.ReceiverOrganisation.ToNullIfEmpty() is null)
xrTableRowReceiverOrganisation.Visible = false;
if (pRO.ReceiverDivision.ToNullIfEmpty() is null)
xrTableRowReceiverDivision.Visible = false;
if (pRO.ReceiverContactPerson.ToNullIfEmpty() is null)
xrTableRowReceiverContactPerson.Visible = false;
/*
if (pRO.ReceiverStreet.ToNullIfEmpty() is null)
xrTableRowReceiverStreet.Visible = false;