diff --git a/ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj b/ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj index aa3512c9f..7e05d5c8d 100644 --- a/ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj +++ b/ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj @@ -55,6 +55,7 @@ InvoiceCustomerReport.cs + diff --git a/ReportImp/AutismusKoelnBonn/BasisRechnung.cs b/ReportImp/AutismusKoelnBonn/BasisRechnung.cs index 7a90ac760..273a399f1 100644 --- a/ReportImp/AutismusKoelnBonn/BasisRechnung.cs +++ b/ReportImp/AutismusKoelnBonn/BasisRechnung.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Text; using BeWo.Data.Access; using BeWo.Data.Entities; @@ -122,7 +123,7 @@ namespace AutismusKoelnBonn } //Anpassungen um die Selbstzahler Rechnung mit abzubilden - if (pRO.RecipientOrganisation.ToLower() == "selbstzahler") + if (pRO.RecipientOrganisation.ToLower() == "selbstzahler") { lbl1.Visible = false; lbl2.Visible = false; diff --git a/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.resx b/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.resx index 5ad90c49a..c109f0464 100644 --- a/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.resx +++ b/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.resx @@ -121,7 +121,7 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAyAFwAYwBmADEAIABCAGUAdAByAGUAdQB1AG4AZwAsACAAQgBlAGcAbABlAGkAdAB1AG4AZwAgAHUAbgBkACAAQgBlAHIAYQB0AHUAbgBnAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBhADEAMgAwAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMgBcAGMAZgAxACAAdgBvAG4AIABNAGUAbgBzAGMAaABlAG4AIABtAGkAdAAgAEEAdQB0AGkAcwBtAHUAcwB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAYQAxADIAMAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADIAXABjAGYAMQAgAEIAZQBXAG8AIABLAFwAdQAyADQANgBcACcAZgA2AGwAbgB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADIAXABjAGYAMQAgAE4AaQBlAGgAbABlAHIAIABLAGkAcgBjAGgAdwBlAGcAIAA0ADEAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA1ADgAXABzAGwAbQB1AGwAdAAxAFwAcwBhADEANgAwAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMgBcAGMAZgAxACAANQAwADcAMwAzACAASwBcAHUAMgA0ADYAXAAnAGYANgBsAG4AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== - ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIABUAGUAbAAuADoAIAAwADIAMgAxACAALwAgADcANwA4ACAAOQA5ADkAOQAgAC0AIAAxADAAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGEAMQA2ADAAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIABGAGEAeAAuADoAIAAwADIAMgAxACAALwAgADcANwA4ACAAOQA5ADkAOQAgAC0AIAA1ADAAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIAB3AHcAdwAuAG0AbwB2AGUAQQBVAFQALQBrAG8AZQBsAG4ALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAyAFwAYwBmADEAIABsAC4AbQBlAGMAawBpAG4AZwBAAG0AbwB2AGUAYQB1AHQALQBrAG8AZQBsAG4ALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIABUAGUAbAAuADoAIAAwADIAMgAxACAALwAgADcANwA4ACAAOQA5ADkAOQAgAC0AIAAxADAAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGEAMQA2ADAAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIABGAGEAeAAuADoAIAAwADIAMgAxACAALwAgADcANwA4ACAAOQA5ADkAOQAgAC0AIAA1ADAAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAaQBlAGwAZAB7AFwAKgBcAGYAbABkAGkAbgBzAHQAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIABIAFkAUABFAFIATABJAE4ASwAgACIAdwB3AHcALgBtAG8AdgBlAEEAVQBUAC0AawBvAGUAbABuAC4AZABlACIAfQB9AHsAXABmAGwAZAByAHMAbAB0AHsAXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAdQBsAFwAZgBzADIAMgBcAGMAZgAyAFwAYwBzADMAIAB3AHcAdwAuAG0AbwB2AGUAQQBVAFQALQBrAG8AZQBsAG4ALgBkAGUAfQB9AH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgBzADIAMgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMgBcAGMAZgAxACAAaQBuAGYAbwBAAG0AbwB2AGUAYQB1AHQALgBrAG8AZQBsAG4ALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgB9AA== ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIABUAGUAbAAuADoAIAAwADIAMgAxACAALwAgADcANwA4ACAAOQA5ADkAOQAgAC0AIAAyADAAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGEAMQA2ADAAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIABGAGEAeAAuADoAIAAwADIAMgAxACAALwAgADcANwA4ACAAOQA5ADkAOQAgAC0AIAA1ADAAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAIAB3AHcAdwAuAG0AbwB2AGUAQQBVAFQALQBrAG8AZQBsAG4ALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA1ADgAXABzAGwAbQB1AGwAdAAxAFwAcwBhADEANgAwAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMgBcAGMAZgAxACAAYQAuAHMAegBhAGIAbwBAAG0AbwB2AGUAYQB1AHQALQBrAG8AZQBsAG4ALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== diff --git a/ReportImp/AutismusKoelnBonn/Invoicing/CustomInvoiceFactory.cs b/ReportImp/AutismusKoelnBonn/Invoicing/CustomInvoiceFactory.cs index 5d9e62e3b..5fe8971e7 100644 --- a/ReportImp/AutismusKoelnBonn/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/AutismusKoelnBonn/Invoicing/CustomInvoiceFactory.cs @@ -21,14 +21,16 @@ namespace AutismusKoelnBonn.Invoicing { if (sr.CostBearer != null) { - if (sr.CostBearer.Name.ToLower().Contains("selbstzahler")) - { - return new SelbstzahlerInvoiceCreation(); - } - else if (sr.CostBearer.ActualRateFactor != 0) + if (sr.CostBearer.Name.ToLower().Contains("selbstzahler")) { - return new FactorInvoiceCreation(); + return new SelbstzahlerInvoiceCreation(); } + else if (sr.CostBearer.ActualRateFactor != 0) + { + return new FactorInvoiceCreation(); + } + else + return new DefaultInvoiceCreation(); } } } diff --git a/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs b/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs index 39c489c00..7ad700e24 100644 --- a/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs +++ b/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs @@ -1,9 +1,13 @@ using BeWo.Data.Access; using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; using BeWo.Service.Invoicing; +using BeWo.Service.Plugins; +using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; using BS.Shared.Services; using System; using System.Collections.Generic; @@ -24,6 +28,12 @@ namespace AutismusKoelnBonn.Invoicing // base.BerechneSummaryItemsSummen(newlist, true); //} + public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, + Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount) + { + return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true); + } + public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) { var invoiceItem = new InvoiceItem(); diff --git a/ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs b/ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs index 9b454531e..316c4d806 100644 --- a/ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs +++ b/ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs @@ -2,6 +2,7 @@ using BeWo.Service.Invoicing; using BS.Shared.Core; using BS.Shared.DataContracts.Compact; +using BS.Shared.Services; using System; using System.Collections.Generic; using System.Linq; @@ -14,6 +15,12 @@ namespace AutismusKoelnBonn.Invoicing private DateTime? accountingPeriodStart = null; private DateTime? accountingPeriodEnd = null; + public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, + Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount) + { + return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true); + } + public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod, IList supportConceptList) { diff --git a/ReportImp/AutismusKoelnBonn/RechnungFaktor.Designer.cs b/ReportImp/AutismusKoelnBonn/RechnungFaktor.Designer.cs index b2034005d..1ff8673ae 100644 --- a/ReportImp/AutismusKoelnBonn/RechnungFaktor.Designer.cs +++ b/ReportImp/AutismusKoelnBonn/RechnungFaktor.Designer.cs @@ -94,9 +94,9 @@ namespace AutismusKoelnBonn this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.AnteilFaktor = new DevExpress.XtraReports.UI.CalculatedField(); this.StdFaktor = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit(); @@ -1016,6 +1016,10 @@ namespace AutismusKoelnBonn this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell6.Weight = 0.52190865825182176D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // AnteilFaktor // this.AnteilFaktor.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; @@ -1028,10 +1032,6 @@ namespace AutismusKoelnBonn this.StdFaktor.Expression = "[Hours]*1.2"; this.StdFaktor.Name = "StdFaktor"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // ServiceInvoiceReportFactor // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/AutismusKoelnBonn/SettlementReport.cs b/ReportImp/AutismusKoelnBonn/SettlementReport.cs index 9a5d083c1..a4346a806 100644 --- a/ReportImp/AutismusKoelnBonn/SettlementReport.cs +++ b/ReportImp/AutismusKoelnBonn/SettlementReport.cs @@ -61,10 +61,10 @@ namespace AutismusKoelnBonn.Alt { sb.AppendLine(cb2sc.CostBearer.Organisation.Address.AddressLine1); } - if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) - { - sb.AppendLine(pRO.RecipientContactPerson); - } + // if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + //{ + // sb.AppendLine(pRO.RecipientContactPerson); + //} if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) { sb.AppendLine(pRO.RecipientPoBox); diff --git a/ReportImp/AutismusKoelnBonn/SettlementReport2.Designer.cs b/ReportImp/AutismusKoelnBonn/SettlementReport2.Designer.cs index 09190b1e7..a7c137974 100644 --- a/ReportImp/AutismusKoelnBonn/SettlementReport2.Designer.cs +++ b/ReportImp/AutismusKoelnBonn/SettlementReport2.Designer.cs @@ -34,20 +34,6 @@ namespace AutismusKoelnBonn this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); - this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); - this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -57,13 +43,12 @@ namespace AutismusKoelnBonn this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); - this.lblAbsenderBonn = new DevExpress.XtraReports.UI.XRRichText(); - this.lblAbsenderKoeln = new DevExpress.XtraReports.UI.XRRichText(); - this.lblTeamBonn = new DevExpress.XtraReports.UI.XRRichText(); - this.lblTeamMerkenich = new DevExpress.XtraReports.UI.XRRichText(); - this.lblTeamKoeln = new DevExpress.XtraReports.UI.XRRichText(); - this.lblHeaderKoeln = new DevExpress.XtraReports.UI.XRRichText(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -80,6 +65,23 @@ namespace AutismusKoelnBonn this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAbsenderBonn = new DevExpress.XtraReports.UI.XRRichText(); + this.lblAbsenderKoeln = new DevExpress.XtraReports.UI.XRRichText(); + this.lblTeamBonn = new DevExpress.XtraReports.UI.XRRichText(); + this.lblTeamMerkenich = new DevExpress.XtraReports.UI.XRRichText(); + this.lblTeamKoeln = new DevExpress.XtraReports.UI.XRRichText(); + this.lblHeaderKoeln = new DevExpress.XtraReports.UI.XRRichText(); + this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -93,24 +95,22 @@ namespace AutismusKoelnBonn this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblAbsenderBonn)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblAbsenderKoeln)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblTeamBonn)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblTeamMerkenich)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblTeamKoeln)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblHeaderKoeln)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -138,170 +138,6 @@ namespace AutismusKoelnBonn this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // topMarginBand1 - // - this.topMarginBand1.HeightF = 41F; - this.topMarginBand1.Name = "topMarginBand1"; - // - // bottomMarginBand1 - // - this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrRichText1, - this.xrRichText3, - this.xrRichText4}); - this.bottomMarginBand1.HeightF = 142F; - this.bottomMarginBand1.Name = "bottomMarginBand1"; - // - // GroupHeader1 - // - this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable2, - this.xrLabel1, - this.xrLabel8, - this.xrLabel9, - this.xrLabel10, - this.xrLabel14, - this.xrLabel11, - this.xrLabel13, - this.xrLabel15, - this.xrLabel16, - this.xrLabel17, - this.xrLabel18, - this.lblAdresse, - this.lblAbsenderBonn, - this.lblAbsenderKoeln, - this.lblTeamBonn, - this.lblTeamMerkenich, - this.lblTeamKoeln, - this.lblHeaderKoeln}); - this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 474.4377F; - this.GroupHeader1.Name = "GroupHeader1"; - this.GroupHeader1.StylePriority.UseFont = false; - // - // fieldApprovedFLSWithFactor - // - this.fieldApprovedFLSWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]"; - this.fieldApprovedFLSWithFactor.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; - this.fieldApprovedFLSWithFactor.Name = "fieldApprovedFLSWithFactor"; - // - // DetailReport - // - this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); - this.DetailReport.DataMember = "InvoiceItems"; - this.DetailReport.DataSource = this.bindingSource1; - this.DetailReport.Level = 0; - this.DetailReport.Name = "DetailReport"; - // - // Detail1 - // - this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable4}); - this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Detail1.HeightF = 17F; - this.Detail1.Name = "Detail1"; - this.Detail1.StylePriority.UseFont = false; - // - // xrTable4 - // - this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(30.88923F, 0F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow33}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 17F); - this.xrTable4.StylePriority.UseBorderColor = false; - // - // xrTableRow33 - // - this.xrTableRow33.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell14, - this.xrTableCell52, - this.xrTableCell53}); - this.xrTableRow33.Name = "xrTableRow33"; - this.xrTableRow33.Weight = 0.085D; - // - // xrTableCell52 - // - this.xrTableCell52.BorderColor = System.Drawing.Color.Black; - this.xrTableCell52.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount", "{0:n2}")}); - this.xrTableCell52.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell52.Name = "xrTableCell52"; - this.xrTableCell52.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell52.StylePriority.UseBorderColor = false; - this.xrTableCell52.StylePriority.UseBorders = false; - this.xrTableCell52.StylePriority.UseFont = false; - this.xrTableCell52.StylePriority.UseTextAlignment = false; - this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell52.Weight = 0.15814115084134622D; - // - // xrTableCell53 - // - this.xrTableCell53.BorderColor = System.Drawing.Color.Black; - this.xrTableCell53.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell53.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal", "{0:c}")}); - this.xrTableCell53.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell53.Name = "xrTableCell53"; - this.xrTableCell53.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell53.StylePriority.UseBorderColor = false; - this.xrTableCell53.StylePriority.UseBorders = false; - this.xrTableCell53.StylePriority.UseFont = false; - this.xrTableCell53.StylePriority.UseTextAlignment = false; - this.xrTableCell53.Text = "xrTableCell10"; - this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.22173076923076923D; - // - // GroupFooter1 - // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable1}); - this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupFooter1.HeightF = 100.5F; - this.GroupFooter1.Name = "GroupFooter1"; - this.GroupFooter1.StylePriority.UseFont = false; - // - // xrRichText1 - // - this.xrRichText1.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot; - this.xrRichText1.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(198.9583F, 109.75F); - this.xrRichText1.StylePriority.UseBorderDashStyle = false; - this.xrRichText1.StylePriority.UseBorders = false; - // - // xrRichText3 - // - this.xrRichText3.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot; - this.xrRichText3.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrRichText3.Font = new System.Drawing.Font("Verdana", 10F); - this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(198.9583F, 0F); - this.xrRichText3.Name = "xrRichText3"; - this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); - this.xrRichText3.SizeF = new System.Drawing.SizeF(310.0833F, 109.75F); - this.xrRichText3.StylePriority.UseBorderDashStyle = false; - this.xrRichText3.StylePriority.UseBorders = false; - // - // xrRichText4 - // - this.xrRichText4.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot; - this.xrRichText4.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrRichText4.Font = new System.Drawing.Font("Verdana", 10F); - this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(509.0417F, 0F); - this.xrRichText4.Name = "xrRichText4"; - this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString"); - this.xrRichText4.SizeF = new System.Drawing.SizeF(176F, 109.75F); - this.xrRichText4.StylePriority.UseBorderDashStyle = false; - this.xrRichText4.StylePriority.UseBorders = false; - // // xrLabel7 // this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F); @@ -389,78 +225,82 @@ namespace AutismusKoelnBonn this.xrLabel12.StylePriority.UseTextAlignment = false; this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // lblAdresse + // topMarginBand1 // - this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.lblAdresse.CanGrow = false; - this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(27.72249F, 43.56254F); - this.lblAdresse.Multiline = true; - this.lblAdresse.Name = "lblAdresse"; - this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAdresse.SizeF = new System.Drawing.SizeF(316.9999F, 131.7708F); - this.lblAdresse.StylePriority.UseBorders = false; - this.lblAdresse.StylePriority.UseFont = false; + this.topMarginBand1.HeightF = 41F; + this.topMarginBand1.Name = "topMarginBand1"; // - // lblAbsenderBonn + // bottomMarginBand1 // - this.lblAbsenderBonn.Font = new System.Drawing.Font("Verdana", 10F); - this.lblAbsenderBonn.LocationFloat = new DevExpress.Utils.PointFloat(27.72249F, 10.00001F); - this.lblAbsenderBonn.Name = "lblAbsenderBonn"; - this.lblAbsenderBonn.SerializableRtfString = resources.GetString("lblAbsenderBonn.SerializableRtfString"); - this.lblAbsenderBonn.SizeF = new System.Drawing.SizeF(317F, 20F); - this.lblAbsenderBonn.Visible = false; + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrRichText1, + this.xrRichText3, + this.xrRichText4}); + this.bottomMarginBand1.HeightF = 142F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // lblAbsenderKoeln + // xrRichText1 // - this.lblAbsenderKoeln.Font = new System.Drawing.Font("Verdana", 10F); - this.lblAbsenderKoeln.LocationFloat = new DevExpress.Utils.PointFloat(27.72249F, 10.00001F); - this.lblAbsenderKoeln.Name = "lblAbsenderKoeln"; - this.lblAbsenderKoeln.SerializableRtfString = resources.GetString("lblAbsenderKoeln.SerializableRtfString"); - this.lblAbsenderKoeln.SizeF = new System.Drawing.SizeF(297.4446F, 20F); + this.xrRichText1.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot; + this.xrRichText1.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(198.9583F, 109.75F); + this.xrRichText1.StylePriority.UseBorderDashStyle = false; + this.xrRichText1.StylePriority.UseBorders = false; // - // lblTeamBonn + // xrRichText3 // - this.lblTeamBonn.CanGrow = false; - this.lblTeamBonn.Font = new System.Drawing.Font("Arial", 8F); - this.lblTeamBonn.LocationFloat = new DevExpress.Utils.PointFloat(471.8751F, 0F); - this.lblTeamBonn.Name = "lblTeamBonn"; - this.lblTeamBonn.Padding = new DevExpress.XtraPrinting.PaddingInfo(6, 0, 0, 0, 100F); - this.lblTeamBonn.SerializableRtfString = resources.GetString("lblTeamBonn.SerializableRtfString"); - this.lblTeamBonn.SizeF = new System.Drawing.SizeF(236.1248F, 221F); - this.lblTeamBonn.StylePriority.UseFont = false; - this.lblTeamBonn.StylePriority.UsePadding = false; - this.lblTeamBonn.StylePriority.UseTextAlignment = false; - this.lblTeamBonn.Visible = false; + this.xrRichText3.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot; + this.xrRichText3.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrRichText3.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(198.9583F, 0F); + this.xrRichText3.Name = "xrRichText3"; + this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); + this.xrRichText3.SizeF = new System.Drawing.SizeF(310.0833F, 109.75F); + this.xrRichText3.StylePriority.UseBorderDashStyle = false; + this.xrRichText3.StylePriority.UseBorders = false; // - // lblTeamMerkenich + // xrRichText4 // - this.lblTeamMerkenich.Font = new System.Drawing.Font("Arial", 8F); - this.lblTeamMerkenich.LocationFloat = new DevExpress.Utils.PointFloat(472.7364F, 111.5F); - this.lblTeamMerkenich.Name = "lblTeamMerkenich"; - this.lblTeamMerkenich.SerializableRtfString = resources.GetString("lblTeamMerkenich.SerializableRtfString"); - this.lblTeamMerkenich.SizeF = new System.Drawing.SizeF(229.972F, 124.0416F); - this.lblTeamMerkenich.StylePriority.UseFont = false; - this.lblTeamMerkenich.Visible = false; + this.xrRichText4.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot; + this.xrRichText4.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrRichText4.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(509.0417F, 0F); + this.xrRichText4.Name = "xrRichText4"; + this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString"); + this.xrRichText4.SizeF = new System.Drawing.SizeF(176F, 109.75F); + this.xrRichText4.StylePriority.UseBorderDashStyle = false; + this.xrRichText4.StylePriority.UseBorders = false; // - // lblTeamKoeln + // GroupHeader1 // - this.lblTeamKoeln.Font = new System.Drawing.Font("Arial", 8F); - this.lblTeamKoeln.LocationFloat = new DevExpress.Utils.PointFloat(472.7364F, 111.5F); - this.lblTeamKoeln.Name = "lblTeamKoeln"; - this.lblTeamKoeln.SerializableRtfString = resources.GetString("lblTeamKoeln.SerializableRtfString"); - this.lblTeamKoeln.SizeF = new System.Drawing.SizeF(229.972F, 97.00002F); - this.lblTeamKoeln.StylePriority.UseFont = false; - // - // lblHeaderKoeln - // - this.lblHeaderKoeln.CanGrow = false; - this.lblHeaderKoeln.Font = new System.Drawing.Font("Arial", 8F); - this.lblHeaderKoeln.LocationFloat = new DevExpress.Utils.PointFloat(477.1666F, 0F); - this.lblHeaderKoeln.Name = "lblHeaderKoeln"; - this.lblHeaderKoeln.SerializableRtfString = resources.GetString("lblHeaderKoeln.SerializableRtfString"); - this.lblHeaderKoeln.SizeF = new System.Drawing.SizeF(230.8333F, 111.5F); - this.lblHeaderKoeln.StylePriority.UseFont = false; - this.lblHeaderKoeln.StylePriority.UseTextAlignment = false; + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, + this.xrLabel1, + this.xrLabel8, + this.xrLabel9, + this.xrLabel10, + this.xrLabel14, + this.xrLabel11, + this.xrLabel13, + this.xrLabel15, + this.xrLabel16, + this.xrLabel17, + this.xrLabel18, + this.lblAdresse, + this.lblAbsenderBonn, + this.lblAbsenderKoeln, + this.lblTeamBonn, + this.lblTeamMerkenich, + this.lblTeamKoeln, + this.lblHeaderKoeln}); + this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); + this.GroupHeader1.HeightF = 474.4377F; + this.GroupHeader1.Name = "GroupHeader1"; + this.GroupHeader1.StylePriority.UseFont = false; // // xrTable2 // @@ -683,6 +523,186 @@ namespace AutismusKoelnBonn this.xrLabel18.Text = "xrLabel8"; this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // + // lblAdresse + // + this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.lblAdresse.CanGrow = false; + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(27.72249F, 43.56254F); + this.lblAdresse.Multiline = true; + this.lblAdresse.Name = "lblAdresse"; + this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresse.SizeF = new System.Drawing.SizeF(316.9999F, 131.7708F); + this.lblAdresse.StylePriority.UseBorders = false; + this.lblAdresse.StylePriority.UseFont = false; + // + // lblAbsenderBonn + // + this.lblAbsenderBonn.Font = new System.Drawing.Font("Verdana", 10F); + this.lblAbsenderBonn.LocationFloat = new DevExpress.Utils.PointFloat(27.72249F, 10.00001F); + this.lblAbsenderBonn.Name = "lblAbsenderBonn"; + this.lblAbsenderBonn.SerializableRtfString = resources.GetString("lblAbsenderBonn.SerializableRtfString"); + this.lblAbsenderBonn.SizeF = new System.Drawing.SizeF(317F, 20F); + this.lblAbsenderBonn.Visible = false; + // + // lblAbsenderKoeln + // + this.lblAbsenderKoeln.Font = new System.Drawing.Font("Verdana", 10F); + this.lblAbsenderKoeln.LocationFloat = new DevExpress.Utils.PointFloat(27.72249F, 10.00001F); + this.lblAbsenderKoeln.Name = "lblAbsenderKoeln"; + this.lblAbsenderKoeln.SerializableRtfString = resources.GetString("lblAbsenderKoeln.SerializableRtfString"); + this.lblAbsenderKoeln.SizeF = new System.Drawing.SizeF(297.4446F, 20F); + // + // lblTeamBonn + // + this.lblTeamBonn.CanGrow = false; + this.lblTeamBonn.Font = new System.Drawing.Font("Arial", 8F); + this.lblTeamBonn.LocationFloat = new DevExpress.Utils.PointFloat(471.8751F, 0F); + this.lblTeamBonn.Name = "lblTeamBonn"; + this.lblTeamBonn.Padding = new DevExpress.XtraPrinting.PaddingInfo(6, 0, 0, 0, 100F); + this.lblTeamBonn.SerializableRtfString = resources.GetString("lblTeamBonn.SerializableRtfString"); + this.lblTeamBonn.SizeF = new System.Drawing.SizeF(236.1248F, 221F); + this.lblTeamBonn.StylePriority.UseFont = false; + this.lblTeamBonn.StylePriority.UsePadding = false; + this.lblTeamBonn.StylePriority.UseTextAlignment = false; + this.lblTeamBonn.Visible = false; + // + // lblTeamMerkenich + // + this.lblTeamMerkenich.Font = new System.Drawing.Font("Arial", 8F); + this.lblTeamMerkenich.LocationFloat = new DevExpress.Utils.PointFloat(472.7364F, 111.5F); + this.lblTeamMerkenich.Name = "lblTeamMerkenich"; + this.lblTeamMerkenich.SerializableRtfString = resources.GetString("lblTeamMerkenich.SerializableRtfString"); + this.lblTeamMerkenich.SizeF = new System.Drawing.SizeF(229.972F, 124.0416F); + this.lblTeamMerkenich.StylePriority.UseFont = false; + this.lblTeamMerkenich.Visible = false; + // + // lblTeamKoeln + // + this.lblTeamKoeln.Font = new System.Drawing.Font("Arial", 8F); + this.lblTeamKoeln.LocationFloat = new DevExpress.Utils.PointFloat(472.7364F, 111.5F); + this.lblTeamKoeln.Name = "lblTeamKoeln"; + this.lblTeamKoeln.SerializableRtfString = resources.GetString("lblTeamKoeln.SerializableRtfString"); + this.lblTeamKoeln.SizeF = new System.Drawing.SizeF(229.972F, 97.00002F); + this.lblTeamKoeln.StylePriority.UseFont = false; + // + // lblHeaderKoeln + // + this.lblHeaderKoeln.CanGrow = false; + this.lblHeaderKoeln.Font = new System.Drawing.Font("Arial", 8F); + this.lblHeaderKoeln.LocationFloat = new DevExpress.Utils.PointFloat(477.1666F, 0F); + this.lblHeaderKoeln.Name = "lblHeaderKoeln"; + this.lblHeaderKoeln.SerializableRtfString = resources.GetString("lblHeaderKoeln.SerializableRtfString"); + this.lblHeaderKoeln.SizeF = new System.Drawing.SizeF(230.8333F, 111.5F); + this.lblHeaderKoeln.StylePriority.UseFont = false; + this.lblHeaderKoeln.StylePriority.UseTextAlignment = false; + // + // fieldApprovedFLSWithFactor + // + this.fieldApprovedFLSWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]"; + this.fieldApprovedFLSWithFactor.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldApprovedFLSWithFactor.Name = "fieldApprovedFLSWithFactor"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1}); + this.DetailReport.DataMember = "InvoiceItems"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 17F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrTable4 + // + this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(30.88923F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow33}); + this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrTable4.StylePriority.UseBorderColor = false; + // + // xrTableRow33 + // + this.xrTableRow33.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell14, + this.xrTableCell52, + this.xrTableCell53}); + this.xrTableRow33.Name = "xrTableRow33"; + this.xrTableRow33.Weight = 0.085D; + // + // xrTableCell14 + // + this.xrTableCell14.BorderColor = System.Drawing.Color.Black; + this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")}); + this.xrTableCell14.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UseBorderColor = false; + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.Text = "xrTableCell14"; + this.xrTableCell14.Weight = 0.62012807992788466D; + // + // xrTableCell52 + // + this.xrTableCell52.BorderColor = System.Drawing.Color.Black; + this.xrTableCell52.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount", "{0:n2}")}); + this.xrTableCell52.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell52.Name = "xrTableCell52"; + this.xrTableCell52.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell52.StylePriority.UseBorderColor = false; + this.xrTableCell52.StylePriority.UseBorders = false; + this.xrTableCell52.StylePriority.UseFont = false; + this.xrTableCell52.StylePriority.UseTextAlignment = false; + this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; + this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell52.Weight = 0.15814115084134622D; + // + // xrTableCell53 + // + this.xrTableCell53.BorderColor = System.Drawing.Color.Black; + this.xrTableCell53.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell53.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal", "{0:c}")}); + this.xrTableCell53.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell53.Name = "xrTableCell53"; + this.xrTableCell53.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell53.StylePriority.UseBorderColor = false; + this.xrTableCell53.StylePriority.UseBorders = false; + this.xrTableCell53.StylePriority.UseFont = false; + this.xrTableCell53.StylePriority.UseTextAlignment = false; + this.xrTableCell53.Text = "xrTableCell10"; + this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell53.Weight = 0.22173076923076923D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.GroupFooter1.HeightF = 100.5F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.StylePriority.UseFont = false; + // // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -867,26 +887,6 @@ namespace AutismusKoelnBonn this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell13.Weight = 0.22173086313100962D; // - // xrTableCell14 - // - this.xrTableCell14.BorderColor = System.Drawing.Color.Black; - this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")}); - this.xrTableCell14.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell14.StylePriority.UseBorderColor = false; - this.xrTableCell14.StylePriority.UseBorders = false; - this.xrTableCell14.StylePriority.UseFont = false; - this.xrTableCell14.StylePriority.UsePadding = false; - this.xrTableCell14.Text = "xrTableCell14"; - this.xrTableCell14.Weight = 0.62012807992788466D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // PageHeader // this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -924,20 +924,20 @@ namespace AutismusKoelnBonn this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblAbsenderBonn)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblAbsenderKoeln)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblTeamBonn)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblTeamMerkenich)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblTeamKoeln)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblHeaderKoeln)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/AutismusKoelnBonn/SettlementReport2.cs b/ReportImp/AutismusKoelnBonn/SettlementReport2.cs index c8214ce88..865493bfc 100644 --- a/ReportImp/AutismusKoelnBonn/SettlementReport2.cs +++ b/ReportImp/AutismusKoelnBonn/SettlementReport2.cs @@ -122,10 +122,10 @@ namespace AutismusKoelnBonn { sb.AppendLine(AddressLine1); } - if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) - { - sb.AppendLine(pRO.RecipientContactPerson); - } + //if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + //{ + // sb.AppendLine(pRO.RecipientContactPerson); + //} if (!String.IsNullOrEmpty(pRO.RecipientPostBox)) { sb.AppendLine(pRO.RecipientPostBox);