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

MH: Perspektiven Konflikt gelöst

Browse Source
This commit is contained in:
HirschleM
2026-05-05 15:42:31 +02:00
parent 5cedfb6f4e ffc53dc6ea
commit 0fc9cf9d6c
5 changed files with 99 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BeWoAllReports.sln
View File

@@ -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

89
ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs generated
View File

@@ -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;
}
}

2
ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs
View File

@@ -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,

2
ReportImp/PerspektivenEV/PerspektivenEV.csproj
View File

@@ -221,7 +221,7 @@
<Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="Translation\CustomTranslationDict.cs" />
<Compile Include="Translation\TranslationDictionary.cs" />
<Compile Include="Validation\DefaultSaveInterceptor.cs" />
</ItemGroup>
<ItemGroup>

27
ReportImp/PerspektivenEV/Translation/TranslationDictionary.cs Normal file
View File

@@ -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<String, String> 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;
}
}
}