diff --git a/ReportImp/VivaAVidaReports/CustomReportCreator.cs b/ReportImp/VivaAVidaReports/CustomReportCreator.cs index 160bad3fa..16bdfcf8d 100644 --- a/ReportImp/VivaAVidaReports/CustomReportCreator.cs +++ b/ReportImp/VivaAVidaReports/CustomReportCreator.cs @@ -3,6 +3,7 @@ using BeWo.Report; using BeWo.Report.ReportObjects; using BeWo.Report.DefaultReports; using DevExpress.XtraReports.UI; +using System; namespace VivaAVida { @@ -34,7 +35,6 @@ namespace VivaAVida return new XtraReport(); } - public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) { var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid); @@ -83,7 +83,8 @@ namespace VivaAVida { ServicesOverviewRO.CreateSignatureString(s); - if (s.ServiceCategory.ToLower().Contains("sozio")) + if (s.ServiceCategory.ToLower().Contains("sozio") && + ro.StartDate >= new DateTime(2025, 2, 1)) { sozioRo.Services.Add(s); } diff --git a/ReportImp/VivaAVidaReports/Invoicing/SoziotherapieInvoiceCreation.cs b/ReportImp/VivaAVidaReports/Invoicing/SoziotherapieInvoiceCreation.cs deleted file mode 100644 index 011a41b64..000000000 --- a/ReportImp/VivaAVidaReports/Invoicing/SoziotherapieInvoiceCreation.cs +++ /dev/null @@ -1,256 +0,0 @@ -using System; -using System.Collections.Generic; -using BeWo.Data.Entities; -using BeWo.Service.Invoicing; -using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; -using BS.Shared.Extensions; -using BS.Shared.Services; - -namespace VivaAVida.Invoicing -{ - public class SoziotherapieInvoiceCreation : InvoiceCreation - { - public override void SetInvoiceId(ServiceInvoice invoice) - { - invoice.InvoiceBase.InvoiceId = "RechnungSoziotherapie"; - invoice.InvoiceBase.InvoiceTypeText = "Soziotherapie"; - } - - public override ServiceInvoice CreateSingleInvoice(int invoiceCounter, CostBearer costBearer, DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept, List serviceRecords) - { - var invoice = new ServiceInvoice(); - - var supportConceptList = new List { supportConcept }; - - SetSenderInformation(invoice); - SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList); - SetSingleInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConcept); - - SetRecipientInformation(invoice, costBearer); - - SetServiceInvoicePeriods(invoice, invoice.InvoiceBase.CostBearer2SupportConcept, invoicePeriod, serviceRecords); - - SetServiceInvoicePeriodAmounts(invoice); - - if (invoicePeriod == null) - { - SetAmountAdvancePayments(invoice); - SetAmountEquityContribution(invoice); - } - - base.CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, supportConcept, serviceRecords); - return invoice; - } - - public override IList CreateInvoiceItems(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc) - { - var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc); - var ii = CreateHausbesuchspauschale(serviceRecordsInPeriod, invoicePeriod, scap); - list.AddRange(ii); - - return list; - } - - public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) - { - var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); - ii.ItemDescription = iServiceRecord.ServiceDescription.Name; - - if (ii.ItemDescription.ToLower().Contains("gruppe")) - { - if (iServiceRecord.RoundedDuration <= 45) - ii.UnitDescription = "GPos: 2002678"; - else if (iServiceRecord.RoundedDuration <= 60) - ii.UnitDescription = "GPos: 2002677"; - else - ii.UnitDescription = "GPos: 2002672"; // 90 min, 2-5 Personen - ii.AmountPerUnit = GetGruppenPreis(scap.CostBearer2SupportConcept, iServiceRecord.Start.Value); - ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; - ii.GrossAmountTotal = ii.AmountTotal; - } - else - { - ii.AmountPerUnit = GetEinzelPreis(scap.CostBearer2SupportConcept, iServiceRecord.Start.Value); - ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; - ii.GrossAmountTotal = ii.AmountTotal; - - if (ii.ItemDescription.ToLower().Contains("video")) - { - if (iServiceRecord.RoundedDuration <= 30) - { - ii.UnitDescription = "GPos: 2001616"; - } - else - { - ii.UnitDescription = "GPos: 2001615"; - } - } - else if (ii.ItemDescription.ToLower().Contains("telefonat")) - { - if (iServiceRecord.RoundedDuration <= 30) - { - ii.UnitDescription = "GPos: 2001618"; - } - else - { - ii.UnitDescription = "GPos: 2001617"; - } - } - else if (ii.ItemDescription.ToLower().Contains("aufsuchende einheit")) - { - if (iServiceRecord.RoundedDuration <= 10) - { - ii.UnitDescription = "GPos: 2001613 / 2009690"; - } - else if (iServiceRecord.RoundedDuration <= 30) - { - ii.UnitDescription = "GPos: 2001612 / 2009690"; - } - else if (iServiceRecord.RoundedDuration <= 45) - { - ii.UnitDescription = "GPos: 2001611 / 2009690"; - } - else - { - ii.UnitDescription = "GPos: 2001610 / 2009690"; - } - } - else if (ii.ItemDescription.ToLower().Contains("aufsuchende probatorik")) - { - ii.UnitDescription = "GPos: 2001607 / 2009690"; - } - else if (ii.ItemDescription.ToLower().Contains("büroprobatorik")) - { - ii.UnitDescription = "GPos: 2001607"; - } - else if (ii.ItemDescription.ToLower().Contains("büroeinheit")) - { - if (iServiceRecord.RoundedDuration <= 10) - { - ii.UnitDescription = "GPos: 2001613"; - } - else if (iServiceRecord.RoundedDuration <= 30) - { - ii.UnitDescription = "GPos: 2001612"; - } - else if (iServiceRecord.RoundedDuration <= 45) - { - ii.UnitDescription = "GPos: 2001611"; - } - else - { - ii.UnitDescription = "GPos: 2001610"; - } - } - } - - return ii; - } - - public virtual IList CreateHausbesuchspauschale(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap) - { - IList items = new List(); - decimal hausbesuchspauschale = 8.53m; - if (scap != null && invoicePeriod != null) - { - hausbesuchspauschale = GetHausbesuchspauschale(scap.CostBearer2SupportConcept, invoicePeriod.StartDate); - } - int countHausbesuch = 0; - foreach (var sr in serviceRecordsInPeriod) - { - if (sr.ServiceDescription != null && sr.ServiceDescription.Name != null && sr.ServiceDescription.Name.ToLower().Contains("aufsuchend")) - { - countHausbesuch++; - } - } - - if (countHausbesuch > 0) - { - var invoiceItem = new InvoiceItem(); - - decimal anzahlHausbesuche = countHausbesuch; - - invoiceItem.AmountPerUnit = hausbesuchspauschale; - invoiceItem.UnitCount = anzahlHausbesuche; - invoiceItem.AmountTotal = anzahlHausbesuche * hausbesuchspauschale; - if (invoicePeriod != null) - { - invoiceItem.ItemPeriodStart = invoicePeriod.StartDate; - invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate; - } - invoiceItem.RateFactor = null; - invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal; - invoiceItem.ItemDescription = "Hausbesuchspauschale"; - invoiceItem.UnitDescription = "GPos: 2009690"; - if (scap != null) - invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid; - - items.Add(invoiceItem); - } - return items; - } - - private decimal GetHausbesuchspauschale(CostBearer2SupportConcept c2s, DateTime dt) - { - String preisName = "Hausbesuchspauschale Primärkasse"; - - if (c2s.CostBearer.Organisation.Function != null) - { - if (c2s.CostBearer.Organisation.Function.Value.Contains("Ersatzkasse")) - { - preisName = "Hausbesuchspauschale Ersatzkasse"; - } - } - - return base.GetPreis(preisName, dt); - } - - private decimal GetGruppenPreis(CostBearer2SupportConcept c2s, DateTime dt) - { - String preisName = "Gruppenstunde Primärkasse"; - - if (c2s.CostBearer.Organisation.Function != null) - { - if (c2s.CostBearer.Organisation.Function.Value.Contains("Ersatzkasse")) - { - preisName = "Gruppenstunde Ersatzkasse"; - } - } - - return base.GetPreis(preisName, dt); - } - - private decimal GetEinzelPreis(CostBearer2SupportConcept c2s, DateTime dt) - { - String preisName = "Einzelstunde Primärkasse"; - - if (c2s.CostBearer.Organisation.Function != null) - { - if (c2s.CostBearer.Organisation.Function.Value.Contains("Ersatzkasse")) - { - preisName = "Einzelstunde Ersatzkasse"; - } - } - - return base.GetPreis(preisName, dt); - } - - public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount) - { - return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true); - } - - public override string GetSummaryItemKey(SupportConceptApprovalPeriod scap, InvoiceItem iitem, bool summaryPerMonth) - { - String key = String.Format("{0}_{1}_{2}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemDescription); - if (summaryPerMonth) - { - key = String.Format("{0}_{1}_{2:yyyyMM}_{3}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemPeriodStart, iitem.ItemDescription); - } - - return key; - } - } -} diff --git a/ReportImp/VivaAVidaReports/LeistungsnachweisSoziotherapie.designer.cs b/ReportImp/VivaAVidaReports/LeistungsnachweisSoziotherapie.designer.cs index 640248839..68e26c92c 100644 --- a/ReportImp/VivaAVidaReports/LeistungsnachweisSoziotherapie.designer.cs +++ b/ReportImp/VivaAVidaReports/LeistungsnachweisSoziotherapie.designer.cs @@ -399,7 +399,7 @@ namespace VivaAVida this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell17.StylePriority.UsePadding = false; this.xrTableCell17.StylePriority.UseTextAlignment = false; - this.xrTableCell17.Text = "[Notice]"; + this.xrTableCell17.Text = "[Notice2]"; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell17.Weight = 0.12626263699193913D; // diff --git a/ReportImp/VivaAVidaReports/SoziotherapieRechnung.Designer.cs b/ReportImp/VivaAVidaReports/SoziotherapieRechnung.Designer.cs index a01dc9b69..9620e0d1c 100644 --- a/ReportImp/VivaAVidaReports/SoziotherapieRechnung.Designer.cs +++ b/ReportImp/VivaAVidaReports/SoziotherapieRechnung.Designer.cs @@ -1,33 +1,33 @@ -using BeWo.Report.ReportObjects; -namespace VivaAVida -{ - partial class SoziotherapieRechnung - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { +using BeWo.Report.ReportObjects; +namespace VivaAVida +{ + partial class SoziotherapieRechnung + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); @@ -53,6 +53,7 @@ namespace VivaAVida this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -65,6 +66,7 @@ namespace VivaAVida this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -74,6 +76,7 @@ namespace VivaAVida this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -287,6 +290,7 @@ namespace VivaAVida this.xrTableCell7.StylePriority.UseFont = false; this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "490 502 234"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell7.Weight = 0.53122488360866615D; // @@ -302,8 +306,8 @@ namespace VivaAVida this.xrLabel6.SizeF = new System.Drawing.SizeF(650.7153F, 38.99988F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "Abrechnung Soziotherapie-Leistungen gemäß $37a SGV, Versicherte(r): [CustomerLast" + - "Name], [CustomerFirstName]\r\nVersichtennummer: [CustomerInsuranceNumber]"; + this.xrLabel6.Text = "Abrechnung Soziotherapie-Leistungen gemäß $37 a SGB V, Versicherte(r): [CustomerL" + + "astName], [CustomerFirstName]\r\nVersichtennummer: [CustomerInsuranceNumber]"; this.xrLabel6.WordWrap = false; // // xrLabel7 @@ -349,6 +353,7 @@ namespace VivaAVida this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel15, this.xrLabel14, + this.xrLabel11, this.xrLabel5, this.xrTable4}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F); @@ -378,6 +383,16 @@ namespace VivaAVida this.xrLabel14.StylePriority.UseFont = false; this.xrLabel14.Text = "[CreatorName]"; // + // xrLabel11 + // + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Calibri", 9F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(442.0537F, 0F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(208.6615F, 218.2751F); + this.xrLabel11.StylePriority.UseFont = false; + // // xrLabel5 // this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Italic); @@ -397,7 +412,7 @@ namespace VivaAVida this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow10, this.xrTableRow14}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650.7151F, 26F); + this.xrTable4.SizeF = new System.Drawing.SizeF(442.0536F, 26F); this.xrTable4.StylePriority.UseFont = false; // // xrTableRow10 @@ -473,12 +488,13 @@ namespace VivaAVida this.xrTable6.Name = "xrTable6"; this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow25}); - this.xrTable6.SizeF = new System.Drawing.SizeF(650.7153F, 25F); + this.xrTable6.SizeF = new System.Drawing.SizeF(650.7155F, 25F); this.xrTable6.StylePriority.UseFont = false; // // xrTableRow25 // this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, this.xrTableCell40, this.xrTableCell42, this.xrTableCell20, @@ -488,6 +504,26 @@ namespace VivaAVida this.xrTableRow25.Name = "xrTableRow25"; this.xrTableRow25.Weight = 1D; // + // xrTableCell3 + // + this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart")}); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); + this.xrTableCell3.Multiline = true; + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell3.StylePriority.UseBorderColor = false; + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell3.TextFormatString = "{0:dd.MM.yyyy}"; + this.xrTableCell3.Weight = 0.44462999229268751D; + // // xrTableCell40 // this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray; @@ -505,7 +541,7 @@ namespace VivaAVida this.xrTableCell40.StylePriority.UseTextAlignment = false; this.xrTableCell40.Text = "Soziotherapie"; this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell40.Weight = 0.75334477285543433D; + this.xrTableCell40.Weight = 0.62414930900179255D; // // xrTableCell42 // @@ -523,7 +559,7 @@ namespace VivaAVida this.xrTableCell42.StylePriority.UsePadding = false; this.xrTableCell42.StylePriority.UseTextAlignment = false; this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell42.Weight = 0.84164422033591535D; + this.xrTableCell42.Weight = 0.79841694330105706D; // // xrTableCell20 // @@ -542,7 +578,7 @@ namespace VivaAVida this.xrTableCell20.StylePriority.UseTextAlignment = false; this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell20.TextFormatString = "{0:0.##}"; - this.xrTableCell20.Weight = 0.22822139477225151D; + this.xrTableCell20.Weight = 0.23261646304723091D; // // xrTableCell44 // @@ -561,7 +597,7 @@ namespace VivaAVida this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell44.TextFormatString = "{0:}"; - this.xrTableCell44.Weight = 0.22822139477225151D; + this.xrTableCell44.Weight = 0.256445220290948D; // // xrTableCell45 // @@ -580,7 +616,7 @@ namespace VivaAVida this.xrTableCell45.StylePriority.UseTextAlignment = false; this.xrTableCell45.Text = "xrTableCell45"; this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell45.Weight = 0.31486369486210231D; + this.xrTableCell45.Weight = 0.281744233911718D; // // xrTableCell47 // @@ -598,7 +634,7 @@ namespace VivaAVida this.xrTableCell47.StylePriority.UsePadding = false; this.xrTableCell47.StylePriority.UseTextAlignment = false; this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell47.Weight = 0.40632358217756026D; + this.xrTableCell47.Weight = 0.45298072340441065D; // // GroupHeader1 // @@ -616,12 +652,13 @@ namespace VivaAVida this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow23}); - this.xrTable5.SizeF = new System.Drawing.SizeF(650.7153F, 25F); + this.xrTable5.SizeF = new System.Drawing.SizeF(650.7155F, 25F); this.xrTable5.StylePriority.UseFont = false; // // xrTableRow23 // this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2, this.xrTableCell32, this.xrTableCell37, this.xrTableCell14, @@ -631,6 +668,27 @@ namespace VivaAVida this.xrTableRow23.Name = "xrTableRow23"; this.xrTableRow23.Weight = 1D; // + // xrTableCell2 + // + this.xrTableCell2.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell2.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell2.StylePriority.UseBackColor = false; + this.xrTableCell2.StylePriority.UseBorderColor = false; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Datum"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell2.Weight = 0.48750891297402821D; + // // xrTableCell32 // this.xrTableCell32.BackColor = System.Drawing.Color.Transparent; @@ -649,7 +707,7 @@ namespace VivaAVida this.xrTableCell32.StylePriority.UseTextAlignment = false; this.xrTableCell32.Text = "Positionsnummer"; this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell32.Weight = 0.75334485886812264D; + this.xrTableCell32.Weight = 0.68434043578358728D; // // xrTableCell37 // @@ -669,7 +727,7 @@ namespace VivaAVida this.xrTableCell37.StylePriority.UseTextAlignment = false; this.xrTableCell37.Text = "Bezeichnung"; this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell37.Weight = 0.8416442411919387D; + this.xrTableCell37.Weight = 0.87541493837556028D; // // xrTableCell14 // @@ -689,7 +747,7 @@ namespace VivaAVida this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "Menge"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell14.Weight = 0.22822136142383243D; + this.xrTableCell14.Weight = 0.25504874611087D; // // xrTableCell33 // @@ -709,7 +767,7 @@ namespace VivaAVida this.xrTableCell33.StylePriority.UseTextAlignment = false; this.xrTableCell33.Text = "Einheit"; this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell33.Weight = 0.22822136142383243D; + this.xrTableCell33.Weight = 0.28117614915144379D; // // xrTableCell36 // @@ -729,7 +787,7 @@ namespace VivaAVida this.xrTableCell36.StylePriority.UseTextAlignment = false; this.xrTableCell36.Text = "Preis"; this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.31486374942651824D; + this.xrTableCell36.Weight = 0.30891553458958454D; // // xrTableCell34 // @@ -749,7 +807,7 @@ namespace VivaAVida this.xrTableCell34.StylePriority.UseTextAlignment = false; this.xrTableCell34.Text = "Gesamtbetrag"; this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell34.Weight = 0.40632415697457513D; + this.xrTableCell34.Weight = 0.49666418721224931D; // // GroupFooter1 // @@ -845,43 +903,43 @@ namespace VivaAVida ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); - } - - - private DevExpress.XtraReports.UI.DetailBand Detail; - private System.Windows.Forms.BindingSource bindingSource1; - private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; - private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; - private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; - private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; - private DevExpress.XtraReports.UI.GroupHeaderBand Page1; - private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel lblAdresse; - private DevExpress.XtraReports.UI.DetailReportBand DetailReport; - private DevExpress.XtraReports.UI.DetailBand Detail1; - private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; - private DevExpress.XtraReports.UI.DetailBand Detail2; - private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; - private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; - private DevExpress.XtraReports.UI.XRTable xrTable5; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; - private DevExpress.XtraReports.UI.XRTable xrTable6; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow25; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; - private DevExpress.XtraReports.UI.XRTable xrTable1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; + } + + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.GroupHeaderBand Page1; + private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; + private DevExpress.XtraReports.UI.XRLabel lblAdresse; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.XRTable xrTable5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRTable xrTable6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow25; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRTable xrTable4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; @@ -902,7 +960,10 @@ namespace VivaAVida private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRLabel xrLabel14; - } -} + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + } +} diff --git a/ReportImp/VivaAVidaReports/SoziotherapieRechnung.cs b/ReportImp/VivaAVidaReports/SoziotherapieRechnung.cs index 92397c877..9041cfc65 100644 --- a/ReportImp/VivaAVidaReports/SoziotherapieRechnung.cs +++ b/ReportImp/VivaAVidaReports/SoziotherapieRechnung.cs @@ -85,7 +85,7 @@ namespace VivaAVida { ii.HourlyRateString = "Anzahl"; } - } + } } } diff --git a/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj b/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj index 4e7926046..6d7605662 100644 --- a/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj +++ b/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj @@ -135,7 +135,6 @@ - Component