MH: DiakonischesWerkMuelheimTwg Pflegerechnung verbessert
This commit is contained in:
@@ -19,7 +19,7 @@ namespace DiakonischesWerkMuelheimTwg.Invoicing
|
||||
public override void SetInvoiceId(ServiceInvoice invoice)
|
||||
{
|
||||
invoice.InvoiceBase.InvoiceId = "Pflege";
|
||||
invoice.InvoiceBase.InvoiceTypeText = "Plegerechnung";
|
||||
invoice.InvoiceBase.InvoiceTypeText = "Pflegerechnung";
|
||||
}
|
||||
|
||||
// Barbeträge in extra Rechnung abrechnen
|
||||
|
||||
@@ -296,8 +296,8 @@ namespace DiakonischesWerkMuelheimTwg
|
||||
this.lblAbrechnungTitel.SizeF = new System.Drawing.SizeF(650F, 21.20831F);
|
||||
this.lblAbrechnungTitel.StylePriority.UseBackColor = false;
|
||||
this.lblAbrechnungTitel.StylePriority.UseFont = false;
|
||||
this.lblAbrechnungTitel.Text = "[BusinessPartnerId] / Rechnung: [InvoiceNumber] - Pflegesatz [InvoiceDateTime!MMM" +
|
||||
"M yyyy]";
|
||||
this.lblAbrechnungTitel.Text = "[BusinessPartnerId] / Rechnung: [InvoiceNumber] - Pflegesatz \"abrechnungszeitraum" +
|
||||
"\"";
|
||||
this.lblAbrechnungTitel.WordWrap = false;
|
||||
//
|
||||
// xrLabel7
|
||||
|
||||
@@ -19,17 +19,16 @@ namespace DiakonischesWerkMuelheimTwg
|
||||
{
|
||||
DateTime start = pRO.AccountingPeriodStart;
|
||||
DateTime end = pRO.AccountingPeriodEnd;
|
||||
|
||||
lblBewilligungszeitraum.Text = "";
|
||||
if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0)
|
||||
if (start.Month == end.Month && start.Year == end.Year)
|
||||
{
|
||||
lblBewilligungszeitraum.Text = pRO.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.StartDate.HasValue ?
|
||||
string.Format("von {0:dd.MM.yyyy}", pRO.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.StartDate.Value ): "";
|
||||
lblBewilligungszeitraum.Text += pRO.ServiceInvoicePeriods[pRO.ServiceInvoicePeriods.Count - 1].SupportConceptApprovalPeriod.EndDate.HasValue ?
|
||||
string.Format(" bis {0:dd.MM.yyyy}", pRO.ServiceInvoicePeriods[pRO.ServiceInvoicePeriods.Count - 1].SupportConceptApprovalPeriod.EndDate.Value) : "";
|
||||
lblAbrechnungTitel.Text = lblAbrechnungTitel.Text.Replace("\"abrechnungszeitraum\"", string.Format("{0:MMMM yyyy}", start));
|
||||
}
|
||||
else
|
||||
{
|
||||
lblAbrechnungTitel.Text = lblAbrechnungTitel.Text.Replace("\"abrechnungszeitraum\"", string.Format("{0:MMMM yyyy} bis {1:MMMM yyyy}", start, end));
|
||||
}
|
||||
|
||||
SetzeAdresse(pRO);
|
||||
SetzeAdresse(pRO);
|
||||
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user