From a074e796709cedec0349892a8067148f549135d2 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Fri, 6 May 2022 10:40:39 +0200 Subject: [PATCH] MH: Rechnung Adik Kleve angepasst --- BeWo.sln | 19 +++++ .../InvoiceCustomerReport.Designer.cs | 80 +++++++++---------- Service/Plugins/PluginLoader.cs | 10 +-- 3 files changed, 64 insertions(+), 45 deletions(-) diff --git a/BeWo.sln b/BeWo.sln index 1936b4b6d..7ccf2afc7 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -525,6 +525,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonieLennepJobfit", "Rep EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Biotop", "ReportImp\Biotop\Biotop.csproj", "{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AwoKreisverbandPloen", "ReportImp\AwoKreisverbandPloen\AwoKreisverbandPloen.csproj", "{6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -4112,6 +4114,22 @@ Global {3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU {3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|x86.ActiveCfg = Release|Any CPU {3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|x86.Build.0 = Release|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Debug|.NET.ActiveCfg = Debug|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Debug|.NET.Build.0 = Debug|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Debug|x86.ActiveCfg = Debug|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Debug|x86.Build.0 = Debug|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Release|.NET.ActiveCfg = Release|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Release|.NET.Build.0 = Release|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Release|Any CPU.Build.0 = Release|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Release|x86.ActiveCfg = Release|Any CPU + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4370,6 +4388,7 @@ Global {B02A94EB-8D34-41D0-8E53-20F116240101} = {D8A691C5-146D-4613-86CC-438F02FE9106} {370A9FEA-F0C5-469B-BFF7-C4049A08AC7F} = {D8A691C5-146D-4613-86CC-438F02FE9106} {3B233B57-6F1C-4153-A0E6-C2739A3AEFBD} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/ReportImp/AdikKleve/InvoiceCustomerReport.Designer.cs b/ReportImp/AdikKleve/InvoiceCustomerReport.Designer.cs index 3aabc923b..ba73819ba 100644 --- a/ReportImp/AdikKleve/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/AdikKleve/InvoiceCustomerReport.Designer.cs @@ -80,16 +80,16 @@ namespace AdikKleve this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLine1 = new DevExpress.XtraReports.UI.XRLine(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -390,7 +390,7 @@ namespace AdikKleve this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(581.4177F, 17.00003F); this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "[RecipientSalutation] [RecipientFirstName] [RecipientLastName],"; + this.xrLabel5.Text = "[RecipientSalutation],"; // // xrLabel4 // @@ -419,7 +419,7 @@ namespace AdikKleve this.lblAbrechnungsText.StylePriority.UseBackColor = false; this.lblAbrechnungsText.StylePriority.UseFont = false; this.lblAbrechnungsText.Text = "Abrechnung über Betreuungsleistungen für [CustomerSalutation] [CustomerFirstName]" + - " [CustomerLastName], geb. [CustomerBirthdate!dd.MM.yyyy]"; + " [CustomerLastName]"; this.lblAbrechnungsText.WordWrap = false; // // xrLabel2 @@ -659,6 +659,17 @@ namespace AdikKleve this.topMarginBand1.HeightF = 230F; this.topMarginBand1.Name = "topMarginBand1"; // + // xrLabel3 + // + this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 201.4167F); + 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(351.375F, 28.58333F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "ADiK-Kleve GmbH & Co. KG *Hoffmannallee 105* 47533 Kleve"; + // // xrPictureBox1 // this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; @@ -692,6 +703,30 @@ namespace AdikKleve this.bottomMarginBand1.Name = "bottomMarginBand1"; this.bottomMarginBand1.StylePriority.UseFont = false; // + // xrLabel13 + // + this.xrLabel13.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99995F); + this.xrLabel13.Multiline = true; + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(517.6666F, 77.49999F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = resources.GetString("xrLabel13.Text"); + // + // xrLabel9 + // + this.xrLabel9.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(517.6666F, 19.99995F); + 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(208.3333F, 77.49999F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UseTextAlignment = false; + this.xrLabel9.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL"; + this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // // xrLine1 // this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); @@ -720,41 +755,6 @@ namespace AdikKleve // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); // - // xrLabel13 - // - this.xrLabel13.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99995F); - this.xrLabel13.Multiline = true; - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(517.6666F, 77.49999F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.Text = resources.GetString("xrLabel13.Text"); - // - // xrLabel9 - // - this.xrLabel9.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(517.6666F, 19.99995F); - 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(208.3333F, 77.49999F); - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.StylePriority.UseTextAlignment = false; - this.xrLabel9.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL"; - this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // xrLabel3 - // - this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 201.4167F); - 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(351.375F, 28.58333F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "ADiK-Kleve GmbH & Co. KG *Hoffmannallee 105* 47533 Kleve"; - // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index c20ae9b52..60d1a6401 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -22,7 +22,7 @@ namespace BeWo.Service.Plugins //t = "5473568546"; //Interner Chat //t = "2356097460"; // Lebenshilfe Würzburg //t = "1234567890"; // Präsentationsdatenbank - t = "5687373602"; // LH Duisburg + //t = "5687373602"; // LH Duisburg //t = "5509064354"; // LH Duisburg Service Plus //t = "5620636022"; // GPZ Biberach //t = "8562233401"; // Sozialwirkstatt Schmitz @@ -36,7 +36,7 @@ namespace BeWo.Service.Plugins //t = "1352143437"; // Sewo //t = "7107514623"; // BeWo Neuss //t = "9098141768"; // Fib e.V. Marburg - t = "1505148718"; // VSD Hamm + //t = "1505148718"; // VSD Hamm //t = "5926081834"; // Spektrum //t = "1378137009"; // BeWo Direkt+ //t = "3010479871"; // Aachener Verein @@ -81,7 +81,7 @@ namespace BeWo.Service.Plugins //t = "8001550599"; // Biallas BeWo //t = "7282396774"; // Caritas Unna //t = "6884855402"; // IBP - //t = "4867997795"; // ADiK Kleve + t = "4867997795"; // ADiK Kleve //t = "3184859776"; // Sergej Becker //t = "7752610643"; // BWK Gbr //t = "3785623125"; // Betreuwo @@ -279,7 +279,7 @@ namespace BeWo.Service.Plugins //t = "4823067940"; // Die Kette 2 //t = "8283849714"; // Forum e.V. (proviel GmbH) //t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia) - t = "2387527289"; // Lebenshilfe Duisburg HPFH + //t = "2387527289"; // Lebenshilfe Duisburg HPFH //t = "5595701056"; // Domiziel Ansbach //t = "9430188510"; // Pro INTEGRA //t = "4820371076"; // Zuhause Wohnen Iris Thimm @@ -298,7 +298,7 @@ namespace BeWo.Service.Plugins //t = "3640152169"; // Claudia Charisius //t = "3884496709"; // Wahl e.V. //t = "3536079480"; // Behindertenhilfe Menden - t = "5427523619"; // ChristopherusHausFamilienhilfe + //t = "5427523619"; // ChristopherusHausFamilienhilfe //t = "8251343124"; // Rat Plus Tat //t = "6819347851"; // Awo Kreisverband Plön //t = "2385915144"; // AKGG GmbHd