diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index 4d2f066c0..b0b49486e 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -1861,7 +1861,9 @@ namespace BeWo.Core if(documentPreviewControl == null) { - documentPreviewControl = new DocumentPreviewControl {CommandBarStyle = CommandBarStyle.Bars}; + //ReportPrintTool tool = new ReportPrintTool(report); + //tool.ShowRibbonPreviewDialog(UserLookAndFeel.Default); + documentPreviewControl = new DocumentPreviewControl {CommandBarStyle = CommandBarStyle.Bars}; documentPreviewControl.Loaded += CustomizeReportPreviewToolBar; documentPreviewControl.SnapsToDevicePixels = true; diff --git a/BeWo/View/Detail/SupportConceptView.xaml b/BeWo/View/Detail/SupportConceptView.xaml index 62443d30e..95eef130c 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml +++ b/BeWo/View/Detail/SupportConceptView.xaml @@ -1047,7 +1047,7 @@ MaskUseAsDisplayFormat="True" Mask="t"> - diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs index 8e9ccbfb2..ffdfbefb2 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptView.xaml.cs @@ -52,8 +52,10 @@ namespace BeWo.View.Detail private SupportConceptCostBearerRelVM supportConceptCostBearerRel2Change; - #region Rechtebinding - public static bool IsAllowedToChangeCostbeaerer + private TaskDC taskToEdit = null; + + #region Rechtebinding + public static bool IsAllowedToChangeCostbeaerer { get { return BeWoApp.LoggedOnUser.HasRight(UserRightType.CostbearerAllowChange); } } @@ -127,32 +129,48 @@ namespace BeWo.View.Detail } }; + this.Loaded += OnLoaded; + } + + private void OnLoaded(object sender, RoutedEventArgs routedEventArgs) + { + if (taskToEdit != null) + { + this.tabitem_tasks.IsSelected = true; + + var item = this.ViewModel.Tasks.VMList.Single(vm => vm.DataContract.TaskOid.Equals(taskToEdit.TaskOid)); + var handle = this.grid_tasks.GetRowHandleByListIndex(this.ViewModel.Tasks.VMList.IndexOf(item)); + + this.gridViewTasks.FocusedRowHandle = handle; + + + //do + //{ + // //this.gridViewTasks.mo(); + //} + //while (!this.gridViewTasks.FocusedColumn.FieldName.Equals("CompletedDate")); + grid_tasks.CurrentColumn = TaskGridColumnCompletedDate; + + Dispatcher.BeginInvoke(new Action(() => { + gridViewTasks.ShowEditor(); + }), System.Windows.Threading.DispatcherPriority.Background); + //gridViewTasks.ShowEditor(); + + + //// WORKAROUND: http://www.devexpress.com/Support/Center/p/B36082.aspx + //this.Dispatcher.BeginInvoke( + // DispatcherPriority.ApplicationIdle, + // (Action)delegate + // { + + // }); + } } public SupportConceptView(SupportConceptVM pViewModel, TaskDC pTaskToEdit) : this(pViewModel) { - if (pTaskToEdit != null) - { - this.tabitem_tasks.IsSelected = true; - - var item = this.ViewModel.Tasks.VMList.Single(vm => vm.DataContract.TaskOid.Equals(pTaskToEdit.TaskOid)); - var handle = this.grid_tasks.GetRowHandleByListIndex(this.ViewModel.Tasks.VMList.IndexOf(item)); - - // WORKAROUND: http://www.devexpress.com/Support/Center/p/B36082.aspx - this.Dispatcher.BeginInvoke( - DispatcherPriority.ApplicationIdle, - (Action)delegate - { - this.gridViewTasks.FocusedRowHandle = handle; - do - { - this.gridViewTasks.MoveNextCell(); - } - while (!this.gridViewTasks.FocusedColumn.FieldName.Equals("CompletedDate")); - this.gridViewTasks.ShowEditor(); - }); - } + taskToEdit = pTaskToEdit; } #endregion diff --git a/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs b/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs index 18cd44951..2707bcbde 100644 --- a/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs +++ b/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs @@ -112,6 +112,7 @@ namespace BeWo.View.Report.Auslastung //} this.combobox_month.SelectedIndex = monthIdx; var years = new List(); + years.Add(DateTime.Now.Year + 1); for (int i = 0; i <= 10; i++) { years.Add(DateTime.Now.Year - i); diff --git a/Model/Changes_2017_11_28.txt b/Model/Changes_2017_11_28.txt new file mode 100644 index 000000000..de120d78c --- /dev/null +++ b/Model/Changes_2017_11_28.txt @@ -0,0 +1,2 @@ +ALTER TABLE `accountingtransaction` +ADD COLUMN `ImportNotice` VARCHAR(256) NULL DEFAULT NULL ; \ No newline at end of file diff --git a/Report/ReportObjects/AuslastungBerechnung.cs b/Report/ReportObjects/AuslastungBerechnung.cs index caef01f9f..0659a822f 100644 --- a/Report/ReportObjects/AuslastungBerechnung.cs +++ b/Report/ReportObjects/AuslastungBerechnung.cs @@ -271,13 +271,7 @@ namespace BeWo.Report.ReportObjects empDetail.AbsenceTimeString = "Abwesenheiten: " + sb.ToString(); } } - - - var span = new DateTimeSpan(); - span.StartDateTime = ro.ReportStartDate; - span.EndDateTime = ro.ReportEndDate; - - //supportconcepts by SupportConceptApprovalPeriodOid + Dictionary supportConceptByScapDict = new Dictionary(); var anteile = CreateAuslastungAnteilig(emp); @@ -379,7 +373,7 @@ namespace BeWo.Report.ReportObjects if (scap.StartDate.HasValue && realEnd.HasValue) { - if (scap.StartDate >= ende || realEnd < start) + if (scap.StartDate >= ende || realEnd < ende.AddDays(-1)) { inTimeRange = false; } diff --git a/ReportImp/AdikKleve/Properties/licenses.licx b/ReportImp/AdikKleve/Properties/licenses.licx index e69de29bb..c7fd819d5 100644 --- a/ReportImp/AdikKleve/Properties/licenses.licx +++ b/ReportImp/AdikKleve/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/AdikKleve/SettlementReport.cs b/ReportImp/AdikKleve/SettlementReport.cs index fb9de9647..0acf3bc50 100644 --- a/ReportImp/AdikKleve/SettlementReport.cs +++ b/ReportImp/AdikKleve/SettlementReport.cs @@ -19,6 +19,10 @@ namespace AdikKleve.Alt public void SetReportDataSource(SettlementRO pRO) { + if (pRO.ClaimWithEigenbeteiligung < 0) + { + pRO.FinalSentence = "Bitte ziehen Sie die Überzahlung bei Ihren nächsten Zahlungen ab."; + } bool isDefaultSpitzabrechnung = false; if (String.IsNullOrEmpty(pRO.Notice)) diff --git a/ReportImp/AdikKleve/SettlementReport2.cs b/ReportImp/AdikKleve/SettlementReport2.cs index f6abf4412..459ad496b 100644 --- a/ReportImp/AdikKleve/SettlementReport2.cs +++ b/ReportImp/AdikKleve/SettlementReport2.cs @@ -21,7 +21,12 @@ namespace AdikKleve public void SetReportDataSource(Settlement2RO pRO) { - if (String.IsNullOrEmpty(pRO.Notice)) + if (pRO.Claim < 0) + { + pRO.FinalSentence = "Bitte ziehen Sie die Überzahlung bei Ihren nächsten Zahlungen ab."; + } + + if (String.IsNullOrEmpty(pRO.Notice)) { lblNotice.Visible = false; } diff --git a/ReportImp/ApiBerlin/ApiBerlin.csproj b/ReportImp/ApiBerlin/ApiBerlin.csproj index 2afa98cc5..2f500e2e9 100644 --- a/ReportImp/ApiBerlin/ApiBerlin.csproj +++ b/ReportImp/ApiBerlin/ApiBerlin.csproj @@ -64,6 +64,7 @@ + Component diff --git a/ReportImp/ApiBerlin/ApiReportCreator.cs b/ReportImp/ApiBerlin/ApiReportCreator.cs new file mode 100644 index 000000000..a4cf823a2 --- /dev/null +++ b/ReportImp/ApiBerlin/ApiReportCreator.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using DevExpress.XtraReports.UI; + +namespace ApiBerlin +{ + public class ApiReportCreator : DefaultReportCreator + { + public override XtraReport CreateAuslastungReport(long? employeeOid, IList teamOids, DateTime startDate, DateTime endDate) + { + IBeWoReport report; + if (teamOids != null && teamOids.Count > 0) + report = FindReportImp("Teamauslastung"); + else + report = FindReportImp("Mitarbeiterauslastung"); + if (startDate.Year == 2007) + { + startDate = new DateTime(2018, startDate.Month, 1); + endDate = startDate.AddMonths(1); + } + var x = MitarbeiterauslastungRO.Create(employeeOid, teamOids, startDate, endDate); + report.SetReportDataSource(x); + + return report as XtraReport; + } + } +} diff --git a/ReportImp/ApiBerlin/Properties/licenses.licx b/ReportImp/ApiBerlin/Properties/licenses.licx index e69de29bb..c7fd819d5 100644 --- a/ReportImp/ApiBerlin/Properties/licenses.licx +++ b/ReportImp/ApiBerlin/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs b/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs index 0d9df2d55..5ff0fe747 100644 --- a/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs +++ b/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs @@ -27,6 +27,7 @@ namespace ApiBerlin.Translation AddOrReplaceTranslation(dict, "Hilfeplan eingereicht am", "BRP eingereicht am"); AddOrReplaceTranslation(dict, "Hilfeplankonferenz", "BEW-Begutachtung am"); AddOrReplaceTranslation(dict, "Ort des Hilfeplangesprächs", "Ort der BEW-Begutachtung"); + AddOrReplaceTranslation(dict, "Hilfeplanübersicht", "Bewilligungs-Ãœbersicht"); AddOrReplaceTranslation(dict, "Kostenträger", "Kostenübernahme"); diff --git a/ReportImp/BUGeVReports/SettlementReport2.cs b/ReportImp/BUGeVReports/SettlementReport2.cs index 3ccea3299..146b01ac5 100644 --- a/ReportImp/BUGeVReports/SettlementReport2.cs +++ b/ReportImp/BUGeVReports/SettlementReport2.cs @@ -24,40 +24,46 @@ namespace BeWo.BUGeVReports ii.DetailDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}", ii.PeriodStartDate, ii.PeriodEndDate); ii.DetailDescription += String.Format(": {0:0.##} FLS {1}x {2:c}", ii.UnitCount, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", ii.AmountPerUnit); + decimal rf = 1; + + if (ii.RateFactor.HasValue) + { + rf = (100 + ii.RateFactor.Value) / 100; + } if (idx == 0) { cellStart1.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodStartDate); cellEnd1.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodEndDate); cellHourlyRate1.Text = String.Format("{0:0.00}", ii.AmountPerUnit); - cellFLS1.Text = String.Format("{0:0.00}", ii.UnitCount); + cellFLS1.Text = String.Format("{0:0.00}", ii.UnitCount * rf); } else if (idx == 1) { cellStart2.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodStartDate); cellEnd2.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodEndDate); cellHourlyRate2.Text = String.Format("{0:0.00}", ii.AmountPerUnit); - cellFLS2.Text = String.Format("{0:0.00}", ii.UnitCount); + cellFLS2.Text = String.Format("{0:0.00}", ii.UnitCount * rf); } else if (idx == 2) { cellStart3.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodStartDate); cellEnd3.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodEndDate); cellHourlyRate3.Text = String.Format("{0:0.00}", ii.AmountPerUnit); - cellFLS3.Text = String.Format("{0:0.00}", ii.UnitCount); + cellFLS3.Text = String.Format("{0:0.00}", ii.UnitCount * rf); } else if (idx == 3) { cellStart4.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodStartDate); cellEnd4.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodEndDate); cellHourlyRate4.Text = String.Format("{0:0.00}", ii.AmountPerUnit); - cellFLS4.Text = String.Format("{0:0.00}", ii.UnitCount); + cellFLS4.Text = String.Format("{0:0.00}", ii.UnitCount * rf); } else if (idx == 4) { cellStart5.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodStartDate); cellEnd5.Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodEndDate); cellHourlyRate5.Text = String.Format("{0:0.00}", ii.AmountPerUnit); - cellFLS5.Text = String.Format("{0:0.00}", ii.UnitCount); + cellFLS5.Text = String.Format("{0:0.00}", ii.UnitCount * rf); } idx++; diff --git a/ReportImp/Club74/Calculations/GroupDurationCalculator.cs b/ReportImp/Club74/Calculations/GroupDurationCalculator.cs new file mode 100644 index 000000000..1e09fc03b --- /dev/null +++ b/ReportImp/Club74/Calculations/GroupDurationCalculator.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Plugins; +using BS.Shared.Core; +using BS.Shared.DataContracts; + +namespace Club74.Calculations +{ + public class CustomGroupDurationCalculator : GroupDurationCalculator + { + + public override GroupDurationDC CalculateGroupDuration(int personCount, int employeeCount, decimal totalDuration, + long[] costBearer2SupportConceptArray) + { + + return new GroupDurationDC() + { + SingleDuration = Math.Round(totalDuration / personCount, 0, MidpointRounding.AwayFromZero), + TotalDuration = totalDuration + }; + + } + } +} diff --git a/ReportImp/Club74/Club74.csproj b/ReportImp/Club74/Club74.csproj index b0a8ebe93..ba9bcbe74 100644 --- a/ReportImp/Club74/Club74.csproj +++ b/ReportImp/Club74/Club74.csproj @@ -64,6 +64,7 @@ + Component diff --git a/ReportImp/Club74/Properties/licenses.licx b/ReportImp/Club74/Properties/licenses.licx index e69de29bb..c7fd819d5 100644 --- a/ReportImp/Club74/Properties/licenses.licx +++ b/ReportImp/Club74/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/Club74/ServicesOverviewReport.Designer.cs b/ReportImp/Club74/ServicesOverviewReport.Designer.cs index 02e83f05c..d2c568ac9 100644 --- a/ReportImp/Club74/ServicesOverviewReport.Designer.cs +++ b/ReportImp/Club74/ServicesOverviewReport.Designer.cs @@ -380,12 +380,11 @@ namespace BeWo.Club74 // xrTableCell16 // this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0: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.UseTextAlignment = false; - this.xrTableCell16.Text = "xrTableCell16"; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell16.Weight = 0.075757572081405461D; // @@ -428,9 +427,6 @@ namespace BeWo.Club74 // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleStartDate.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleStartDate.Name = "formattingRuleStartDate"; // @@ -623,9 +619,6 @@ namespace BeWo.Club74 // this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleServiceDesc.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc"; // @@ -633,9 +626,6 @@ namespace BeWo.Club74 // this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleCostBearer.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleCostBearer.Name = "formattingRuleCostBearer"; // @@ -643,9 +633,6 @@ namespace BeWo.Club74 // this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleEmployeeName.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName"; // @@ -718,7 +705,7 @@ namespace BeWo.Club74 this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel4.BorderWidth = 2; + this.xrLabel4.BorderWidth = 2F; this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")}); this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); @@ -769,7 +756,7 @@ namespace BeWo.Club74 this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.SnapGridSize = 9F; this.SnappingMode = DevExpress.XtraReports.UI.SnappingMode.SnapToGrid; - this.Version = "13.1"; + this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); diff --git a/ReportImp/Club74/ServicesOverviewReport.cs b/ReportImp/Club74/ServicesOverviewReport.cs index 0c8503b39..3d33d0ebf 100644 --- a/ReportImp/Club74/ServicesOverviewReport.cs +++ b/ReportImp/Club74/ServicesOverviewReport.cs @@ -28,11 +28,16 @@ namespace BeWo.Club74 if (pRO.Services != null) { var servicesBillable = new List(); - + pRO.TotalFLMBillable = 0; foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { - if (s.IsBillable) - servicesBillable.Add(s); + if (s.IsBillable) + { + servicesBillable.Add(s); + + s.Minutes = Math.Round(s.Minutes, 0, MidpointRounding.AwayFromZero); + pRO.TotalFLMBillable += s.Minutes; + } } pRO.Services = servicesBillable; diff --git a/ReportImp/Nous/Nous.csproj b/ReportImp/Nous/Nous.csproj index 4ef09d15b..4ebf35a47 100644 --- a/ReportImp/Nous/Nous.csproj +++ b/ReportImp/Nous/Nous.csproj @@ -8,15 +8,16 @@ Library Properties Nous - Nous - v4.6.1 + 7185105541_Reports + v4.5 512 + true full false - bin\Debug\ + ..\..\Host\bin\ DEBUG;TRACE prompt 4 @@ -24,7 +25,7 @@ pdbonly true - bin\Release\ + ..\..\Host\bin\ TRACE prompt 4 diff --git a/ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs b/ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs index d88b21b02..56f66a9a3 100644 --- a/ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs +++ b/ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs @@ -77,13 +77,13 @@ namespace PraxisPusteblume this.cellHouryRate = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellClaim = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.lblReststunden = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); @@ -430,7 +430,7 @@ namespace PraxisPusteblume // this.xrTableCell15.CanShrink = true; this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.##}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCountString", "{0:0.##}")}); this.xrTableCell15.Multiline = true; this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -475,14 +475,14 @@ namespace PraxisPusteblume // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, this.xrTable1, - this.xrLabel15, this.xrLabel14, this.lblReststunden, this.xrLabel12, this.xrLabel4}); this.GroupFooter1.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupFooter1.HeightF = 299.7807F; + this.GroupFooter1.HeightF = 293.2983F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -546,19 +546,6 @@ namespace PraxisPusteblume this.cellClaim.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.cellClaim.Weight = 0.16153846153846155D; // - // xrLabel15 - // - this.xrLabel15.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 275.7149F); - this.xrLabel15.Multiline = true; - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(475F, 24.06577F); - this.xrLabel15.StylePriority.UseBorders = false; - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.StylePriority.UseTextAlignment = false; - this.xrLabel15.Text = "Anlagen"; - // // xrLabel14 // this.xrLabel14.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -566,11 +553,11 @@ namespace PraxisPusteblume this.xrLabel14.Multiline = true; this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(475F, 115.7325F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(475F, 93.85751F); this.xrLabel14.StylePriority.UseBorders = false; this.xrLabel14.StylePriority.UseFont = false; this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "Mit freundlichen Grüßen\r\nIhre Praxis Pusteblume\r\n\r\n\r\n\r\n[CreatorName]"; + this.xrLabel14.Text = "Mit freundlichen Grüßen\r\nIhre Praxis Pusteblume\r\n\r\n\r\nGesine Herzog"; // // lblReststunden // @@ -621,6 +608,18 @@ namespace PraxisPusteblume this.fieldGruppe.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; this.fieldGruppe.Expression = "Iif([ServiceDescription] == \'Gruppenbetreuung\', \'P\', \'\')"; this.fieldGruppe.Name = "fieldGruppe"; + // + // xrLabel2 + // + this.xrLabel2.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 253.8399F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(578.4584F, 39.45834F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Diplom-Heilpädagogin (FH)\r\nGeschäftsführerin Projekt Aufwind mit Praxis Pusteblum" + + "e\r\n"; // // Behandlungsnachweis // @@ -700,7 +699,6 @@ namespace PraxisPusteblume private DevExpress.XtraReports.UI.XRLabel lblReststunden; private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel4; - private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow17; @@ -712,5 +710,6 @@ namespace PraxisPusteblume private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.CalculatedField fieldEinzel; private DevExpress.XtraReports.UI.CalculatedField fieldGruppe; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; } } diff --git a/ReportImp/PraxisPusteblume/Behandlungsnachweis.cs b/ReportImp/PraxisPusteblume/Behandlungsnachweis.cs index 88b7387c6..ce5f6793f 100644 --- a/ReportImp/PraxisPusteblume/Behandlungsnachweis.cs +++ b/ReportImp/PraxisPusteblume/Behandlungsnachweis.cs @@ -9,6 +9,7 @@ using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using DevExpress.XtraReports.UI; +using PraxisPusteblume.Invoicing; namespace PraxisPusteblume { @@ -111,6 +112,10 @@ namespace PraxisPusteblume foreach (var i in p.ServiceInvoiceItems) { + if (i.UnitCount.HasValue) + { + i.UnitCountString = InvoiceHelper.GetUnitString(i.UnitCount); + } if (i.HourlyRate.HasValue) { hourlyRate = i.HourlyRate.Value; @@ -140,7 +145,7 @@ namespace PraxisPusteblume cellDesription.Text = "Behandlungseinheiten / Monat:"; - cellHours.Text = String.Format("{0:0.00} Stunden x", hours); + cellHours.Text = String.Format("{0:0.00} Stunden x", InvoiceHelper.GetUnitString(hours)); cellHouryRate.Text = String.Format("{0:0.00} Euro", hourlyRate); cellClaim.Text = String.Format("{0} Euro", pRO.NetClaim.Replace("€", "").Trim()); diff --git a/ReportImp/PraxisPusteblume/Invoicing/DefaultInvoiceCreation.cs b/ReportImp/PraxisPusteblume/Invoicing/DefaultInvoiceCreation.cs index b26f7f4d7..2aeca3bf3 100644 --- a/ReportImp/PraxisPusteblume/Invoicing/DefaultInvoiceCreation.cs +++ b/ReportImp/PraxisPusteblume/Invoicing/DefaultInvoiceCreation.cs @@ -29,14 +29,7 @@ namespace PraxisPusteblume.Invoicing { var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); - //if (iServiceRecord.ServiceDescription.Name == "") - ii.ItemDescription = "Einzelbetreuung"; - if (ii.RateFactor.HasValue && ii.UnitCount.HasValue) - { - ii.UnitCount = Math.Round(ii.UnitCount.Value * ((100 + ii.RateFactor.Value) / 100), 2, MidpointRounding.AwayFromZero); - - ii.GrossAmountTotal = ii.UnitCount * (ii.AmountPerUnit ?? 0); - } + InvoiceHelper.InitInvoiceItem(ii); return ii; } diff --git a/ReportImp/PraxisPusteblume/Invoicing/InvoiceHelper.cs b/ReportImp/PraxisPusteblume/Invoicing/InvoiceHelper.cs new file mode 100644 index 000000000..3d492ddd1 --- /dev/null +++ b/ReportImp/PraxisPusteblume/Invoicing/InvoiceHelper.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using BeWo.Data.Entities; +using BS.Shared.DataContracts; +using BS.Shared.Services; + +namespace PraxisPusteblume.Invoicing +{ + public class InvoiceHelper + { + + public static void InitInvoiceItem(InvoiceItem ii) + { + //if (iServiceRecord.ServiceDescription.Name == "") + ii.ItemDescription = "Einzelbetreuung"; + if (ii.RateFactor.HasValue && ii.UnitCount.HasValue) + { + if (ii.RateFactor == 33.33m) + { + ii.RateFactor = 100m / 3m; + } + ii.UnitCount = ii.UnitCount.Value * ((100 + ii.RateFactor.Value) / 100); + + ii.GrossAmountTotal = ii.UnitCount * (ii.AmountPerUnit ?? 0); + } + + } + + public static String GetUnitString(decimal? unitCount) + { + if (!unitCount.HasValue) + return "0"; + + if (unitCount.Value != Math.Floor(unitCount.Value)) + { + var rest = unitCount.Value - Math.Floor(unitCount.Value); + + if (Math.Round(rest, 2, MidpointRounding.AwayFromZero) == 0.33m) + { + return String.Format("{0:0} 1/3", Math.Floor(unitCount.Value)); + } + if (Math.Round(rest, 2, MidpointRounding.AwayFromZero) == 0.67m) + { + return String.Format("{0:0} 2/3", Math.Floor(unitCount.Value)); + } + } + return String.Format("{0:0.##}", unitCount); + } + + public static int GetKW(DateTime actualDate) + { + Calendar objCal = CultureInfo.CurrentCulture.Calendar; + int weekofyear = objCal.GetWeekOfYear(actualDate, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday); + + return weekofyear; + } + } +} diff --git a/ReportImp/PraxisPusteblume/Invoicing/SammelrechnungInvoiceCreation.cs b/ReportImp/PraxisPusteblume/Invoicing/SammelrechnungInvoiceCreation.cs index 0c395f9dc..c340d5d27 100644 --- a/ReportImp/PraxisPusteblume/Invoicing/SammelrechnungInvoiceCreation.cs +++ b/ReportImp/PraxisPusteblume/Invoicing/SammelrechnungInvoiceCreation.cs @@ -37,15 +37,8 @@ namespace PraxisPusteblume.Invoicing { var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); - //if (iServiceRecord.ServiceDescription.Name == "") - ii.ItemDescription = "Einzelbetreuung"; - if (ii.RateFactor.HasValue && ii.UnitCount.HasValue) - { - ii.UnitCount = Math.Round(ii.UnitCount.Value * ((100 + ii.RateFactor.Value) / 100), 2, MidpointRounding.AwayFromZero); - - ii.GrossAmountTotal = ii.UnitCount * (ii.AmountPerUnit ?? 0); - } - + InvoiceHelper.InitInvoiceItem(ii); + return ii; } @@ -77,7 +70,7 @@ namespace PraxisPusteblume.Invoicing foreach (var iitem in sip.InvoiceItemList) { DateTime itemDate = iitem.ItemPeriodStart.Value.Date; - var kw = GetKW(itemDate); + var kw = InvoiceHelper.GetKW(itemDate); InvoiceItem newItem; String key = String.Format("{0}_{1}", kw, itemDate.Year); @@ -129,20 +122,12 @@ namespace PraxisPusteblume.Invoicing } foreach (InvoiceItem invoiceItem in newList) { - if (invoiceItem.AmountPerUnit.HasValue) - { - invoiceItem.AmountPerUnit = Math.Round(invoiceItem.AmountPerUnit.Value, 2, MidpointRounding.AwayFromZero); - } - else + if (!invoiceItem.AmountPerUnit.HasValue) { invoiceItem.AmountPerUnit = 0; } - if (invoiceItem.UnitCount.HasValue) - { - invoiceItem.UnitCount = Math.Round(invoiceItem.UnitCount.Value, 2, MidpointRounding.AwayFromZero); - } - else + if (!invoiceItem.UnitCount.HasValue) { invoiceItem.UnitCount = 0; } @@ -153,9 +138,9 @@ namespace PraxisPusteblume.Invoicing invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal; invoiceItem.UnitDescription = String.Format("{0:dd}.-{1:dd.MM.yyyy} / KW {2}", invoiceItem.ItemPeriodStart, - invoiceItem.ItemPeriodEnd, GetKW(invoiceItem.ItemPeriodStart.Value)); + invoiceItem.ItemPeriodEnd, InvoiceHelper.GetKW(invoiceItem.ItemPeriodStart.Value)); - invoiceItem.ItemDescription = String.Format("{0:0.##} Betreuungseinheiten á {1:c}", invoiceItem.UnitCount, + invoiceItem.ItemDescription = String.Format("{0} Betreuungseinheiten á {1:c}", InvoiceHelper.GetUnitString(invoiceItem.UnitCount), invoiceItem.AmountPerUnit); } @@ -172,12 +157,6 @@ namespace PraxisPusteblume.Invoicing } - private static int GetKW(DateTime actualDate) - { - Calendar objCal = CultureInfo.CurrentCulture.Calendar; - int weekofyear = objCal.GetWeekOfYear(actualDate, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday); - - return weekofyear; - } + } } diff --git a/ReportImp/PraxisPusteblume/PraxisPusteblume.csproj b/ReportImp/PraxisPusteblume/PraxisPusteblume.csproj index cdcd25eff..4acc57445 100644 --- a/ReportImp/PraxisPusteblume/PraxisPusteblume.csproj +++ b/ReportImp/PraxisPusteblume/PraxisPusteblume.csproj @@ -49,6 +49,7 @@ + diff --git a/ReportImp/PraxisPusteblume/Sammelrechnung.Designer.cs b/ReportImp/PraxisPusteblume/Sammelrechnung.Designer.cs index d041c2246..cb55e3864 100644 --- a/ReportImp/PraxisPusteblume/Sammelrechnung.Designer.cs +++ b/ReportImp/PraxisPusteblume/Sammelrechnung.Designer.cs @@ -68,6 +68,10 @@ namespace PraxisPusteblume this.cellGesamtText = new DevExpress.XtraReports.UI.XRTableCell(); this.cellGesamtSumme = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAnlage = new DevExpress.XtraReports.UI.XRLabel(); + this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); + this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); @@ -114,7 +118,7 @@ namespace PraxisPusteblume // xrLabel11 // this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "OrganisationDebitorNumber")}); this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(601.7087F, 52.29171F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -244,24 +248,25 @@ namespace PraxisPusteblume // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblMonat, this.lblNachweisFuer, this.xrLabel5}); - this.Page1.HeightF = 145F; + this.Page1.HeightF = 166.875F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // // lblNachweisFuer // - this.lblNachweisFuer.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblNachweisFuer.LocationFloat = new DevExpress.Utils.PointFloat(45.83359F, 42.00001F); + this.lblNachweisFuer.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblNachweisFuer.LocationFloat = new DevExpress.Utils.PointFloat(45.83003F, 71.16667F); this.lblNachweisFuer.Multiline = true; this.lblNachweisFuer.Name = "lblNachweisFuer"; this.lblNachweisFuer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblNachweisFuer.SizeF = new System.Drawing.SizeF(671.1665F, 103F); + this.lblNachweisFuer.SizeF = new System.Drawing.SizeF(671.1665F, 95.70834F); this.lblNachweisFuer.StylePriority.UseFont = false; - this.lblNachweisFuer.Text = "Sehr geehrte Damen und Herren,\r\nfür geleistete heilpädagogische Behandlung im Rah" + - "men der Fachdienststunden für den Pfarrkindergarten St. Irmgard darf ich Ihnen i" + - "n Rechnung stellen:"; + this.lblNachweisFuer.Text = "Sehr geehrte Damen und Herren,\r\n\r\nfür geleistete heilpädagogische Behandlung im R" + + "ahmen der Fachdienststunden für den Pfarrkindergarten St. Irmgard darf ich Ihnen" + + " in Rechnung stellen:"; // // xrLabel5 // @@ -375,10 +380,13 @@ namespace PraxisPusteblume // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblNotice, + this.lblAnlage, + this.xrLabel2, this.xrTable1, this.xrLabel14}); this.GroupFooter1.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupFooter1.HeightF = 211.1316F; + this.GroupFooter1.HeightF = 219.09F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -445,16 +453,63 @@ namespace PraxisPusteblume // // xrLabel14 // - this.xrLabel14.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel14.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(45.83359F, 65.19076F); this.xrLabel14.Multiline = true; this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(475F, 145.9409F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(475F, 75.10758F); this.xrLabel14.StylePriority.UseBorders = false; this.xrLabel14.StylePriority.UseFont = false; this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "Mit freundlichen Grüßen\r\nIhre Praxis Pusteblume\r\n\r\n\r\n\r\n[CreatorName]"; + this.xrLabel14.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nGesine Herzog"; + // + // xrLabel2 + // + this.xrLabel2.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(45.83359F, 140.2983F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(671.1665F, 39.45834F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Diplom-Heilpädagogin (FH)\r\nGeschäftsführerin Projekt Aufwind mit Praxis Pusteblum" + + "e\r\n"; + // + // lblAnlage + // + this.lblAnlage.CanShrink = true; + this.lblAnlage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Underline); + this.lblAnlage.LocationFloat = new DevExpress.Utils.PointFloat(45.83003F, 179.7567F); + this.lblAnlage.Multiline = true; + this.lblAnlage.Name = "lblAnlage"; + this.lblAnlage.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAnlage.SizeF = new System.Drawing.SizeF(671.1665F, 19.66667F); + this.lblAnlage.StylePriority.UseFont = false; + this.lblAnlage.Text = "Anlage"; + // + // lblNotice + // + this.lblNotice.CanShrink = true; + this.lblNotice.Font = new System.Drawing.Font("Segoe UI", 9F); + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(45.83003F, 199.4233F); + this.lblNotice.Multiline = true; + this.lblNotice.Name = "lblNotice"; + this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblNotice.SizeF = new System.Drawing.SizeF(671.1665F, 19.66667F); + this.lblNotice.StylePriority.UseFont = false; + this.lblNotice.Text = "8 Fachdienstnachweise für November 2017"; + // + // lblMonat + // + this.lblMonat.CanShrink = true; + this.lblMonat.Font = new System.Drawing.Font("Segoe UI", 10F); + this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(45.83003F, 29.50001F); + this.lblMonat.Multiline = true; + this.lblMonat.Name = "lblMonat"; + this.lblMonat.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblMonat.SizeF = new System.Drawing.SizeF(671.1665F, 19.66667F); + this.lblMonat.StylePriority.UseFont = false; // // Sammelrechnung // @@ -526,5 +581,9 @@ namespace PraxisPusteblume private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.XRTableCell cellGesamtText; private DevExpress.XtraReports.UI.XRTableCell cellGesamtSumme; + private DevExpress.XtraReports.UI.XRLabel lblNotice; + private DevExpress.XtraReports.UI.XRLabel lblAnlage; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblMonat; } } diff --git a/ReportImp/PraxisPusteblume/Sammelrechnung.cs b/ReportImp/PraxisPusteblume/Sammelrechnung.cs index c421f3c80..8c192ea17 100644 --- a/ReportImp/PraxisPusteblume/Sammelrechnung.cs +++ b/ReportImp/PraxisPusteblume/Sammelrechnung.cs @@ -9,6 +9,7 @@ using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using DevExpress.XtraReports.UI; +using PraxisPusteblume.Invoicing; namespace PraxisPusteblume { @@ -22,6 +23,24 @@ namespace PraxisPusteblume public void SetReportDataSource(ServiceInvoiceRO pRO) { + if (pRO.InvoiceBase != null && pRO.InvoiceBase.RecipientOrganisationOid.HasValue) + { + var org = DAOFactory.GenericDAO.LoadByID(pRO.InvoiceBase.RecipientOrganisationOid.Value); + pRO.OrganisationDebitorNumber = org.DebitorNumber; + + } + lblNotice.Text = ""; + if (String.IsNullOrEmpty(pRO.Notice)) + { + lblAnlage.Visible = false; + lblNotice.Visible = false; + } + else + { + lblNotice.Text = pRO.Notice; + } + lblMonat.Text = String.Format("{0:MMMM yyyy}", pRO.AccountingPeriodStart); + StringBuilder sb = new StringBuilder(); if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) @@ -42,9 +61,9 @@ namespace PraxisPusteblume } lblAdresse.Text = sb.ToString(); - - lblNachweisFuer.Text = String.Format("Behandlungsnachweis für: {0}, geb. am {1:dd.MM.yyyy}", - pRO.CustomerName, pRO.CustomerBirthdate); + + lblNachweisFuer.Text = String.Format("Sehr geehrte Damen und Herren,\r\n\r\nfür geleistete heilpädagogische Behandlung im Rahmen der Fachdienststunden für den {0} darf ich Ihnen in Rechnung stellen:", + pRO.RecipientOrganisation); @@ -88,7 +107,7 @@ namespace PraxisPusteblume } hours *= rateFactor; - cellGesamtText.Text = String.Format("{0:0.##} Betreuungseinheiten á {1:c}", hours, hourlyRate); + cellGesamtText.Text = String.Format("{0} Betreuungseinheiten á {1:c}", InvoiceHelper.GetUnitString(hours), hourlyRate); cellGesamtSumme.Text = pRO.GrossClaim; this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/SozialeDienstleistungenBeckerReports/Properties/licenses.licx b/ReportImp/SozialeDienstleistungenBeckerReports/Properties/licenses.licx index e69de29bb..c7fd819d5 100644 --- a/ReportImp/SozialeDienstleistungenBeckerReports/Properties/licenses.licx +++ b/ReportImp/SozialeDienstleistungenBeckerReports/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/TwgJonathan/Properties/licenses.licx b/ReportImp/TwgJonathan/Properties/licenses.licx new file mode 100644 index 000000000..c7fd819d5 --- /dev/null +++ b/ReportImp/TwgJonathan/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/TwgJonathan/Rechnung.Designer.cs b/ReportImp/TwgJonathan/Rechnung.Designer.cs new file mode 100644 index 000000000..85b58e813 --- /dev/null +++ b/ReportImp/TwgJonathan/Rechnung.Designer.cs @@ -0,0 +1,716 @@ +using BeWo.Report.ReportObjects; +namespace TwgJonathan +{ + partial class Rechnung + { + /// + /// 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(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Rechnung)); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); + this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); + this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); + this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblMonatJahr = new DevExpress.XtraReports.UI.XRLabel(); + this.lblNachweisFuer = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow(); + this.cellDesription = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellHours = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellHouryRate = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellClaim = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblReststunden = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel16, + this.xrLabel11, + this.xrLabel10, + this.xrLabel9, + this.xrLabel7, + this.xrLabel6, + this.xrLabel3, + this.xrLabel1, + this.xrRichText1, + this.lblAdresse}); + this.ReportHeader.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ReportHeader.HeightF = 185.4584F; + this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseFont = false; + // + // xrLabel16 + // + this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(601.7087F, 107.3334F); + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(125.2914F, 23F); + this.xrLabel16.Text = "xrLabel16"; + // + // xrLabel11 + // + this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(601.7087F, 52.29171F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(125.2914F, 29.50002F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "Ansprechpartner:"; + // + // xrLabel10 + // + this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(601.7087F, 32.2917F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(125.29F, 20F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Ansprechpartner:"; + // + // xrLabel9 + // + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(601.7087F, 12.29169F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(125.29F, 20F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "Gesine Herzog"; + // + // xrLabel7 + // + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(465.7087F, 107.3334F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(120.125F, 29.50002F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Datum:"; + // + // xrLabel6 + // + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(465.7092F, 52.29171F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(135.21F, 20F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "Kundennummer:"; + // + // xrLabel3 + // + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(465.7087F, 32.2917F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(134.71F, 20F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Rechnungsnummer:"; + // + // xrLabel1 + // + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(465.7087F, 12.29169F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(134.71F, 20F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Ansprechpartnerin:"; + // + // xrRichText1 + // + this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(371.875F, 32.2917F); + // + // lblAdresse + // + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 32.29173F); + this.lblAdresse.Multiline = true; + this.lblAdresse.Name = "lblAdresse"; + this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresse.SizeF = new System.Drawing.SizeF(371.875F, 153.1667F); + this.lblAdresse.StylePriority.UseFont = false; + this.lblAdresse.Text = "Bezirk Oberbayern\r\nz. Hd. Frau Besold\r\nRechnungsstelle\r\n\r\n80353 München"; + // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 13.95833F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(312.83F, 176.75F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrRichText2 + // + this.xrRichText2.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(465.7087F, 45.20833F); + this.xrRichText2.Name = "xrRichText2"; + this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); + this.xrRichText2.SizeF = new System.Drawing.SizeF(261.2915F, 132.875F); + // + // ruleRateFactorNull + // + this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; + this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + // + // topMarginBand1 + // + this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrRichText2, + this.xrPictureBox1}); + this.topMarginBand1.HeightF = 201F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrRichText3}); + this.bottomMarginBand1.HeightF = 100F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // xrRichText3 + // + this.xrRichText3.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F); + this.xrRichText3.Name = "xrRichText3"; + this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); + this.xrRichText3.SizeF = new System.Drawing.SizeF(726.9984F, 69.75002F); + // + // Page1 + // + this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblMonatJahr, + this.lblNachweisFuer, + this.xrTable3, + this.xrLabel5}); + this.Page1.HeightF = 190F; + this.Page1.Name = "Page1"; + this.Page1.StylePriority.UseFont = false; + // + // lblMonatJahr + // + this.lblMonatJahr.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblMonatJahr.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 90.99998F); + this.lblMonatJahr.Name = "lblMonatJahr"; + this.lblMonatJahr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblMonatJahr.SizeF = new System.Drawing.SizeF(371.8748F, 32.99999F); + this.lblMonatJahr.StylePriority.UseFont = false; + this.lblMonatJahr.Text = "Monat/Jahr:"; + // + // lblNachweisFuer + // + this.lblNachweisFuer.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblNachweisFuer.LocationFloat = new DevExpress.Utils.PointFloat(45.83359F, 42.00001F); + this.lblNachweisFuer.Name = "lblNachweisFuer"; + this.lblNachweisFuer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblNachweisFuer.SizeF = new System.Drawing.SizeF(593.3746F, 32.99999F); + this.lblNachweisFuer.StylePriority.UseFont = false; + this.lblNachweisFuer.Text = "Behandlungsnachweis für: , geb. am"; + // + // xrTable3 + // + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable3.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 145F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow14}); + this.xrTable3.SizeF = new System.Drawing.SizeF(400F, 45F); + this.xrTable3.StylePriority.UseBorderColor = false; + this.xrTable3.StylePriority.UseBorders = false; + this.xrTable3.StylePriority.UseFont = false; + this.xrTable3.StylePriority.UseTextAlignment = false; + this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrTableRow14 + // + this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell41, + this.xrTableCell14, + this.xrTableCell16, + this.xrTableCell18}); + this.xrTableRow14.Name = "xrTableRow14"; + this.xrTableRow14.StylePriority.UseBackColor = false; + this.xrTableRow14.Weight = 0.061901526707613716D; + // + // xrTableCell41 + // + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.Text = "Datum"; + this.xrTableCell41.Weight = 0.15384613876697989D; + // + // xrTableCell14 + // + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UseBackColor = false; + this.xrTableCell14.StylePriority.UseBorderColor = false; + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.Text = "Anzahl BE"; + this.xrTableCell14.Weight = 0.15384614870837435D; + // + // xrTableCell16 + // + this.xrTableCell16.Multiline = true; + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.Text = "Einzel-\r\nförderung"; + this.xrTableCell16.Weight = 0.15384615635238774D; + // + // xrTableCell18 + // + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "Gruppen-\r\nförderung*"; + this.xrTableCell18.Weight = 0.15384610472396937D; + // + // xrLabel5 + // + this.xrLabel5.Font = new System.Drawing.Font("Segoe UI", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(120.125F, 29.50002F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.Text = "Rechnung"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "ServiceInvoicePeriods"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.HeightF = 0F; + this.Detail1.Name = "Detail1"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2}); + this.DetailReport1.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.Detail2.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail2.HeightF = 24F; + this.Detail2.Name = "Detail2"; + this.Detail2.StylePriority.UseFont = false; + // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow10}); + this.xrTable4.SizeF = new System.Drawing.SizeF(400F, 24F); + this.xrTable4.StylePriority.UseBackColor = false; + this.xrTable4.StylePriority.UseBorderColor = false; + this.xrTable4.StylePriority.UseBorders = false; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell12, + this.xrTableCell15, + this.xrTableCell17, + this.xrTableCell19}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.StylePriority.UseFont = false; + this.xrTableRow10.Weight = 0.12000000000000002D; + // + // xrTableCell12 + // + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart", "{0:dd.MM.yyyy}")}); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell12.Weight = 0.15384615384615383D; + // + // xrTableCell15 + // + this.xrTableCell15.CanShrink = true; + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.##}")}); + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell15.StylePriority.UseBorderColor = false; + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UseFont = false; + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.StylePriority.UseTextAlignment = false; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell15.Weight = 0.1538461538461538D; + // + // xrTableCell17 + // + this.xrTableCell17.CanShrink = true; + this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.fieldEinzel", "{0:0.##}")}); + this.xrTableCell17.Font = new System.Drawing.Font("Wingdings 2", 10.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.StylePriority.UseFont = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.Text = "xrTableCell17"; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell17.Weight = 0.15384615384615391D; + // + // xrTableCell19 + // + this.xrTableCell19.CanShrink = true; + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.fieldGruppe", "{0:c}")}); + this.xrTableCell19.Font = new System.Drawing.Font("Wingdings 2", 10.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.Text = "xrTableCell19"; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell19.Weight = 0.15384615384615377D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1, + this.xrLabel15, + this.xrLabel14, + this.lblReststunden, + this.xrLabel12, + this.xrLabel4}); + this.GroupFooter1.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.GroupFooter1.HeightF = 299.7807F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.StylePriority.UseFont = false; + // + // xrTable1 + // + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 113.0154F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow17}); + this.xrTable1.SizeF = new System.Drawing.SizeF(593.375F, 30F); + // + // xrTableRow17 + // + this.xrTableRow17.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.cellDesription, + this.cellHours, + this.cellHouryRate, + this.xrTableCell3, + this.cellClaim}); + this.xrTableRow17.Name = "xrTableRow17"; + this.xrTableRow17.Weight = 0.15D; + // + // cellDesription + // + this.cellDesription.Name = "cellDesription"; + this.cellDesription.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.cellDesription.StylePriority.UseBorderColor = false; + this.cellDesription.StylePriority.UseBorders = false; + this.cellDesription.StylePriority.UseFont = false; + this.cellDesription.Text = "Behandlungseinheiten/Monat:"; + this.cellDesription.Weight = 0.36673076923076925D; + // + // cellHours + // + this.cellHours.Name = "cellHours"; + this.cellHours.Text = "cellHours"; + this.cellHours.Weight = 0.16153846153846155D; + // + // cellHouryRate + // + this.cellHouryRate.Name = "cellHouryRate"; + this.cellHouryRate.Text = "cellHouryRate"; + this.cellHouryRate.Weight = 0.16153846153846155D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "="; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell3.Weight = 0.061538508488581736D; + // + // cellClaim + // + this.cellClaim.Name = "cellClaim"; + this.cellClaim.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.cellClaim.StylePriority.UseBorderColor = false; + this.cellClaim.StylePriority.UseBorders = false; + this.cellClaim.StylePriority.UseFont = false; + this.cellClaim.StylePriority.UseTextAlignment = false; + this.cellClaim.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.cellClaim.Weight = 0.16153846153846155D; + // + // xrLabel15 + // + this.xrLabel15.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 275.7149F); + this.xrLabel15.Multiline = true; + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(475F, 24.06577F); + this.xrLabel15.StylePriority.UseBorders = false; + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.StylePriority.UseTextAlignment = false; + this.xrLabel15.Text = "Anlagen"; + // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(45.83359F, 159.9824F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(475F, 115.7325F); + this.xrLabel14.StylePriority.UseBorders = false; + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.StylePriority.UseTextAlignment = false; + this.xrLabel14.Text = "Mit freundlichen Grüßen\r\nIhre Praxis Pusteblume\r\n\r\n\r\n\r\n[CreatorName]"; + // + // lblReststunden + // + this.lblReststunden.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblReststunden.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 68.85744F); + this.lblReststunden.Multiline = true; + this.lblReststunden.Name = "lblReststunden"; + this.lblReststunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblReststunden.SizeF = new System.Drawing.SizeF(475F, 31.35745F); + this.lblReststunden.StylePriority.UseBorders = false; + this.lblReststunden.StylePriority.UseFont = false; + this.lblReststunden.StylePriority.UseTextAlignment = false; + this.lblReststunden.Text = "Reststunden: 40"; + // + // xrLabel12 + // + this.xrLabel12.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(371.8748F, 32.99999F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "*Gruppengröße"; + // + // xrLabel4 + // + this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel4.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(465.7087F, 0F); + 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(251.2914F, 68.85744F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Unterschrift Sorgeberechtigte/r bzw.\r\nErzieher/in des Kindergartens"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // fieldEinzel + // + this.fieldEinzel.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.fieldEinzel.Expression = "Iif([ServiceDescription] == \'Einzelbetreuung\', \'P\', \'\')"; + this.fieldEinzel.Name = "fieldEinzel"; + // + // fieldGruppe + // + this.fieldGruppe.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.fieldGruppe.Expression = "Iif([ServiceDescription] == \'Gruppenbetreuung\', \'P\', \'\')"; + this.fieldGruppe.Name = "fieldGruppe"; + // + // Rechnung + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.topMarginBand1, + this.bottomMarginBand1, + this.Page1, + this.DetailReport, + this.GroupFooter1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldEinzel, + this.fieldGruppe}); + this.DataSource = this.bindingSource1; + this.DisplayName = "Rechnung"; + this.ExportOptions.PrintPreview.DefaultFileName = "Rechnung"; + this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleRateFactorNull}); + this.Margins = new System.Drawing.Printing.Margins(55, 45, 201, 100); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).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.XRLabel lblAdresse; + private DevExpress.XtraReports.UI.XRRichText xrRichText2; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + 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.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRRichText xrRichText1; + private DevExpress.XtraReports.UI.XRLabel lblNachweisFuer; + private DevExpress.XtraReports.UI.XRRichText xrRichText3; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel lblMonatJahr; + private DevExpress.XtraReports.UI.XRLabel lblReststunden; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel15; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow17; + private DevExpress.XtraReports.UI.XRTableCell cellDesription; + private DevExpress.XtraReports.UI.XRTableCell cellHours; + private DevExpress.XtraReports.UI.XRTableCell cellHouryRate; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell cellClaim; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.CalculatedField fieldEinzel; + private DevExpress.XtraReports.UI.CalculatedField fieldGruppe; + } +} diff --git a/ReportImp/TwgJonathan/Rechnung.cs b/ReportImp/TwgJonathan/Rechnung.cs new file mode 100644 index 000000000..4c22c3157 --- /dev/null +++ b/ReportImp/TwgJonathan/Rechnung.cs @@ -0,0 +1,219 @@ +using System; +using System.Text; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using BeWo.Service.ServiceImplementations; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using DevExpress.XtraReports.UI; + +namespace TwgJonathan +{ + [IDSpecificClass(Identifier = "Behandlungsnachweis")] + public partial class Rechnung : XtraReport, IBeWoReport + { + public Rechnung() + { + this.InitializeComponent(); + } + + public void SetReportDataSource(ServiceInvoiceRO pRO) + { + StringBuilder sb = new StringBuilder(); + + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) + { + sb.AppendLine(pRO.RecipientOrganisation); + } + if (!String.IsNullOrEmpty(pRO.RecipientDivision)) + { + sb.AppendLine(pRO.RecipientDivision); + } + if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + { + sb.AppendLine(pRO.RecipientStreet); + } + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + sb.AppendLine(pRO.RecipientPostCodeAndTown); + } + lblAdresse.Text = sb.ToString(); + + + lblNachweisFuer.Text = String.Format("Behandlungsnachweis für: {0}, geb. am {1:dd.MM.yyyy}", + pRO.CustomerName, pRO.CustomerBirthdate); + + lblMonatJahr.Text = String.Format("Monat/Jahr: {0:MM}/{0:yyyy}", pRO.AccountingPeriodStart); + + var stats = GetStatistics(pRO); + if (stats != null) + { + lblReststunden.Text = String.Format("Reststunden: {0:0.##}", + (stats.MinutesApprovedTotal - stats.MinutesProvidedTotal) / 60); + } + //lblAZ.Text = pRO.CustomerReferenceNumber; + //if (pRO.InvoiceDateTime.HasValue) + // pRO.Notice = String.Format("{0:dd.MM.yyyy}", pRO.InvoiceDateTime.Value.AddDays(30)); + + // if (pRO.ServiceInvoicePeriods != null) + // { + // foreach (var sip in pRO.ServiceInvoicePeriods) + // { + // if (sip.ServiceInvoiceItems != null) + // { + // foreach (var ii in sip.ServiceInvoiceItems) + // { + // ii.ServiceDescription = String.Format("{0}\n{1}", ii.ServiceDescription, ii.Notice); + + // ii.CustomerFirstname = String.Format("{0:c}", ii.AmountPerUnit); + // if (!String.IsNullOrEmpty(ii.RateFactor)) + // { + + //var rfStr = ii.RateFactor.Replace("%", "").Replace(",00", "").Trim(); + //int rfInt = 0; + //Int32.TryParse(rfStr, out rfInt); + + + + //if (rateFactor > 1) + //{ + // ii.CustomerFirstname = String.Format("{0} x {1:0.##}", ii.CustomerFirstname, rateFactor); + //} + //else + //{ + // ii.CustomerFirstname = String.Format("{0}", ii.CustomerFirstname); + //} + // } + + // } + // } + // } + + // } + + //SetCustomerInfos(pRO); + + //cellDesription.Text = String.Format("Fachleistungsstunden {0:MM}/{0:yyyy}", pRO.AccountingPeriodStart); + + decimal hourlyRate = 0; + decimal rateFactor = 1; + decimal hours = 0; + if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0) + { + foreach (var p in pRO.ServiceInvoicePeriods) + { + + if (p.ServiceInvoiceItems != null && p.ServiceInvoiceItems.Count > 0) + { + + foreach (var i in p.ServiceInvoiceItems) + { + if (i.HourlyRate.HasValue) + { + hourlyRate = i.HourlyRate.Value; + + if (!String.IsNullOrEmpty(i.RateFactor)) + { + var rfStr = i.RateFactor.Replace("%", "").Replace(",00", "").Trim(); + int rfInt = 0; + Int32.TryParse(rfStr, out rfInt); + + rateFactor = (100m + rfInt) / 100m; + } + } + + if (i.Hours.HasValue) + hours += i.Hours.Value; + + + + } + + } + } + + } + hours *= rateFactor; + + cellDesription.Text = "Behandlungseinheiten / Monat:"; + + cellHours.Text = String.Format("{0:0.00} Stunden x", hours); + cellHouryRate.Text = String.Format("{0:0.00} Euro", hourlyRate); + cellClaim.Text = String.Format("{0} Euro", pRO.NetClaim.Replace("€", "").Trim()); + + this.bindingSource1.DataSource = pRO; + } + + private SupportConceptStatisticsDC GetStatistics(ServiceInvoiceRO ro) + { + if (ro.InvoiceBase.SupportConceptCostBearerRelDc != null) + { + var service = new OperationsServiceImp(); + + + long cb2scOid = ro.InvoiceBase.SupportConceptCostBearerRelDc.CostBearer2SupportConceptOid.Value; + + + return service.CreateSupportConceptStatistics(cb2scOid, ro.AccountingPeriodEnd); + + //if (stats.PeriodStatistics != null && stats.PeriodStatistics.Count > 0) + //{ + // foreach (var ps in stats.PeriodStatistics) + // { + // if (ps.SupportConceptApprovalPeriod != null && + // ps.SupportConceptApprovalPeriod.ServiceCategory != null && + // (ps.SupportConceptApprovalPeriod.ServiceCategory.Name.StartsWith("Verhinderung") || + // ps.SupportConceptApprovalPeriod.ServiceCategory.Name.StartsWith("Betreuungsleistungen"))) + // { + // return ps; + // } + // } + //} + + //return null; + } + return null; + } + + private void SetCustomerInfos(ServiceInvoiceRO pRO) + { + String mnr = String.Empty; + Customer c = null; + if (pRO.CustomerOid.HasValue) + { + c = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid.Value); + } + if (c == null) + { + if (pRO.ServiceInvoicePeriods.Count > 0) + { + var c2s = pRO.ServiceInvoicePeriods[0].CostBearer2SupportConcept; + c = c2s.SupportConcept.Customer; + } + } + + if (c != null) + { + foreach (var vv in c.VarFieldValueList) + { + if (vv.VarFieldDefOid.Value == 2) + { + var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); + if (varFieldValue != null) + { + mnr = varFieldValue.ToString(); + + } + } + } + } + + + //txtMittelbindungsnr.Text = mnr; + + } + } +} \ No newline at end of file diff --git a/ReportImp/TwgJonathan/Rechnung.resx b/ReportImp/TwgJonathan/Rechnung.resx new file mode 100644 index 000000000..9a02a1e02 --- /dev/null +++ b/ReportImp/TwgJonathan/Rechnung.resx @@ -0,0 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFMAZQBnAG8AZQAgAFUASQA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAFAAcgBhAHgAaQBzACAAUAB1AHMAdABlAGIAbAB1AG0AZQAgAFwAdQA4ADcAMgA5AFwAJwBiADcAIABCAHIAYQBuAGQAXAB1ADIAMgA4AFwAJwBlADQAYwBrAGUAcgAgADEAMgAgAFwAdQA4ADcAMgA5AFwAJwBiADcAIAA4ADMAMgA1ADAAIABNAGEAcgBxAHUAYQByAHQAcwB0AGUAaQBuAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIA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 + TkSuQmCC + + + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFMAZQBnAG8AZQAgAFUASQA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADAAIABQAHIAYQB4AGkAcwAgAFAAdQBzAHQAZQBiAGwAdQBtAGUAfQBcAGIAXABmADIAXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA4AFwAYwBmADAAIABCAHIAYQBuAGQAXAB1ADIAMgA4AFwAJwBlADQAYwBrAGUAcgAgADEAMgAgAFwAdQA4ADcAMgA5AFwAJwBiADcAIAA4ADMAMgA1ADAAIABNAGEAcgBxAHUAYQByAHQAcwB0AGUAaQBuAH0AXABmADIAXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADEAOABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEAOABcAGMAZgAwACAAVABlAGwALgAgADAAIAA4ADYAIAA0ADEAIAAvACAANgA5ACAANQA4ACAANwA1ACAAXAB1ADgANwAyADkAXAAnAGIANwAgAEYAYQB4ACAANgA5ACAANgAxACAAOQAzAH0AXABmADIAXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmAGkAZQBsAGQAewBcACoAXABmAGwAZABpAG4AcwB0AHsAXABmADIAXABmAHMAMQA4AFwAYwBmADAAIAAgAEgAWQBQAEUAUgBMAEkATgBLACAAIgBtAGEAaQBsAHQAbwA6AGsAbwBuAHQAYQBrAHQAQABwAHIAYQB4AGkAcwAtAHAAdQBzAHQAZQBiAGwAdQBtAGUALgBkAGUAIgAgAH0AfQB7AFwAZgBsAGQAcgBzAGwAdAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAxADgAXABjAGYAMgBcAGMAcwAzACAAawBvAG4AdABhAGsAdABAAHAAcgBhAHgAaQBzAC0AcAB1AHMAdABlAGIAbAB1AG0AZQAuAGQAZQB9AH0AfQBcAGYAMgBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmADIAXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA4AFwAYwBmADAAIAB3AHcAdwAuAHAAcgBhAHgAaQBzAC0AcAB1AHMAdABlAGIAbAB1AG0AZQAuAGQAZQB9AFwAZgAyAFwAZgBzADEAOABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEAOABcAGMAZgAwACAAdwB3AHcALgBwAHIAbwBqAGUAawB0AC0AYQB1AGYAdwBpAG4AZAAuAGQAZQB9AFwAZgAyAFwAZgBzADEAOABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== + + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFMAZQBnAG8AZQAgAFUASQA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAEsAdABvAC4AOgAgAEkAQgBBAE4AIABEAEUAMAA4ACAANwAxADAAOQAgADAAMAAwADAAIAAwADEAMAA4ACAAMQAxADQAMQAgADUAMwAsACAAQgBJAEMAIABHAEUATgBPAEQARQBGADEAQgBHAEwALAAgAFYAbwBsAGsAcwBiAGEAbgBrAC0AUgBhAGkAZgBmAGUAaQBzAGUAbgBiAGEAbgBrACAATwBiAGUAcgBiAGEAeQBlAHIAbgAgAFMAXAB1ADIANQAyAFwAJwBmAGMAZABvAHMAdAAgAGUARwAuAH0AXABmADIAXABmAHMAMQA0AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBjAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABTAHQAZQB1AGUAcgAtAE4AcgAuACAAMQA2ADMALwAyADIAOAAvADMAMAA4ADMANQAsACAARgBBACAAVAByAGEAdQBuAHMAdABlAGkAbgAuACAAVQBuAHMAZQByAGUAIABoAGUAaQBsAHAAXAB1ADIAMgA4AFwAJwBlADQAZABhAGcAbwBnAGkAcwBjAGgAZQBuACAATABlAGkAcwB0AHUAbgBnAGUAbgAgAHMAaQBuAGQAIABuAGEAYwBoACAAXAB1ADEANgA3AFwAJwBhADcAIAA0ACAATgByAC4AIAAxADYAIABaAGkAZgBmAGUAcgAgAGgAIABVAFMAdABHACAAdgBvAG4AIABkAGUAcgAgAFUAbQBzAGEAdAB6AHMAdABlAHUAZQByACAAYgBlAGYAcgBlAGkAdAAuAH0AXABmADIAXABmAHMAMQA0AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBjAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABTAG8AbgBzAHQAaQBnAGUAIABMAGkAZQBmAGUAcgB1AG4AZwBlAG4AIAB1AG4AZAAgAEwAZQBpAHMAdAB1AG4AZwBlAG4AIAB1AG4AdABlAHIAbABpAGUAZwBlAG4AIABkAGUAcgAgAEsAbABlAGkAbgB1AG4AdABlAHIAbgBlAGgAbQBlAHIAcgBlAGcAZQBsAHUAbgBnACAAbgBhAGMAaAAgAFwAdQAxADYANwBcACcAYQA3ACAAMQA5ACAAVQBTAHQARwAuAH0AXABmADIAXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/TwgJonathan/TwgJonathan.csproj b/ReportImp/TwgJonathan/TwgJonathan.csproj index e7b314b0a..c00cf46ef 100644 --- a/ReportImp/TwgJonathan/TwgJonathan.csproj +++ b/ReportImp/TwgJonathan/TwgJonathan.csproj @@ -31,8 +31,15 @@ 4 + + + + + + + @@ -41,7 +48,38 @@ + + Component + + + Rechnung.cs + + + + + Rechnung.cs + Designer + + + + + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + Data + + + {40D8B312-EA64-49E3-A31A-5E57ED4D5654} + Report + + + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} + Service + + + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} + Shared + + \ No newline at end of file diff --git a/ReportImp/TwgJonathan/logo.png b/ReportImp/TwgJonathan/logo.png new file mode 100644 index 000000000..1b3a139ec Binary files /dev/null and b/ReportImp/TwgJonathan/logo.png differ diff --git a/ReportImp/VKMAachen/ServiceInvoiceReport.Designer.cs b/ReportImp/VKMAachen/ServiceInvoiceReport.Designer.cs index 6a3baaf30..d368db4ff 100644 --- a/ReportImp/VKMAachen/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/VKMAachen/ServiceInvoiceReport.Designer.cs @@ -31,10 +31,7 @@ namespace VKMAachen System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); 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(); @@ -61,7 +58,6 @@ namespace VKMAachen this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -71,16 +67,19 @@ namespace VKMAachen this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -93,53 +92,23 @@ namespace VKMAachen // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrRichText2, + this.lblAdresse, this.xrTable2}); this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); this.ReportHeader.HeightF = 291.7083F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // - // xrRichText2 - // - this.xrRichText2.Font = new System.Drawing.Font("Times New Roman", 12F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrRichText2.Name = "xrRichText2"; - this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); - this.xrRichText2.SizeF = new System.Drawing.SizeF(317F, 128.4167F); - this.xrRichText2.StylePriority.UseFont = false; - // // xrTable2 // - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(536.2919F, 140.6667F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(521.7087F, 140.6667F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow2, this.xrTableRow5, this.xrTableRow4, this.xrTableRow3, this.xrTableRow1}); - this.xrTable2.SizeF = new System.Drawing.SizeF(140.7081F, 142.7083F); - // - // 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("Times New Roman", 14F); - 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 = "- AUFTAKT -"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 1D; + this.xrTable2.SizeF = new System.Drawing.SizeF(185.291F, 114.1666F); // // xrTableRow5 // @@ -233,12 +202,12 @@ namespace VKMAachen // // topMarginBand1 // - this.topMarginBand1.HeightF = 170.5F; + this.topMarginBand1.HeightF = 170F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 58.4582F; + this.bottomMarginBand1.HeightF = 58F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // Page1 @@ -248,18 +217,18 @@ namespace VKMAachen this.xrLabel2, this.xrLabel8}); this.Page1.Font = new System.Drawing.Font("Verdana", 10F); - this.Page1.HeightF = 207.1667F; + this.Page1.HeightF = 251.9584F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // // xrLabel3 // this.xrLabel3.Font = new System.Drawing.Font("Times New Roman", 12F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 111.5833F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 134.5F); 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(676.8332F, 95.5834F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(676.8332F, 117.4584F); this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = resources.GetString("xrLabel3.Text"); // @@ -269,27 +238,28 @@ namespace VKMAachen this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Bold); this.xrLabel2.ForeColor = System.Drawing.Color.Black; - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 53.37496F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 53.37499F); + this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(676.8332F, 20F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(676.8332F, 58.20834F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.StylePriority.UseForeColor = false; - this.xrLabel2.Text = "Eingliederungshilfe gem. §35a SGB VIII für [CustomerName]"; - this.xrLabel2.WordWrap = false; + this.xrLabel2.Text = "Gewährung von Eingliederungshilfe gem. § 35a SGB VIII für [CustomerName], geb. am" + + " [CustomerBirthdate!dd.MM.yyyy], Verwendungszweck [CustomerReferenceNumber]"; // // xrLabel8 // this.xrLabel8.Font = new System.Drawing.Font("Times New Roman", 11F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(550.9169F, 15.99998F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(521.7087F, 15.99998F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(125.2499F, 23F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(154.4581F, 23F); this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "Datum [InvoiceDate]"; - this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrLabel8.Text = "[InvoiceDate]"; + this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // DetailReport // @@ -340,18 +310,27 @@ namespace VKMAachen // // xrTable6 // + this.xrTable6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTable6.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(51.04167F, 0F); this.xrTable6.Name = "xrTable6"; + this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow25}); - this.xrTable6.SizeF = new System.Drawing.SizeF(625.9583F, 25F); + this.xrTable6.SizeF = new System.Drawing.SizeF(510F, 25F); + this.xrTable6.StylePriority.UseBorders = false; this.xrTable6.StylePriority.UseFont = false; + this.xrTable6.StylePriority.UsePadding = false; // // xrTableRow25 // this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell40}); + this.xrTableCell40, + this.xrTableCell3, + this.xrTableCell4, + this.xrTableCell5}); this.xrTableRow25.Name = "xrTableRow25"; this.xrTableRow25.Weight = 1D; // @@ -359,7 +338,6 @@ namespace VKMAachen // this.xrTableCell40.BackColor = System.Drawing.Color.Transparent; this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell40.CanShrink = true; this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart", "{0:MMMM yyyy}")}); @@ -374,7 +352,7 @@ namespace VKMAachen this.xrTableCell40.StylePriority.UseTextAlignment = false; this.xrTableCell40.Text = "xrTableCell40"; this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell40.Weight = 3D; + this.xrTableCell40.Weight = 0.71889771357413812D; // // GroupFooter1 // @@ -407,10 +385,6 @@ namespace VKMAachen this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.Text = "xrLabel1"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // DetailReport1 // this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -477,12 +451,12 @@ namespace VKMAachen // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel11, + this.xrLabel12, this.xrLabel10, this.xrLabel9, this.xrLabel7, - this.xrRichText1}); - this.ReportFooter.HeightF = 234.2083F; + this.xrLabel11}); + this.ReportFooter.HeightF = 224.2083F; this.ReportFooter.Name = "ReportFooter"; // // xrLabel11 @@ -499,47 +473,118 @@ namespace VKMAachen this.xrLabel11.Text = "xrLabel11"; this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // - // xrLabel10 + // xrLabel7 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.37498F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(213.5417F, 23F); - this.xrLabel10.StylePriority.UseTextAlignment = false; - this.xrLabel10.Text = "Mit freundlichen Grüßen,"; - this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrLabel7.Font = new System.Drawing.Font("Times New Roman", 12F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.08341471F, 58.37491F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(655.9998F, 92.50006F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Bitte überweisen Sie den Betrag auf das unten aufgeführte Konto.\r\n\t\r\n\r\nMit freund" + + "lichen Grüßen"; // // xrLabel9 // - this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPerson")}); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 137.1248F); + this.xrLabel9.Font = new System.Drawing.Font("Times New Roman", 10F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0.08341471F, 196.7083F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(135.4167F, 23F); - this.xrLabel9.StylePriority.UseTextAlignment = false; - this.xrLabel9.Text = "xrLabel9"; - this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel9.SizeF = new System.Drawing.SizeF(350.9583F, 27.50003F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "Leitung AUFTAKT "; // - // xrLabel7 + // xrLabel10 // - this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonDivision")}); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 160.1249F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(135.4167F, 23F); - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "xrLabel7"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel10.Font = new System.Drawing.Font("Times New Roman", 12F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.08341471F, 150.875F); + 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(316.9164F, 45.83333F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.StylePriority.UseTextAlignment = false; + this.xrLabel10.Text = "Stephanie Schieder"; + this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; // - // xrRichText1 + // xrLabel12 // - this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 183.125F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(135.4167F, 51.08337F); + this.xrLabel12.Font = new System.Drawing.Font("Times New Roman", 12F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(445.8333F, 196.7083F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(222.1247F, 27.50003F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + this.xrLabel12.Text = "Anlage: Stundenaufstellung"; + this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // xrTableCell3 + // + this.xrTableCell3.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.00}")}); + this.xrTableCell3.Font = new System.Drawing.Font("Times New Roman", 12F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseBackColor = false; + 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.MiddleRight; + this.xrTableCell3.Weight = 0.5751181708593095D; + // + // xrTableCell4 + // + this.xrTableCell4.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit", "{0:c}")}); + this.xrTableCell4.Font = new System.Drawing.Font("Times New Roman", 12F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseBackColor = false; + this.xrTableCell4.StylePriority.UseBorderColor = false; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell4.Weight = 0.5751181708593095D; + // + // xrTableCell5 + // + this.xrTableCell5.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell5.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:c}")}); + this.xrTableCell5.Font = new System.Drawing.Font("Times New Roman", 12F); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseBackColor = false; + this.xrTableCell5.StylePriority.UseBorderColor = false; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell5.Weight = 0.5751181708593095D; + // + // lblAdresse + // + this.lblAdresse.Font = new System.Drawing.Font("Times New Roman", 12F); + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblAdresse.Multiline = true; + this.lblAdresse.Name = "lblAdresse"; + this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresse.SizeF = new System.Drawing.SizeF(488.5417F, 140.6667F); + this.lblAdresse.StylePriority.UseFont = false; // // ServiceInvoiceReport // @@ -556,17 +601,15 @@ namespace VKMAachen this.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 170, 58); + this.Margins = new System.Drawing.Printing.Margins(75, 45, 170, 58); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -595,13 +638,10 @@ namespace VKMAachen private DevExpress.XtraReports.UI.XRTable xrTable6; private DevExpress.XtraReports.UI.XRTableRow xrTableRow25; private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; private DevExpress.XtraReports.UI.DetailBand Detail2; private DevExpress.XtraReports.UI.XRTable xrTable1; @@ -613,10 +653,14 @@ namespace VKMAachen private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRRichText xrRichText1; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRLabel lblAdresse; } } diff --git a/ReportImp/VKMAachen/ServiceInvoiceReport.cs b/ReportImp/VKMAachen/ServiceInvoiceReport.cs index 1d99c1cdc..6bbf317de 100644 --- a/ReportImp/VKMAachen/ServiceInvoiceReport.cs +++ b/ReportImp/VKMAachen/ServiceInvoiceReport.cs @@ -1,3 +1,5 @@ +using System; +using System.Text; using BeWo.Report; using BeWo.Report.ReportObjects; @@ -26,6 +28,33 @@ namespace VKMAachen { pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Remove(0, 9); } + + StringBuilder sb = new StringBuilder(); + + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) + { + sb.AppendLine(pRO.RecipientOrganisation); + } + if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + { + sb.AppendLine(pRO.RecipientContactPerson); + } + if (!String.IsNullOrEmpty(pRO.RecipientDivision)) + { + sb.AppendLine(pRO.RecipientDivision); + } + if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + { + sb.AppendLine(pRO.RecipientStreet); + } + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + sb.AppendLine(""); + sb.AppendLine(pRO.RecipientPostCodeAndTown); + } + lblAdresse.Text = sb.ToString(); + + bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/VKMAachen/ServiceInvoiceReport.resx b/ReportImp/VKMAachen/ServiceInvoiceReport.resx index 5a0ac99b2..b265596c4 100644 --- a/ReportImp/VKMAachen/ServiceInvoiceReport.resx +++ b/ReportImp/VKMAachen/ServiceInvoiceReport.resx @@ -117,18 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ewBcAHIAdABmADEAXABhAG4AcwBpAFwAYQBuAHMAaQBjAHAAZwAxADIANQAyAFwAZABlAGYAZgAwAHsAXABmAG8AbgB0AHQAYgBsAHsAXABmADAAXABmAG4AaQBsACAAVABpAG0AZQBzACAATgBlAHcAIABSAG8AbQBhAG4AOwB9AHsAXABmADEAXABmAG4AaQBsAFwAZgBjAGgAYQByAHMAZQB0ADAAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQANAAoAewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAOwB9AA0ACgBcAHYAaQBlAHcAawBpAG4AZAA0AFwAdQBjADEAXABwAGEAcgBkAFwAYwBmADEAXABsAGEAbgBnADEAMAAzADEAXABmADAAXABmAHMAMgA0ACAAWwBSAGUAYwBpAHAAaQBlAG4AdABPAHIAZwBhAG4AaQBzAGEAdABpAG8AbgBdAFwAcABhAHIADQAKAFwAYgBcAGYAMQAgAFsAUgBlAGMAaQBwAGkAZQBuAHQAQwBvAG4AdABhAGMAdABQAGUAcgBzAG8AbgBdAFwAYgAwAFwAZgAwAFwAcABhAHIADQAKAFsAUgBlAGMAaQBwAGkAZQBuAHQARABpAHYAaQBzAGkAbwBuAF0AXABwAGEAcgANAAoAWwBSAGUAYwBpAHAAaQBlAG4AdABTAHQAcgBlAGUAdABdAFwAcABhAHIADQAKAFwAcABhAHIADQAKAFwAYgBcAGYAMQAgAFsAUgBlAGMAaQBwAGkAZQBuAHQAUABvAHMAdABDAG8AZABlAEEAbgBkAFQAbwB3AG4AXQBcAGMAZgAwAFwAYgAwAFwAZgAwAFwAcABhAHIADQAKAH0ADQAKAA== - - Sehr geehrter Frau/Herr [RecipientContactPerson], + Sehr geehrte Damen und Herren, -gemäß des Bewilligungsbescheides vom [ApprovalDate] stellen wir für die Leistungen der Eingliederungshilfe gem. §35a SGB VIII lt. beigefügter Aufstellung folgenden Betrag in Rechnung: +bezugnehmend auf den Bewilligungsbescheid vom [ApprovalDate] stellen wir für die Leistungen der Eingliederungshilfe gem. § 35a SGB VIII lt. beigefügter Aufstellung folgenden Betrag in Rechnung: 17, 17 - - ewBcAHIAdABmADEAXABhAG4AcwBpAFwAYQBuAHMAaQBjAHAAZwAxADIANQAyAFwAZABlAGYAZgAwAHsAXABmAG8AbgB0AHQAYgBsAHsAXABmADAAXABmAHIAbwBtAGEAbgBcAGYAcAByAHEAMgBcAGYAYwBoAGEAcgBzAGUAdAAwACAAVABpAG0AZQBzACAATgBlAHcAIABSAG8AbQBhAG4AOwB9AHsAXABmADEAXABmAG4AaQBsACAAVABpAG0AZQBzACAATgBlAHcAIABSAG8AbQBhAG4AOwB9AH0ADQAKAFwAdgBpAGUAdwBrAGkAbgBkADQAXAB1AGMAMQBcAHAAYQByAGQAXABxAGMAXABsAGEAbgBnADEAMAAzADEAXABmADAAXABmAHMAMgA0ACAAQQBVAEYAVABBAEsAVABcAHAAYQByAA0ACgBcAGYAcwAxADYAIABBAHUAdABpAHMAbQB1AHMAIABGAGEAbQBpAGwAaQBlACAAVABlAGkAbABoAGEAYgBlACAAQQBrAHQAaQBvAG4AXABmADEAXABmAHMAMgA0AFwAcABhAHIADQAKAH0ADQAKAA== - \ No newline at end of file