MH: Porta Briefpapier

This commit is contained in:
2025-07-01 16:34:35 +02:00
parent afc374e009
commit 0f60db55a9
4 changed files with 76 additions and 83 deletions

View File

@@ -73,13 +73,13 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.lblMobilnummer = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.lblMobilnummer = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
@@ -650,6 +650,58 @@ namespace BeWo.Report.DefaultReports
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLabel11
//
this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")});
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 238.3334F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(403.12F, 17F);
this.xrLabel11.Text = "xrLabel5";
//
// lblMobilnummer
//
this.lblMobilnummer.LocationFloat = new DevExpress.Utils.PointFloat(0F, 221.3334F);
this.lblMobilnummer.Multiline = true;
this.lblMobilnummer.Name = "lblMobilnummer";
this.lblMobilnummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblMobilnummer.SizeF = new System.Drawing.SizeF(403.12F, 17F);
//
// xrLabel7
//
this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonPhone")});
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 204.3334F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(403.12F, 17F);
this.xrLabel7.Text = "xrLabel5";
//
// xrLabel6
//
this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonDivision")});
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.25F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(403.12F, 17F);
this.xrLabel6.Text = "xrLabel5";
//
// xrLabel5
//
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPerson")});
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 160.25F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(403.12F, 17F);
this.xrLabel5.Text = "xrLabel5";
//
// xrLabel1
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -665,62 +717,10 @@ namespace BeWo.Report.DefaultReports
this.xrLabel1.Text = "xrLabel1";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// xrLabel5
//
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPerson")});
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 160.25F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(403.12F, 17F);
this.xrLabel5.Text = "xrLabel5";
//
// xrLabel6
//
this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonDivision")});
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.25F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(403.12F, 17F);
this.xrLabel6.Text = "xrLabel5";
//
// xrLabel7
//
this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonPhone")});
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 204.3334F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(403.12F, 17F);
this.xrLabel7.Text = "xrLabel5";
//
// lblMobilnummer
//
this.lblMobilnummer.LocationFloat = new DevExpress.Utils.PointFloat(0F, 221.3334F);
this.lblMobilnummer.Multiline = true;
this.lblMobilnummer.Name = "lblMobilnummer";
this.lblMobilnummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblMobilnummer.SizeF = new System.Drawing.SizeF(403.12F, 17F);
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel11
//
this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")});
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 238.3334F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(403.12F, 17F);
this.xrLabel11.Text = "xrLabel5";
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -735,7 +735,7 @@ namespace BeWo.Report.DefaultReports
this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 204.375F, 50F);
this.Margins = new DevExpress.Drawing.DXMargins(93F, 52F, 204.375F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;

View File

@@ -34,9 +34,12 @@ namespace BeWo.Report.DefaultReports
SetzeAdresse(pRO);
var mobilnummer = pRO.InvoiceBase.SenderContactInformations.FirstOrDefault(i => i.ContactType == BS.Shared.ContactType.business_MobilePhone);
if (mobilnummer != null)
lblMobilnummer.Text = "Mobil: " + mobilnummer.ContactValue;
if (pRO.InvoiceBase.SenderContactInformations != null)
{
var mobilnummer = pRO.InvoiceBase.SenderContactInformations.FirstOrDefault(i => i.ContactType == BS.Shared.ContactType.business_MobilePhone);
if (mobilnummer != null)
lblMobilnummer.Text = "Mobil: " + mobilnummer.ContactValue;
}
pRO.SenderContactPersonPhone = pRO.SenderContactPersonPhone.Replace("Tel.", "Telefon");

View File

@@ -32,7 +32,6 @@ namespace BeWo.Report.DefaultReports
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
@@ -92,7 +91,6 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -111,12 +109,13 @@ namespace BeWo.Report.DefaultReports
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -739,10 +738,6 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.Weight = 3D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -942,6 +937,10 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.16397432767427886D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -959,19 +958,17 @@ namespace BeWo.Report.DefaultReports
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 203.125F, 43F);
this.Margins = new DevExpress.Drawing.DXMargins(95F, 74F, 203.125F, 43F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

View File

@@ -54,16 +54,9 @@ namespace BeWo.Report.DefaultReports
lblAnrede.Text = "Guten Tag,";
}
if (pRO.InvoiceBaseOid.HasValue)
{
var invoiceBase = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(DAOFactory.GenericDAO.GetByID<InvoiceBase>(pRO.InvoiceBaseOid.Value));
var mobilnummer = invoiceBase.SenderContactInformations.FirstOrDefault(i => i.ContactType == BS.Shared.ContactType.business_MobilePhone);
if (mobilnummer != null)
lblMobilnummer.Text = "Mobil: " + mobilnummer.ContactValue;
}
pRO.SenderContactPersonFax = pRO.SenderContactPersonFax.Replace("Fax", "Mobil");
if (pRO.SenderContactPersonFax != null)
pRO.SenderContactPersonFax = pRO.SenderContactPersonFax.Replace("Fax", "Mobil");
if (pRO.SenderContactPersonPhone != null)
pRO.SenderContactPersonPhone = pRO.SenderContactPersonPhone.Replace("Tel.", "Telefon");
if (!pRO.SenderContactPerson.IsNullOrEmpty() && pRO.SenderContactPerson.Contains("Peters"))