diff --git a/BeWo.sln b/BeWo.sln index 95024093a..d081ec3a8 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -441,6 +441,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KcmGmbH", "ReportImp\KcmGmb EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KirschbaumManz", "ReportImp\KirschbaumManz\KirschbaumManz.csproj", "{56602D65-47F7-4175-A065-A044FE7F6C81}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkmLeverkusen", "ReportImp\SkmLeverkusen\SkmLeverkusen.csproj", "{E30D35E8-9B15-4345-B8B7-422415A659DA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3356,6 +3358,22 @@ Global {56602D65-47F7-4175-A065-A044FE7F6C81}.Release|Mixed Platforms.Build.0 = Release|Any CPU {56602D65-47F7-4175-A065-A044FE7F6C81}.Release|x86.ActiveCfg = Release|Any CPU {56602D65-47F7-4175-A065-A044FE7F6C81}.Release|x86.Build.0 = Release|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Debug|.NET.ActiveCfg = Debug|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Debug|.NET.Build.0 = Debug|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Debug|x86.ActiveCfg = Debug|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Debug|x86.Build.0 = Debug|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Release|.NET.ActiveCfg = Release|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Release|.NET.Build.0 = Release|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Release|Any CPU.Build.0 = Release|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Release|x86.ActiveCfg = Release|Any CPU + {E30D35E8-9B15-4345-B8B7-422415A659DA}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3572,6 +3590,7 @@ Global {0F14574F-9637-40FE-8FCE-E047EFA4EC0B} = {D8A691C5-146D-4613-86CC-438F02FE9106} {815DC325-1C77-4EC1-964F-D54D2321EDAF} = {D8A691C5-146D-4613-86CC-438F02FE9106} {56602D65-47F7-4175-A065-A044FE7F6C81} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {E30D35E8-9B15-4345-B8B7-422415A659DA} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/ReportImp/BeWoNordeifel/SettlementReport.Designer.cs b/ReportImp/BeWoNordeifel/SettlementReport.Designer.cs index 45ee6abf3..1bd156f9a 100644 --- a/ReportImp/BeWoNordeifel/SettlementReport.Designer.cs +++ b/ReportImp/BeWoNordeifel/SettlementReport.Designer.cs @@ -53,7 +53,6 @@ namespace BeWo.Report.DefaultReports.Alt 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.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -100,6 +99,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(); @@ -120,13 +120,12 @@ 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); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -195,7 +194,7 @@ namespace BeWo.Report.DefaultReports.Alt // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 169F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(366.9999F, 186F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); @@ -383,20 +382,6 @@ namespace BeWo.Report.DefaultReports.Alt this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]"; this.xrLabel3.WordWrap = false; // - // xrLabel2 - // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); - 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 = "Rechnung Nr. [InvoiceNumber]"; - this.xrLabel2.WordWrap = false; - // // xrTable2 // this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 0F); @@ -771,7 +756,6 @@ namespace BeWo.Report.DefaultReports.Alt this.xrLabel_RecipientStreet, this.RecipientPostCodeAndTown, this.xrTable2, - this.xrLabel2, this.xrLabel3, this.xrLabel4, this.xrLabel5, @@ -853,6 +837,10 @@ 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[] { @@ -1068,10 +1056,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); - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1096,8 +1080,8 @@ namespace BeWo.Report.DefaultReports.Alt ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1111,7 +1095,6 @@ namespace BeWo.Report.DefaultReports.Alt 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.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; diff --git a/ReportImp/SkmLeverkusen/SettlementReport.Designer.cs b/ReportImp/SkmLeverkusen/SettlementReport.Designer.cs index dfa8af9f5..b23bcc13d 100644 --- a/ReportImp/SkmLeverkusen/SettlementReport.Designer.cs +++ b/ReportImp/SkmLeverkusen/SettlementReport.Designer.cs @@ -134,7 +134,7 @@ namespace SkmLeverkusen.Alt // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 397.2083F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 460.7499F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -265,7 +265,7 @@ namespace SkmLeverkusen.Alt // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 322.2083F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 385.7499F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -275,7 +275,7 @@ namespace SkmLeverkusen.Alt // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 289.2084F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 352.7501F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -287,7 +287,7 @@ namespace SkmLeverkusen.Alt this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 246.8751F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310.4168F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -302,7 +302,7 @@ namespace SkmLeverkusen.Alt this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 230.8751F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.4168F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F); @@ -316,10 +316,10 @@ namespace SkmLeverkusen.Alt this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 213.875F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.4167F); 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.SizeF = new System.Drawing.SizeF(479.5F, 17F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]"; @@ -481,7 +481,7 @@ namespace SkmLeverkusen.Alt this.xrLabel6, this.xrTable1}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 465.2083F; + this.GroupHeader1.HeightF = 528.75F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -489,7 +489,7 @@ namespace SkmLeverkusen.Alt // this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(350F, 153.2917F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(479.5F, 271.4167F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(170.5002F, 23F); diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 5f7f41c8d..9690e1296 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -211,7 +211,7 @@ namespace BeWo.Service.Plugins //t = "5022131330"; // Tabula Rasa //t = "4189934785"; // Landshuter Netzwerke //t = "4290816992"; // BeWo Imflow - t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR + //t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR //t = "3678599942"; // VKM Rietberg //t = "4069072369"; // BeWo Dreilich&Pastor (Pastor) //t = "4160851689"; // BeWo Dreilich&Pastor (Dreilich) @@ -248,7 +248,7 @@ namespace BeWo.Service.Plugins //t = "5098825926"; // SAB GmbH //t = "7808149226"; // BeWo Flex //t = "7419804320"; // Gender Bewo - //t = "4500422855"; // BeWo Nordeifel + t = "4500422855"; // BeWo Nordeifel //t = "3565931805"; // Betreuungsbüro Frank Röhrig //t = "4152581290"; // MVZ Medikus GmbH (Stoffwechsel Betreutes wohnen) //t = "2594047883"; // KOMM Ambulante Dienste e. V. diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index e789da508..fe96d368f 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -6564,7 +6564,7 @@ namespace BeWo.Service.ServiceImplementations { try { - return "#FF8686"; + return "#008EED"; } catch (Exception e) {