AWOMuensterlandRecklinghausen/SbdRechnung - neu ab April 2024

This commit is contained in:
2024-04-17 15:21:28 +02:00
parent b0f6bd5800
commit af72bf65ab
2 changed files with 18 additions and 7 deletions

View File

@@ -113,10 +113,23 @@ namespace AWOMuensterlandRecklinghausen
{
XtraReport masterReport = new XtraReport();
masterReport.CreateDocument();
var seite1 = new ServiceInvoiceReport();
var ro = ServiceInvoiceRO.Create(iDC);
seite1.SetReportDataSource(ro);
seite1.CreateDocument();
if (iDC.InvoiceBase.InvoiceId != null && iDC.InvoiceBase.InvoiceId == "SBD") // bis März 2024
{
var seite1 = new ServiceInvoiceReportOld();
var ro = ServiceInvoiceRO.Create(iDC);
seite1.SetReportDataSource(ro);
seite1.CreateDocument();
masterReport.Pages.AddRange(seite1.Pages);
}
else
{
var seite1 = new ServiceInvoiceReport();
var ro = ServiceInvoiceRO.Create(iDC);
seite1.SetReportDataSource(ro);
seite1.CreateDocument();
masterReport.Pages.AddRange(seite1.Pages);
}
int month = iDC.InvoiceBase.AccountingPeriodStart.Value.Month;
int year = iDC.InvoiceBase.AccountingPeriodStart.Value.Year;
@@ -126,10 +139,8 @@ namespace AWOMuensterlandRecklinghausen
var qb = CreateServiceOverviewSingleCustomerReport(cOid, month, year, oOid, 0, null, 1, DateTime.DaysInMonth(year, month));
qb.CreateDocument();
masterReport.Pages.AddRange(seite1.Pages);
masterReport.Pages.AddRange(qb.Pages);
invoiceReport = masterReport;
}
else
{

View File

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
namespace AWOMuensterlandRecklinghausen
{
[IDSpecificClass(Identifier = "SBDOLD")]
[IDSpecificClass(Identifier = "SBD")]
public partial class ServiceInvoiceReportOld : XtraReport, IBeWoReport<ServiceInvoiceRO>
{
public ServiceInvoiceReportOld()