From a369cd9a6dfb8893b1da8349d72b2a433becf5a6 Mon Sep 17 00:00:00 2001 From: Kojo Date: Fri, 30 Aug 2024 10:57:38 +0200 Subject: [PATCH 1/6] =?UTF-8?q?BetreuwoWesel:=20GP-Nummer=20n=C3=BCr=20f?= =?UTF-8?q?=C3=BCr=20LVR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BetreuwoWesel/RechnungFud.Designer.cs | 36 ++++++++--------- ReportImp/BetreuwoWesel/RechnungFud.cs | 19 ++++----- .../SettlementReport.Designer.cs | 40 +++++++++---------- ReportImp/BetreuwoWesel/SettlementReport.cs | 6 +++ .../SettlementReport2.Designer.cs | 40 +++++++++---------- ReportImp/BetreuwoWesel/SettlementReport2.cs | 5 +++ 6 files changed, 77 insertions(+), 69 deletions(-) diff --git a/ReportImp/BetreuwoWesel/RechnungFud.Designer.cs b/ReportImp/BetreuwoWesel/RechnungFud.Designer.cs index e19867ea0..abc302286 100644 --- a/ReportImp/BetreuwoWesel/RechnungFud.Designer.cs +++ b/ReportImp/BetreuwoWesel/RechnungFud.Designer.cs @@ -32,6 +32,7 @@ namespace BetreuWoWesel System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungFud)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.lblGebAz = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); @@ -85,7 +86,6 @@ namespace BetreuWoWesel this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit(); @@ -105,7 +105,7 @@ namespace BetreuWoWesel // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel4, + this.lblGpNummer, this.xrLabel7, this.lblGebAz, this.xrLabel1, @@ -121,6 +121,21 @@ namespace BetreuWoWesel this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // lblGpNummer + // + this.lblGpNummer.BackColor = System.Drawing.Color.Transparent; + this.lblGpNummer.CanShrink = true; + this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(419.795F, 365.2083F); + this.lblGpNummer.Name = "lblGpNummer"; + this.lblGpNummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGpNummer.SizeF = new System.Drawing.SizeF(255.2083F, 20F); + this.lblGpNummer.StylePriority.UseBackColor = false; + this.lblGpNummer.StylePriority.UseFont = false; + this.lblGpNummer.StylePriority.UseTextAlignment = false; + this.lblGpNummer.Text = "Geschäftsnummer: 2000256442"; + this.lblGpNummer.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblGpNummer.WordWrap = false; + // // xrLabel7 // this.xrLabel7.BackColor = System.Drawing.Color.Transparent; @@ -727,21 +742,6 @@ namespace BetreuWoWesel "egebene Konto. Vielen Dank für Ihr Vertrauen"; this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel4 - // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(419.795F, 365.2083F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(255.2083F, 20F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "Geschäftsnummer: 2000256442"; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrLabel4.WordWrap = false; - // // RechnungFud // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -828,6 +828,6 @@ namespace BetreuWoWesel private DevExpress.XtraReports.UI.XRLabel xrLabel22; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.XRRichText xrRichText5; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel lblGpNummer; } } diff --git a/ReportImp/BetreuwoWesel/RechnungFud.cs b/ReportImp/BetreuwoWesel/RechnungFud.cs index 362c2dddb..c4807eaf3 100644 --- a/ReportImp/BetreuwoWesel/RechnungFud.cs +++ b/ReportImp/BetreuwoWesel/RechnungFud.cs @@ -1,9 +1,6 @@ using System; -using BeWo.Data.Access; -using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; -using BS.Shared; using BS.Shared.Core; using DevExpress.XtraReports.UI; @@ -28,19 +25,19 @@ namespace BetreuWoWesel pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace(" ALS", "").Trim(); lblGebAz.Text = lblGebAz.Text.Replace("Vers.-Nr.:", "AZ:"); + } + + if (!pRO.RecipientOrganisation.ToLower().Contains("lvr")) + { + lblGpNummer.Visible = false; } - - } - - - - if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower() == "herr") + } + + if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower() == "herr") pRO.CustomerSalutation = "Herrn"; - this.bindingSource1.DataSource = pRO; } - } } \ No newline at end of file diff --git a/ReportImp/BetreuwoWesel/SettlementReport.Designer.cs b/ReportImp/BetreuwoWesel/SettlementReport.Designer.cs index 5a55f48ee..97fc2a0ad 100644 --- a/ReportImp/BetreuwoWesel/SettlementReport.Designer.cs +++ b/ReportImp/BetreuwoWesel/SettlementReport.Designer.cs @@ -34,6 +34,7 @@ namespace BetreuWoWesel.Alt 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.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -104,7 +105,6 @@ namespace BetreuWoWesel.Alt this.xrRichText5 = new DevExpress.XtraReports.UI.XRRichText(); this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -125,7 +125,7 @@ namespace BetreuWoWesel.Alt // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel1, + this.lblGpNummer, this.xrLabel8, this.xrRichText1, this.xrLabel9, @@ -141,6 +141,23 @@ namespace BetreuWoWesel.Alt this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // lblGpNummer + // + this.lblGpNummer.BackColor = System.Drawing.Color.Transparent; + this.lblGpNummer.CanShrink = true; + this.lblGpNummer.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(460.42F, 289.9167F); + this.lblGpNummer.Multiline = true; + this.lblGpNummer.Name = "lblGpNummer"; + this.lblGpNummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGpNummer.SizeF = new System.Drawing.SizeF(214.5836F, 17F); + this.lblGpNummer.StylePriority.UseBackColor = false; + this.lblGpNummer.StylePriority.UseFont = false; + this.lblGpNummer.StylePriority.UseTextAlignment = false; + this.lblGpNummer.Text = "Geschäftsnummer: 2000256442"; + this.lblGpNummer.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblGpNummer.WordWrap = false; + // // xrLabel8 // this.xrLabel8.CanShrink = true; @@ -893,23 +910,6 @@ namespace BetreuWoWesel.Alt this.xrPictureBox1.SizeF = new System.Drawing.SizeF(139.1942F, 65.97227F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // - // xrLabel1 - // - this.xrLabel1.BackColor = System.Drawing.Color.Transparent; - this.xrLabel1.CanShrink = true; - this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(460.42F, 289.9167F); - this.xrLabel1.Multiline = true; - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(214.5836F, 17F); - this.xrLabel1.StylePriority.UseBackColor = false; - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Geschäftsnummer: 2000256442"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrLabel1.WordWrap = false; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); @@ -1021,6 +1021,6 @@ namespace BetreuWoWesel.Alt private DevExpress.XtraReports.UI.XRRichText xrRichText4; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRRichText xrRichText5; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel lblGpNummer; } } diff --git a/ReportImp/BetreuwoWesel/SettlementReport.cs b/ReportImp/BetreuwoWesel/SettlementReport.cs index 11db21625..1b0daf836 100644 --- a/ReportImp/BetreuwoWesel/SettlementReport.cs +++ b/ReportImp/BetreuwoWesel/SettlementReport.cs @@ -13,6 +13,12 @@ namespace BetreuWoWesel.Alt public void SetReportDataSource(SettlementRO pRO) { + string orga = pRO.RecipientOrganisation; + if (pRO.RecipientOrganisation != null && !pRO.RecipientOrganisation.ToLower().Contains("lvr")) + { + lblGpNummer.Visible = false; + } + if (!String.IsNullOrEmpty(pRO.CustomerBirthdayString)) { xrLabel3.Text += ", geb. " + pRO.CustomerBirthdayString; diff --git a/ReportImp/BetreuwoWesel/SettlementReport2.Designer.cs b/ReportImp/BetreuwoWesel/SettlementReport2.Designer.cs index ca10af3ec..dd7f887c5 100644 --- a/ReportImp/BetreuwoWesel/SettlementReport2.Designer.cs +++ b/ReportImp/BetreuwoWesel/SettlementReport2.Designer.cs @@ -71,6 +71,7 @@ namespace BetreuWoWesel this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -121,7 +122,6 @@ namespace BetreuWoWesel this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); @@ -502,7 +502,7 @@ namespace BetreuWoWesel // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel7, + this.lblGpNummer, this.xrTable1, this.xrRichText1, this.xrLabel9, @@ -522,6 +522,23 @@ namespace BetreuWoWesel this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // lblGpNummer + // + this.lblGpNummer.BackColor = System.Drawing.Color.Transparent; + this.lblGpNummer.CanShrink = true; + this.lblGpNummer.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(460.42F, 268.5F); + this.lblGpNummer.Multiline = true; + this.lblGpNummer.Name = "lblGpNummer"; + this.lblGpNummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGpNummer.SizeF = new System.Drawing.SizeF(214.5836F, 17F); + this.lblGpNummer.StylePriority.UseBackColor = false; + this.lblGpNummer.StylePriority.UseFont = false; + this.lblGpNummer.StylePriority.UseTextAlignment = false; + this.lblGpNummer.Text = "Geschäftsnummer: 2000256442"; + this.lblGpNummer.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblGpNummer.WordWrap = false; + // // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -1078,23 +1095,6 @@ namespace BetreuWoWesel this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.2553230872521034D; // - // xrLabel7 - // - this.xrLabel7.BackColor = System.Drawing.Color.Transparent; - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(460.42F, 268.5F); - 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(214.5836F, 17F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "Geschäftsnummer: 2000256442"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrLabel7.WordWrap = false; - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1220,6 +1220,6 @@ namespace BetreuWoWesel private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel lblGpNummer; } } diff --git a/ReportImp/BetreuwoWesel/SettlementReport2.cs b/ReportImp/BetreuwoWesel/SettlementReport2.cs index 94fe89cf2..8d63650b2 100644 --- a/ReportImp/BetreuwoWesel/SettlementReport2.cs +++ b/ReportImp/BetreuwoWesel/SettlementReport2.cs @@ -15,6 +15,11 @@ namespace BetreuWoWesel public void SetReportDataSource(Settlement2RO pRO) { + if (pRO.RecipientOrganisation != null && !pRO.RecipientOrganisation.ToLower().Contains("lvr")) + { + lblGpNummer.Visible = false; + } + if (pRO.CustomerBirthday != null) { xrLabel3.Text += String.Format(", geb. {0:dd.MM.yyyy}", pRO.CustomerBirthday); From e5066dabbf5a59d68871c3d14864909cbb335705 Mon Sep 17 00:00:00 2001 From: Kojo Date: Fri, 30 Aug 2024 13:41:45 +0200 Subject: [PATCH 2/6] =?UTF-8?q?PariSozial:=20GP-Nummer=20(nur=20f=C3=BCr?= =?UTF-8?q?=20LVR)=20+=20Bemerkung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceInvoiceReport.Designer.cs | 1150 +++++++++-------- ReportImp/PariSozial/ServiceInvoiceReport.cs | 23 +- .../PariSozial/ServiceInvoiceReport.resx | 244 ++-- .../PariSozial/SettlementReport2.Designer.cs | 66 +- ReportImp/PariSozial/SettlementReport2.cs | 7 + ReportImp/PariSozial/SettlementReport2.resx | 4 +- 6 files changed, 758 insertions(+), 736 deletions(-) diff --git a/ReportImp/PariSozial/ServiceInvoiceReport.Designer.cs b/ReportImp/PariSozial/ServiceInvoiceReport.Designer.cs index 8e21047e6..c71d4b856 100644 --- a/ReportImp/PariSozial/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/PariSozial/ServiceInvoiceReport.Designer.cs @@ -28,572 +28,585 @@ namespace PariSozial /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); - 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.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); - this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); - this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); - this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.lblHinweise = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); - // - // Detail - // - this.Detail.HeightF = 0F; - this.Detail.Name = "Detail"; - this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // ReportHeader - // - this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel9}); - this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.ReportHeader.Name = "ReportHeader"; - this.ReportHeader.StylePriority.UseFont = false; - // - // ruleRateFactorNull - // - this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; - this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; - this.ruleRateFactorNull.Name = "ruleRateFactorNull"; - // - // topMarginBand1 - // - this.topMarginBand1.Name = "topMarginBand1"; - // - // bottomMarginBand1 - // - this.bottomMarginBand1.HeightF = 99.52094F; - this.bottomMarginBand1.Name = "bottomMarginBand1"; - // - // DetailReport - // - this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1, - this.DetailReport2}); - this.DetailReport.DataMember = "ServiceInvoicePeriods"; - this.DetailReport.DataSource = this.bindingSource1; - this.DetailReport.Level = 0; - this.DetailReport.Name = "DetailReport"; - // - // Detail1 - // - this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable1}); - this.Detail1.HeightF = 25F; - this.Detail1.Name = "Detail1"; - // - // xrTable1 - // - this.xrTable1.BorderColor = System.Drawing.Color.Black; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(640F, 25F); - this.xrTable1.StylePriority.UseBorderColor = false; - this.xrTable1.StylePriority.UseFont = false; - // - // xrTableRow1 - // - this.xrTableRow1.BackColor = System.Drawing.Color.Silver; - this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1, - this.xrTableCell8, - this.xrTableCell2, - this.xrTableCell5, - this.xrTableCell4}); - this.xrTableRow1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.StylePriority.UseBackColor = false; - this.xrTableRow1.StylePriority.UseBorders = false; - this.xrTableRow1.StylePriority.UseFont = false; - this.xrTableRow1.StylePriority.UseTextAlignment = false; - this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableRow1.Weight = 0.59523809523809512D; - // - // xrTableCell1 - // - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.StylePriority.UseBorderColor = false; - this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.Text = "Pos."; - this.xrTableCell1.Weight = 0.035466370085942812D; - // - // xrTableCell8 - // - this.xrTableCell8.Multiline = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell8.StylePriority.UseBorderColor = false; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.Text = "Abrechnungszeitraum"; - this.xrTableCell8.Weight = 0.21279822051565681D; - // - // xrTableCell2 - // - this.xrTableCell2.Multiline = true; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.StylePriority.UseBorderColor = false; - this.xrTableCell2.StylePriority.UseBorders = false; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.Text = "Ass.Std."; - this.xrTableCell2.Weight = 0.088665925214857D; - // - // xrTableCell5 - // - this.xrTableCell5.Multiline = true; - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell5.StylePriority.UseBorderColor = false; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UsePadding = false; - this.xrTableCell5.Text = "Stundensatz"; - this.xrTableCell5.Weight = 0.088665925214857D; - // - // xrTableCell4 - // - this.xrTableCell4.Multiline = true; - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell4.StylePriority.UseBorderColor = false; - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.StylePriority.UsePadding = false; - this.xrTableCell4.Text = "Vergütungsanspruch"; - this.xrTableCell4.Weight = 0.14186548034377122D; - // - // DetailReport2 - // - this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail3, - this.GroupFooter1}); - this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; - this.DetailReport2.DataSource = this.bindingSource1; - this.DetailReport2.Level = 0; - this.DetailReport2.Name = "DetailReport2"; - // - // Detail3 - // - this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable2}); - this.Detail3.HeightF = 25F; - this.Detail3.Name = "Detail3"; - // - // xrTable2 - // - this.xrTable2.BorderColor = System.Drawing.Color.Black; - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(640F, 25F); - this.xrTable2.StylePriority.UseBorderColor = false; - this.xrTable2.StylePriority.UseFont = false; - // - // xrTableRow2 - // - this.xrTableRow2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3, - this.xrTableCell6, - this.xrTableCell7, - this.xrTableCell9, - this.xrTableCell10}); - this.xrTableRow2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.StylePriority.UseBackColor = false; - this.xrTableRow2.StylePriority.UseBorders = false; - this.xrTableRow2.StylePriority.UseFont = false; - this.xrTableRow2.StylePriority.UseTextAlignment = false; - this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableRow2.Weight = 0.59523809523809512D; - // - // xrTableCell3 - // - this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart")}); - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.StylePriority.UseBorderColor = false; - this.xrTableCell3.StylePriority.UseBorders = false; - this.xrTableCell3.StylePriority.UseFont = false; - this.xrTableCell3.StylePriority.UsePadding = false; - xrSummary1.FormatString = "{0:0}"; - xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell3.Summary = xrSummary1; - this.xrTableCell3.Weight = 0.035466370085942812D; - // - // xrTableCell6 - // - this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.Multiline = true; - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell6.StylePriority.UseBorderColor = false; - this.xrTableCell6.StylePriority.UseBorders = false; - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.Text = "[AccountingPeriodStart!dd.MM.yyyy] - [AccountingPeriodEnd!dd.MM.yyyy]"; - this.xrTableCell6.Weight = 0.21279822051565681D; - // - // xrTableCell7 - // - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours")}); - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseBorderColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.TextFormatString = "{0:0..00}"; - this.xrTableCell7.Weight = 0.088665925214857D; - // - // xrTableCell9 - // - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit")}); - this.xrTableCell9.Multiline = true; - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrTableCell9.StylePriority.UseBorderColor = false; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell9.TextFormatString = "{0:c}"; - this.xrTableCell9.Weight = 0.088665925214857D; - // - // xrTableCell10 - // - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount")}); - this.xrTableCell10.Multiline = true; - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrTableCell10.StylePriority.UseBorderColor = false; - this.xrTableCell10.StylePriority.UseBorders = false; - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell10.TextFormatString = "{0:c}"; - this.xrTableCell10.Weight = 0.14186548034377122D; - // - // GroupFooter1 - // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel6, - this.xrLabel1}); - this.GroupFooter1.HeightF = 58.41665F; - this.GroupFooter1.Name = "GroupFooter1"; - // - // xrLabel6 - // - this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); - this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(485F, 0F); - 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(155F, 25F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.StylePriority.UseTextAlignment = false; - this.xrLabel6.Text = "Rechnungsbetrag:"; - this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel1 - // - this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(325F, 0F); - this.xrLabel1.Multiline = true; - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(155F, 25F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Rechnungsbetrag:"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // - // GroupHeader1 - // - this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel3, - this.xrLabel4, - this.xrLabel5, - this.xrLabel12, - this.xrLabel17, - this.xrLabel18, - this.xrLabel8, - this.xrLabel7, - this.xrLabel2, - this.lblAdresse}); - this.GroupHeader1.HeightF = 398.25F; - this.GroupHeader1.Name = "GroupHeader1"; - // - // xrLabel3 - // - this.xrLabel3.BackColor = System.Drawing.Color.Silver; - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial Black", 16F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 210.9167F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel3.SizeF = new System.Drawing.SizeF(340.3333F, 31.99995F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "Leistungsabrechnung"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - // - // xrLabel4 - // - this.xrLabel4.BackColor = System.Drawing.Color.Silver; - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242.9166F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(39, 2, 0, 0, 100F); - this.xrLabel4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel4.SizeF = new System.Drawing.SizeF(149.1667F, 22F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UsePadding = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "Rechnung Nr.:"; - // - // xrLabel5 - // - this.xrLabel5.BackColor = System.Drawing.Color.Silver; - this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 264.9167F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(39, 2, 0, 0, 100F); - this.xrLabel5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel5.SizeF = new System.Drawing.SizeF(149.1667F, 22F); - this.xrLabel5.StylePriority.UseBackColor = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UsePadding = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Debitor:"; - // - // xrLabel12 - // - this.xrLabel12.BackColor = System.Drawing.Color.Silver; - this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); - this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(149.1667F, 242.9166F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(70, 0, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(191.1666F, 22F); - this.xrLabel12.StylePriority.UseBackColor = false; - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.StylePriority.UsePadding = false; - this.xrLabel12.StylePriority.UseTextAlignment = false; - this.xrLabel12.Text = "Rechnung Nr.:"; - // - // xrLabel17 - // - this.xrLabel17.BackColor = System.Drawing.Color.Silver; - this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")}); - this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(149.1667F, 264.9167F); - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(70, 0, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(191.1666F, 22F); - this.xrLabel17.StylePriority.UseBackColor = false; - this.xrLabel17.StylePriority.UseFont = false; - this.xrLabel17.StylePriority.UsePadding = false; - this.xrLabel17.StylePriority.UseTextAlignment = false; - this.xrLabel17.Text = "xxxx"; - // - // xrLabel18 - // - this.xrLabel18.CanShrink = true; - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(37.25016F, 304.5833F); - this.xrLabel18.Multiline = true; - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel18.SizeF = new System.Drawing.SizeF(506.1666F, 93.66669F); - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.Text = "Leistungsempfänger*in: [CustomerName]\r\nGP-Nr.: [CustomerReferenceNumber]\r\n\r\nLeist" + - "ungsart: Assistenzstunden\r\nBetreuungszeitraum: [AccountingPeriodStart!MMMM yyyy]" + - ""; - // - // xrLabel8 - // - this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(357.0001F, 177.9583F); - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); - this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrLabel8.TextFormatString = "Datum: {0:dd.MM.yyyy}"; - // - // xrLabel7 - // - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(348.0001F, 0F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "PariSozial gGmbH"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // xrLabel2 - // - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(348.0001F, 34.00004F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel2.SizeF = new System.Drawing.SizeF(292F, 122F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Friedhofstr. 39\r\n41236 Mönchengladbach\r\nTelefon: 02166-9239-35\r\nTelefax: 02166-92" + - "39-19\r\nRückfragen an: Herrn Gabriel Kasaboglu\r\nE-Mail: kasaboglu@pariteam-mg.de\r" + - "\nSteuer Nr. 131/5951/0051\r\n"; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // lblAdresse - // - this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.lblAdresse.Multiline = true; - this.lblAdresse.Name = "lblAdresse"; - this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 151.6667F); - this.lblAdresse.StylePriority.UseFont = false; - // - // ReportFooter - // - this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.lblHinweise}); - this.ReportFooter.Name = "ReportFooter"; - // - // lblHinweise - // - this.lblHinweise.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.lblHinweise.Multiline = true; - this.lblHinweise.Name = "lblHinweise"; - this.lblHinweise.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblHinweise.SizeF = new System.Drawing.SizeF(653.0001F, 93.16671F); - this.lblHinweise.StylePriority.UseFont = false; - this.lblHinweise.Text = resources.GetString("lblHinweise.Text"); - // - // xrLabel9 - // - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(193F, 51.5F); - this.xrLabel9.Multiline = true; - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.Text = "\r\n"; - // - // ServiceInvoiceReport - // - this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail, - this.ReportHeader, - this.topMarginBand1, - this.bottomMarginBand1, - this.DetailReport, - this.GroupHeader1, - this.ReportFooter}); - this.DataSource = this.bindingSource1; - this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { - this.ruleRateFactorNull}); - this.Margins = new DevExpress.Drawing.DXMargins(100F, 74F, 100F, 99.52094F); - 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.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); - + this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); + 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.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblKontaktdaten = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); + this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.lblHinweise = new DevExpress.XtraReports.UI.XRLabel(); + this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel9}); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseFont = false; + // + // xrLabel9 + // + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(193F, 51.5F); + this.xrLabel9.Multiline = true; + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "\r\n"; + // + // ruleRateFactorNull + // + this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; + this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + // + // topMarginBand1 + // + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 99.52094F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport2}); + this.DetailReport.DataMember = "ServiceInvoicePeriods"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.Detail1.HeightF = 25F; + this.Detail1.Name = "Detail1"; + // + // xrTable1 + // + this.xrTable1.BorderColor = System.Drawing.Color.Black; + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(640F, 25F); + this.xrTable1.StylePriority.UseBorderColor = false; + this.xrTable1.StylePriority.UseFont = false; + // + // xrTableRow1 + // + this.xrTableRow1.BackColor = System.Drawing.Color.Silver; + this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell8, + this.xrTableCell2, + this.xrTableCell5, + this.xrTableCell4}); + this.xrTableRow1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.StylePriority.UseBackColor = false; + this.xrTableRow1.StylePriority.UseBorders = false; + this.xrTableRow1.StylePriority.UseFont = false; + this.xrTableRow1.StylePriority.UseTextAlignment = false; + this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableRow1.Weight = 0.59523809523809512D; + // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.Text = "Pos."; + this.xrTableCell1.Weight = 0.035466370085942812D; + // + // xrTableCell8 + // + this.xrTableCell8.Multiline = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseBorderColor = false; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.Text = "Abrechnungszeitraum"; + this.xrTableCell8.Weight = 0.21279822051565681D; + // + // xrTableCell2 + // + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell2.StylePriority.UseBorderColor = false; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.Text = "Ass.Std."; + this.xrTableCell2.Weight = 0.088665925214857D; + // + // xrTableCell5 + // + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorderColor = false; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.Text = "Stundensatz"; + this.xrTableCell5.Weight = 0.088665925214857D; + // + // xrTableCell4 + // + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseBorderColor = false; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.Text = "Vergütungsanspruch"; + this.xrTableCell4.Weight = 0.14186548034377122D; + // + // DetailReport2 + // + this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail3, + this.GroupFooter1}); + this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport2.DataSource = this.bindingSource1; + this.DetailReport2.Level = 0; + this.DetailReport2.Name = "DetailReport2"; + // + // Detail3 + // + this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.Detail3.HeightF = 25F; + this.Detail3.Name = "Detail3"; + // + // xrTable2 + // + this.xrTable2.BorderColor = System.Drawing.Color.Black; + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(640F, 25F); + this.xrTable2.StylePriority.UseBorderColor = false; + this.xrTable2.StylePriority.UseFont = false; + // + // xrTableRow2 + // + this.xrTableRow2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell6, + this.xrTableCell7, + this.xrTableCell9, + this.xrTableCell10}); + this.xrTableRow2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.StylePriority.UseBackColor = false; + this.xrTableRow2.StylePriority.UseBorders = false; + this.xrTableRow2.StylePriority.UseFont = false; + this.xrTableRow2.StylePriority.UseTextAlignment = false; + this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableRow2.Weight = 0.59523809523809512D; + // + // xrTableCell3 + // + this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseBorderColor = false; + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + xrSummary1.FormatString = "{0:0}"; + xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell3.Summary = xrSummary1; + this.xrTableCell3.Weight = 0.035466370085942812D; + // + // xrTableCell6 + // + this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseBorderColor = false; + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.Text = "[AccountingPeriodStart!dd.MM.yyyy] - [AccountingPeriodEnd!dd.MM.yyyy]"; + this.xrTableCell6.Weight = 0.21279822051565681D; + // + // xrTableCell7 + // + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours")}); + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorderColor = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.TextFormatString = "{0:0..00}"; + this.xrTableCell7.Weight = 0.088665925214857D; + // + // xrTableCell9 + // + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit")}); + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell9.TextFormatString = "{0:c}"; + this.xrTableCell9.Weight = 0.088665925214857D; + // + // xrTableCell10 + // + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount")}); + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorderColor = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell10.TextFormatString = "{0:c}"; + this.xrTableCell10.Weight = 0.14186548034377122D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblNotice, + this.xrLabel6, + this.xrLabel1}); + this.GroupFooter1.HeightF = 96.29164F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // xrLabel6 + // + this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(485F, 0F); + 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(155F, 25F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.Text = "Rechnungsbetrag:"; + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(325F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(155F, 25F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "Rechnungsbetrag:"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // GroupHeader1 + // + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel3, + this.xrLabel4, + this.xrLabel5, + this.xrLabel12, + this.xrLabel17, + this.xrLabel18, + this.xrLabel8, + this.xrLabel7, + this.lblKontaktdaten, + this.lblAdresse}); + this.GroupHeader1.HeightF = 398.25F; + this.GroupHeader1.Name = "GroupHeader1"; + // + // xrLabel3 + // + this.xrLabel3.BackColor = System.Drawing.Color.Silver; + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial Black", 16F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 210.9167F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel3.SizeF = new System.Drawing.SizeF(340.3333F, 31.99995F); + this.xrLabel3.StylePriority.UseBackColor = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "Leistungsabrechnung"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel4 + // + this.xrLabel4.BackColor = System.Drawing.Color.Silver; + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242.9166F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(39, 2, 0, 0, 100F); + this.xrLabel4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel4.SizeF = new System.Drawing.SizeF(149.1667F, 22F); + this.xrLabel4.StylePriority.UseBackColor = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UsePadding = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Rechnung Nr.:"; + // + // xrLabel5 + // + this.xrLabel5.BackColor = System.Drawing.Color.Silver; + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 264.9167F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(39, 2, 0, 0, 100F); + this.xrLabel5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel5.SizeF = new System.Drawing.SizeF(149.1667F, 22F); + this.xrLabel5.StylePriority.UseBackColor = false; + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UsePadding = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "Debitor:"; + // + // xrLabel12 + // + this.xrLabel12.BackColor = System.Drawing.Color.Silver; + this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(149.1667F, 242.9166F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(70, 0, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(191.1666F, 22F); + this.xrLabel12.StylePriority.UseBackColor = false; + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UsePadding = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + this.xrLabel12.Text = "Rechnung Nr.:"; + // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Silver; + this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")}); + this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(149.1667F, 264.9167F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(70, 0, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(191.1666F, 22F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.StylePriority.UsePadding = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.Text = "xxxx"; + // + // xrLabel18 + // + this.xrLabel18.CanShrink = true; + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(37.25016F, 304.5833F); + this.xrLabel18.Multiline = true; + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel18.SizeF = new System.Drawing.SizeF(506.1666F, 93.66669F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.Text = "Leistungsempfänger*in: [CustomerName]\r\nGP-Nr.: [CustomerReferenceNumber]\r\n\r\nLeist" + + "ungsart: Assistenzstunden\r\nBetreuungszeitraum: [AccountingPeriodStart!MMMM yyyy]" + + ""; + // + // xrLabel8 + // + this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(357.0001F, 177.9583F); + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); + this.xrLabel8.StylePriority.UseTextAlignment = false; + this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrLabel8.TextFormatString = "Datum: {0:dd.MM.yyyy}"; + // + // xrLabel7 + // + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(348.0001F, 0F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "PariSozial gGmbH"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // lblKontaktdaten + // + this.lblKontaktdaten.LocationFloat = new DevExpress.Utils.PointFloat(348.0001F, 34.00004F); + this.lblKontaktdaten.Multiline = true; + this.lblKontaktdaten.Name = "lblKontaktdaten"; + this.lblKontaktdaten.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblKontaktdaten.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.lblKontaktdaten.SizeF = new System.Drawing.SizeF(292F, 122F); + this.lblKontaktdaten.StylePriority.UseFont = false; + this.lblKontaktdaten.StylePriority.UseTextAlignment = false; + this.lblKontaktdaten.Text = "Friedhofstr. 39\r\n41236 Mönchengladbach\r\nTelefon: 02166-9239-35\r\nTelefax: 02166-92" + + "39-19\r\nRückfragen an: Herrn Gabriel Kasaboglu\r\nE-Mail: kasaboglu@pariteam-mg.de\r" + + "\nSteuer Nr. 131/5951/0051\r\n[GP-Nummer]"; + this.lblKontaktdaten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // lblAdresse + // + this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblAdresse.Multiline = true; + this.lblAdresse.Name = "lblAdresse"; + this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 151.6667F); + this.lblAdresse.StylePriority.UseFont = false; + // + // ReportFooter + // + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblHinweise}); + this.ReportFooter.Name = "ReportFooter"; + // + // lblHinweise + // + this.lblHinweise.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblHinweise.Multiline = true; + this.lblHinweise.Name = "lblHinweise"; + this.lblHinweise.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblHinweise.SizeF = new System.Drawing.SizeF(653.0001F, 93.16671F); + this.lblHinweise.StylePriority.UseFont = false; + this.lblHinweise.Text = resources.GetString("lblHinweise.Text"); + // + // lblNotice + // + this.lblNotice.CanShrink = true; + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.99994F); + this.lblNotice.Multiline = true; + this.lblNotice.Name = "lblNotice"; + this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblNotice.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.lblNotice.SizeF = new System.Drawing.SizeF(640.0001F, 29.08337F); + this.lblNotice.StylePriority.UseFont = false; + // + // ServiceInvoiceReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.topMarginBand1, + this.bottomMarginBand1, + this.DetailReport, + this.GroupHeader1, + this.ReportFooter}); + this.DataSource = this.bindingSource1; + this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; + this.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleRateFactorNull}); + this.Margins = new DevExpress.Drawing.DXMargins(100F, 74F, 100F, 99.52094F); + 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.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + } @@ -612,7 +625,7 @@ namespace PariSozial private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblKontaktdaten; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel5; @@ -637,6 +650,7 @@ namespace PariSozial private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblHinweise; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel lblNotice; } } diff --git a/ReportImp/PariSozial/ServiceInvoiceReport.cs b/ReportImp/PariSozial/ServiceInvoiceReport.cs index cd8a92d9e..53cb8c175 100644 --- a/ReportImp/PariSozial/ServiceInvoiceReport.cs +++ b/ReportImp/PariSozial/ServiceInvoiceReport.cs @@ -55,17 +55,18 @@ namespace PariSozial sb.AppendLine(pRO.RecipientPostCodeAndTown); } - lblAdresse.Text = sb.ToString(); - - DateTime start = pRO.AccountingPeriodStart; - DateTime end = pRO.AccountingPeriodEnd; - if (start.Month == end.Month && start.Year == end.Year) - { - //lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start); - } - else - { - //lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); + lblAdresse.Text = sb.ToString(); + + string gpNummer = ""; + if (pRO.RecipientOrganisation != null && pRO.RecipientOrganisation.Equals("Landschaftsverband Rheinland")) + { + gpNummer = "GP-Nummer: 20000217071"; + } + lblKontaktdaten.Text = lblKontaktdaten.Text.Replace("[GP-Nummer]", gpNummer); + + if (!String.IsNullOrEmpty(pRO.Notice)) + { + lblNotice.Text = "Bemerkung:\n" + pRO.Notice; } lblHinweise.Text = lblHinweise.Text.Replace("xxxxx", String.Format("{0:dd.MM.yyyy}", pRO.InvoiceDateTime.Value.AddDays(14))).Replace("rrrrr", pRO.InvoiceNumber); diff --git a/ReportImp/PariSozial/ServiceInvoiceReport.resx b/ReportImp/PariSozial/ServiceInvoiceReport.resx index 1f4d88dae..fd28ed8f8 100644 --- a/ReportImp/PariSozial/ServiceInvoiceReport.resx +++ b/ReportImp/PariSozial/ServiceInvoiceReport.resx @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Die abgerechneten Leistungen sind gemäß §4 Nr. 16 UStG umsatzsteuerbefreit. Bitte überweisen Sie innerhalb von 14 Tagen (bis zum xxxxx) unter Angabe der Rechnungsnummer (rrrrr) -auf das Geschäftskonto bei der Bank für Sozialwirtschaft Köln - +auf das Geschäftskonto bei der Bank für Sozialwirtschaft Köln + \ No newline at end of file diff --git a/ReportImp/PariSozial/SettlementReport2.Designer.cs b/ReportImp/PariSozial/SettlementReport2.Designer.cs index d071e0b17..fc2061abd 100644 --- a/ReportImp/PariSozial/SettlementReport2.Designer.cs +++ b/ReportImp/PariSozial/SettlementReport2.Designer.cs @@ -50,7 +50,7 @@ namespace PariSozial this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblKontaktdaten = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -71,7 +71,9 @@ namespace PariSozial this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -100,12 +102,10 @@ namespace PariSozial this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -199,7 +199,7 @@ namespace PariSozial this.xrLabel4, this.xrLabel3, this.xrLabel2, - this.xrLabel13, + this.lblKontaktdaten, this.xrLabel7, this.lblAdresse, this.xrLabel8}); @@ -298,18 +298,18 @@ namespace PariSozial this.xrLabel2.Text = "Leistungsabrechnung"; this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; // - // xrLabel13 + // lblKontaktdaten // - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(348.0001F, 34.00004F); - this.xrLabel13.Multiline = true; - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel13.SizeF = new System.Drawing.SizeF(292F, 122F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.Text = resources.GetString("xrLabel13.Text"); - this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblKontaktdaten.LocationFloat = new DevExpress.Utils.PointFloat(348.0001F, 34.00004F); + this.lblKontaktdaten.Multiline = true; + this.lblKontaktdaten.Name = "lblKontaktdaten"; + this.lblKontaktdaten.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblKontaktdaten.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.lblKontaktdaten.SizeF = new System.Drawing.SizeF(292F, 122F); + this.lblKontaktdaten.StylePriority.UseFont = false; + this.lblKontaktdaten.StylePriority.UseTextAlignment = false; + this.lblKontaktdaten.Text = resources.GetString("lblKontaktdaten.Text"); + this.lblKontaktdaten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // // xrLabel7 // @@ -561,6 +561,10 @@ namespace PariSozial this.Zwischensumme.HeightF = 0F; this.Zwischensumme.Name = "Zwischensumme"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -571,6 +575,17 @@ namespace PariSozial this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // + // lblNotice + // + this.lblNotice.CanShrink = true; + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 176.0417F); + this.lblNotice.Multiline = true; + this.lblNotice.Name = "lblNotice"; + this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblNotice.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.lblNotice.SizeF = new System.Drawing.SizeF(640.0001F, 29.08337F); + this.lblNotice.StylePriority.UseFont = false; + // // xrTable3 // this.xrTable3.BorderColor = System.Drawing.Color.Black; @@ -972,21 +987,6 @@ namespace PariSozial this.xrTableCell31.TextFormatString = "{0:c}"; this.xrTableCell31.Weight = 0.14186548034377122D; // - // lblNotice - // - this.lblNotice.CanShrink = true; - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 176.0417F); - this.lblNotice.Multiline = true; - this.lblNotice.Name = "lblNotice"; - this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblNotice.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.lblNotice.SizeF = new System.Drawing.SizeF(640.0001F, 29.08337F); - this.lblNotice.StylePriority.UseFont = false; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1014,8 +1014,8 @@ namespace PariSozial this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1040,7 +1040,7 @@ namespace PariSozial private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRLabel lblKontaktdaten; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel6; diff --git a/ReportImp/PariSozial/SettlementReport2.cs b/ReportImp/PariSozial/SettlementReport2.cs index 9b4636066..63ea2dfc2 100644 --- a/ReportImp/PariSozial/SettlementReport2.cs +++ b/ReportImp/PariSozial/SettlementReport2.cs @@ -54,6 +54,13 @@ namespace PariSozial lblAdresse.Text = sb.ToString(); + string gpNummer = ""; + if (pRO.RecipientOrganisation != null && pRO.RecipientOrganisation.Equals("Landschaftsverband Rheinland")) + { + gpNummer = "GP-Nummer: 20000217071"; + } + lblKontaktdaten.Text = lblKontaktdaten.Text.Replace("[GP-Nummer]", gpNummer); + if (!String.IsNullOrEmpty(pRO.Notice)) { lblNotice.Text = "Bemerkung:\n" + pRO.Notice; diff --git a/ReportImp/PariSozial/SettlementReport2.resx b/ReportImp/PariSozial/SettlementReport2.resx index 0753d0ba3..64587d704 100644 --- a/ReportImp/PariSozial/SettlementReport2.resx +++ b/ReportImp/PariSozial/SettlementReport2.resx @@ -123,7 +123,7 @@ Bitte überweisen Sie innerhalb von 14 Tagen (bis zum xxxxx) unter Angabe der Rechnungsnummer (rrrrr) auf das Geschäftskonto bei der Bank für Sozialwirtschaft Köln - + Friedhofstr. 39 41236 Mönchengladbach Telefon: 02166-9239-35 @@ -131,7 +131,7 @@ Telefax: 02166-9239-19 Rückfragen an: Herrn Gabriel Kasaboglu E-Mail: kasaboglu@pariteam-mg.de Steuer Nr. 131/5951/0051 -GP-Nummer: 20000217071 +[GP-Nummer] \ No newline at end of file From 188c16d4676df5c4e5e8509e21bd21f0c2bdd9e2 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 1 Sep 2024 20:47:02 +0200 Subject: [PATCH 3/6] =?UTF-8?q?Perseh=20Schnittstelle,=20diverse=20Todos?= =?UTF-8?q?=20f=C3=BCrs=20Release=20+=20Anpassungen=20Schulbegleitung=20Hi?= =?UTF-8?q?ldmann/Kloss=20Betreuungszeiten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/BeWo.csproj | 6 +- BeWo/BeWoApp.xaml.cs | 2 +- BeWo/LoginControl.xaml.cs | 31 +- .../Detail/Accounting/InvoiceOverview.xaml | 2 +- BeWo/View/Detail/MassnahmenTreeViewView.xaml | 20 +- .../Detail/MassnahmenTreeViewView.xaml.cs | 2 + BeWo/View/Detail/ServiceCategoryView.xaml | 2 +- BeWo/View/Detail/ServiceDescriptionView.xaml | 31 +- BeWo/View/Detail/UrlaubskontoView.xaml.cs | 41 +- .../ServiceRecordCreationView.xaml.cs | 30 +- .../Navigation/UserNavigationView.xaml.cs | 3 +- BeWo/View/StundenplanView.xaml | 13 +- BeWo/View/StundenplanView.xaml.cs | 35 +- BeWo/ViewModel/ArbeitszeitEintragVM.cs | 28 +- .../BeWoDatabaseTerminator/Program.cs | 53 +- Data/Mappings/SupportConceptHistory.hbm.xml | 1 + .../Mitarbeiterarbeitszeitkonto.designer.cs | 12 +- .../MitarbeiterstundenkontoBerechnung.cs | 2 +- ReportImp/AkggMid/LeistungsnachweisHelper.cs | 7 +- .../Club74SettlementInvoiceCreation.cs | 16 +- .../CustomServiceRecordStatisticFactory.cs | 2 +- .../ZeitdokumentationPlanIstUebersicht.cs | 3 +- .../CustomGroupDurationCalculator.cs | 22 + .../HPHBersenbrueck/HPHBersenbrueck.csproj | 1 + .../Invoicing/NeueAssistenzInvoiceCreation.cs | 31 +- ...hweisKompensatorischeAssistenz.Designer.cs | 2457 +++++++++-------- ...stungsnachweisKompensatorischeAssistenz.cs | 25 +- ...nachweisQualifizierteAssistenz.Designer.cs | 514 +++- ...LeistungsnachweisQualifizierteAssistenz.cs | 26 +- .../HphServiceRecordStatisticFactory.cs | 59 +- .../CustomReportCreator.cs | 14 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 13 + ReportImp/SHKService/SHKService.csproj | 1 + .../Service/CustomVacationService.cs | 30 + ...CustomMitarbeiterstundenkontoBerechnung.cs | 13 +- .../Mitarbeiterarbeitszeitkonto.cs | 3 +- ReportImp/SHKServiceSBD/SHKServiceSBD.csproj | 1 + .../Service/CustomVacationService.cs | 30 + .../CustomSettlementInvoiceCreation.cs | 29 +- .../Import/AvisImport/LvrAvisKlientGesamt.cs | 14 +- .../Import/AvisImport/LvrAvisMonatGesamt.cs | 10 +- ...hnitt.cs => LvrAvisTextAbschnittReader.cs} | 38 +- Service/Import/Perseh/PersehReader.cs | 241 +- Service/Import/TextAbschnitt.cs | 23 + Service/Import/TextAbschnittReader.cs | 42 + .../Invoicing/LWLSettlementInvoiceCreation.cs | 29 +- .../Invoicing/SettlementInvoiceCreation.cs | 12 +- Service/Plugins/PluginLoader.cs | 6 +- Service/Service.csproj | 4 +- Shared/DataContracts/Settlement2DC.cs | 3 + 50 files changed, 2483 insertions(+), 1550 deletions(-) create mode 100644 ReportImp/HPHBersenbrueck/Calculations/CustomGroupDurationCalculator.cs create mode 100644 ReportImp/SHKService/Service/CustomVacationService.cs create mode 100644 ReportImp/SHKServiceSBD/Service/CustomVacationService.cs rename Service/Import/AvisImport/{LvrAvisTextAbschnitt.cs => LvrAvisTextAbschnittReader.cs} (61%) create mode 100644 Service/Import/TextAbschnitt.cs create mode 100644 Service/Import/TextAbschnittReader.cs diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 0d83cb1d0..55268c179 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -16,7 +16,7 @@ true Internet true - false + true 8CA4066C36C87B745E4016FDA715A6DB16FCFFA9 @@ -43,12 +43,12 @@ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.248 + 2.0.1.249 true publish.htm false true - 249 + 250 2.0.1.%2a false true diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index f498cd3c9..8b06c5bf3 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -50,7 +50,7 @@ namespace BeWo public static MainControl MainControl; public static string ShortVersion = "3.21"; - public static string Version = "Version 3.21.4"; + public static string Version = "Version 3.21.5"; public static int RenderTier = 0; diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs index 2ff1abe2c..9bb349c0d 100644 --- a/BeWo/LoginControl.xaml.cs +++ b/BeWo/LoginControl.xaml.cs @@ -244,15 +244,19 @@ namespace BeWo //!!!!Wenn hier neue Keys hinzugefügt werden, muss das auch in der Klasse ChatController.HauptKlassen.Chat und im DatabaseTerminator gemacht werden!! - private static String PUB_KEY_X3 = "3082010A02820101009CD30CF05AE52E47B7725D3783B3686330EAD735261925E1BDBE35F170922FB7B84B4105ABA99E350858ECB12AC468870BA3E375E4E6F3A76271BA7981601FD7919A9FF3D0786771C8690E9591CFFEE699E9603C48CC7ECA4D7712249D471B5AEBB9EC1E37001C9CAC7BA705EACE4AEBBD41E53698B9CBFD6D3C9668DF232A42900C867467C87FA59AB8526114133F65E98287CBDBFA0E56F68689F3853F9786AFB0DC1AEF6B0D95167DC42BA065B299043675806BAC4AF31B9049782FA2964F2A20252904C674C0D031CD8F31389516BAA833B843F1B11FC3307FA27931133D2D36F8E3FCF2336AB93931C5AFC48D0D1D641633AAFA8429B6D40BC0D87DC3930203010001"; + private static String PUB_KEY_X3 = "9CD30CF05AE52E47B7725D3783B3686330EAD735261925E1BDBE35F170922FB7B84B4105ABA99E350858ECB12AC468870BA3E375E4E6F3A76271BA7981601FD7919A9FF3D0786771C8690E9591CFFEE699E9603C48CC7ECA4D7712249D471B5AEBB9EC1E37001C9CAC7BA705EACE4AEBBD41E53698B9CBFD6D3C9668DF232A42900C867467C87FA59AB8526114133F65E98287CBDBFA0E56F68689F3853F9786AFB0DC1AEF6B0D95167DC42BA065B299043675806BAC4AF31B9049782FA2964F2A20252904C674C0D031CD8F31389516BAA833B843F1B11FC3307FA27931133D2D36F8E3FCF2336AB93931C5AFC48D0D1D641633AAFA8429B6D40BC0D87DC3930203010001"; - private static String PUB_KEY_R3 = "3082010A0282010100BB021528CCF6A094D30F12EC8D5592C3F882F199A67A4288A75D26AAB52BB9C54CB1AF8E6BF975C8A3D70F4794145535578C9EA8A23919F5823C42A94E6EF53BC32EDB8DC0B05CF35938E7EDCF69F05A0B1BBEC094242587FA3771B313E71CACE19BEFDBE43B45524596A9C153CE34C852EEB5AEED8FDE6070E2A554ABB66D0E97A540346B2BD3BC66EB66347CFA6B8B8F572999F830175DBA726FFB81C5ADD286583D17C7E709BBF12BF786DCC1DA715DD446E3CCAD25C188BC60677566B3F118F7A25CE653FF3A88B647A5FF1318EA9809773F9D53F9CF01E5F5A6701714AF63A4FF99B3939DDC53A706FE48851DA169AE2575BB13CC5203F5ED51A18BDB150203010001"; + private static String PUB_KEY_R3 = "BB021528CCF6A094D30F12EC8D5592C3F882F199A67A4288A75D26AAB52BB9C54CB1AF8E6BF975C8A3D70F4794145535578C9EA8A23919F5823C42A94E6EF53BC32EDB8DC0B05CF35938E7EDCF69F05A0B1BBEC094242587FA3771B313E71CACE19BEFDBE43B45524596A9C153CE34C852EEB5AEED8FDE6070E2A554ABB66D0E97A540346B2BD3BC66EB66347CFA6B8B8F572999F830175DBA726FFB81C5ADD286583D17C7E709BBF12BF786DCC1DA715DD446E3CCAD25C188BC60677566B3F118F7A25CE653FF3A88B647A5FF1318EA9809773F9D53F9CF01E5F5A6701714AF63A4FF99B3939DDC53A706FE48851DA169AE2575BB13CC5203F5ED51A18BDB150203010001"; - private static String PUB_KEY_E1 = "04245C2DA22AFD1C4BA65D97732731ACB2A06962EF65E8A6B0F0AC4B9FFF1C0B700FD3982F4DFC0F009B37F074055732972E05EF2A4325A3FB6E342713F64F7E69D302995EEB244792C1249BE6B1218FC12481FC68CC1F69BA58F51922F774C616"; + private static String PUB_KEY_E1 = "245c2da22afd1c4ba65d97732731acb2a06962ef65e8a6b0f0ac4b9fff1c0b700fd3982f4dfc0f009b37f074055732972e05ef2a4325a3fb6e342713f64f7e69d302995eeb244792c1249be6b1218fc12481fc68cc1f69ba58f51922f774c616"; - private static String PUB_KEY_R11 = "3082010A0282010100BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001"; + private static String PUB_KEY_E5 = "0d0b3a8a6b618eb6efdc5f58e7c6424554ab63f66661480a2e5975b481023750b73f1679dc98eca1289772201c2ccfd57c52204e54785b84146bc090ae85ecc051413c5a877f064dd4fe60d1fa6c2de17d951088a208540f991a4ce6ea0aacd8"; - private static String PUB_KEY_R10 = "3082010A0282010100CF57E5E6C45412EDB447FEC92758764650288C1D3E88DF059DD5B51829BDDDB55ABFFAF6CEA3BEAF00214B625A5A3C012FC55803F689FF8E1143EBC1B5E01407968F6F1FD7E7BA8139097565B7C2AF185B372628E7A3F4072B6D1AFFAB58BC95AE40FFE9CB57C4B55B7F780D1861BC17E754C6BB4991CD6E18D18085EEA66536BC74EABC504CEAFC21F338169394BAB0D36B3806CD16127ACA5275C8AD76B2C29C5D98455C6F617BC62DEE3C13528601D957E6381CDF8DB51F92919AE74A1CCC45A87255F0B0E6A307ECFDA71B669E3F488B71847158C93AFAEF5EF25B442B3C74E78FB247C1076ACD9AB70D96F712812651540AEC61F6F7F5E2F28AC8950D8D0203010001"; + private static String PUB_KEY_E6 = "d9f19e4687f8217160a826eba3fab9eada1db912a7d426d95114b1617c7596bf220b391fd5bed10a46aa2d3c4a09842ebe409555e91940376675ed324e770449f8707bc318e7cef77110feac74d800d4ed6d1c731633109c3ab2ea6c62f4bdb8"; + + private static String PUB_KEY_R10 = "CF57E5E6C45412EDB447FEC92758764650288C1D3E88DF059DD5B51829BDDDB55ABFFAF6CEA3BEAF00214B625A5A3C012FC55803F689FF8E1143EBC1B5E01407968F6F1FD7E7BA8139097565B7C2AF185B372628E7A3F4072B6D1AFFAB58BC95AE40FFE9CB57C4B55B7F780D1861BC17E754C6BB4991CD6E18D18085EEA66536BC74EABC504CEAFC21F338169394BAB0D36B3806CD16127ACA5275C8AD76B2C29C5D98455C6F617BC62DEE3C13528601D957E6381CDF8DB51F92919AE74A1CCC45A87255F0B0E6A307ECFDA71B669E3F488B71847158C93AFAEF5EF25B442B3C74E78FB247C1076ACD9AB70D96F712812651540AEC61F6F7F5E2F28AC8950D8D0203010001"; + + private static String PUB_KEY_R11 = "BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001"; private bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors) @@ -263,15 +267,18 @@ namespace BeWo return false; bool chainContainsPk = false; - + foreach (var element in chain.ChainElements) { - String pk = element.Certificate.GetPublicKeyString(); - String testx3 = PUB_KEY_X3; - String testr3 = PUB_KEY_R3; - String teste1 = PUB_KEY_E1; - String r11 = PUB_KEY_R11; - if (pk == PUB_KEY_X3 || pk == PUB_KEY_R3 || pk == PUB_KEY_E1 || pk == PUB_KEY_R11 || pk == PUB_KEY_R10) + String pk = element.Certificate.GetPublicKeyString().ToLower(); + + if (pk.Contains(PUB_KEY_X3.ToLower()) || + pk.Contains(PUB_KEY_R3.ToLower()) || + pk.Contains(PUB_KEY_E1.ToLower()) || + pk.Contains(PUB_KEY_E5.ToLower()) || + pk.Contains(PUB_KEY_E6.ToLower()) || + pk.Contains(PUB_KEY_R10.ToLower()) || + pk.Contains(PUB_KEY_R11.ToLower())) { chainContainsPk = true; } diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml index 221831d61..2b3d7eb51 100644 --- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml +++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml @@ -65,7 +65,7 @@ - + diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml b/BeWo/View/Detail/MassnahmenTreeViewView.xaml index f13d7832b..4acc21489 100644 --- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml +++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml @@ -82,10 +82,22 @@ + diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs index 704f6ce8a..edafc87a9 100644 --- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs +++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs @@ -341,10 +341,12 @@ namespace BeWo.View.Detail private void ToggleButton_Checked(object sender, RoutedEventArgs e) { Bearbeitungsmodus = true; + EditToggleButton.Content = "Bearbeiten deaktivieren"; } private void ToggleButton_Unchecked(object sender, RoutedEventArgs e) { Bearbeitungsmodus = false; + EditToggleButton.Content = "Bearbeiten aktivieren"; } private void StartCopyItem(SupportConceptGoalTreeItem _item, SupportConceptGoalTreeItem _copy) diff --git a/BeWo/View/Detail/ServiceCategoryView.xaml b/BeWo/View/Detail/ServiceCategoryView.xaml index 6b2153340..46c1eb10c 100644 --- a/BeWo/View/Detail/ServiceCategoryView.xaml +++ b/BeWo/View/Detail/ServiceCategoryView.xaml @@ -133,7 +133,7 @@ - + diff --git a/BeWo/View/Detail/ServiceDescriptionView.xaml b/BeWo/View/Detail/ServiceDescriptionView.xaml index e77962c57..936319620 100644 --- a/BeWo/View/Detail/ServiceDescriptionView.xaml +++ b/BeWo/View/Detail/ServiceDescriptionView.xaml @@ -16,8 +16,8 @@ - - + + @@ -26,9 +26,8 @@ - - + @@ -39,9 +38,9 @@ - + - + @@ -66,17 +65,17 @@ - @@ -112,7 +111,7 @@ - + @@ -140,7 +139,7 @@ - + diff --git a/BeWo/View/Detail/UrlaubskontoView.xaml.cs b/BeWo/View/Detail/UrlaubskontoView.xaml.cs index 4e4dfb56a..7c55c3a04 100755 --- a/BeWo/View/Detail/UrlaubskontoView.xaml.cs +++ b/BeWo/View/Detail/UrlaubskontoView.xaml.cs @@ -57,28 +57,31 @@ namespace BeWo.View.Detail } private void _YearPicker_EditValueChanged(object sender, EditValueChangedEventArgs e) { - if (_GridLeaveDays == null) + if (_YearPicker.SelectedItem != null) { - _GridLeaveDays = rootGrid.Resources["datagrid_leavedays"] as GridControl; - - WPFGridLeaveDays.Children.Add(_GridLeaveDays); - } - - var urlaubskonto = ServiceFacade.DoEmployeeServiceSync(s => s.ErstelleUrlaubskontoDarstellung(DataContract, (int)_YearPicker.SelectedItem)); - - if (urlaubskonto == null) - { - urlaubskonto = new List(); - urlaubskonto.Add(new UrlaubskontoDarstellungDC() + if (_GridLeaveDays == null) { - Erlaeuterung = "Es existiert kein Vertrag für ausgewähltes Jahr", - }); - button_openLeaveDayDialogue.Visibility = Visibility.Collapsed; - } - else - button_openLeaveDayDialogue.Visibility = Visibility.Visible; + _GridLeaveDays = rootGrid.Resources["datagrid_leavedays"] as GridControl; - _GridLeaveDays.ItemsSource = urlaubskonto; + WPFGridLeaveDays.Children.Add(_GridLeaveDays); + } + + var urlaubskonto = ServiceFacade.DoEmployeeServiceSync(s => s.ErstelleUrlaubskontoDarstellung(DataContract, (int)_YearPicker.SelectedItem)); + + if (urlaubskonto == null) + { + urlaubskonto = new List(); + urlaubskonto.Add(new UrlaubskontoDarstellungDC() + { + Erlaeuterung = "Es existiert kein Vertrag für ausgewähltes Jahr", + }); + button_openLeaveDayDialogue.Visibility = Visibility.Collapsed; + } + else + button_openLeaveDayDialogue.Visibility = Visibility.Visible; + + _GridLeaveDays.ItemsSource = urlaubskonto; + } } private void button_addLeaveDay_Click(object sender, RoutedEventArgs e) diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs index 0e600dd2c..43e69af3c 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs @@ -13,11 +13,27 @@ namespace BeWo.View.Detail.Zeiterfassung { public partial class ServiceRecordCreationView { - + private DateTime _StartDatum; + private DateTime _EndDatum; - public DateTime StartDatum { get; set; } + public DateTime StartDatum + { + get { return _StartDatum; } + set + { + _StartDatum = value; + UpdateSelectedArbeitszeitVm(); + } + } - public DateTime EndDatum { get; set; } + public DateTime EndDatum { + get { return _EndDatum; } + set + { + _EndDatum = value; + UpdateSelectedArbeitszeitVm(); + } + } public SupportConceptCostBearerRelDC SupportConceptCostBearerRel { get; set; } @@ -44,7 +60,13 @@ namespace BeWo.View.Detail.Zeiterfassung private void UpdateSelectedArbeitszeitVm() { - SelectedArbeitszeitVM = ArbeitszeitListVM.VMList[0]; + foreach (var item in ArbeitszeitListVM.VMList) + { + if ((!item.GueltigVon.HasValue || item.GueltigVon <= EndDatum) && (!item.GueltigBis.HasValue || item.GueltigBis >= StartDatum)) + { + SelectedArbeitszeitVM = item; + } + } } diff --git a/BeWo/View/Navigation/UserNavigationView.xaml.cs b/BeWo/View/Navigation/UserNavigationView.xaml.cs index 3b664a537..ff709321c 100644 --- a/BeWo/View/Navigation/UserNavigationView.xaml.cs +++ b/BeWo/View/Navigation/UserNavigationView.xaml.cs @@ -54,7 +54,8 @@ namespace BeWo.View.Navigation { textblock_link.Visibility = Visibility.Collapsed; } - //###CB SERIENBRIEF mainNavigationView.MailMergeButton.Visibility = Visibility.Collapsed; + mainNavigationView.chkShowDeleted.Visibility = Visibility.Collapsed; + //###CB SERIENBRIEF mainNavigationView.MailMergeButton.Visibility = Visibility.Collapsed; } private void OnLoaded(object sender, RoutedEventArgs e) diff --git a/BeWo/View/StundenplanView.xaml b/BeWo/View/StundenplanView.xaml index d7b9a03c8..7439daaac 100644 --- a/BeWo/View/StundenplanView.xaml +++ b/BeWo/View/StundenplanView.xaml @@ -99,9 +99,13 @@ -