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

BellaDonna/Invoicing/ - neues LVR Format + nur noch SR2 mit Format

Browse Source
This commit is contained in:
Alexandra
2024-09-09 16:37:35 +02:00
parent 7229b67edf
commit 487ea125ed
7 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReportImp/BellaDonna/BellaDonna.csproj
View File

@@ -73,6 +73,7 @@
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\CustomInvoiceNumberGenerator.cs" />
<Compile Include="Invoicing\DefaultInvoiceCreation.cs" />
<Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>

18
ReportImp/BellaDonna/Invoicing/SettlementInvoiceCreation.cs Normal file
View File

@@ -0,0 +1,18 @@
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using System;
using System.Collections.Generic;
using System.Linq;
namespace BellaDonna
{
public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
{
public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s)
{
return false;
}
}
}

48
ReportImp/BellaDonna/Rechnung67.Designer.cs generated
View File

@@ -52,6 +52,8 @@ namespace BellaDonna
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblGp = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -66,7 +68,7 @@ namespace BellaDonna
//
// ReportHeader
//
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 0F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -86,7 +88,7 @@ namespace BellaDonna
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -101,6 +103,8 @@ namespace BellaDonna
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel5,
this.lblGp,
this.xrRichText1,
this.lblAdresse,
this.xrLabel3,
@@ -112,11 +116,11 @@ namespace BellaDonna
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(476.3336F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(230.6664F, 224.5833F);
this.xrRichText1.SizeF = new System.Drawing.SizeF(230.6664F, 154.1389F);
this.xrRichText1.StylePriority.UseFont = false;
//
// lblAdresse
@@ -147,7 +151,7 @@ namespace BellaDonna
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(476.3336F, 239.3611F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(472.8336F, 232.0694F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(169.1664F, 23F);
@@ -213,7 +217,8 @@ namespace BellaDonna
//
// xrLabel4
//
this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))), DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(380F, 20.00003F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -242,7 +247,8 @@ namespace BellaDonna
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -254,6 +260,25 @@ namespace BellaDonna
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// lblGp
//
this.lblGp.LocationFloat = new DevExpress.Utils.PointFloat(472.8336F, 209.0694F);
this.lblGp.Name = "lblGp";
this.lblGp.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGp.SizeF = new System.Drawing.SizeF(169.1664F, 23F);
this.lblGp.StylePriority.UseTextAlignment = false;
this.lblGp.Text = "GP: ";
this.lblGp.Visible = false;
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 259.3611F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(437.9164F, 23F);
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.Text = "Rechnungnr.: [InvoiceNumber]";
//
// Rechnung67
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -265,14 +290,15 @@ namespace BellaDonna
this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(80, 40, 200, 50);
this.Margins = new DevExpress.Drawing.DXMargins(80F, 40F, 200F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -303,5 +329,7 @@ namespace BellaDonna
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel lblGp;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
}
}

13
ReportImp/BellaDonna/Rechnung67.cs
View File

@@ -55,6 +55,19 @@ namespace BellaDonna
}
lblAbrechnungszeitraum.Text = lblAbrechnungszeitraum.Text.Replace("#####", text);
if (pRO.RecipientOrganisation.Contains("Landschaftsverband Rheinland"))
{
lblGp.Visible = true;
if (pRO.RecipientOrganisation.Contains("Dez 7"))
{
lblGp.Text = "GP-Nr. 2000089562";
}
else
{
lblGp.Text = "GP-Nr. 2000239439";
}
}
this.bindingSource1.DataSource = pRO;
}
}

3
ReportImp/BellaDonna/Rechnung67.resx
View File

File diff suppressed because one or more lines are too long

1
ReportImp/BellaDonna/SettlementReport.cs
View File

@@ -10,6 +10,7 @@ namespace BellaDonna
{
public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
{
// ab September 2024 nur noch SR2
public Spitzabrechnung()
{
InitializeComponent();

3
ReportImp/BellaDonna/SettlementReport2.Designer.cs generated
View File

@@ -320,7 +320,8 @@ namespace BellaDonna.Neu
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]";
this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName], geb. [CustomerB" +
"irthday!dd.MM.yyyy]";
this.xrLabel3.WordWrap = false;
//
// xrLabel2