diff --git a/.gitignore b/.gitignore index f94fe032e..ab3defbb0 100644 --- a/.gitignore +++ b/.gitignore @@ -489,4 +489,6 @@ /ReportImp/PassgenauUG/obj/Release /ReportImp/KompassBeWoWesel/obj/Debug /ReportImp/MobiloAmbulant/obj/Debug +/ReportImp/KompassBeWoWesel/obj/Release +/ReportImp/MobiloAmbulant/obj/Release /ReportImp/EmpathieFachassistenz/obj/Debug diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs index 7e08b7689..26f993861 100644 --- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs +++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs @@ -145,8 +145,8 @@ namespace BeWo.View.Detail chkWithClient.Content = Translator.Translate("Zeiterfassung für ausgewählten Klienten"); txtTimeRecording.Text = Translator.Translate("Zeiterfassung"); } - //numerictb_distance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed; - numerictb_distance.Visibility = Visibility.Visible; //abc123 + + numerictb_distance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed; lblDistance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed; DistanceGridColumn.Visible = BeWoApp.AppSettings.ShowDistanceFields; diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index 0ab55890d..519550cf9 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -613,6 +613,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kimm", "ReportImp\Kimm\Kimm EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PassgenauUG", "ReportImp\PassgenauUG\PassgenauUG.csproj", "{87D57693-C3EB-4DD0-8C32-4C8D7BE9066E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KompassBeWoWesel", "ReportImp\KompassBeWoWesel\KompassBeWoWesel.csproj", "{911023BC-9AAC-427D-AA85-04AF886FE81C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobiloAmbulant", "ReportImp\MobiloAmbulant\MobiloAmbulant.csproj", "{0F14574F-9637-40FE-8FCE-E047EFA4EC0B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -4900,6 +4904,38 @@ Global {87D57693-C3EB-4DD0-8C32-4C8D7BE9066E}.Release|Mixed Platforms.Build.0 = Release|Any CPU {87D57693-C3EB-4DD0-8C32-4C8D7BE9066E}.Release|x86.ActiveCfg = Release|Any CPU {87D57693-C3EB-4DD0-8C32-4C8D7BE9066E}.Release|x86.Build.0 = Release|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Debug|.NET.ActiveCfg = Debug|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Debug|.NET.Build.0 = Debug|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Debug|x86.ActiveCfg = Debug|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Debug|x86.Build.0 = Debug|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Release|.NET.ActiveCfg = Release|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Release|.NET.Build.0 = Release|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Release|Any CPU.Build.0 = Release|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Release|x86.ActiveCfg = Release|Any CPU + {911023BC-9AAC-427D-AA85-04AF886FE81C}.Release|x86.Build.0 = Release|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Debug|.NET.ActiveCfg = Debug|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Debug|.NET.Build.0 = Debug|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Debug|x86.ActiveCfg = Debug|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Debug|x86.Build.0 = Debug|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|.NET.ActiveCfg = Release|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|.NET.Build.0 = Release|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|Any CPU.Build.0 = Release|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|x86.ActiveCfg = Release|Any CPU + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -5202,6 +5238,8 @@ Global {C252012D-4EE1-4262-B599-28297AE41E9C} = {D8A691C5-146D-4613-86CC-438F02FE9106} {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5} = {D8A691C5-146D-4613-86CC-438F02FE9106} {87D57693-C3EB-4DD0-8C32-4C8D7BE9066E} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {911023BC-9AAC-427D-AA85-04AF886FE81C} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {0F14574F-9637-40FE-8FCE-E047EFA4EC0B} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index 4b21acef4..2beba1959 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ BeWo2.0 true - Debug|Any CPU + Release|Any CPU diff --git a/ReportImp/KompassBeWoWesel/KompassBeWoWesel.csproj b/ReportImp/KompassBeWoWesel/KompassBeWoWesel.csproj index 7c69f18ba..8bb1faa64 100644 --- a/ReportImp/KompassBeWoWesel/KompassBeWoWesel.csproj +++ b/ReportImp/KompassBeWoWesel/KompassBeWoWesel.csproj @@ -7,7 +7,7 @@ {911023BC-9AAC-427D-AA85-04AF886FE81C} Library Properties - KundeXyz + KompassBeWoWesel 4368361336_Reports v4.7.2 512 diff --git a/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.Designer.cs b/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.Designer.cs index eace0620d..c6b508e14 100644 --- a/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.Designer.cs @@ -1,5 +1,5 @@ using BeWo.Report.ReportObjects; -namespace BeWo.Report.DefaultReports +namespace KompassBeWoWesel { partial class ServiceInvoiceReport { @@ -36,6 +36,7 @@ namespace BeWo.Report.DefaultReports this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); @@ -43,21 +44,6 @@ namespace BeWo.Report.DefaultReports this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -90,15 +76,17 @@ namespace BeWo.Report.DefaultReports this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -123,36 +111,45 @@ namespace BeWo.Report.DefaultReports // // topMarginBand1 // - this.topMarginBand1.HeightF = 55.41666F; + this.topMarginBand1.HeightF = 55F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrRichText1, + this.xrRichText3}); + this.bottomMarginBand1.HeightF = 90.00003F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrRichText2, this.xrPictureBox1, + this.xrRichText2, this.xrLabel7, this.xrLabel4, this.xrLabel3, this.xrLabel2, this.xrLabel5, this.xrLabel8, - this.lblAbrechnungszeitraum, - this.xrTable2}); - this.Page1.Font = new System.Drawing.Font("Verdana", 10F); + this.lblAbrechnungszeitraum}); this.Page1.HeightF = 463.4583F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrRichText2 + // + this.xrRichText2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.83F); + this.xrRichText2.Name = "xrRichText2"; + this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); + this.xrRichText2.SizeF = new System.Drawing.SizeF(317F, 17.37499F); + this.xrRichText2.StylePriority.UseFont = false; + // // xrLabel7 // - this.xrLabel7.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 99.37502F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 111.1806F); this.xrLabel7.Multiline = true; this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -165,7 +162,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 334.375F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -180,7 +177,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 314.3751F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -194,7 +191,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.375F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -206,7 +203,6 @@ namespace BeWo.Report.DefaultReports // // xrLabel5 // - this.xrLabel5.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 396.875F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -218,7 +214,6 @@ namespace BeWo.Report.DefaultReports // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 271.375F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -230,7 +225,6 @@ namespace BeWo.Report.DefaultReports // // lblAbrechnungszeitraum // - this.lblAbrechnungszeitraum.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 421.875F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; @@ -239,158 +233,8 @@ namespace BeWo.Report.DefaultReports this.lblAbrechnungszeitraum.StylePriority.UseFont = false; this.lblAbrechnungszeitraum.Text = "hiermit berechnen wir für den ... folgende erbrachte Tätigkeiten:"; // - // xrTable2 - // - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 99.37502F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow2, - this.xrTableRow5, - this.xrTableRow4, - this.xrTableRow3, - this.xrTableRow1, - this.xrTableRow6, - this.xrTableRow8}); - this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 134F); - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell4}); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 0.13245033112582783D; - // - // xrTableCell4 - // - this.xrTableCell4.CanShrink = true; - this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell4.Weight = 1D; - // - // xrTableRow5 - // - this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell13}); - this.xrTableRow5.Name = "xrTableRow5"; - this.xrTableRow5.Weight = 0.13245033112582783D; - // - // xrTableCell13 - // - this.xrTableCell13.CanShrink = true; - this.xrTableCell13.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell13.StylePriority.UseFont = false; - this.xrTableCell13.StylePriority.UseTextAlignment = false; - this.xrTableCell13.Text = "[SenderContactPerson]"; - this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell13.Weight = 1D; - // - // xrTableRow4 - // - this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell11}); - this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 0.13245033112582783D; - // - // xrTableCell11 - // - this.xrTableCell11.CanShrink = true; - this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "[SenderContactPersonDivision]"; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell11.Weight = 1D; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.13245033112582783D; - // - // xrTableCell8 - // - this.xrTableCell8.CanShrink = true; - this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "[SenderContactPersonMail]"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell8.Weight = 1D; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.13245033112582783D; - // - // xrTableCell1 - // - this.xrTableCell1.CanShrink = true; - this.xrTableCell1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "[SenderContactPersonPhone]"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell1.Weight = 1D; - // - // xrTableRow6 - // - this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell2}); - this.xrTableRow6.Name = "xrTableRow6"; - this.xrTableRow6.Weight = 0.11258278145695365D; - // - // xrTableCell2 - // - this.xrTableCell2.CanShrink = true; - this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "[SenderContactPersonFax]"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell2.Weight = 1D; - // - // xrTableRow8 - // - this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5}); - this.xrTableRow8.Name = "xrTableRow8"; - this.xrTableRow8.Weight = 0.11258278145695365D; - // - // xrTableCell5 - // - this.xrTableCell5.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.Weight = 1D; - // // xrLabel15 // - this.xrLabel15.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -400,7 +244,6 @@ namespace BeWo.Report.DefaultReports // // xrTable4 // - this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F); this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -420,7 +263,6 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell9.StylePriority.UseFont = false; @@ -444,7 +286,6 @@ namespace BeWo.Report.DefaultReports // this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); - this.xrLabel14.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -454,7 +295,7 @@ namespace BeWo.Report.DefaultReports // // xrLabel9 // - this.xrLabel9.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic); this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -810,26 +651,33 @@ namespace BeWo.Report.DefaultReports this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // xrPictureBox1 - // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(468.1569F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(208.8431F, 86.08335F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrRichText2 + // xrPictureBox1 // - this.xrRichText2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.75F); - this.xrRichText2.Name = "xrRichText2"; - this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); - this.xrRichText2.SizeF = new System.Drawing.SizeF(395.5419F, 17.37499F); - this.xrRichText2.StylePriority.UseFont = false; + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(405.62F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(272.3848F, 127.8333F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrRichText1 + // + this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(410.2917F, 90.00002F); + // + // xrRichText3 + // + this.xrRichText3.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(485.0833F, 15.625F); + this.xrRichText3.Name = "xrRichText3"; + this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); + this.xrRichText3.SizeF = new System.Drawing.SizeF(192.9167F, 74.37502F); // // ServiceInvoiceReport // @@ -842,20 +690,21 @@ namespace BeWo.Report.DefaultReports this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 10F); + this.Font = new System.Drawing.Font("Arial", 11F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 55, 50); + this.Margins = new System.Drawing.Printing.Margins(75, 50, 55, 90); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -874,21 +723,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum; - private DevExpress.XtraReports.UI.XRTable xrTable2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRTable xrTable4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; @@ -922,7 +756,9 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRRichText xrRichText2; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRRichText xrRichText1; + private DevExpress.XtraReports.UI.XRRichText xrRichText3; } } diff --git a/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.cs b/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.cs index 26d7dfc83..3686e5458 100644 --- a/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.cs +++ b/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.cs @@ -1,9 +1,10 @@ using System; +using BeWo.Report; using BeWo.Report.ReportObjects; using DevExpress.XtraReports.UI; -namespace BeWo.Report.DefaultReports +namespace KompassBeWoWesel { public partial class ServiceInvoiceReport : XtraReport, IBeWoReport { diff --git a/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.resx b/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.resx index 778011fcd..23f0ae454 100644 --- a/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.resx +++ b/ReportImp/KompassBeWoWesel/ServiceInvoiceReport.resx @@ -117,8 +117,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ewBcAHIAdABmADEAXABhAG4AcwBpAGMAcABnADEAMgA1ADIADQAKAHsADQAKAFwAZgBvAG4AdAB0AGIAbAANAAoAewBcAGYAMAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQANAAoAewBcAGYAMQAgAEEAcgBpAGEAbAA7AH0ADQAKAH0ADQAKAHsADQAKAFwAYwBvAGwAbwByAHQAYgBsAA0ACgA7AA0ACgBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAA7AA0ACgBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAOwANAAoAXAByAGUAZAA1ADEAXABnAHIAZQBlAG4ANQAxAFwAYgBsAHUAZQA1ADEAOwANAAoAfQANAAoAXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcAB7AFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAaQAtADEANAAyAFwAbABpADEANAAyAFwAbABpAG4AMQA0ADIAXABuAG8AdwBpAGQAYwB0AGwAcABhAHIAXABzAGwAMgA4ADgAXABzAGwAbQB1AGwAdAAxAHsAXAAqAFwAYgBrAG0AawBzAHQAYQByAHQAIABfAGQAeABfAGYAcgBhAGcAXwBTAHQAYQByAHQARgByAGEAZwBtAGUAbgB0AH0AewBcACoAXABiAGsAbQBrAGUAbgBkACAAXwBkAHgAXwBmAHIAYQBnAF8AUwB0AGEAcgB0AEYAcgBhAGcAbQBlAG4AdAB9AHsAXABmADEAXABmAHMAMQA2AFwAYwBmADMAIABLAG8AbQBwAGEAcwBzACAAQgBlAFcAbwAgAFcAZQBzAGUAbAAgAEcAYgBSACAAIAB8ACAAIABLAGEAaQBzAGUAcgByAGkAbgBnACAANAAgACAAfAAgACAANAA2ADQAOAAzACAAVwBlAHMAZQBsAH0AXABmADEAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQANAAoAfQANAAoA + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAAgAE4AYQByAHIAbwB3ACAAQgBvAGwAZAA7AH0AewBcAGYAMwAgAEEAcgBpAGEAbAAgAE4AYQByAHIAbwB3ADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AFwAcgBlAGQAMgA0ADcAXABnAHIAZQBlAG4AMQA1ADAAXABiAGwAdQBlADcAMAAgADsAXAByAGUAZAA2ADQAXABnAHIAZQBlAG4ANgA0AFwAYgBsAHUAZQA2ADQAIAA7AFwAcgBlAGQANwAxAFwAZwByAGUAZQBuADcAMgBcAGIAbAB1AGUANwAxACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAZgAyAFwAZgBzADEAOABcAGMAZgAzACAASwBvAG0AcABhAHMAcwAgAEIAZQBXAG8AIABXAGUAcwBlAGwAIABHAGIAUgAgAH0AXABmADMAXABmAHMAMQA4AFwAYwBmADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAZgAzAFwAZgBzADEAOABcAGMAZgA0ACAAQwBoAHIAaQBzAHQAbwBwAGgAIABBAC4AIABXAGEAZwBuAGUAcgAgAHUAbgBkACAAQQBuAG4AYQAgAEsALgAgAEcAYQB0AGgAbQBhAG4AbgAgAH0AXABmADMAXABmAHMAMQA4AFwAYwBmADUAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAZgAzAFwAZgBzADEAOABcAGMAZgA1ACAASwBhAGkAcwBlAHIAcgBpAG4AZwAgADQAIAAgACAASQAgACAAIAA0ADYANAA4ADMAIABXAGUAcwBlAGwAfQBcAGIAXABmADMAXABmAHMAMQA4AFwAYwBmADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAYgBcAGYAMwBcAGYAcwAxADgAXABjAGYANAAgAFQAZQBsAGUAZgBvAG4AOgB9AHsAXABmADMAXABmAHMAMQA4AFwAYwBmADUAIAAgADAAMgA4ADEAIAAvACAANAA3ACAAMwA2ACAAMAA5ACAANwA0ACAAIAAgAH0AewBcAGIAXABmADMAXABmAHMAMQA4AFwAYwBmADQAIABUAGUAbABlAGYAYQB4AC4AOgB9AHsAXABmADMAXABmAHMAMQA4AFwAYwBmADQAIAAgAH0AewBcAGYAMwBcAGYAcwAxADgAXABjAGYANQAgADAAMgA4ADEALwAgADQANwAgADMANgAgADIANQAgADgANgB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGIAXABmADMAXABmAHMAMQA4AFwAYwBmADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGIAXABmADMAXABmAHMAMQA4AFwAYwBmADQAIABXAGUAYgA6AH0AewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADMAXABmAHMAMQA4AFwAYwBmADQAIAAgAH0AewBcAGYAaQBlAGwAZAB7AFwAKgBcAGYAbABkAGkAbgBzAHQAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIAAgAEgAWQBQAEUAUgBMAEkATgBLACAAIgBoAHQAdABwADoALwAvAHcAdwB3AC4AawBvAG0AcABhAHMAcwAtAGIAZQB3AG8ALgBkAGUALwAiAH0AfQB7AFwAZgBsAGQAcgBzAGwAdAB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMwBcAGYAcwAxADgAXABjAGYAMQBcAGMAcwAzACAAdwB3AHcAfQB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMwBcAGYAcwAxADgAXABjAGYAMQBcAGMAcwAzACAALgBrAG8AbQBwAGEAcwBzAC0AYgBlAHcAbwAuAGQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMwBcAGYAcwAxADgAXABjAGYAMQBcAGMAcwAzACAAZQB9AH0AfQB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMwBcAGYAcwAxADgAXABjAGYANAAgACAAIAAgACAASQAgACAAIAAgAH0AewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABiAFwAZgAzAFwAZgBzADEAOABcAGMAZgA0ACAARQAtAE0AYQBpAGwAOgB9AHsAXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAzAFwAZgBzADEAOABcAGMAZgA0ACAAIABtAGEAaQBsAEAAawBvAG0AcABhAHMAcwAtAGIAZQB3AG8ALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA= + + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAAgAE4AYQByAHIAbwB3ADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AFwAcgBlAGQANgA0AFwAZwByAGUAZQBuADYANABcAGIAbAB1AGUANgA0ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwAgAEIAYQBuAGsAdgBlAHIAYgBpAG4AZAB1AG4AZwA6AH0AewBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwAgACAAfQBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAaQAtADEANAAyAFwAbABpADEANAAyAFwAbABpAG4AMQA0ADIAXABuAG8AdwBpAGQAYwB0AGwAcABhAHIAXABzAGwAMgA4ADgAXABzAGwAbQB1AGwAdAAxAHsAXABmADIAXABmAHMAMQA4AFwAYwBmADMAIABHAEwAUwAgAEIAYQBuAGsAfQBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADMAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwAgAEkAQgBBAE4AOgB9AHsAXABmADIAXABmAHMAMQA4AFwAYwBmADMAIAAgAEQARQA5ADgAIAA0ADMAMAA2ACAAMAA5ADYANwAgADEAMAA4ADgAIAA5ADYAMQA2ACAAMAAwAH0AXABiAFwAZgAyAFwAZgBzADEAOABcAGMAZgAzAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABiAFwAZgAyAFwAZgBzADEAOABcAGMAZgAzACAAUwB0AGUAdQBlAHIAIABJAEQAOgAgAH0AewBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwAgAEQARQAzADIAMgAyADQAMwA5ADMAMQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA= @@ -10477,6 +10480,9 @@ er1e5//Z + + ewBcAHIAdABmADEAXABhAG4AcwBpAGMAcABnADEAMgA1ADIADQAKAHsADQAKAFwAZgBvAG4AdAB0AGIAbAANAAoAewBcAGYAMAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQANAAoAewBcAGYAMQAgAEEAcgBpAGEAbAA7AH0ADQAKAH0ADQAKAHsADQAKAFwAYwBvAGwAbwByAHQAYgBsAA0ACgA7AA0ACgBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAA7AA0ACgBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAOwANAAoAXAByAGUAZAA1ADEAXABnAHIAZQBlAG4ANQAxAFwAYgBsAHUAZQA1ADEAOwANAAoAfQANAAoAXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcAB7AFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAaQAtADEANAAyAFwAbABpADEANAAyAFwAbABpAG4AMQA0ADIAXABuAG8AdwBpAGQAYwB0AGwAcABhAHIAXABzAGwAMgA4ADgAXABzAGwAbQB1AGwAdAAxAHsAXAAqAFwAYgBrAG0AawBzAHQAYQByAHQAIABfAGQAeABfAGYAcgBhAGcAXwBTAHQAYQByAHQARgByAGEAZwBtAGUAbgB0AH0AewBcACoAXABiAGsAbQBrAGUAbgBkACAAXwBkAHgAXwBmAHIAYQBnAF8AUwB0AGEAcgB0AEYAcgBhAGcAbQBlAG4AdAB9AHsAXABmADEAXABmAHMAMQA2AFwAYwBmADMAIABLAG8AbQBwAGEAcwBzACAAQgBlAFcAbwAgAFcAZQBzAGUAbAAgAEcAYgBSACAAIAB8ACAAIABLAGEAaQBzAGUAcgByAGkAbgBnACAANAAgACAAfAAgACAANAA2ADQAOAAzACAAVwBlAHMAZQBsAH0AXABmADEAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQANAAoAfQANAAoA + 17, 17 diff --git a/ReportImp/KompassBeWoWesel/SettlementReport.Designer.cs b/ReportImp/KompassBeWoWesel/SettlementReport.Designer.cs index 61b136634..f26b9408b 100644 --- a/ReportImp/KompassBeWoWesel/SettlementReport.Designer.cs +++ b/ReportImp/KompassBeWoWesel/SettlementReport.Designer.cs @@ -1,4 +1,4 @@ -namespace BeWo.Report.DefaultReports.Alt +namespace KompassBeWoWesel.Alt { partial class Spitzabrechnung { @@ -47,9 +47,7 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); @@ -57,21 +55,10 @@ namespace BeWo.Report.DefaultReports.Alt this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); @@ -81,6 +68,7 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -101,17 +89,13 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -132,7 +116,6 @@ namespace BeWo.Report.DefaultReports.Alt // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(366.9998F, 279.8333F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -145,7 +128,6 @@ namespace BeWo.Report.DefaultReports.Alt // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 500.75F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -278,7 +260,6 @@ namespace BeWo.Report.DefaultReports.Alt // // xrLabel6 // - this.xrLabel6.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 425.7499F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; @@ -290,7 +271,6 @@ namespace BeWo.Report.DefaultReports.Alt // // xrLabel5 // - this.xrLabel5.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 392.75F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -298,55 +278,28 @@ namespace BeWo.Report.DefaultReports.Alt this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; // - // xrLabel4 - // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 361.1667F); - this.xrLabel4.Multiline = true; - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; - this.xrLabel4.WordWrap = false; - // // xrLabel3 // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 319.8333F); + this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 302.8333F); + this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 41.33334F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 69.44443F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Spitzabrechnung: [CustomerName], [CustomerStreet], [CustomerPostalCode] [Customer" + - "Town] * [CustomerBirthdayString]"; + this.xrLabel3.Text = "Rechnungsnummer: [InvoiceNumber]\r\nSpitzabrechnung: [CustomerName], [CustomerStree" + + "t], [CustomerPostalCode] [CustomerTown] *[CustomerBirthdayString]\r\nAZ: [Customer" + + "ReferenceNumber]"; this.xrLabel3.WordWrap = false; // - // xrLabel2 - // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 302.8333F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F); - this.xrLabel2.StylePriority.UseBackColor = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Rechnungsnumme: [InvoiceNumber]"; - this.xrLabel2.WordWrap = false; - // // RecipientPostCodeAndTown // this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); - this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 190.8333F); + this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 201.25F); this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -357,8 +310,7 @@ namespace BeWo.Report.DefaultReports.Alt // xrLabel_RecipientStreet // this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.8333F); + this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 172.2499F); this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -369,8 +321,7 @@ namespace BeWo.Report.DefaultReports.Alt // xrLabel_RecipientDivision // this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 144.8333F); + this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155.25F); this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -381,8 +332,7 @@ namespace BeWo.Report.DefaultReports.Alt // xrLabel_RecipientContactPerson // this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 127.8333F); + this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 138.25F); this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -393,8 +343,7 @@ namespace BeWo.Report.DefaultReports.Alt // xrLabel1 // this.xrLabel1.CanShrink = true; - this.xrLabel1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110.8333F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 121.25F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -405,147 +354,25 @@ namespace BeWo.Report.DefaultReports.Alt // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, - this.xrTable3, - this.xrLabel12, - this.lblNotice}); - this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 199F; + this.xrLabel10}); + this.ReportFooter.HeightF = 187.4722F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel10 // - this.xrLabel10.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.11113F); + this.xrLabel10.Multiline = true; this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(692F, 166.3611F); this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Mit freundlichen Grüßen"; - // - // xrTable3 - // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow20, - this.xrTableRow21, - this.xrTableRow22, - this.xrTableRow23, - this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 68F); - this.xrTable3.StylePriority.UseFont = false; - // - // xrTableRow20 - // - this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell16}); - this.xrTableRow20.Name = "xrTableRow20"; - this.xrTableRow20.Weight = 0.38095238095238093D; - // - // xrTableCell16 - // - this.xrTableCell16.CanShrink = true; - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell16.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.StylePriority.UseFont = false; - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.Text = "xrTableCell1"; - this.xrTableCell16.Weight = 3D; - // - // xrTableRow21 - // - this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell18}); - this.xrTableRow21.Name = "xrTableRow21"; - this.xrTableRow21.Weight = 0.23809523809523808D; - // - // xrTableCell18 - // - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Weight = 3D; - // - // xrTableRow22 - // - this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29}); - this.xrTableRow22.Name = "xrTableRow22"; - this.xrTableRow22.Weight = 0.38095238095238088D; - // - // xrTableCell29 - // - this.xrTableCell29.CanShrink = true; - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); - this.xrTableCell29.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell29.StylePriority.UseFont = false; - this.xrTableCell29.StylePriority.UsePadding = false; - this.xrTableCell29.Text = "xrTableCell4"; - this.xrTableCell29.Weight = 3D; - // - // xrTableRow23 - // - this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell30}); - this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 0.23809523809523803D; - // - // xrTableCell30 - // - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.Weight = 3D; - // - // xrTableRow24 - // - this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell31}); - this.xrTableRow24.Name = "xrTableRow24"; - this.xrTableRow24.Weight = 0.38095238095238093D; - // - // xrTableCell31 - // - this.xrTableCell31.CanShrink = true; - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); - this.xrTableCell31.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell31.StylePriority.UseFont = false; - this.xrTableCell31.StylePriority.UsePadding = false; - this.xrTableCell31.Text = "xrTableCell8"; - this.xrTableCell31.Weight = 3D; - // - // xrLabel12 - // - this.xrLabel12.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 182F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "[CreatorName]"; - // - // lblNotice - // - this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); - this.lblNotice.Name = "lblNotice"; - this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F); - this.lblNotice.StylePriority.UseFont = false; - this.lblNotice.Text = "Abschließende Bemerkungen:"; + this.xrLabel10.Text = resources.GetString("xrLabel10.Text"); // // topMarginBand1 // - this.topMarginBand1.HeightF = 64.58334F; + this.topMarginBand1.HeightF = 65F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -553,9 +380,25 @@ namespace BeWo.Report.DefaultReports.Alt this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrRichText3, this.xrRichText1}); - this.bottomMarginBand1.HeightF = 115.5416F; + this.bottomMarginBand1.HeightF = 116F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrRichText3 + // + this.xrRichText3.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(485.0833F, 15.62508F); + this.xrRichText3.Name = "xrRichText3"; + this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); + this.xrRichText3.SizeF = new System.Drawing.SizeF(192.9167F, 74.37502F); + // + // xrRichText1 + // + this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(410.2917F, 90.00002F); + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -566,14 +409,12 @@ namespace BeWo.Report.DefaultReports.Alt this.xrLabel_RecipientDivision, this.xrLabel_RecipientStreet, this.RecipientPostCodeAndTown, - this.xrLabel2, this.xrLabel3, - this.xrLabel4, this.xrLabel5, this.xrLabel6, this.xrTable1, this.xrLabel8}); - this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); + this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F); this.GroupHeader1.HeightF = 568.75F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; @@ -589,7 +430,7 @@ namespace BeWo.Report.DefaultReports.Alt // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 45.41667F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.83335F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(395.5419F, 17.37499F); @@ -608,7 +449,6 @@ namespace BeWo.Report.DefaultReports.Alt // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable5}); - this.Detail1.Font = new System.Drawing.Font("Verdana", 10F); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -665,11 +505,14 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell23.Weight = 0.21685899000901443D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4}); - this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F); this.GroupFooter1.HeightF = 132F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; @@ -842,7 +685,7 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableCell56.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell56.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell56.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell56.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); this.xrTableCell56.Name = "xrTableCell56"; this.xrTableCell56.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell56.StylePriority.UseBorderColor = false; @@ -875,7 +718,7 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableCell58.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell58.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell58.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell58.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); this.xrTableCell58.Name = "xrTableCell58"; this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell58.StylePriority.UseBorderColor = false; @@ -886,26 +729,6 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // - // xrRichText1 - // - this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(410.2917F, 90.00002F); - // - // xrRichText3 - // - this.xrRichText3.Font = new System.Drawing.Font("Times New Roman", 9.75F); - this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(485.0833F, 25.62498F); - this.xrRichText3.Name = "xrRichText3"; - this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); - this.xrRichText3.SizeF = new System.Drawing.SizeF(192.9167F, 74.37502F); - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -919,21 +742,21 @@ namespace BeWo.Report.DefaultReports.Alt this.GroupFooter1}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; + this.Font = new System.Drawing.Font("Arial", 11F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 65, 116); + this.Margins = new System.Drawing.Printing.Margins(75, 50, 65, 116); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -945,17 +768,13 @@ namespace BeWo.Report.DefaultReports.Alt private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel5; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown; private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet; private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision; private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; @@ -967,17 +786,6 @@ namespace BeWo.Report.DefaultReports.Alt private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTable xrTable3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow20; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow21; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow22; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; diff --git a/ReportImp/KompassBeWoWesel/SettlementReport.cs b/ReportImp/KompassBeWoWesel/SettlementReport.cs index f7f6ea8f3..89d91a2c8 100644 --- a/ReportImp/KompassBeWoWesel/SettlementReport.cs +++ b/ReportImp/KompassBeWoWesel/SettlementReport.cs @@ -6,7 +6,7 @@ using BeWo.Report; using BeWo.Report.ReportObjects; using BS.Shared.DataContracts; -namespace BeWo.Report.DefaultReports.Alt +namespace KompassBeWoWesel.Alt { public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { @@ -19,10 +19,7 @@ namespace BeWo.Report.DefaultReports.Alt { bool isDefaultSpitzabrechnung = false; - if (String.IsNullOrEmpty(pRO.Notice)) - { - lblNotice.Visible = false; - } + if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1) { diff --git a/ReportImp/KompassBeWoWesel/SettlementReport.resx b/ReportImp/KompassBeWoWesel/SettlementReport.resx index af596dced..621e8b6d9 100644 --- a/ReportImp/KompassBeWoWesel/SettlementReport.resx +++ b/ReportImp/KompassBeWoWesel/SettlementReport.resx @@ -117,6 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bitte überweisen Sie unsere Restforderung nach Prüfung der Endabrechnung auf das unten angege- +bene Konto. +Für Rückfragen stehe ich Ihnen gerne zur Verfügung. + +Mit freundlichen Grüßen + + + +[CreatorName] + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAAgAE4AYQByAHIAbwB3ADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AFwAcgBlAGQANgA0AFwAZwByAGUAZQBuADYANABcAGIAbAB1AGUANgA0ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwAgAEIAYQBuAGsAdgBlAHIAYgBpAG4AZAB1AG4AZwA6AH0AewBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwAgACAAfQBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAaQAtADEANAAyAFwAbABpADEANAAyAFwAbABpAG4AMQA0ADIAXABuAG8AdwBpAGQAYwB0AGwAcABhAHIAXABzAGwAMgA4ADgAXABzAGwAbQB1AGwAdAAxAHsAXABmADIAXABmAHMAMQA4AFwAYwBmADMAIABHAEwAUwAgAEIAYQBuAGsAfQBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADMAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmAGkALQAxADQAMgBcAGwAaQAxADQAMgBcAGwAaQBuADEANAAyAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIAOAA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwAgAEkAQgBBAE4AOgB9AHsAXABmADIAXABmAHMAMQA4AFwAYwBmADMAIAAgAEQARQA5ADgAIAA0ADMAMAA2ACAAMAA5ADYANwAgADEAMAA4ADgAIAA5ADYAMQA2ACAAMAAwAH0AXABiAFwAZgAyAFwAZgBzADEAOABcAGMAZgAzAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABiAFwAZgAyAFwAZgBzADEAOABcAGMAZgAzACAAUwB0AGUAdQBlAHIAIABJAEQAOgAgAH0AewBcAGYAMgBcAGYAcwAxADgAXABjAGYAMwAgAEQARQAzADIAMgAyADQAMwA5ADMAMQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA= diff --git a/ReportImp/LebenshilfeEssenReports/ServicesOverviewReport.Designer.cs b/ReportImp/LebenshilfeEssenReports/ServicesOverviewReport.Designer.cs index dfa5e8fcd..ad0c42064 100644 --- a/ReportImp/LebenshilfeEssenReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/LebenshilfeEssenReports/ServicesOverviewReport.Designer.cs @@ -124,6 +124,8 @@ namespace BeWo.LebenshilfeEssenReports this.customerCountField = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldFLSTotal = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblDebNr = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -362,6 +364,8 @@ namespace BeWo.LebenshilfeEssenReports // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel11, + this.lblDebNr, this.xrLabel18, this.lblKostenstelle, this.xrLabel8, @@ -395,10 +399,10 @@ namespace BeWo.LebenshilfeEssenReports // // xrLabel18 // - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(429.4998F, 43F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(442.6942F, 42.99999F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(112.8755F, 18.00001F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(99.68109F, 18.00001F); this.xrLabel18.StylePriority.UseFont = false; this.xrLabel18.StylePriority.UseTextAlignment = false; this.xrLabel18.Text = "Kostenstelle:"; @@ -466,10 +470,10 @@ namespace BeWo.LebenshilfeEssenReports // this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerLastName")}); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(222.375F, 43F); + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(222.375F, 42.99999F); this.xrLabel28.Name = "xrLabel28"; this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(207.1248F, 18F); + this.xrLabel28.SizeF = new System.Drawing.SizeF(220.3192F, 18F); this.xrLabel28.StylePriority.UseBorders = false; this.xrLabel28.StylePriority.UseFont = false; // @@ -480,7 +484,7 @@ namespace BeWo.LebenshilfeEssenReports this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(222.375F, 61F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel29.SizeF = new System.Drawing.SizeF(377.9999F, 18F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(220.3192F, 18F); this.xrLabel29.StylePriority.UseBorders = false; this.xrLabel29.StylePriority.UseFont = false; // @@ -1100,6 +1104,26 @@ namespace BeWo.LebenshilfeEssenReports this.fieldFLSTotal.FieldType = DevExpress.XtraReports.UI.FieldType.Double; this.fieldFLSTotal.Name = "fieldFLSTotal"; // + // xrLabel11 + // + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(442.6943F, 60.99995F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(99.68109F, 18.00001F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "Debitorennr."; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // lblDebNr + // + this.lblDebNr.LocationFloat = new DevExpress.Utils.PointFloat(542.3753F, 61F); + this.lblDebNr.Name = "lblDebNr"; + this.lblDebNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblDebNr.SizeF = new System.Drawing.SizeF(132.6246F, 18F); + this.lblDebNr.StylePriority.UseBorders = false; + this.lblDebNr.StylePriority.UseFont = false; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1233,5 +1257,7 @@ namespace BeWo.LebenshilfeEssenReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; private DevExpress.XtraReports.UI.XRLabel xrLabel19; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel lblDebNr; } } diff --git a/ReportImp/LebenshilfeEssenReports/ServicesOverviewReport.cs b/ReportImp/LebenshilfeEssenReports/ServicesOverviewReport.cs index 29b0d3310..02bec6755 100644 --- a/ReportImp/LebenshilfeEssenReports/ServicesOverviewReport.cs +++ b/ReportImp/LebenshilfeEssenReports/ServicesOverviewReport.cs @@ -73,6 +73,10 @@ namespace BeWo.LebenshilfeEssenReports { lblKostenstelle.Text = customer.CostCenter; } + if (!String.IsNullOrEmpty(customer.DebitorNumber)) + { + lblDebNr.Text = customer.DebitorNumber; + } } this.bindingSource1.DataSource = pRO; }