From 68aa9f660a535d323b8de3e9637fa4da22f1e835 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 23 Jun 2023 14:22:58 +0200 Subject: [PATCH] HPHBersenbrueck/RechnungSelbstzahler Debitor --- ReportImp/HPHBersenbrueck/Export/MicosExporter.cs | 5 +++-- ReportImp/HPHBersenbrueck/RechnungSelbstzahler.Designer.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ReportImp/HPHBersenbrueck/Export/MicosExporter.cs b/ReportImp/HPHBersenbrueck/Export/MicosExporter.cs index b78d92776..a70802343 100644 --- a/ReportImp/HPHBersenbrueck/Export/MicosExporter.cs +++ b/ReportImp/HPHBersenbrueck/Export/MicosExporter.cs @@ -140,7 +140,8 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber sb.Append(" "); // Skonto 9 Leerzeichen sb.Append(" "); // Textschlüssel 2 Leerzeichen - sb.Append(" "); // Zusatz-Schlüssel 1 Leerzeichen + + sb.Append(" "); // Zusatz-Schlüssel 1 Leerzeichen oder 2 für Storno String buchungstext = data.Buchungstext; // Verwendungszweck if (buchungstext.Length > 25) @@ -351,7 +352,7 @@ INNER JOIN invoicebase ib on ib.costbearer2supportconceptoid = cb2sc.oid inner join serviceinvoice si on si.invoicebaseoid = ib.oid inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid inner join invoiceitem ii on ii.serviceinvoiceperiodoid = sip.oid -WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and ib.isactive = 1 and ib.type <> 1 +WHERE c.`IsActive` = 1 AND ib.isactive = 1 and ib.type <> 1 and ib.`InvoiceDate` >= ':Monat_Start' AND ib.`InvoiceDate` < ':Monat_End' ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate` "; diff --git a/ReportImp/HPHBersenbrueck/RechnungSelbstzahler.Designer.cs b/ReportImp/HPHBersenbrueck/RechnungSelbstzahler.Designer.cs index 377f60621..452605973 100644 --- a/ReportImp/HPHBersenbrueck/RechnungSelbstzahler.Designer.cs +++ b/ReportImp/HPHBersenbrueck/RechnungSelbstzahler.Designer.cs @@ -522,7 +522,7 @@ namespace HPHBersenbrueck this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.StylePriority.UsePadding = false; this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "[OrganisationDebitorNumber]"; + this.xrTableCell9.Text = "[DebitorNumber]"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell9.Weight = 0.91905500302801868D; //