diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index 05c0d84b2..764e29722 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -12138,7 +12138,8 @@ Global {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|Mixed Platforms.Build.0 = Release|Any CPU {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|x86.ActiveCfg = Release|Any CPU - {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|x86.Build.0 = Release|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|.NET.ActiveCfg = Debug|Any CPU + {E0B2DAB1-3926-408F-95E5-3CDD54B3421C}.Release|x86.Build.0 = Release|Any CPU + {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|.NET.ActiveCfg = Debug|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|.NET.Build.0 = Debug|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -12161,7 +12162,7 @@ Global {E23C4943-8677-40DA-A45F-1322D1AD2443}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Release|Mixed Platforms.Build.0 = Release|Any CPU {E23C4943-8677-40DA-A45F-1322D1AD2443}.Release|x86.ActiveCfg = Release|Any CPU - {E23C4943-8677-40DA-A45F-1322D1AD2443}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection diff --git a/ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs b/ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs index 08cd17554..598e2c7c8 100644 --- a/ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs +++ b/ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs @@ -78,6 +78,8 @@ namespace BeWoImFlow this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -114,8 +116,9 @@ namespace BeWoImFlow this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -726,6 +729,9 @@ namespace BeWoImFlow // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblUnterschriftKlient, + this.xrPictureBox2, + this.xrLabel18, this.xrLabel17, this.xrPictureBox1, this.xrLabel9, @@ -743,10 +749,33 @@ namespace BeWoImFlow this.xrLabel11, this.xrLabel10, this.xrLabel1}); - this.GroupFooter1.HeightF = 270.5F; + this.GroupFooter1.HeightF = 274F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(415F, 214.5F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(120.1389F, 35.50002F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // + // xrPictureBox1 + // + this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 214.5F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // xrLabel9 // this.xrLabel9.BackColor = System.Drawing.Color.Gainsboro; @@ -1199,28 +1228,41 @@ namespace BeWoImFlow this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // xrLabel17 + // lblUnterschriftKlient // - this.xrLabel17.BackColor = System.Drawing.Color.Transparent; - this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(415F, 214.5F); - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(120.1389F, 35.50002F); - this.xrLabel17.StylePriority.UseBackColor = false; - this.xrLabel17.StylePriority.UseTextAlignment = false; - this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 250F); + this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; + this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(304.5972F, 20F); + this.lblUnterschriftKlient.StylePriority.UseBackColor = false; + this.lblUnterschriftKlient.StylePriority.UseBorders = false; + this.lblUnterschriftKlient.StylePriority.UseFont = false; + this.lblUnterschriftKlient.StylePriority.UsePadding = false; + this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; + this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; + this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // - // xrPictureBox1 + // xrPictureBox2 // - this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 214.5F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(200.236F, 214.5F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel18 + // + this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 214.5F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(105.2361F, 35.50002F); + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; // // Quittierungsbeleg // @@ -1342,5 +1384,8 @@ namespace BeWoImFlow private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; } } diff --git a/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs b/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs index ca77532a2..bfd157a34 100644 --- a/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs +++ b/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs @@ -522,7 +522,7 @@ namespace PerspektivenEV.Export String sql = @" select sip.Claim, - c.DebitorNumber, + CASE WHEN ib.RecipientOrganisation = 'EIGENANTEIL' THEN c2s.KontoHilfeplan ELSE c.DebitorNumber END AS DebitorNumber, ib.InvoiceDate, ib.invoicenumber, ib.Oid AS InvoiceOID, diff --git a/ReportImp/PerspektivenEV/PerspektivenEV.csproj b/ReportImp/PerspektivenEV/PerspektivenEV.csproj index 06e7927fe..da9eadd2a 100644 --- a/ReportImp/PerspektivenEV/PerspektivenEV.csproj +++ b/ReportImp/PerspektivenEV/PerspektivenEV.csproj @@ -221,7 +221,7 @@ Teamstundenkonto.cs - + diff --git a/ReportImp/PerspektivenEV/Translation/TranslationDictionary.cs b/ReportImp/PerspektivenEV/Translation/TranslationDictionary.cs new file mode 100644 index 000000000..741c16714 --- /dev/null +++ b/ReportImp/PerspektivenEV/Translation/TranslationDictionary.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; + +namespace PerspektivenEV.Translation +{ + public class CustomTranslationDictionary : TranslationDictionary + { + public override Dictionary GetTranslationDictionary() + { + var dict = base.GetTranslationDictionary(); + AddOrReplaceTranslation(dict, "Debitor Nr.", "Debitor Kostenträger"); + AddOrReplaceTranslation(dict, "KontoHilfeplan", "Debitor Klient"); + AddOrReplaceTranslation(dict, "Künd.-frist (Tage)", "Regenerationstage"); + return dict; + } + } +}