diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index d71170f49..c5869eebb 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.199 + 2.0.1.200 true publish.htm false true - 200 + 201 2.0.1.%2a false true @@ -2479,392 +2479,392 @@ False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs index 8fac9f6ea..3be6a1608 100644 --- a/Report/ReportObjects/ServicesOverviewRO.cs +++ b/Report/ReportObjects/ServicesOverviewRO.cs @@ -1365,7 +1365,7 @@ namespace BeWo.Report.ReportObjects var mandatorSettings = lResult.Mandator?.Settings; - if(mandatorSettings.Contains("ShowEmployeeSignature=1")) + if (mandatorSettings != null && mandatorSettings.Contains("ShowEmployeeSignature=1")) { var serviceRecordOids = lResult.Services.Select(service => service.ServiceRecordOid).ToList(); diff --git a/ReportImp/ABCBetreuungenReports/SettlementReport.resx b/ReportImp/ABCBetreuungenReports/SettlementReport.resx index bad326731..b5bda3350 100644 --- a/ReportImp/ABCBetreuungenReports/SettlementReport.resx +++ b/ReportImp/ABCBetreuungenReports/SettlementReport.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + anbei sende ich Ihnen die Abrechnung über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: diff --git a/ReportImp/ABCBetreuungenReports/SettlementReport2.resx b/ReportImp/ABCBetreuungenReports/SettlementReport2.resx index a7618657a..29b1ed697 100644 --- a/ReportImp/ABCBetreuungenReports/SettlementReport2.resx +++ b/ReportImp/ABCBetreuungenReports/SettlementReport2.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + anbei sende ich Ihnen die Abrechnung über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: diff --git a/ReportImp/CaritasWuppertalSolingen/CaritasWuppertalSolingen.csproj b/ReportImp/CaritasWuppertalSolingen/CaritasWuppertalSolingen.csproj index 5b7fcf76b..23a67091f 100644 --- a/ReportImp/CaritasWuppertalSolingen/CaritasWuppertalSolingen.csproj +++ b/ReportImp/CaritasWuppertalSolingen/CaritasWuppertalSolingen.csproj @@ -64,6 +64,8 @@ + + Component diff --git a/ReportImp/CaritasWuppertalSolingen/Invoicing/CustomInvoiceFactory.cs b/ReportImp/CaritasWuppertalSolingen/Invoicing/CustomInvoiceFactory.cs new file mode 100644 index 000000000..13ef87621 --- /dev/null +++ b/ReportImp/CaritasWuppertalSolingen/Invoicing/CustomInvoiceFactory.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; + +namespace CaritasWuppertalSolingen.Invoicing +{ + public class CustomInvoiceFactory : InvoiceFactory + { + + public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) + { + + return new DefaultInvoiceCreation(); + + } + + } +} diff --git a/ReportImp/CaritasWuppertalSolingen/Invoicing/DefaultInvoiceCreation.cs b/ReportImp/CaritasWuppertalSolingen/Invoicing/DefaultInvoiceCreation.cs new file mode 100644 index 000000000..c7c553b68 --- /dev/null +++ b/ReportImp/CaritasWuppertalSolingen/Invoicing/DefaultInvoiceCreation.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; +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 CaritasWuppertalSolingen.Invoicing +{ + public class DefaultInvoiceCreation : InvoiceCreation + { + public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, + BS.Shared.Services.Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount) + { + return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, summaryPerMonth, true); + } + } +} diff --git a/ReportImp/IntegraHeinsbergReports/InvoiceCustomerReport.Designer.cs b/ReportImp/IntegraHeinsbergReports/InvoiceCustomerReport.Designer.cs index 3cb36aec6..8b50a4d40 100644 --- a/ReportImp/IntegraHeinsbergReports/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/IntegraHeinsbergReports/InvoiceCustomerReport.Designer.cs @@ -60,7 +60,6 @@ namespace BeWo.IntegraHeinsbergReports this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -76,6 +75,7 @@ namespace BeWo.IntegraHeinsbergReports this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); @@ -84,6 +84,7 @@ namespace BeWo.IntegraHeinsbergReports ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -436,25 +437,13 @@ namespace BeWo.IntegraHeinsbergReports // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, + this.xrRichText4, this.xrTable4}); this.ReportFooter.Font = new System.Drawing.Font("Calibri", 12F); this.ReportFooter.HeightF = 235.25F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; - // - // xrLabel10 - // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(68.75018F, 55.54182F); - 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(676.4174F, 179.7082F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Bitte zahlen Sie den Gesamtbetrag unter Angabe der o.g. Debitoren- und Rechnungsn" + - "ummer binnen 14 Tagen auf unten aufgeführtes Konto.\r\n\r\n\r\nMit freundlichem Gruß\r\n" + - "\r\ngez. Rebecca Kunz"; // // xrTable4 // @@ -577,7 +566,8 @@ namespace BeWo.IntegraHeinsbergReports this.xrTableCell24.StylePriority.UseFont = false; this.xrTableCell24.StylePriority.UseForeColor = false; this.xrTableCell24.StylePriority.UsePadding = false; - this.xrTableCell24.Text = "Kreissparkasse Heinsberg\r\nBIC: WELADED1ERK\r\nIBAN: DE93 3125 1220 1401 9077 93"; + this.xrTableCell24.Text = "Stadtsparkasse Düsseldorf\r\nBIC: DUSSDEDDXXX\r\nIBAN: DE29 3005 0110 1008 4779 43" + + ""; this.xrTableCell24.Weight = 1.0003293648442897D; // // DetailReport @@ -602,6 +592,13 @@ namespace BeWo.IntegraHeinsbergReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); // + // xrRichText4 + // + this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(68.75006F, 51.65269F); + this.xrRichText4.Name = "xrRichText4"; + this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString"); + this.xrRichText4.SizeF = new System.Drawing.SizeF(681.811F, 173.5973F); + // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -628,6 +625,7 @@ namespace BeWo.IntegraHeinsbergReports ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -641,7 +639,6 @@ namespace BeWo.IntegraHeinsbergReports private DevExpress.XtraReports.UI.XRLabel lblCustomerName; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; @@ -679,5 +676,6 @@ namespace BeWo.IntegraHeinsbergReports private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRRichText xrRichText3; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRRichText xrRichText4; } } diff --git a/ReportImp/IntegraHeinsbergReports/InvoiceCustomerReport.resx b/ReportImp/IntegraHeinsbergReports/InvoiceCustomerReport.resx index b841c82b3..4b40a78cc 100644 --- a/ReportImp/IntegraHeinsbergReports/InvoiceCustomerReport.resx +++ b/ReportImp/IntegraHeinsbergReports/InvoiceCustomerReport.resx @@ -126,6 +126,9 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADEAMgA3AFwAZwByAGUAZQBuADEAMgA3AFwAYgBsAHUAZQAxADIANwAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADQAMgA1ADMAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMQA2AFwAYwBmADMAIABJAG4AdABlAGcAcgBhACAAZQAuAFYALgAgAFwAdQAxADgAMwBcACcAYgA3ACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAxADYAXABjAGYAMwAgAFUAbgB0AGUAcgBiAHIAdQBjAGgAZQByAHMAdAByAC4AIAAzADEAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAxADYAXABjAGYAMwAgACAAXAB1ADEAOAAzAFwAJwBiADcAIAA1ADIANQAyADUAIABIAGUAaQBuAHMAYgBlAHIAZwB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADIANQA1AFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA0ADIANQAzAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxACAAQgBpAHQAdABlACAAegBhAGgAbABlAG4AIABTAGkAZQAgAGQAZQBuACAARwBlAHMAYQBtAHQAYgBlAHQAcgBhAGcAIAB1AG4AdABlAHIAIABBAG4AZwBhAGIAZQAgAGQAZQByACAAbwAuAGcALgAgAEQAZQBiAGkAdABvAHIAZQBuAC0AIAB1AG4AZAAgAFIAZQBjAGgAbgB1AG4AZwBzAG4AdQBtAG0AZQByAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADQAMgA1ADMAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAIABiAGkAbgBuAGUAbgAgADEANAAgAFQAYQBnAGUAbgAgAGEAdQBmACAAdQBuAHQAZQBuACAAYQB1AGYAZwBlAGYAXAB1ADIANQAyAFwAJwBmAGMAaAByAHQAZQBzACAASwBvAG4AdABvAC4AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANAAyADUAMwBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANAAyADUAMwB7AFwAKgBcAGIAawBtAGsAcwB0AGEAcgB0ACAAXwBkAHgAXwBmAHIAYQBnAF8AUwB0AGEAcgB0AEYAcgBhAGcAbQBlAG4AdAB9AHsAXAAqAFwAYgBrAG0AawBlAG4AZAAgAF8AZAB4AF8AZgByAGEAZwBfAFMAdABhAHIAdABGAHIAYQBnAG0AZQBuAHQAfQB7AFwAYgBcAGYAcwAyADQAXABjAGYAMwAgAEEAYwBoAHQAdQBuAGcAIABCAGEAbgBrAHYAZQByAGIAaQBuAGQAdQBuAGcAIABoAGEAdAAgAHMAaQBjAGgAIABnAGUAXAB1ADIAMgA4AFwAJwBlADQAbgBkAGUAcgB0ACEAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgBzADIANABcAGMAZgAzAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADQAMgA1ADMAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADQAMgA1ADMAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAIABNAGkAdAAgAGYAcgBlAHUAbgBkAGwAaQBjAGgAZQBtACAARwByAHUAXAB1ADIAMgAzAFwAJwBkAGYAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANAAyADUAMwBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANAAyADUAMwB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADQAXABjAGYAMQAgAGcAZQB6AC4AIABSAGUAYgBlAGMAYwBhACAASwB1AG4AegB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A + diff --git a/ReportImp/IntegraHeinsbergReports/ServiceInvoiceReport.designer.cs b/ReportImp/IntegraHeinsbergReports/ServiceInvoiceReport.designer.cs index 8c4c75999..6bc4a38c7 100644 --- a/ReportImp/IntegraHeinsbergReports/ServiceInvoiceReport.designer.cs +++ b/ReportImp/IntegraHeinsbergReports/ServiceInvoiceReport.designer.cs @@ -60,7 +60,6 @@ namespace BeWo.IntegraHeinsbergReports this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -76,6 +75,7 @@ namespace BeWo.IntegraHeinsbergReports this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); @@ -84,6 +84,7 @@ namespace BeWo.IntegraHeinsbergReports ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -436,25 +437,13 @@ namespace BeWo.IntegraHeinsbergReports // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, + this.xrRichText4, this.xrTable4}); this.ReportFooter.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ReportFooter.HeightF = 228.9999F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; - // - // xrLabel10 - // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(68.75F, 55.54174F); - 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(676.4174F, 173.4581F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Bitte zahlen Sie den Gesamtbetrag unter Angabe der o.g. Debitoren- und Rechnungsn" + - "ummer binnen 14 Tagen auf unten aufgeführtes Konto.\r\n\r\n\r\nMit freundlichem Gruß\r\n" + - "\r\ngez. Rebecca Kunz"; // // xrTable4 // @@ -579,7 +568,8 @@ namespace BeWo.IntegraHeinsbergReports this.xrTableCell24.StylePriority.UseFont = false; this.xrTableCell24.StylePriority.UseForeColor = false; this.xrTableCell24.StylePriority.UsePadding = false; - this.xrTableCell24.Text = "Kreissparkasse Heinsberg\r\nBIC: WELADED1ERK\r\nIBAN: DE93 3125 1220 1401 9077 93"; + this.xrTableCell24.Text = "Stadtsparkasse Düsseldorf\r\nBIC: DUSSDEDDXXX\r\nIBAN: DE29 3005 0110 1008 4779 43" + + ""; this.xrTableCell24.Weight = 1.0003293648442897D; // // DetailReport @@ -604,6 +594,13 @@ namespace BeWo.IntegraHeinsbergReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrRichText4 + // + this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(68.75F, 47.90107F); + this.xrRichText4.Name = "xrRichText4"; + this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString"); + this.xrRichText4.SizeF = new System.Drawing.SizeF(681.811F, 173.5973F); + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -630,6 +627,7 @@ namespace BeWo.IntegraHeinsbergReports ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -643,7 +641,6 @@ namespace BeWo.IntegraHeinsbergReports private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; @@ -681,5 +678,6 @@ namespace BeWo.IntegraHeinsbergReports private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRRichText xrRichText3; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRRichText xrRichText4; } } diff --git a/ReportImp/IntegraHeinsbergReports/ServiceInvoiceReport.resx b/ReportImp/IntegraHeinsbergReports/ServiceInvoiceReport.resx index a3a971495..2c12e063f 100644 --- a/ReportImp/IntegraHeinsbergReports/ServiceInvoiceReport.resx +++ b/ReportImp/IntegraHeinsbergReports/ServiceInvoiceReport.resx @@ -126,6 +126,9 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADEAMgA3AFwAZwByAGUAZQBuADEAMgA3AFwAYgBsAHUAZQAxADIANwAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADQAMgA1ADMAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMQA2AFwAYwBmADMAIABJAG4AdABlAGcAcgBhACAAZQAuAFYALgAgAFwAdQAxADgAMwBcACcAYgA3ACAAVQBuAHQAZQByAGIAcgB1AGMAaABlAHIAcwB0AHIALgAgADMAMQAgAFwAdQAxADgAMwBcACcAYgA3ACAANQAyADUAMgA1ACAASABlAGkAbgBzAGIAZQByAGcAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADIANQA1AFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA0ADIANQAzAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxACAAQgBpAHQAdABlACAAegBhAGgAbABlAG4AIABTAGkAZQAgAGQAZQBuACAARwBlAHMAYQBtAHQAYgBlAHQAcgBhAGcAIAB1AG4AdABlAHIAIABBAG4AZwBhAGIAZQAgAGQAZQByACAAbwAuAGcALgAgAEQAZQBiAGkAdABvAHIAZQBuAC0AIAB1AG4AZAAgAFIAZQBjAGgAbgB1AG4AZwBzAG4AdQBtAG0AZQByAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADQAMgA1ADMAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAIABiAGkAbgBuAGUAbgAgADEANAAgAFQAYQBnAGUAbgAgAGEAdQBmACAAdQBuAHQAZQBuACAAYQB1AGYAZwBlAGYAXAB1ADIANQAyAFwAJwBmAGMAaAByAHQAZQBzACAASwBvAG4AdABvAC4AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANAAyADUAMwBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANAAyADUAMwB7AFwAKgBcAGIAawBtAGsAcwB0AGEAcgB0ACAAXwBkAHgAXwBmAHIAYQBnAF8AUwB0AGEAcgB0AEYAcgBhAGcAbQBlAG4AdAB9AHsAXAAqAFwAYgBrAG0AawBlAG4AZAAgAF8AZAB4AF8AZgByAGEAZwBfAFMAdABhAHIAdABGAHIAYQBnAG0AZQBuAHQAfQB7AFwAYgBcAGYAcwAyADQAXABjAGYAMwAgAEEAYwBoAHQAdQBuAGcAIABCAGEAbgBrAHYAZQByAGIAaQBuAGQAdQBuAGcAIABoAGEAdAAgAHMAaQBjAGgAIABnAGUAXAB1ADIAMgA4AFwAJwBlADQAbgBkAGUAcgB0ACEAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgBzADIANABcAGMAZgAzAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADQAMgA1ADMAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADQAMgA1ADMAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAIABNAGkAdAAgAGYAcgBlAHUAbgBkAGwAaQBjAGgAZQBtACAARwByAHUAXAB1ADIAMgAzAFwAJwBkAGYAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANAAyADUAMwBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANAAyADUAMwB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADQAXABjAGYAMQAgAGcAZQB6AC4AIABSAGUAYgBlAGMAYwBhACAASwB1AG4AegB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A + diff --git a/ReportImp/IntegraHeinsbergReports/SettlementReport.Designer.cs b/ReportImp/IntegraHeinsbergReports/SettlementReport.Designer.cs index 74224d9a0..c344533c2 100644 --- a/ReportImp/IntegraHeinsbergReports/SettlementReport.Designer.cs +++ b/ReportImp/IntegraHeinsbergReports/SettlementReport.Designer.cs @@ -679,7 +679,8 @@ namespace BeWo.IntegraHeinsbergReports.Alt this.xrTableCell24.StylePriority.UseFont = false; this.xrTableCell24.StylePriority.UseForeColor = false; this.xrTableCell24.StylePriority.UsePadding = false; - this.xrTableCell24.Text = "Kreissparkasse Heinsberg\r\nBIC: WELADED1ERK\r\nIBAN: DE93 3125 1220 1401 9077 93"; + this.xrTableCell24.Text = "Stadtsparkasse Düsseldorf\r\nBIC: DUSSDEDDXXX\r\nIBAN: DE29 3005 0110 1008 4779 43" + + ""; this.xrTableCell24.Weight = 1.0003293648442897D; // // bindingSource1 diff --git a/ReportImp/IntegraHeinsbergReports/SettlementReport2.designer.cs b/ReportImp/IntegraHeinsbergReports/SettlementReport2.designer.cs index 23f2c21cb..3b4973e0b 100644 --- a/ReportImp/IntegraHeinsbergReports/SettlementReport2.designer.cs +++ b/ReportImp/IntegraHeinsbergReports/SettlementReport2.designer.cs @@ -528,7 +528,7 @@ namespace BeWo.IntegraHeinsbergReports // xrTableCell21 // this.xrTableCell21.CanShrink = true; - this.xrTableCell21.Font = new System.Drawing.Font("Arial", 8F); + this.xrTableCell21.Font = new System.Drawing.Font("Calibri", 8F); this.xrTableCell21.Multiline = true; this.xrTableCell21.Name = "xrTableCell21"; this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -540,7 +540,7 @@ namespace BeWo.IntegraHeinsbergReports // xrTableCell22 // this.xrTableCell22.CanShrink = true; - this.xrTableCell22.Font = new System.Drawing.Font("Arial", 8F); + this.xrTableCell22.Font = new System.Drawing.Font("Calibri", 8F); this.xrTableCell22.ForeColor = System.Drawing.Color.DimGray; this.xrTableCell22.Multiline = true; this.xrTableCell22.Name = "xrTableCell22"; @@ -555,13 +555,14 @@ namespace BeWo.IntegraHeinsbergReports // // xrTableCell24 // - this.xrTableCell24.Font = new System.Drawing.Font("Arial", 8F); + this.xrTableCell24.Font = new System.Drawing.Font("Calibri", 8F); this.xrTableCell24.Multiline = true; this.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell24.StylePriority.UseFont = false; this.xrTableCell24.StylePriority.UsePadding = false; - this.xrTableCell24.Text = "Kreissparkasse Heinsberg\r\nBIC: WELADED1ERK\r\nIBAN: DE93 3125 1220 1401 9077 93"; + this.xrTableCell24.Text = "Stadtsparkasse Düsseldorf\r\nBIC: DUSSDEDDXXX\r\nIBAN: DE29 3005 0110 1008 4779 43" + + ""; this.xrTableCell24.Weight = 1.0003293648442897D; // // ReportFooter diff --git a/ReportImp/KommAmbulanteDienste/Quittierungsbeleg.Designer.cs b/ReportImp/KommAmbulanteDienste/Quittierungsbeleg.Designer.cs index 19a7292e7..e2e68c643 100644 --- a/ReportImp/KommAmbulanteDienste/Quittierungsbeleg.Designer.cs +++ b/ReportImp/KommAmbulanteDienste/Quittierungsbeleg.Designer.cs @@ -114,6 +114,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -532,6 +533,7 @@ namespace BeWo.Report.DefaultReports // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox1, this.xrLabel14, this.xrLabel16, this.xrLabel7, @@ -541,7 +543,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel4, this.xrLabel3, this.xrLabel2}); - this.ReportHeader.HeightF = 130F; + this.ReportHeader.HeightF = 170F; this.ReportHeader.Name = "ReportHeader"; // // xrLabel14 @@ -550,7 +552,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 47.1111F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 89.5F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F); @@ -568,7 +570,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")}); this.xrLabel16.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 47.1111F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 89.5F); this.xrLabel16.Name = "xrLabel16"; this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel16.SizeF = new System.Drawing.SizeF(100.2502F, 30.50001F); @@ -586,7 +588,7 @@ namespace BeWo.Report.DefaultReports | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 77.6111F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 120F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F); @@ -603,7 +605,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 77.6111F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 120F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(158.3612F, 30.50001F); @@ -620,7 +622,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(170F, 77.6111F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(170F, 120F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F); @@ -636,7 +638,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(170F, 47.11109F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(170F, 89.5F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(158.3612F, 30.50001F); @@ -655,7 +657,7 @@ namespace BeWo.Report.DefaultReports | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(49.36111F, 77.6111F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(49.36111F, 120F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel4.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F); @@ -673,7 +675,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 47.11109F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 89.5F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F); @@ -688,15 +690,15 @@ namespace BeWo.Report.DefaultReports // xrLabel2 // this.xrLabel2.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 9.999996F); 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(674.9998F, 25F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(465.6389F, 25F); this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.StylePriority.UseTextAlignment = false; this.xrLabel2.Text = "Leistungsnachweis [Mandator.Name]"; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // formattingRuleServiceDesc // @@ -721,7 +723,7 @@ namespace BeWo.Report.DefaultReports // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; + this.topMarginBand1.HeightF = 80F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -1163,6 +1165,14 @@ namespace BeWo.Report.DefaultReports this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(555.5F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(167F, 89.5F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1181,7 +1191,7 @@ namespace BeWo.Report.DefaultReports this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(50, 30, 100, 30); + this.Margins = new System.Drawing.Printing.Margins(50, 30, 80, 30); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -1281,5 +1291,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; } } diff --git a/ReportImp/KommAmbulanteDienste/Quittierungsbeleg.resx b/ReportImp/KommAmbulanteDienste/Quittierungsbeleg.resx index 9f46badba..318f3dc86 100644 --- a/ReportImp/KommAmbulanteDienste/Quittierungsbeleg.resx +++ b/ReportImp/KommAmbulanteDienste/Quittierungsbeleg.resx @@ -120,6 +120,90 @@ 21, 17 + + + + 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 + hAGRJyFgaenvdDwzg6VEljsAAAAASUVORK5CYII= + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABLAHIAYQBuAGsAZQBuAGgAYQB1AHMAYQB1AGYAZQBuAHQAaABhAGwAdABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYgBlAGsAYQBuAG4AdAAgAG8AZABlAHIAIAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwByAGUAbABlAHYAYQBuAHQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A diff --git a/ReportImp/KommAmbulanteDienste/logo.jpg b/ReportImp/KommAmbulanteDienste/logo.jpg new file mode 100644 index 000000000..fd99d8a52 Binary files /dev/null and b/ReportImp/KommAmbulanteDienste/logo.jpg differ diff --git a/ReportImp/KommAmbulanteDienste/logo.png b/ReportImp/KommAmbulanteDienste/logo.png new file mode 100644 index 000000000..d9ec93fd3 Binary files /dev/null and b/ReportImp/KommAmbulanteDienste/logo.png differ diff --git a/ReportImp/WegweiserBetreuungsdienstReports/Leistungsnachweis.Designer.cs b/ReportImp/WegweiserBetreuungsdienstReports/Leistungsnachweis.Designer.cs index 46887a390..22d2c14b3 100644 --- a/ReportImp/WegweiserBetreuungsdienstReports/Leistungsnachweis.Designer.cs +++ b/ReportImp/WegweiserBetreuungsdienstReports/Leistungsnachweis.Designer.cs @@ -569,6 +569,7 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.lblArtDerHilfe.StylePriority.UseBorders = false; this.lblArtDerHilfe.StylePriority.UseFont = false; this.lblArtDerHilfe.StylePriority.UseTextAlignment = false; + this.lblArtDerHilfe.Text = "SPFH"; this.lblArtDerHilfe.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel4 diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index c95d8008a..ece47c552 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -94,7 +94,7 @@ namespace BeWo.Service.Plugins //t = "9290510010"; // BeWo Schilling //t = "5251218094"; // KOMO e.V. //t = "3529871747"; // Vivat gemeinnützige GmbH - //t = "8561513464"; // Caritasverband Wuppertal/Solingen + t = "8561513464"; // Caritasverband Wuppertal/Solingen //t = "2727001973"; // SD Julia Schönberg //t = "5653806613"; // Feid und Kollegen //t = "3830114427"; // FiZ Familie im Zentrum Hof @@ -105,7 +105,6 @@ namespace BeWo.Service.Plugins //t = "3350425974"; // BeWo Rückenwind //t = "9447917179"; // LH Rodenkirchen //t = "4690407894"; // Bleib im Leben - //t = "2576513996"; // TRIAS //t = "2509786400"; // LH Stade //t = "8677523325"; // BeWo Richartz //t = "1765854593"; // Mein Betreutes Wohnen @@ -245,7 +244,7 @@ namespace BeWo.Service.Plugins //t = "2697528233"; // Diakonisches Werk Wesel //t = "2547623489"; // Sprungbrett //t = "5076807716"; // Psychosoziale Hilfen Bochum e.V. - t = "1601313225"; // Bella Donna + //t = "1601313225"; // Bella Donna //t = "5098825926"; // SAB GmbH //t = "7808149226"; // BeWo Flex //t = "7419804320"; // Gender Bewo diff --git a/Service/Security/Method2Rights.cs b/Service/Security/Method2Rights.cs new file mode 100644 index 000000000..259bb11b8 --- /dev/null +++ b/Service/Security/Method2Rights.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.IO; +using System.Linq; +using System.Net; +using System.Security.Cryptography; +using System.Text; +using System.Text.RegularExpressions; +using System.Web; +using System.Windows; +using BeWo.Data; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BS.Shared; +using BS.Shared.DataContracts; + +namespace BeWo.Service.Security +{ + public class Method2Rights + { + + public static Dictionary> GetAuthorizedMethodDictionary() + { + var dict = new Dictionary>(); + + dict.Add("DeleteUserGroups", new UserRightType[] { UserRightType.UserGroupView_Delete }); + dict.Add("DeactivateUserGroup", new UserRightType[] { UserRightType.UserGroupView_Delete }); + dict.Add("UpdateUserGroup", new UserRightType[] { UserRightType.UserGroupView_Edit }); + dict.Add("InsertNewUserGroup", new UserRightType[] { UserRightType.UserGroupView_Create }); + + dict.Add("InsertNewUser", new UserRightType[] { UserRightType.UserView_Create }); + dict.Add("DeactivateUser", new UserRightType[] { UserRightType.UserView_Delete }); + dict.Add("DeactivateUsers", new UserRightType[] { UserRightType.UserView_Delete }); + dict.Add("DeleteUsers", new UserRightType[] { UserRightType.UserView_Delete }); + dict.Add("DeleteUser", new UserRightType[] { UserRightType.UserView_Delete }); + dict.Add("UpdateUser", new UserRightType[] { UserRightType.UserView_Edit }); + + + + return dict; + } + + } +} + diff --git a/Service/Security/SecurityContextInitializer.cs b/Service/Security/SecurityContextInitializer.cs index f6fd67081..6499d75d5 100644 --- a/Service/Security/SecurityContextInitializer.cs +++ b/Service/Security/SecurityContextInitializer.cs @@ -106,27 +106,37 @@ namespace BeWo.Service.Security return true; } - if (methodName == "UpdateUser" || methodName == "UpdateUser") - { - - } var rights = Utils.GetGrantedRights(lUser); - var dict = Right2Methods.GetAuthorizedMethodDictionary(); + var dict = Method2Rights.GetAuthorizedMethodDictionary(); - foreach (var right in rights) + if (dict.ContainsKey(methodName)) { + var benoetigteRechte = dict[methodName]; - if (dict.ContainsKey(right)) + foreach (var right in benoetigteRechte) { - var names = dict[right]; - if (names.Contains(methodName)) + if (!rights.Contains(right)) { - return true; + return false; } - - return true; } } + //var dict = Right2Methods.GetAuthorizedMethodDictionary(); + + //foreach (var right in rights) + //{ + + // if (dict.ContainsKey(right)) + // { + // var names = dict[right]; + // if (names.Contains(methodName)) + // { + // return true; + // } + + // return true; + // } + //} return true; } diff --git a/Service/Service.csproj b/Service/Service.csproj index 0965a9fe0..8c15d4d52 100644 --- a/Service/Service.csproj +++ b/Service/Service.csproj @@ -379,6 +379,7 @@ + diff --git a/Service/XAMLInformation/InfoViaXAMLManager.cs b/Service/XAMLInformation/InfoViaXAMLManager.cs index 4c805d353..8ddcd53ae 100644 --- a/Service/XAMLInformation/InfoViaXAMLManager.cs +++ b/Service/XAMLInformation/InfoViaXAMLManager.cs @@ -14,7 +14,8 @@ namespace BeWo.Service.XAMLInformation { var employee = DAOFactory.GenericDAO.GetByID(empOid); string xamlstring = ""; - + xamlstring = ""; + return xamlstring; #region Variablen setzen //Geburtstag var birthdayTimeAndDate = employee.Person.DateOfBirth.ToString().Split(' '); @@ -137,7 +138,8 @@ namespace BeWo.Service.XAMLInformation { var customer = DAOFactory.GenericDAO.GetByID(customerOid); string xamlstring = ""; - + xamlstring = ""; + return xamlstring; #region Variablen setzen string ort = "";