ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cb

Browse Source
This commit is contained in:
Christian
2021-09-27 21:33:04 +02:00
parent 20f7fc351c
commit 73f5092b67
22 changed files with 790 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -546,3 +546,6 @@
/ReportImp/Wichernhaus/obj
/ReportImp/FAMRheinSiegGbr/obj/Release
/ReportImp/KoelnerBeWoSelbstbestimmtLeben/obj/Release
/ReportImp/DiakonischesWerkPassau/obj/Release
/ReportImp/DiakonischesWerkRegensburg/obj/Debug
/ReportImp/DiakonischesWerkRegensburg/obj/Release

27
BeWoAllReports.sln
View File

@@ -658,6 +658,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkRegensburg"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KoelnerBeWoSelbstbestimmtLeben", "ReportImp\KoelnerBeWoSelbstbestimmtLeben\KoelnerBeWoSelbstbestimmtLeben.csproj", "{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkPassau", "ReportImp\DiakonischesWerkPassau\DiakonischesWerkPassau.csproj", "{BE015430-F83C-4CAB-902A-5D1962697715}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -7937,6 +7939,30 @@ Global
{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|x86.ActiveCfg = Release|Any CPU
{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|x86.Build.0 = Release|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|.NET.ActiveCfg = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|.NET.Build.0 = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|x86.ActiveCfg = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|x86.Build.0 = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|x86.Build.0 = Debug|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Release|.NET.ActiveCfg = Release|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Release|.NET.Build.0 = Release|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Release|Any CPU.Build.0 = Release|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Release|x86.ActiveCfg = Release|Any CPU
{BE015430-F83C-4CAB-902A-5D1962697715}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -8264,6 +8290,7 @@ Global
{88273E87-C5F9-4DBF-876A-296527A61B4A} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{FE240F9F-CC85-4F7D-9080-BEEBE76B0735} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{BE015430-F83C-4CAB-902A-5D1962697715} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

2
ReportImp/Bussmannshof/Budgetnachweis.cs
View File

@@ -10,7 +10,7 @@ using DevExpress.XtraReports.UI;
namespace Bussmannshof
{
[IDSpecificClass(Identifier = "LWLNEU")]
public partial class Budgetnachweis : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
public partial class Budgetnachweis : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport<SettlementRO>
{
public Budgetnachweis()
{

2
ReportImp/Bussmannshof/Bussmannshof.csproj
View File

@@ -104,7 +104,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Invoiceing\" />
<Folder Include="Invoicing\" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />

2
ReportImp/DiakonischesWerkPassau/DiakonischesWerkPassau.csproj
View File

@@ -7,7 +7,7 @@
<ProjectGuid>{BE015430-F83C-4CAB-902A-5D1962697715}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>KundeXyz</RootNamespace>
<RootNamespace>DiakonischesWerkPassau</RootNamespace>
<AssemblyName>4947061147_Reports</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>

892
ReportImp/DomizielAnsbach/CollectiveBillingReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

3
ReportImp/DomizielAnsbach/DomizielAnsbach.csproj
View File

@@ -60,6 +60,8 @@
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Invoicing\CollectiveInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="QuittierungsbelegPB.cs">
<SubType>Component</SubType>
@@ -121,5 +123,6 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

98
ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs Normal file
View File

@@ -0,0 +1,98 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Services;
namespace DomizielAnsbach.Invoicing
{
public class CollectiveInvoiceCreation : InvoiceCreation
{
private DateTime? accountingPeriodStart = null;
private DateTime? accountingPeriodEnd = null;
public virtual List<ServiceInvoiceDC> GenerateServiceInvoices(long costBearerOid,
DateTimeSpan invoicePeriod,
Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
var costBearer = DAOFactory.GenericDAO.LoadByID<CostBearer>(costBearerOid);
var invoiceList = new List<ServiceInvoice>();
var invoiceCounter = 0;
ServiceInvoice invoice;
invoice = CreateCollectiveBilling2(costBearer, invoicePeriod, supportConcepts2ServiceRecords);
if (invoice != null)
{
invoiceList.Add(invoice);
}
var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList();
return result.Count > 1 ? result.OrderBy(i => i.InvoiceBase.CustomerLastName).ToList() : result;
}
private ServiceInvoice CreateCollectiveBilling2(CostBearer costBearer, DateTimeSpan invoicePeriod, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
var invoice = new ServiceInvoice();
var newDict = new Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>>();
foreach (var sc2sr in supportConcepts2ServiceRecords)
{
if (sc2sr.Key.IsApproved)
{
newDict.Add(sc2sr.Key, sc2sr.Value);
}
}
SetRecipientInformation(invoice, costBearer);
SetSenderInformation(invoice);
SetInvoiceBaseData(0, invoice, costBearer, invoicePeriod, newDict.Keys.ToList());
SetCollectiveBillingBaseData(0, invoice, costBearer, invoicePeriod, newDict);
SetCollectiveBillingServiceInvoicePeriods(invoice, invoicePeriod, newDict);
SetServiceInvoicePeriodAmounts(invoice);
// Spitzabrechnung
if (invoicePeriod == null)
{
SetAmountAdvancePayments(invoice);
}
return invoice;
}
public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
IList<CompactSupportConceptDC> supportConceptList)
{
if (invoicePeriod != null)
{
accountingPeriodStart = invoicePeriod.StartDate;
accountingPeriodEnd = invoicePeriod.EndDate;
}
base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
}
public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
Calculations calc)
{
return base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
}
}
}

21
ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs Normal file
View File

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace DomizielAnsbach.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
return new CollectiveInvoiceCreation();
}
}
}

87
ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs generated
View File

@@ -46,7 +46,6 @@ namespace DomizielAnsbach
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -67,13 +66,15 @@ namespace DomizielAnsbach
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -81,10 +82,8 @@ namespace DomizielAnsbach
//
// Detail
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
this.Detail.Font = new System.Drawing.Font("Arial", 11F);
this.Detail.HeightF = 60F;
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.StylePriority.UseFont = false;
@@ -95,7 +94,7 @@ namespace DomizielAnsbach
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0.6944444F, 0F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -163,7 +162,8 @@ namespace DomizielAnsbach
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.Detail1,
this.GroupHeader1});
this.DetailReport.DataMember = "Services";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -213,34 +213,36 @@ namespace DomizielAnsbach
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F);
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell13.Weight = 0.13888887377323028D;
//
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##} Min.")});
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F);
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell2.Weight = 0.13888887698574931D;
//
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription", "{0:0.##}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice", "{0:0.##}")});
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 0, 100F);
this.xrTableCell15.StylePriority.UseFont = false;
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "xrTableCell15";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell15.Weight = 0.40404036892472889D;
//
// xrTableCell5
@@ -251,10 +253,6 @@ namespace DomizielAnsbach
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell5.Weight = 0.16414128592247781D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -457,6 +455,28 @@ namespace DomizielAnsbach
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(540F, 62.08327F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(137F, 17.99997F);
this.xrLabel3.StylePriority.UseBorders = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Berufsbezeichnung";
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(178.3263F, 62.08327F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(281.5348F, 17.99997F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Unterschrift des Bezugsbetreuers";
//
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -497,27 +517,19 @@ namespace DomizielAnsbach
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// xrLabel2
// GroupHeader1
//
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(178.3263F, 62.08327F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(281.5348F, 17.99997F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Unterschrift des Bezugsbetreuers";
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F);
this.GroupHeader1.HeightF = 60F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrLabel3
// bindingSource1
//
this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(540F, 62.08327F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(137F, 17.99997F);
this.xrLabel3.StylePriority.UseBorders = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Berufsbezeichnung";
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// QuittierungsbelegPB
//
@@ -596,5 +608,6 @@ namespace DomizielAnsbach
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
}
}

4
ReportImp/LebenshilfeEssenReports/SettlementReport.Designer.cs generated
View File

@@ -555,7 +555,7 @@ namespace BeWo.LebenshilfeEssenReports
this.xrRichText3,
this.xrLabel10});
this.ReportFooter.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ReportFooter.HeightF = 260F;
this.ReportFooter.HeightF = 305.8333F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.PrintAtBottom = true;
@@ -575,7 +575,7 @@ namespace BeWo.LebenshilfeEssenReports
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(588F, 0F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(199F, 260F);
this.xrRichText3.SizeF = new System.Drawing.SizeF(199F, 305.8333F);
//
// xrLabel10
//

2
ReportImp/LebenshilfeEssenReports/SettlementReport.resx
View File

File diff suppressed because one or more lines are too long

2
ReportImp/LebenshilfeEssenReports/SettlementReport2.resx
View File

File diff suppressed because one or more lines are too long

1
ReportImp/LebenshilfeFrankfurtOder/Invoicing/FudInvoiceCreation.cs
View File

@@ -426,6 +426,7 @@ namespace LebenshilfeFrankfurtOder.Invoicing
if (sr.DistanceInMeter.HasValue)
{
km += sr.DistanceInMeter.Value;
sr.DistanceInMeter = 0; // Verhindern, dass bei mehreren Bewilligungen doppelt abgerechnet wird
}
}

52
ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs generated
View File

@@ -60,7 +60,7 @@ namespace PraxisPusteblume
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.lblBetreff = 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();
@@ -78,7 +78,6 @@ namespace PraxisPusteblume
this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.tableGesamtStunden = new DevExpress.XtraReports.UI.XRTable();
this.tableRowGesamtStunden = new DevExpress.XtraReports.UI.XRTableRow();
this.cellDescription = new DevExpress.XtraReports.UI.XRTableCell();
@@ -86,6 +85,7 @@ namespace PraxisPusteblume
this.cellHouryRate = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellClaim = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.rtAnschriftIfs)).BeginInit();
@@ -299,7 +299,7 @@ namespace PraxisPusteblume
this.lblMonatJahr,
this.lblNachweisFuer,
this.xrTable3,
this.xrLabel5});
this.lblBetreff});
this.Page1.HeightF = 190F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
@@ -326,8 +326,8 @@ namespace PraxisPusteblume
//
// xrTable3
//
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
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);
@@ -385,15 +385,15 @@ namespace PraxisPusteblume
this.xrTableCell18.Text = "Gruppen-\r\nförderung*";
this.xrTableCell18.Weight = 0.15384610472396937D;
//
// xrLabel5
// lblBetreff
//
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";
this.lblBetreff.Font = new System.Drawing.Font("Segoe UI", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F);
this.lblBetreff.Name = "lblBetreff";
this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBetreff.SizeF = new System.Drawing.SizeF(645.8195F, 29.50002F);
this.lblBetreff.StylePriority.UseFont = false;
this.lblBetreff.Text = "Rechnung";
//
// DetailReport
//
@@ -430,7 +430,7 @@ namespace PraxisPusteblume
//
// xrTable4
//
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
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";
@@ -562,17 +562,6 @@ namespace PraxisPusteblume
this.GroupFooter2.Name = "GroupFooter2";
this.GroupFooter2.StylePriority.UseFont = false;
//
// GroupFooter3
//
this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel14,
this.xrLabel2});
this.GroupFooter3.Font = new System.Drawing.Font("Segoe UI", 10F);
this.GroupFooter3.HeightF = 173.1593F;
this.GroupFooter3.Level = 2;
this.GroupFooter3.Name = "GroupFooter3";
this.GroupFooter3.StylePriority.UseFont = false;
//
// tableGesamtStunden
//
this.tableGesamtStunden.LocationFloat = new DevExpress.Utils.PointFloat(45.83F, 0F);
@@ -633,6 +622,17 @@ namespace PraxisPusteblume
this.cellClaim.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.cellClaim.Weight = 0.16153846153846155D;
//
// GroupFooter3
//
this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel14,
this.xrLabel2});
this.GroupFooter3.Font = new System.Drawing.Font("Segoe UI", 10F);
this.GroupFooter3.HeightF = 173.1593F;
this.GroupFooter3.Level = 2;
this.GroupFooter3.Name = "GroupFooter3";
this.GroupFooter3.StylePriority.UseFont = false;
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -707,7 +707,7 @@ namespace PraxisPusteblume
private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
private DevExpress.XtraReports.UI.XRLabel lblAdresse;
private DevExpress.XtraReports.UI.XRRichText rtKopfNormal;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblBetreff;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;

17
ReportImp/PraxisPusteblume/Behandlungsnachweis.cs
View File

@@ -26,6 +26,11 @@ namespace PraxisPusteblume
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
bool isIfs = PruefeIfs(pRO);
bool isIndHp = CheckHP(pRO);
if (isIndHp)
{
lblBetreff.Text = "Rechnung - Heilpädagogische Leistungen";
}
StringBuilder sb = new StringBuilder();
@@ -66,6 +71,8 @@ namespace PraxisPusteblume
{
lblUnterschrift.Visible = false;
}
//var stats = GetStatistics(pRO);
//if (stats != null)
//{
@@ -206,6 +213,16 @@ namespace PraxisPusteblume
this.bindingSource1.DataSource = pRO;
}
private bool CheckHP(ServiceInvoiceRO pRo)
{
//if (pRo.InvoiceBase.in)
if (pRo.RecipientOrganisation.Contains("Heilpädagogisch"))
{
return true;
}
return false;
}
private void AddGruppenZeilen(ServiceInvoiceRO pRO, Dictionary<string, decimal> gruppenHours, Dictionary<string, decimal> gruppenHourlyRate, Dictionary<string, decimal> gruppenClaim)
{
if (gruppenHours.Count > 0)

96
ReportImp/PraxisPusteblume/IfsRechnung.Designer.cs generated
View File

@@ -75,8 +75,10 @@ namespace PraxisPusteblume
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.lblBetragTeamsitzung = new DevExpress.XtraReports.UI.XRLabel();
this.lblGleichTeam = new DevExpress.XtraReports.UI.XRLabel();
this.lblBezeichnungTeam = new DevExpress.XtraReports.UI.XRLabel();
this.tableSummen = new DevExpress.XtraReports.UI.XRTable();
this.rowFirstSumme = new DevExpress.XtraReports.UI.XRTableRow();
this.cellDesription1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -97,16 +99,14 @@ namespace PraxisPusteblume
this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.lblBezeichnungTeam = new DevExpress.XtraReports.UI.XRLabel();
this.lblGleichTeam = new DevExpress.XtraReports.UI.XRLabel();
this.lblBetragTeamsitzung = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.rtAnschriftIfs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtKopfIfs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtFussIfs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tableSummen)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -553,10 +553,6 @@ namespace PraxisPusteblume
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell7.Weight = 0.15384615384615377D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -569,6 +565,46 @@ namespace PraxisPusteblume
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// lblBetragTeamsitzung
//
this.lblBetragTeamsitzung.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblBetragTeamsitzung.LocationFloat = new DevExpress.Utils.PointFloat(534.2051F, 10.00002F);
this.lblBetragTeamsitzung.Multiline = true;
this.lblBetragTeamsitzung.Name = "lblBetragTeamsitzung";
this.lblBetragTeamsitzung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBetragTeamsitzung.SizeF = new System.Drawing.SizeF(105.0032F, 29.99997F);
this.lblBetragTeamsitzung.StylePriority.UseBorders = false;
this.lblBetragTeamsitzung.StylePriority.UseFont = false;
this.lblBetragTeamsitzung.StylePriority.UseTextAlignment = false;
this.lblBetragTeamsitzung.Text = "Pauschale für Teamsitzung";
//
// lblGleichTeam
//
this.lblGleichTeam.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblGleichTeam.LocationFloat = new DevExpress.Utils.PointFloat(494.205F, 10.00002F);
this.lblGleichTeam.Multiline = true;
this.lblGleichTeam.Name = "lblGleichTeam";
this.lblGleichTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGleichTeam.SizeF = new System.Drawing.SizeF(39.99973F, 29.99997F);
this.lblGleichTeam.StylePriority.UseBorders = false;
this.lblGleichTeam.StylePriority.UseFont = false;
this.lblGleichTeam.StylePriority.UseTextAlignment = false;
this.lblGleichTeam.Text = "=";
this.lblGleichTeam.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// lblBezeichnungTeam
//
this.lblBezeichnungTeam.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblBezeichnungTeam.LocationFloat = new DevExpress.Utils.PointFloat(45.83401F, 10.00002F);
this.lblBezeichnungTeam.Multiline = true;
this.lblBezeichnungTeam.Name = "lblBezeichnungTeam";
this.lblBezeichnungTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBezeichnungTeam.SizeF = new System.Drawing.SizeF(448.371F, 29.99997F);
this.lblBezeichnungTeam.StylePriority.UseBorders = false;
this.lblBezeichnungTeam.StylePriority.UseFont = false;
this.lblBezeichnungTeam.StylePriority.UseTextAlignment = false;
this.lblBezeichnungTeam.Text = "Pauschale für Teamsitzung";
//
// tableSummen
//
this.tableSummen.LocationFloat = new DevExpress.Utils.PointFloat(45.83F, 40F);
@@ -750,45 +786,9 @@ namespace PraxisPusteblume
this.GroupFooter2.Level = 1;
this.GroupFooter2.Name = "GroupFooter2";
//
// lblBezeichnungTeam
// bindingSource1
//
this.lblBezeichnungTeam.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblBezeichnungTeam.LocationFloat = new DevExpress.Utils.PointFloat(45.83401F, 10.00002F);
this.lblBezeichnungTeam.Multiline = true;
this.lblBezeichnungTeam.Name = "lblBezeichnungTeam";
this.lblBezeichnungTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBezeichnungTeam.SizeF = new System.Drawing.SizeF(448.371F, 29.99997F);
this.lblBezeichnungTeam.StylePriority.UseBorders = false;
this.lblBezeichnungTeam.StylePriority.UseFont = false;
this.lblBezeichnungTeam.StylePriority.UseTextAlignment = false;
this.lblBezeichnungTeam.Text = "Pauschale für Teamsitzung";
//
// lblGleichTeam
//
this.lblGleichTeam.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblGleichTeam.LocationFloat = new DevExpress.Utils.PointFloat(494.205F, 10.00002F);
this.lblGleichTeam.Multiline = true;
this.lblGleichTeam.Name = "lblGleichTeam";
this.lblGleichTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGleichTeam.SizeF = new System.Drawing.SizeF(39.99973F, 29.99997F);
this.lblGleichTeam.StylePriority.UseBorders = false;
this.lblGleichTeam.StylePriority.UseFont = false;
this.lblGleichTeam.StylePriority.UseTextAlignment = false;
this.lblGleichTeam.Text = "=";
this.lblGleichTeam.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// lblBetragTeamsitzung
//
this.lblBetragTeamsitzung.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblBetragTeamsitzung.LocationFloat = new DevExpress.Utils.PointFloat(534.2051F, 10.00002F);
this.lblBetragTeamsitzung.Multiline = true;
this.lblBetragTeamsitzung.Name = "lblBetragTeamsitzung";
this.lblBetragTeamsitzung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBetragTeamsitzung.SizeF = new System.Drawing.SizeF(105.0032F, 29.99997F);
this.lblBetragTeamsitzung.StylePriority.UseBorders = false;
this.lblBetragTeamsitzung.StylePriority.UseFont = false;
this.lblBetragTeamsitzung.StylePriority.UseTextAlignment = false;
this.lblBetragTeamsitzung.Text = "Pauschale für Teamsitzung";
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// IfsRechnung
//
@@ -820,8 +820,8 @@ namespace PraxisPusteblume
((System.ComponentModel.ISupportInitialize)(this.rtFussIfs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tableSummen)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

4
ReportImp/PraxisPusteblume/IfsRechnungBezirk.Designer.cs generated
View File

@@ -526,9 +526,9 @@ namespace PraxisPusteblume
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(464.5831F, 29.50002F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(565.2776F, 29.50002F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Rechnung - Heilpädagogische Leistungen";
this.xrLabel5.Text = "Rechnung";
//
// bindingSource1
//

38
ReportImp/PraxisPusteblume/RechnungIndividualbegleitung.Designer.cs generated
View File

@@ -58,7 +58,7 @@ namespace PraxisPusteblume
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblBetreff = 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();
@@ -67,7 +67,6 @@ namespace PraxisPusteblume
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField();
@@ -85,6 +84,7 @@ namespace PraxisPusteblume
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter4 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.rtAnschriftIfs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtAnschriftNormal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtKopfNormal)).BeginInit();
@@ -93,8 +93,8 @@ namespace PraxisPusteblume
((System.ComponentModel.ISupportInitialize)(this.rtFussNormal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tableGesamtStunden)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -126,7 +126,7 @@ namespace PraxisPusteblume
// rtAnschriftIfs
//
this.rtAnschriftIfs.Font = new System.Drawing.Font("Verdana", 10F);
this.rtAnschriftIfs.LocationFloat = new DevExpress.Utils.PointFloat(190.0622F, 76.58335F);
this.rtAnschriftIfs.LocationFloat = new DevExpress.Utils.PointFloat(190.0588F, 75.04171F);
this.rtAnschriftIfs.Name = "rtAnschriftIfs";
this.rtAnschriftIfs.SerializableRtfString = resources.GetString("rtAnschriftIfs.SerializableRtfString");
this.rtAnschriftIfs.SizeF = new System.Drawing.SizeF(434.2296F, 32.29169F);
@@ -296,7 +296,7 @@ namespace PraxisPusteblume
this.lblMonatJahr,
this.lblNachweisFuer,
this.xrTable3,
this.xrLabel5});
this.lblBetreff});
this.Page1.HeightF = 190F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
@@ -364,15 +364,15 @@ namespace PraxisPusteblume
this.xrTableCell14.Text = "Anzahl Betreuungsstunden";
this.xrTableCell14.Weight = 0.30769224549594154D;
//
// xrLabel5
// lblBetreff
//
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(501.375F, 29.50002F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Rechnung Individualbegleitung";
this.lblBetreff.Font = new System.Drawing.Font("Segoe UI", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F);
this.lblBetreff.Name = "lblBetreff";
this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBetreff.SizeF = new System.Drawing.SizeF(501.375F, 29.50002F);
this.lblBetreff.StylePriority.UseFont = false;
this.lblBetreff.Text = "Rechnung Individualbegleitung";
//
// DetailReport
//
@@ -454,10 +454,6 @@ namespace PraxisPusteblume
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell15.Weight = 0.3076923076923076D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -613,6 +609,10 @@ namespace PraxisPusteblume
this.xrLabel8.SizeF = new System.Drawing.SizeF(660.9375F, 32.99998F);
this.xrLabel8.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// RechnungIndividualbegleitung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -648,8 +648,8 @@ namespace PraxisPusteblume
((System.ComponentModel.ISupportInitialize)(this.rtFussNormal)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tableGesamtStunden)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -664,7 +664,7 @@ namespace PraxisPusteblume
private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
private DevExpress.XtraReports.UI.XRLabel lblAdresse;
private DevExpress.XtraReports.UI.XRRichText rtKopfNormal;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblBetreff;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;

66
ReportImp/Wetterleuchten/Budgetnachweis.Designer.cs generated
View File

@@ -58,10 +58,6 @@ namespace Wetterleuchten
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -325,10 +321,6 @@ namespace Wetterleuchten
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.RecipientPostCodeAndTown,
this.xrLabel_RecipientStreet,
this.xrLabel_RecipientDivision,
this.xrLabel_RecipientContactPerson,
this.xrLabel14,
this.xrLabel13,
this.xrPictureBox1,
@@ -416,60 +408,18 @@ namespace Wetterleuchten
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// RecipientPostCodeAndTown
//
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 219.5833F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F);
this.RecipientPostCodeAndTown.StylePriority.UseFont = false;
this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]";
//
// xrLabel_RecipientStreet
//
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 202.5833F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientStreet.StylePriority.UseFont = false;
this.xrLabel_RecipientStreet.Text = "[RecipientStreet]";
//
// xrLabel_RecipientDivision
//
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.5833F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientDivision.StylePriority.UseFont = false;
this.xrLabel_RecipientDivision.Text = "[RecipientDivision]";
//
// xrLabel_RecipientContactPerson
//
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.5833F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false;
this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]";
//
// xrLabel14
//
this.xrLabel14.CanShrink = true;
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 151.5833F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 160F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel14.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(351.4559F, 98.33334F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "[RecipientOrganisation]";
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" +
"ünster";
//
// Budgetnachweis
//
@@ -522,10 +472,6 @@ namespace Wetterleuchten
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
}
}

2
Service/Invoicing/InvoiceCreation.cs
View File

@@ -96,7 +96,7 @@ namespace BeWo.Service.Invoicing
return null;
}
private ServiceInvoice CreateCollectiveBilling(CostBearer costBearer, DateTimeSpan invoicePeriod, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
public virtual ServiceInvoice CreateCollectiveBilling(CostBearer costBearer, DateTimeSpan invoicePeriod, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
var invoice = new ServiceInvoice();

5
Service/Plugins/PluginLoader.cs
View File

@@ -1,5 +1,4 @@
using System;
using System;
using System.Configuration;
using System.IO;
using System.Linq;
@@ -224,7 +223,7 @@ namespace BeWo.Service.Plugins
//t = "7817461089"; // FAB e.V. (Familienarbeit und Beratung e.V.)
//t = "5207911843"; // Pro Balance
//t = "8619663355"; // HSH Cologne
//t = "1652658918"; // LH Frankfurt Oder
t = "1652658918"; // LH Frankfurt Oder
//t = "7696927868"; // Kuhring Betreuung
//t = "6251348980"; // BeWo Gün
//t = "6782533512"; // LH Dorsten
@@ -279,7 +278,7 @@ namespace BeWo.Service.Plugins
//t = "8283849714"; // Forum e.V. (proviel GmbH)
//t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia)
//t = "2387527289"; // Lebenshilfe Duisburg HPFH
//t = "5595701056"; // Domiziel Ansbach
t = "5595701056"; // Domiziel Ansbach
//t = "9430188510"; // Pro INTEGRA
//t = "4820371076"; // Zuhause Wohnen Iris Thimm
//t = "1078667960"; // FAM Rhein-Sieg Gbr