This commit is contained in:
Christian
2021-12-21 00:41:23 +01:00
parent 8b38ccf49a
commit 79e2347b1a
18 changed files with 1894 additions and 26 deletions

View File

@@ -34,7 +34,7 @@ namespace BellaDonna
foreach (var idc in dcList)
{
IBeWoReport<ServiceInvoiceRO> singleReport = null;
if (idc.InvoiceBase.RecipientOrganisation == "Landschaftsverband Rheinland")
if (idc.InvoiceBase.RecipientOrganisation == "Landschaftsverband Rheinland" || idc.InvoiceBase.RecipientOrganisation.Contains("Amt für Soziales "))
{
singleReport = new Rechnung67();
@@ -59,7 +59,7 @@ namespace BellaDonna
{
var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(invoiceBaseOid.Value);
if (ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "Landschaftsverband Rheinland" || ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "Amt für Soziales und Wohnen Essen")
if (ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "Landschaftsverband Rheinland" || ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "Amt für Soziales ")
{
var report = new Rechnung67();
var si = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoiceBaseOid.Value);

View File

@@ -140,8 +140,8 @@ namespace BellaDonna
this.lblBetreff.SizeF = new System.Drawing.SizeF(650F, 49.86108F);
this.lblBetreff.StylePriority.UseBackColor = false;
this.lblBetreff.StylePriority.UseFont = false;
this.lblBetreff.Text = "##### für [CustomerSalutation] [CustomerName], geb. [CustomerBirthdate!dd.MM.yyyy" +
"]\r\nAktenzeichen: [CustomerReferenceNumber]";
this.lblBetreff.Text = "##### [CustomerSalutation] [CustomerName], geb. [CustomerBirthdate!dd.MM.yyyy]\r\nA" +
"ktenzeichen: [CustomerReferenceNumber]";
//
// xrLabel2
//

View File

@@ -35,7 +35,7 @@ namespace BellaDonna
}
lblAbrechnungszeitraum.Text = lblAbrechnungszeitraum.Text.Replace("#####", text);
lblBetreff.Text = lblBetreff.Text.Replace("#####", "Ambulant Betreutes Wohnen");
lblBetreff.Text = lblBetreff.Text.Replace("#####", "Flexible Erziehungshilfe");
this.bindingSource1.DataSource = pRO;
}