Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo
This commit is contained in:
@@ -65,7 +65,6 @@ namespace AutismusKoelnBonn
|
||||
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.cellVerbleiben = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
|
||||
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
|
||||
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
|
||||
@@ -154,21 +153,20 @@ namespace AutismusKoelnBonn
|
||||
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.fieldStunden = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.xrPictureBox4 = new DevExpress.XtraReports.UI.XRPictureBox();
|
||||
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
|
||||
//
|
||||
// Detail
|
||||
//
|
||||
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTableServiceRecords1});
|
||||
this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
|
||||
this.Detail.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.Detail.HeightF = 20F;
|
||||
this.Detail.Name = "Detail";
|
||||
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
@@ -177,8 +175,8 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableServiceRecords1
|
||||
//
|
||||
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
|
||||
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
|
||||
@@ -269,10 +267,9 @@ namespace AutismusKoelnBonn
|
||||
// xrTable3
|
||||
//
|
||||
this.xrTable3.BorderColor = System.Drawing.Color.Black;
|
||||
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTable3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
|
||||
this.xrTable3.Name = "xrTable3";
|
||||
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
@@ -299,7 +296,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.}")});
|
||||
this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
|
||||
this.xrTableCell13.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.xrTableCell13.Name = "xrTableCell13";
|
||||
this.xrTableCell13.StylePriority.UseFont = false;
|
||||
this.xrTableCell13.StylePriority.UsePadding = false;
|
||||
@@ -311,7 +308,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString")});
|
||||
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
|
||||
this.xrTableCell6.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.xrTableCell6.Name = "xrTableCell6";
|
||||
this.xrTableCell6.StylePriority.UseFont = false;
|
||||
this.xrTableCell6.StylePriority.UseTextAlignment = false;
|
||||
@@ -323,7 +320,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
this.xrTableCell82.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4")});
|
||||
this.xrTableCell82.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
|
||||
this.xrTableCell82.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.xrTableCell82.Name = "xrTableCell82";
|
||||
this.xrTableCell82.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrTableCell82.StylePriority.UseFont = false;
|
||||
@@ -337,7 +334,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
this.xrTableCell58.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
|
||||
this.xrTableCell58.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
|
||||
this.xrTableCell58.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.xrTableCell58.Name = "xrTableCell58";
|
||||
this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrTableCell58.StylePriority.UseFont = false;
|
||||
@@ -351,7 +348,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2", "{0:0.##}")});
|
||||
this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
|
||||
this.xrTableCell16.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.xrTableCell16.Name = "xrTableCell16";
|
||||
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrTableCell16.StylePriority.UseFont = false;
|
||||
@@ -362,26 +359,23 @@ namespace AutismusKoelnBonn
|
||||
// GroupFooter1
|
||||
//
|
||||
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrPictureBox4,
|
||||
this.xrLabel14,
|
||||
this.xrTable4,
|
||||
this.xrTable2});
|
||||
this.GroupFooter1.HeightF = 121.1667F;
|
||||
this.GroupFooter1.HeightF = 97.70836F;
|
||||
this.GroupFooter1.Name = "GroupFooter1";
|
||||
//
|
||||
// xrTable4
|
||||
//
|
||||
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTable4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104.1667F);
|
||||
this.xrTable4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 57.70836F);
|
||||
this.xrTable4.Name = "xrTable4";
|
||||
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
|
||||
this.xrTableRow5});
|
||||
this.xrTable4.SizeF = new System.Drawing.SizeF(401.4583F, 17F);
|
||||
this.xrTable4.SizeF = new System.Drawing.SizeF(700.4166F, 40F);
|
||||
this.xrTable4.StylePriority.UseBackColor = false;
|
||||
this.xrTable4.StylePriority.UseFont = false;
|
||||
this.xrTable4.StylePriority.UseTextAlignment = false;
|
||||
@@ -396,11 +390,11 @@ namespace AutismusKoelnBonn
|
||||
this.xrTableRow5.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableRow5.StylePriority.UseFont = false;
|
||||
this.xrTableRow5.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableRow5.Weight = 0.94444284321620819D;
|
||||
this.xrTableRow5.Weight = 2.2222184546263724D;
|
||||
//
|
||||
// xrTableCell26
|
||||
//
|
||||
this.xrTableCell26.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrTableCell26.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
|
||||
this.xrTableCell26.Name = "xrTableCell26";
|
||||
this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
|
||||
this.xrTableCell26.StylePriority.UseFont = false;
|
||||
@@ -410,18 +404,18 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell30
|
||||
//
|
||||
this.xrTableCell30.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrTableCell30.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
|
||||
this.xrTableCell30.Name = "xrTableCell30";
|
||||
this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
|
||||
this.xrTableCell30.StylePriority.UseFont = false;
|
||||
this.xrTableCell30.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell30.Text = "Unterschrift";
|
||||
this.xrTableCell30.Weight = 0.68636175441686842D;
|
||||
this.xrTableCell30.Weight = 1.4153991848308489D;
|
||||
//
|
||||
// xrTable2
|
||||
//
|
||||
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
|
||||
this.xrTable2.Name = "xrTable2";
|
||||
@@ -552,10 +546,6 @@ namespace AutismusKoelnBonn
|
||||
this.cellVerbleiben.StylePriority.UseBackColor = false;
|
||||
this.cellVerbleiben.Weight = 0.14733120593653812D;
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
//
|
||||
// formattingRuleStartDate
|
||||
//
|
||||
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
|
||||
@@ -567,15 +557,15 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTable1});
|
||||
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
|
||||
this.ReportHeader.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.ReportHeader.HeightF = 230F;
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
this.ReportHeader.StylePriority.UseFont = false;
|
||||
//
|
||||
// xrTable1
|
||||
//
|
||||
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
|
||||
this.xrTable1.Name = "xrTable1";
|
||||
@@ -615,7 +605,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell7
|
||||
//
|
||||
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
|
||||
this.xrTableCell7.Name = "xrTableCell7";
|
||||
this.xrTableCell7.StylePriority.UseFont = false;
|
||||
this.xrTableCell7.Text = "Leistungsnachweis";
|
||||
@@ -623,7 +613,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell2
|
||||
//
|
||||
this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
|
||||
this.xrTableCell2.Name = "xrTableCell2";
|
||||
this.xrTableCell2.StylePriority.UseFont = false;
|
||||
this.xrTableCell2.Text = "[Month] [Year]";
|
||||
@@ -672,8 +662,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell14
|
||||
//
|
||||
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 8.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell14.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell14.Name = "xrTableCell14";
|
||||
this.xrTableCell14.StylePriority.UseFont = false;
|
||||
this.xrTableCell14.StylePriority.UseTextAlignment = false;
|
||||
@@ -740,8 +729,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell36
|
||||
//
|
||||
this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Arial", 8.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell36.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell36.Name = "xrTableCell36";
|
||||
this.xrTableCell36.StylePriority.UseFont = false;
|
||||
this.xrTableCell36.Text = "Abrechnungszeitraum von";
|
||||
@@ -796,8 +784,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell42
|
||||
//
|
||||
this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 8.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell42.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell42.Name = "xrTableCell42";
|
||||
this.xrTableCell42.StylePriority.UseFont = false;
|
||||
this.xrTableCell42.Text = "Abrechnungszeitraum bis";
|
||||
@@ -893,7 +880,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell53
|
||||
//
|
||||
this.xrTableCell53.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
this.xrTableCell53.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.xrTableCell53.Name = "xrTableCell53";
|
||||
this.xrTableCell53.StylePriority.UseBorders = false;
|
||||
@@ -942,7 +929,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell59
|
||||
//
|
||||
this.xrTableCell59.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
this.xrTableCell59.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell59.Name = "xrTableCell59";
|
||||
this.xrTableCell59.StylePriority.UseBorders = false;
|
||||
@@ -950,8 +937,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell60
|
||||
//
|
||||
this.xrTableCell60.Font = new DevExpress.Drawing.DXFont("Arial", 8.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell60.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell60.Name = "xrTableCell60";
|
||||
this.xrTableCell60.StylePriority.UseFont = false;
|
||||
this.xrTableCell60.Text = "Bewilligungszeitraum von";
|
||||
@@ -1006,8 +992,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// xrTableCell66
|
||||
//
|
||||
this.xrTableCell66.Font = new DevExpress.Drawing.DXFont("Arial", 8.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell66.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell66.Name = "xrTableCell66";
|
||||
this.xrTableCell66.StylePriority.UseFont = false;
|
||||
this.xrTableCell66.Text = "Bewilligungszeitraum bis";
|
||||
@@ -1212,7 +1197,7 @@ namespace AutismusKoelnBonn
|
||||
//
|
||||
// topMarginBand1
|
||||
//
|
||||
this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
|
||||
this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
|
||||
this.topMarginBand1.HeightF = 50F;
|
||||
this.topMarginBand1.Name = "topMarginBand1";
|
||||
this.topMarginBand1.StylePriority.UseFont = false;
|
||||
@@ -1266,30 +1251,9 @@ namespace AutismusKoelnBonn
|
||||
this.fieldStunden.Expression = "[Minutes] / 60";
|
||||
this.fieldStunden.Name = "fieldStunden";
|
||||
//
|
||||
// xrPictureBox4
|
||||
// bindingSource1
|
||||
//
|
||||
this.xrPictureBox4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
|
||||
this.xrPictureBox4.LocationFloat = new DevExpress.Utils.PointFloat(144.8986F, 58.20834F);
|
||||
this.xrPictureBox4.Name = "xrPictureBox4";
|
||||
this.xrPictureBox4.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
|
||||
this.xrPictureBox4.SizeF = new System.Drawing.SizeF(234.0597F, 45.95832F);
|
||||
this.xrPictureBox4.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
|
||||
//
|
||||
// xrLabel14
|
||||
//
|
||||
this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
|
||||
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("arial", 8F);
|
||||
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 81.16665F);
|
||||
this.xrLabel14.Name = "xrLabel14";
|
||||
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel14.SizeF = new System.Drawing.SizeF(119.9998F, 23.00002F);
|
||||
this.xrLabel14.StylePriority.UseBackColor = false;
|
||||
this.xrLabel14.StylePriority.UseFont = false;
|
||||
this.xrLabel14.StylePriority.UseTextAlignment = false;
|
||||
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
//
|
||||
// LeistungsnachweisJugendamt
|
||||
//
|
||||
@@ -1308,25 +1272,24 @@ namespace AutismusKoelnBonn
|
||||
this.fieldAbrechenbareFLS,
|
||||
this.fieldStunden});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.formattingRuleStartDate,
|
||||
this.formattingRuleServiceDesc,
|
||||
this.formattingRuleCostBearer,
|
||||
this.formattingRuleEmployeeName});
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(70F, 50F, 50F, 36F);
|
||||
this.Margins = new System.Drawing.Printing.Margins(70, 50, 50, 36);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
this.SnapGridSize = 9F;
|
||||
this.Version = "23.2";
|
||||
this.Version = "17.1";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
|
||||
|
||||
}
|
||||
@@ -1458,7 +1421,5 @@ namespace AutismusKoelnBonn
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
|
||||
private DevExpress.XtraReports.UI.XRTableCell cellVerbleiben;
|
||||
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox4;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,6 +66,11 @@
|
||||
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
|
||||
<Compile Include="Invoicing\DefaultInvoiceCreation.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Properties\Resources.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="QuittierungsbelegMitDatum.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
@@ -103,6 +108,10 @@
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Properties\licenses.licx" />
|
||||
<EmbeddedResource Include="Properties\Resources.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="QuittierungsbelegMitDatum.resx">
|
||||
<DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
|
||||
BIN
ReportImp/AwoWesel/Logo2025.png
Normal file
BIN
ReportImp/AwoWesel/Logo2025.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
63
ReportImp/AwoWesel/Properties/Resources.Designer.cs
generated
Normal file
63
ReportImp/AwoWesel/Properties/Resources.Designer.cs
generated
Normal file
@@ -0,0 +1,63 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// Dieser Code wurde von einem Tool generiert.
|
||||
// Laufzeitversion:4.0.30319.42000
|
||||
//
|
||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||
// der Code erneut generiert wird.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace AwoWesel.Properties {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
|
||||
/// </summary>
|
||||
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
|
||||
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
|
||||
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
|
||||
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class Resources {
|
||||
|
||||
private static global::System.Resources.ResourceManager resourceMan;
|
||||
|
||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||
|
||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||
internal Resources() {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AwoWesel.Properties.Resources", typeof(Resources).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
|
||||
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Globalization.CultureInfo Culture {
|
||||
get {
|
||||
return resourceCulture;
|
||||
}
|
||||
set {
|
||||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
120
ReportImp/AwoWesel/Properties/Resources.resx
Normal file
120
ReportImp/AwoWesel/Properties/Resources.resx
Normal file
@@ -0,0 +1,120 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@@ -0,0 +1 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
65
ReportImp/AwoWesel/ServiceInvoiceReport.Designer.cs
generated
65
ReportImp/AwoWesel/ServiceInvoiceReport.Designer.cs
generated
@@ -30,6 +30,7 @@ namespace AwoWesel
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
|
||||
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
|
||||
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
|
||||
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
|
||||
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
|
||||
@@ -94,7 +95,7 @@ namespace AwoWesel
|
||||
//
|
||||
// ReportHeader
|
||||
//
|
||||
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
|
||||
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
|
||||
this.ReportHeader.HeightF = 0F;
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
this.ReportHeader.StylePriority.UseFont = false;
|
||||
@@ -114,15 +115,15 @@ namespace AwoWesel
|
||||
//
|
||||
// xrPictureBox1
|
||||
//
|
||||
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(446.3748F, 38.74993F);
|
||||
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(511.7084F, 35.62492F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(284.875F, 131.2501F);
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(245.2915F, 134.3751F);
|
||||
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
|
||||
//
|
||||
// xrRichText2
|
||||
//
|
||||
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
|
||||
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(573.2496F, 0F);
|
||||
this.xrRichText2.Name = "xrRichText2";
|
||||
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
|
||||
@@ -133,18 +134,20 @@ namespace AwoWesel
|
||||
//
|
||||
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrLabel10});
|
||||
this.bottomMarginBand1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.bottomMarginBand1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.bottomMarginBand1.HeightF = 70F;
|
||||
this.bottomMarginBand1.Name = "bottomMarginBand1";
|
||||
this.bottomMarginBand1.StylePriority.UseFont = false;
|
||||
//
|
||||
// xrLabel10
|
||||
//
|
||||
this.xrLabel10.Font = new System.Drawing.Font("Arial", 6.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 6.8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
|
||||
this.xrLabel10.Multiline = true;
|
||||
this.xrLabel10.Name = "xrLabel10";
|
||||
this.xrLabel10.SizeF = new System.Drawing.SizeF(750F, 56.83F);
|
||||
this.xrLabel10.SizeF = new System.Drawing.SizeF(757.0001F, 56.83F);
|
||||
this.xrLabel10.StylePriority.UseFont = false;
|
||||
this.xrLabel10.StylePriority.UsePadding = false;
|
||||
this.xrLabel10.StylePriority.UseTextAlignment = false;
|
||||
@@ -163,19 +166,20 @@ namespace AwoWesel
|
||||
this.xrLabel5,
|
||||
this.xrLabel8,
|
||||
this.lblAbrechnungszeitraum});
|
||||
this.Page1.HeightF = 399.9167F;
|
||||
this.Page1.HeightF = 407.2083F;
|
||||
this.Page1.Name = "Page1";
|
||||
this.Page1.StylePriority.UseFont = false;
|
||||
//
|
||||
// xrLabel6
|
||||
//
|
||||
this.xrLabel6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 0F);
|
||||
this.xrLabel6.Name = "xrLabel6";
|
||||
this.xrLabel6.SizeF = new System.Drawing.SizeF(365.9582F, 17F);
|
||||
this.xrLabel6.StylePriority.UseFont = false;
|
||||
this.xrLabel6.StylePriority.UsePadding = false;
|
||||
this.xrLabel6.Text = "AWO KV Wesel e.V. · Bahnhofstraße 1-3 · 47495 Rheinberg";
|
||||
this.xrLabel6.Text = "AWO KV Wesel e.V. · Uerdinger Str. 31 · 47441 Moers";
|
||||
//
|
||||
// lblAdresse
|
||||
//
|
||||
@@ -190,8 +194,9 @@ namespace AwoWesel
|
||||
//
|
||||
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel4.CanShrink = true;
|
||||
this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 268.3333F);
|
||||
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 268.3332F);
|
||||
this.xrLabel4.Multiline = true;
|
||||
this.xrLabel4.Name = "xrLabel4";
|
||||
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -205,8 +210,9 @@ namespace AwoWesel
|
||||
//
|
||||
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel3.CanShrink = true;
|
||||
this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 248.3334F);
|
||||
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 248.3333F);
|
||||
this.xrLabel3.Name = "xrLabel3";
|
||||
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
|
||||
@@ -219,7 +225,8 @@ namespace AwoWesel
|
||||
//
|
||||
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel2.CanShrink = true;
|
||||
this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 228.3333F);
|
||||
this.xrLabel2.Name = "xrLabel2";
|
||||
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -231,7 +238,7 @@ namespace AwoWesel
|
||||
//
|
||||
// xrLabel5
|
||||
//
|
||||
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 330.8333F);
|
||||
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(35.95775F, 350.625F);
|
||||
this.xrLabel5.Name = "xrLabel5";
|
||||
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
|
||||
@@ -252,7 +259,7 @@ namespace AwoWesel
|
||||
//
|
||||
// lblAbrechnungszeitraum
|
||||
//
|
||||
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 355.8333F);
|
||||
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(35.95775F, 375.625F);
|
||||
this.lblAbrechnungszeitraum.Multiline = true;
|
||||
this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
|
||||
this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -321,7 +328,8 @@ namespace AwoWesel
|
||||
//
|
||||
// xrLabel9
|
||||
//
|
||||
this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Italic, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 44.79167F);
|
||||
this.xrLabel9.Name = "xrLabel9";
|
||||
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -494,7 +502,8 @@ namespace AwoWesel
|
||||
//
|
||||
// xrTable6
|
||||
//
|
||||
this.xrTable6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTable6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(37.99947F, 0F);
|
||||
this.xrTable6.Name = "xrTable6";
|
||||
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
|
||||
@@ -627,7 +636,8 @@ namespace AwoWesel
|
||||
//
|
||||
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
|
||||
this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(430.1247F, 0F);
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
|
||||
@@ -653,16 +663,19 @@ namespace AwoWesel
|
||||
this.DetailReport});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
|
||||
this.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.ruleRateFactorNull});
|
||||
this.Margins = new System.Drawing.Printing.Margins(45, 25, 180, 70);
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(45F, 25F, 180F, 70F);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
this.Version = "17.1";
|
||||
this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("ServiceInvoiceReport.Watermark.Image")));
|
||||
this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Stretch;
|
||||
this.Version = "23.2";
|
||||
xrWatermark1.Id = "Watermark1";
|
||||
xrWatermark1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrWatermark1.ImageSource"));
|
||||
xrWatermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Stretch;
|
||||
this.Watermarks.Add(xrWatermark1);
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -378,7 +378,7 @@ namespace BellaDonna.Export
|
||||
from invoicebase ib
|
||||
inner join organisation org on org.costbeareroid = ib.RecipientOrganisationOid
|
||||
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1
|
||||
and ib.Type = 2
|
||||
and ib.Type = 2 AND ib.`IsExported` = 0
|
||||
";
|
||||
|
||||
return sql;
|
||||
|
||||
@@ -82,6 +82,7 @@
|
||||
<Compile Include="Sammelrechnung.Designer.cs">
|
||||
<DependentUpon>Sammelrechnung.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Service\CustomAccountingService.cs" />
|
||||
<Compile Include="Service\CustomVacationService.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -33,6 +33,7 @@ namespace DiakonischesWerkRegensburg
|
||||
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
|
||||
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
|
||||
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
|
||||
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
|
||||
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
@@ -48,27 +49,26 @@ namespace DiakonischesWerkRegensburg
|
||||
this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
|
||||
this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
|
||||
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
|
||||
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
|
||||
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
|
||||
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
|
||||
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
|
||||
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
|
||||
//
|
||||
// Detail
|
||||
@@ -93,6 +93,21 @@ namespace DiakonischesWerkRegensburg
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
this.ReportHeader.StylePriority.UseFont = false;
|
||||
//
|
||||
// xrLabel8
|
||||
//
|
||||
this.xrLabel8.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel8.CanShrink = true;
|
||||
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 300.7083F);
|
||||
this.xrLabel8.Name = "xrLabel8";
|
||||
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel8.SizeF = new System.Drawing.SizeF(555.56F, 27.76F);
|
||||
this.xrLabel8.StylePriority.UseBackColor = false;
|
||||
this.xrLabel8.StylePriority.UseFont = false;
|
||||
this.xrLabel8.Text = "[CustomerFirstName] [CustomerLastName], geb. [CustomerBirthdate!dd.MM.yyyy], Akte" +
|
||||
"nzeichen: [CustomerReferenceNumber]";
|
||||
this.xrLabel8.WordWrap = false;
|
||||
//
|
||||
// xrLabel3
|
||||
//
|
||||
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
|
||||
@@ -171,7 +186,7 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// lblAdresse
|
||||
//
|
||||
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
|
||||
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23F);
|
||||
this.lblAdresse.Multiline = true;
|
||||
this.lblAdresse.Name = "lblAdresse";
|
||||
@@ -211,7 +226,7 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTable6});
|
||||
this.Detail1.HeightF = 25F;
|
||||
this.Detail1.HeightF = 20F;
|
||||
this.Detail1.Name = "Detail1";
|
||||
this.Detail1.StylePriority.UseFont = false;
|
||||
//
|
||||
@@ -225,7 +240,7 @@ namespace DiakonischesWerkRegensburg
|
||||
this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
|
||||
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
|
||||
this.xrTableRow25});
|
||||
this.xrTable6.SizeF = new System.Drawing.SizeF(540F, 25F);
|
||||
this.xrTable6.SizeF = new System.Drawing.SizeF(420F, 20F);
|
||||
this.xrTable6.StylePriority.UseBorders = false;
|
||||
this.xrTable6.StylePriority.UseFont = false;
|
||||
this.xrTable6.StylePriority.UsePadding = false;
|
||||
@@ -238,55 +253,78 @@ namespace DiakonischesWerkRegensburg
|
||||
this.xrTableCell45,
|
||||
this.xrTableCell3});
|
||||
this.xrTableRow25.Name = "xrTableRow25";
|
||||
this.xrTableRow25.Weight = 0.99999999999999989D;
|
||||
this.xrTableRow25.Weight = 0.79999999999999993D;
|
||||
//
|
||||
// xrTableCell9
|
||||
//
|
||||
this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodEnd")});
|
||||
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell9.Name = "xrTableCell9";
|
||||
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
|
||||
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableCell9.StylePriority.UseBorders = false;
|
||||
this.xrTableCell9.StylePriority.UseFont = false;
|
||||
this.xrTableCell9.StylePriority.UsePadding = false;
|
||||
this.xrTableCell9.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell9.TextFormatString = "{0:dd.MM.yyyy}";
|
||||
this.xrTableCell9.Weight = 0.68322841128249778D;
|
||||
this.xrTableCell9.Weight = 0.39854985252728192D;
|
||||
//
|
||||
// xrTableCell6
|
||||
//
|
||||
this.xrTableCell6.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart")});
|
||||
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell6.Multiline = true;
|
||||
this.xrTableCell6.Name = "xrTableCell6";
|
||||
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableCell6.StylePriority.UseBorders = false;
|
||||
this.xrTableCell6.StylePriority.UseFont = false;
|
||||
this.xrTableCell6.StylePriority.UsePadding = false;
|
||||
this.xrTableCell6.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell6.Text = "xrTableCell6";
|
||||
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell6.TextFormatString = "{0:dd.MM.yyyy}";
|
||||
this.xrTableCell6.Weight = 0.39854985252728192D;
|
||||
//
|
||||
// xrTableCell45
|
||||
//
|
||||
this.xrTableCell45.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.##}")});
|
||||
this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell45.Name = "xrTableCell45";
|
||||
this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
|
||||
this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableCell45.StylePriority.UseBorderColor = false;
|
||||
this.xrTableCell45.StylePriority.UseBorders = false;
|
||||
this.xrTableCell45.StylePriority.UseFont = false;
|
||||
this.xrTableCell45.StylePriority.UsePadding = false;
|
||||
this.xrTableCell45.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.xrTableCell45.Weight = 0.283096864018934D;
|
||||
this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell45.Weight = 0.39855006255865155D;
|
||||
//
|
||||
// xrTableCell3
|
||||
//
|
||||
this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:c}")});
|
||||
this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell3.Name = "xrTableCell3";
|
||||
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
|
||||
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableCell3.StylePriority.UseBorders = false;
|
||||
this.xrTableCell3.StylePriority.UseFont = false;
|
||||
this.xrTableCell3.StylePriority.UsePadding = false;
|
||||
this.xrTableCell3.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.xrTableCell3.Weight = 0.400131519444102D;
|
||||
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell3.Weight = 0.3985498370752536D;
|
||||
//
|
||||
// GroupHeader3
|
||||
//
|
||||
this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTable5});
|
||||
this.GroupHeader3.HeightF = 25F;
|
||||
this.GroupHeader3.HeightF = 20F;
|
||||
this.GroupHeader3.Name = "GroupHeader3";
|
||||
//
|
||||
// xrTable5
|
||||
@@ -299,7 +337,7 @@ namespace DiakonischesWerkRegensburg
|
||||
this.xrTable5.Name = "xrTable5";
|
||||
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
|
||||
this.xrTableRow1});
|
||||
this.xrTable5.SizeF = new System.Drawing.SizeF(540F, 25F);
|
||||
this.xrTable5.SizeF = new System.Drawing.SizeF(420F, 20F);
|
||||
this.xrTable5.StylePriority.UseBackColor = false;
|
||||
this.xrTable5.StylePriority.UseBorders = false;
|
||||
//
|
||||
@@ -313,132 +351,109 @@ namespace DiakonischesWerkRegensburg
|
||||
this.xrTableCell1});
|
||||
this.xrTableRow1.Name = "xrTableRow1";
|
||||
this.xrTableRow1.StylePriority.UseBackColor = false;
|
||||
this.xrTableRow1.Weight = 0.99999999999999989D;
|
||||
this.xrTableRow1.Weight = 0.79999999999999993D;
|
||||
//
|
||||
// xrTableCell2
|
||||
//
|
||||
this.xrTableCell2.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrTableCell2.Name = "xrTableCell2";
|
||||
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
|
||||
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableCell2.StylePriority.UseBackColor = false;
|
||||
this.xrTableCell2.StylePriority.UseBorders = false;
|
||||
this.xrTableCell2.StylePriority.UseFont = false;
|
||||
this.xrTableCell2.StylePriority.UsePadding = false;
|
||||
this.xrTableCell2.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell2.Text = "von";
|
||||
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell2.Weight = 0.68322852603339645D;
|
||||
this.xrTableCell2.Weight = 0.39854991494744452D;
|
||||
//
|
||||
// xrTableCell5
|
||||
//
|
||||
this.xrTableCell5.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrTableCell5.Multiline = true;
|
||||
this.xrTableCell5.Name = "xrTableCell5";
|
||||
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableCell5.StylePriority.UseBackColor = false;
|
||||
this.xrTableCell5.StylePriority.UseBorders = false;
|
||||
this.xrTableCell5.StylePriority.UseFont = false;
|
||||
this.xrTableCell5.StylePriority.UsePadding = false;
|
||||
this.xrTableCell5.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell5.Text = "bis";
|
||||
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell5.Weight = 0.39854997286544447D;
|
||||
//
|
||||
// xrTableCell4
|
||||
//
|
||||
this.xrTableCell4.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrTableCell4.Name = "xrTableCell4";
|
||||
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
|
||||
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableCell4.StylePriority.UseBackColor = false;
|
||||
this.xrTableCell4.StylePriority.UseBorders = false;
|
||||
this.xrTableCell4.StylePriority.UseFont = false;
|
||||
this.xrTableCell4.StylePriority.UsePadding = false;
|
||||
this.xrTableCell4.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell4.Text = "Stunden:";
|
||||
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.xrTableCell4.Weight = 0.28309692864294422D;
|
||||
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell4.Weight = 0.39854997465172465D;
|
||||
//
|
||||
// xrTableCell1
|
||||
//
|
||||
this.xrTableCell1.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrTableCell1.Name = "xrTableCell1";
|
||||
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
|
||||
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableCell1.StylePriority.UseBackColor = false;
|
||||
this.xrTableCell1.StylePriority.UseBorders = false;
|
||||
this.xrTableCell1.StylePriority.UseFont = false;
|
||||
this.xrTableCell1.StylePriority.UsePadding = false;
|
||||
this.xrTableCell1.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell1.Text = "Satz";
|
||||
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.xrTableCell1.Weight = 0.40013160209951731D;
|
||||
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell1.Weight = 0.39855003527591759D;
|
||||
//
|
||||
// ReportHeader1
|
||||
//
|
||||
this.ReportHeader1.HeightF = 0F;
|
||||
this.ReportHeader1.Name = "ReportHeader1";
|
||||
this.ReportHeader1.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
|
||||
//
|
||||
// xrLabel8
|
||||
//
|
||||
this.xrLabel8.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel8.CanShrink = true;
|
||||
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 300.7083F);
|
||||
this.xrLabel8.Name = "xrLabel8";
|
||||
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel8.SizeF = new System.Drawing.SizeF(555.5619F, 17F);
|
||||
this.xrLabel8.StylePriority.UseBackColor = false;
|
||||
this.xrLabel8.StylePriority.UseFont = false;
|
||||
this.xrLabel8.Text = "[CustomerFirstName] [CustomerLastName], geb. [CustomerBirthdate!dd.MM.yyyy]";
|
||||
this.xrLabel8.WordWrap = false;
|
||||
//
|
||||
// ReportFooter
|
||||
//
|
||||
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrRichText2,
|
||||
this.xrLabel1});
|
||||
this.ReportFooter.HeightF = 404.4731F;
|
||||
this.ReportFooter.HeightF = 384.4732F;
|
||||
this.ReportFooter.Name = "ReportFooter";
|
||||
//
|
||||
// xrLabel1
|
||||
//
|
||||
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
|
||||
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 256.5563F);
|
||||
this.xrLabel1.Multiline = true;
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel1.SizeF = new System.Drawing.SizeF(555.5629F, 147.9168F);
|
||||
this.xrLabel1.StylePriority.UseFont = false;
|
||||
this.xrLabel1.Text = "Mit freundlichen Grüßen\r\n\r\n\r\n\r\nSandra Jörg\r\nDipl. Sozialpädagogin (FH)\r\nBereichsl" +
|
||||
"eitung\r\n";
|
||||
//
|
||||
// xrRichText2
|
||||
//
|
||||
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 0F);
|
||||
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(10.0009F, 10.00001F);
|
||||
this.xrRichText2.Name = "xrRichText2";
|
||||
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
|
||||
this.xrRichText2.SizeF = new System.Drawing.SizeF(555.5628F, 220.9166F);
|
||||
this.xrRichText2.StylePriority.UseFont = false;
|
||||
//
|
||||
// xrTableCell5
|
||||
// xrLabel1
|
||||
//
|
||||
this.xrTableCell5.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrTableCell5.Multiline = true;
|
||||
this.xrTableCell5.Name = "xrTableCell5";
|
||||
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
|
||||
this.xrTableCell5.StylePriority.UseBackColor = false;
|
||||
this.xrTableCell5.StylePriority.UseFont = false;
|
||||
this.xrTableCell5.StylePriority.UsePadding = false;
|
||||
this.xrTableCell5.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell5.Text = "bis";
|
||||
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell5.Weight = 0.68322852603339645D;
|
||||
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
|
||||
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(9.997749F, 246.5564F);
|
||||
this.xrLabel1.Multiline = true;
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel1.SizeF = new System.Drawing.SizeF(555.563F, 137.9168F);
|
||||
this.xrLabel1.StylePriority.UseFont = false;
|
||||
this.xrLabel1.Text = "Mit freundlichen Grüßen\r\n\r\n\r\n\r\nSandra Jörg\r\nDipl. Sozialpädagogin (FH)\r\nBereichsl" +
|
||||
"eitung\r\n";
|
||||
//
|
||||
// xrTableCell6
|
||||
// bindingSource1
|
||||
//
|
||||
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart")});
|
||||
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell6.Multiline = true;
|
||||
this.xrTableCell6.Name = "xrTableCell6";
|
||||
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
|
||||
this.xrTableCell6.StylePriority.UseFont = false;
|
||||
this.xrTableCell6.StylePriority.UsePadding = false;
|
||||
this.xrTableCell6.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell6.Text = "xrTableCell6";
|
||||
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
this.xrTableCell6.TextFormatString = "{0:dd.MM.yyyy}";
|
||||
this.xrTableCell6.Weight = 0.68322841128249778D;
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
|
||||
//
|
||||
// Einzelrechnung
|
||||
//
|
||||
@@ -465,8 +480,8 @@ namespace DiakonischesWerkRegensburg
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
|
||||
|
||||
}
|
||||
|
||||
@@ -94,10 +94,10 @@ namespace DiakonischesWerkRegensburg
|
||||
{
|
||||
sb.AppendLine(pRO.RecipientOrganisation);
|
||||
}
|
||||
if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
|
||||
{
|
||||
sb.AppendLine(pRO.RecipientContactPerson);
|
||||
}
|
||||
//if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
|
||||
//{
|
||||
// sb.AppendLine(pRO.RecipientContactPerson);
|
||||
//}
|
||||
if (!String.IsNullOrEmpty(pRO.RecipientDivision))
|
||||
{
|
||||
sb.AppendLine(pRO.RecipientDivision);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -12,157 +12,102 @@ using BS.Shared.Services;
|
||||
|
||||
namespace DiakonischesWerkRegensburg.Invoicing
|
||||
{
|
||||
public class CustomInvoiceCreationTagespauschale : InvoiceCreation
|
||||
public class CustomInvoiceCreation : InvoiceCreation
|
||||
{
|
||||
private DateTime? accountingPeriodStart = null;
|
||||
private DateTime? accountingPeriodEnd = null;
|
||||
|
||||
//public override void CheckMaxApprovedAmount(ServiceInvoice invoice, ServiceInvoicePeriod sip, SupportConceptApprovalPeriodDC scap,
|
||||
// CostBearer2SupportConcept costBearer2SupportConcept, DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
|
||||
public override ServiceInvoicePeriod CreateServiceInvoicePeriod(SupportConceptApprovalPeriodDC approvalPeriodDC, DateTimeSpan invoiceAccountingPeriodSpan)
|
||||
{
|
||||
var sip = new ServiceInvoicePeriod
|
||||
{
|
||||
Start = invoiceAccountingPeriodSpan.StartDateTime,
|
||||
End = invoiceAccountingPeriodSpan.EndDateTime,
|
||||
};
|
||||
|
||||
return sip;
|
||||
}
|
||||
|
||||
//public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
|
||||
// IList<CompactSupportConceptDC> supportConceptList)
|
||||
//{
|
||||
// // do nothing base.CheckMaxApprovedAmount(invoice, sip, scap, costBearer2SupportConcept, invoicePeriod, serviceRecords);
|
||||
// if (invoicePeriod != null)
|
||||
// {
|
||||
// accountingPeriodStart = invoicePeriod.StartDate;
|
||||
// accountingPeriodEnd = invoicePeriod.EndDate;
|
||||
// }
|
||||
// base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
|
||||
//}
|
||||
|
||||
public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
|
||||
IList<CompactSupportConceptDC> supportConceptList)
|
||||
{
|
||||
if (invoicePeriod != null)
|
||||
{
|
||||
accountingPeriodStart = invoicePeriod.StartDate;
|
||||
accountingPeriodEnd = invoicePeriod.EndDate;
|
||||
}
|
||||
base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
|
||||
}
|
||||
//public override void SetSingleInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer,
|
||||
// DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept)
|
||||
//{
|
||||
// base.SetSingleInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConcept);
|
||||
|
||||
public override void SetSingleInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer,
|
||||
DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept)
|
||||
{
|
||||
base.SetSingleInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConcept);
|
||||
// Person p = invoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.Person;
|
||||
// invoice.InvoiceBase.InvoiceTitle = String.Format("{0}, {1}, {2}", invoice.InvoiceBase.RecipientOrganisation, p.LastName, p.FirstName);
|
||||
//}
|
||||
|
||||
Person p = invoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.Person;
|
||||
invoice.InvoiceBase.InvoiceTitle = String.Format("{0}, {1}, {2}", invoice.InvoiceBase.RecipientOrganisation, p.LastName, p.FirstName);
|
||||
}
|
||||
// public override void SetInvoiceItems(ServiceInvoice invoice, ServiceInvoicePeriod serviceInvoicePeriod,
|
||||
// SupportConceptApprovalPeriodDC scap, CostBearer2SupportConcept cb2sc,
|
||||
// DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
|
||||
// {
|
||||
// serviceInvoicePeriod.ApprovedFixedAmount = null;
|
||||
// //base.SetInvoiceItems(invoice, serviceInvoicePeriod, scap, cb2sc, invoicePeriod, serviceRecords);
|
||||
// Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
|
||||
// serviceInvoicePeriod.InvoiceItemList.Add(CreateInvoiceItem(scap, calc, cb2sc));
|
||||
|
||||
public override void SetInvoiceItems(ServiceInvoice invoice, ServiceInvoicePeriod serviceInvoicePeriod,
|
||||
SupportConceptApprovalPeriodDC scap, CostBearer2SupportConcept cb2sc,
|
||||
DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
|
||||
{
|
||||
serviceInvoicePeriod.ApprovedFixedAmount = null;
|
||||
//base.SetInvoiceItems(invoice, serviceInvoicePeriod, scap, cb2sc, invoicePeriod, serviceRecords);
|
||||
Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
|
||||
serviceInvoicePeriod.InvoiceItemList.Add(CreateInvoiceItem(scap, calc, cb2sc));
|
||||
|
||||
serviceInvoicePeriod.Claim = serviceInvoicePeriod.InvoiceItemList.Sum(i => i.GrossAmountTotal);
|
||||
}
|
||||
// serviceInvoicePeriod.Claim = serviceInvoicePeriod.InvoiceItemList.Sum(i => i.GrossAmountTotal);
|
||||
// }
|
||||
|
||||
public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
|
||||
Calculations calc)
|
||||
{
|
||||
|
||||
return new List<InvoiceItem>();
|
||||
}
|
||||
// public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
|
||||
// Calculations calc)
|
||||
// {
|
||||
|
||||
private InvoiceItem CreateInvoiceItem(SupportConceptApprovalPeriodDC scap, Calculations calc, CostBearer2SupportConcept cb2sc)
|
||||
{
|
||||
var invoiceItem = new InvoiceItem();
|
||||
|
||||
DateTime start = accountingPeriodStart.Value;
|
||||
DateTime end = accountingPeriodEnd.Value;
|
||||
// return new List<InvoiceItem>();
|
||||
// }
|
||||
|
||||
if (scap.StartDate.HasValue && scap.StartDate > start)
|
||||
{
|
||||
start = scap.StartDate.Value;
|
||||
}
|
||||
// private InvoiceItem CreateInvoiceItem(SupportConceptApprovalPeriodDC scap, Calculations calc, CostBearer2SupportConcept cb2sc)
|
||||
//{
|
||||
// var invoiceItem = new InvoiceItem();
|
||||
|
||||
if (scap.EndDate.HasValue && scap.EndDate < end)
|
||||
{
|
||||
end = scap.EndDate.Value;
|
||||
}
|
||||
// DateTime start = accountingPeriodStart.Value;
|
||||
// DateTime end = accountingPeriodEnd.Value;
|
||||
|
||||
|
||||
int days = BerechneAbrechenbareTage(start, end, cb2sc.SupportConcept.Customer);
|
||||
|
||||
invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount ?? 0;
|
||||
if (scap.ApprovedFixedAmount.HasValue && scap.ApprovedFixedAmountInterval.HasValue &&
|
||||
scap.ApprovedFixedAmountInterval.Value == SupportConceptApprovalInterval.Daily)
|
||||
{
|
||||
invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount.Value;
|
||||
}
|
||||
invoiceItem.UnitCount = days;
|
||||
invoiceItem.AmountTotal = invoiceItem.UnitCount * invoiceItem.AmountPerUnit;
|
||||
invoiceItem.ItemPeriodStart = start;
|
||||
invoiceItem.ItemPeriodEnd = end;
|
||||
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
|
||||
|
||||
invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
|
||||
|
||||
return invoiceItem;
|
||||
}
|
||||
// if (scap.StartDate.HasValue && scap.StartDate > start)
|
||||
// {
|
||||
// start = scap.StartDate.Value;
|
||||
// }
|
||||
|
||||
private int BerechneAbrechenbareTage(DateTime start, DateTime end, Customer customer)
|
||||
{
|
||||
int days = (int)end.Subtract(start).TotalDays + 1;
|
||||
// if (scap.EndDate.HasValue && scap.EndDate < end)
|
||||
// {
|
||||
// end = scap.EndDate.Value;
|
||||
// }
|
||||
|
||||
//var abs = customer.AbsenceTimes;
|
||||
|
||||
//foreach (var at in abs)
|
||||
//{
|
||||
// if (at.Start <= end && (!at.End.HasValue || at.End.Value >= start))
|
||||
// {
|
||||
// int abwesenheitStart = (int)start.Subtract(at.Start.Value).TotalDays + 1;
|
||||
// int days = BerechneAbrechenbareTage(start, end, cb2sc.SupportConcept.Customer);
|
||||
|
||||
// DateTime abwStart = start;
|
||||
// DateTime abwEnd = end;
|
||||
// invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount ?? 0;
|
||||
// if (scap.ApprovedFixedAmount.HasValue && scap.ApprovedFixedAmountInterval.HasValue &&
|
||||
// scap.ApprovedFixedAmountInterval.Value == SupportConceptApprovalInterval.Daily)
|
||||
// {
|
||||
// invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount.Value;
|
||||
// }
|
||||
// invoiceItem.UnitCount = days;
|
||||
// invoiceItem.AmountTotal = invoiceItem.UnitCount * invoiceItem.AmountPerUnit;
|
||||
// invoiceItem.ItemPeriodStart = start;
|
||||
// invoiceItem.ItemPeriodEnd = end;
|
||||
// invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
|
||||
|
||||
// if (at.Start.Value > abwStart)
|
||||
// {
|
||||
// abwStart = at.Start.Value;
|
||||
// }
|
||||
// invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
|
||||
|
||||
// if (at.End.HasValue && at.End.Value < abwEnd)
|
||||
// {
|
||||
// abwEnd = at.End.Value;
|
||||
// }
|
||||
// return invoiceItem;
|
||||
//}
|
||||
|
||||
// int daysAbwesenheit = (int)abwEnd.Subtract(abwStart).TotalDays + 1;
|
||||
|
||||
// int letzterTag = abwesenheitStart + daysAbwesenheit - 1;
|
||||
|
||||
// if (letzterTag > 30)
|
||||
// {
|
||||
// if (letzterTag <= 56)
|
||||
// {
|
||||
// if (abwesenheitStart > 30)
|
||||
// {
|
||||
// days -= (letzterTag - abwesenheitStart);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// days -= (letzterTag - 30);
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// int tageAbzug = 56 - abwesenheitStart;
|
||||
|
||||
// if (tageAbzug > 0)
|
||||
// {
|
||||
// days -= tageAbzug;
|
||||
// }
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
//}
|
||||
//if (days < 0)
|
||||
//{
|
||||
// days = 0;
|
||||
//}
|
||||
return days;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
// private int BerechneAbrechenbareTage(DateTime start, DateTime end, Customer customer)
|
||||
// {
|
||||
// int days = (int)end.Subtract(start).TotalDays + 1;
|
||||
// return days;
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,12 +11,10 @@ namespace DiakonischesWerkRegensburg.Invoicing
|
||||
{
|
||||
public class CustomInvoiceFactory : InvoiceFactory
|
||||
{
|
||||
|
||||
//public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
|
||||
//{
|
||||
// return new CustomInvoiceCreation();
|
||||
|
||||
//}
|
||||
|
||||
}
|
||||
|
||||
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
|
||||
{
|
||||
return new CustomInvoiceCreation();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,10 +29,13 @@ namespace DiakonischesWerkRegensburg
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sammelrechnung));
|
||||
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
|
||||
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
|
||||
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
|
||||
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
|
||||
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
|
||||
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
@@ -67,13 +70,11 @@ namespace DiakonischesWerkRegensburg
|
||||
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand();
|
||||
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
|
||||
@@ -103,6 +104,31 @@ namespace DiakonischesWerkRegensburg
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
this.ReportHeader.StylePriority.UseFont = false;
|
||||
//
|
||||
// xrLabel3
|
||||
//
|
||||
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel3.CanShrink = true;
|
||||
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(178.334F, 325.7084F);
|
||||
this.xrLabel3.Name = "xrLabel3";
|
||||
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel3.SizeF = new System.Drawing.SizeF(387.2294F, 17F);
|
||||
this.xrLabel3.StylePriority.UseBackColor = false;
|
||||
this.xrLabel3.StylePriority.UseFont = false;
|
||||
this.xrLabel3.Text = "[InvoiceNumber] - [AccountingPeriodStart!MMMM yyyy]";
|
||||
this.xrLabel3.WordWrap = false;
|
||||
//
|
||||
// xrLabel1
|
||||
//
|
||||
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
|
||||
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 691.5561F);
|
||||
this.xrLabel1.Multiline = true;
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel1.SizeF = new System.Drawing.SizeF(555.5628F, 230.2084F);
|
||||
this.xrLabel1.StylePriority.UseFont = false;
|
||||
this.xrLabel1.Text = resources.GetString("xrLabel1.Text");
|
||||
//
|
||||
// xrRichText1
|
||||
//
|
||||
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 414.3894F);
|
||||
@@ -167,7 +193,7 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// lblAdresse
|
||||
//
|
||||
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
|
||||
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23F);
|
||||
this.lblAdresse.Multiline = true;
|
||||
this.lblAdresse.Name = "lblAdresse";
|
||||
@@ -240,6 +266,8 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell42
|
||||
//
|
||||
this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell42.Name = "xrTableCell42";
|
||||
this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
|
||||
@@ -254,11 +282,14 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell9
|
||||
//
|
||||
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.NotBillableString")});
|
||||
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell9.Name = "xrTableCell9";
|
||||
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
|
||||
this.xrTableCell9.StylePriority.UseBorders = false;
|
||||
this.xrTableCell9.StylePriority.UseFont = false;
|
||||
this.xrTableCell9.StylePriority.UsePadding = false;
|
||||
this.xrTableCell9.StylePriority.UseTextAlignment = false;
|
||||
@@ -267,6 +298,8 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell45
|
||||
//
|
||||
this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.##}")});
|
||||
this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
@@ -282,11 +315,14 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell3
|
||||
//
|
||||
this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:c}")});
|
||||
this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell3.Name = "xrTableCell3";
|
||||
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
|
||||
this.xrTableCell3.StylePriority.UseBorders = false;
|
||||
this.xrTableCell3.StylePriority.UseFont = false;
|
||||
this.xrTableCell3.StylePriority.UsePadding = false;
|
||||
this.xrTableCell3.StylePriority.UseTextAlignment = false;
|
||||
@@ -295,11 +331,14 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell10
|
||||
//
|
||||
this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:c}")});
|
||||
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
|
||||
this.xrTableCell10.Name = "xrTableCell10";
|
||||
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
|
||||
this.xrTableCell10.StylePriority.UseBorders = false;
|
||||
this.xrTableCell10.StylePriority.UseFont = false;
|
||||
this.xrTableCell10.StylePriority.UsePadding = false;
|
||||
this.xrTableCell10.StylePriority.UseTextAlignment = false;
|
||||
@@ -445,6 +484,8 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell11
|
||||
//
|
||||
this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrTableCell11.Name = "xrTableCell11";
|
||||
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
|
||||
@@ -459,8 +500,11 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell12
|
||||
//
|
||||
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("arial", 10.5F);
|
||||
this.xrTableCell12.Name = "xrTableCell12";
|
||||
this.xrTableCell12.StylePriority.UseBorders = false;
|
||||
this.xrTableCell12.StylePriority.UseFont = false;
|
||||
this.xrTableCell12.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
|
||||
@@ -468,10 +512,13 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell13
|
||||
//
|
||||
this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")});
|
||||
this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrTableCell13.Name = "xrTableCell13";
|
||||
this.xrTableCell13.StylePriority.UseBorders = false;
|
||||
this.xrTableCell13.StylePriority.UseFont = false;
|
||||
this.xrTableCell13.StylePriority.UseTextAlignment = false;
|
||||
xrSummary1.FormatString = "{0:0.##}";
|
||||
@@ -482,8 +529,11 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell7
|
||||
//
|
||||
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("arial", 10.5F);
|
||||
this.xrTableCell7.Name = "xrTableCell7";
|
||||
this.xrTableCell7.StylePriority.UseBorders = false;
|
||||
this.xrTableCell7.StylePriority.UseFont = false;
|
||||
this.xrTableCell7.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
|
||||
@@ -491,11 +541,14 @@ namespace DiakonischesWerkRegensburg
|
||||
//
|
||||
// xrTableCell14
|
||||
//
|
||||
this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")});
|
||||
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrTableCell14.Name = "xrTableCell14";
|
||||
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
|
||||
this.xrTableCell14.StylePriority.UseBorders = false;
|
||||
this.xrTableCell14.StylePriority.UseFont = false;
|
||||
this.xrTableCell14.StylePriority.UsePadding = false;
|
||||
this.xrTableCell14.StylePriority.UseTextAlignment = false;
|
||||
@@ -503,21 +556,6 @@ namespace DiakonischesWerkRegensburg
|
||||
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.xrTableCell14.Weight = 0.69076967431961256D;
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
|
||||
//
|
||||
// xrLabel1
|
||||
//
|
||||
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
|
||||
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 691.5561F);
|
||||
this.xrLabel1.Multiline = true;
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel1.SizeF = new System.Drawing.SizeF(555.5628F, 230.2084F);
|
||||
this.xrLabel1.StylePriority.UseFont = false;
|
||||
this.xrLabel1.Text = resources.GetString("xrLabel1.Text");
|
||||
//
|
||||
// ReportHeader1
|
||||
//
|
||||
this.ReportHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
@@ -528,34 +566,20 @@ namespace DiakonischesWerkRegensburg
|
||||
this.ReportHeader1.Name = "ReportHeader1";
|
||||
this.ReportHeader1.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
|
||||
//
|
||||
// xrLabel3
|
||||
// xrLabel7
|
||||
//
|
||||
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel3.CanShrink = true;
|
||||
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(178.334F, 325.7084F);
|
||||
this.xrLabel3.Name = "xrLabel3";
|
||||
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel3.SizeF = new System.Drawing.SizeF(387.2294F, 17F);
|
||||
this.xrLabel3.StylePriority.UseBackColor = false;
|
||||
this.xrLabel3.StylePriority.UseFont = false;
|
||||
this.xrLabel3.Text = "[InvoiceNumber] - [AccountingPeriodStart!MMMM yyyy]";
|
||||
this.xrLabel3.WordWrap = false;
|
||||
//
|
||||
// xrLabel4
|
||||
//
|
||||
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel4.CanShrink = true;
|
||||
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 0F);
|
||||
this.xrLabel4.Multiline = true;
|
||||
this.xrLabel4.Name = "xrLabel4";
|
||||
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel4.SizeF = new System.Drawing.SizeF(555.5629F, 29.87499F);
|
||||
this.xrLabel4.StylePriority.UseBackColor = false;
|
||||
this.xrLabel4.StylePriority.UseFont = false;
|
||||
this.xrLabel4.Text = "Abrechnung Fachleistungsstunden Ambulant unterstütztes Wohnen";
|
||||
this.xrLabel4.WordWrap = false;
|
||||
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel7.CanShrink = true;
|
||||
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 72.16663F);
|
||||
this.xrLabel7.Multiline = true;
|
||||
this.xrLabel7.Name = "xrLabel7";
|
||||
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel7.SizeF = new System.Drawing.SizeF(555.5629F, 24.66666F);
|
||||
this.xrLabel7.StylePriority.UseBackColor = false;
|
||||
this.xrLabel7.StylePriority.UseFont = false;
|
||||
this.xrLabel7.Text = "Abrechnungszeitraum: [AccountingPeriod]";
|
||||
this.xrLabel7.WordWrap = false;
|
||||
//
|
||||
// xrLabel6
|
||||
//
|
||||
@@ -572,20 +596,24 @@ namespace DiakonischesWerkRegensburg
|
||||
this.xrLabel6.Text = "Einzelaufstellung erstellt am [InvoiceDate]";
|
||||
this.xrLabel6.WordWrap = false;
|
||||
//
|
||||
// xrLabel7
|
||||
// xrLabel4
|
||||
//
|
||||
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel7.CanShrink = true;
|
||||
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 72.16663F);
|
||||
this.xrLabel7.Multiline = true;
|
||||
this.xrLabel7.Name = "xrLabel7";
|
||||
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel7.SizeF = new System.Drawing.SizeF(555.5629F, 24.66666F);
|
||||
this.xrLabel7.StylePriority.UseBackColor = false;
|
||||
this.xrLabel7.StylePriority.UseFont = false;
|
||||
this.xrLabel7.Text = "Abrechnungszeitraum: [AccountingPeriod]";
|
||||
this.xrLabel7.WordWrap = false;
|
||||
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel4.CanShrink = true;
|
||||
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 0F);
|
||||
this.xrLabel4.Multiline = true;
|
||||
this.xrLabel4.Name = "xrLabel4";
|
||||
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel4.SizeF = new System.Drawing.SizeF(555.5629F, 29.87499F);
|
||||
this.xrLabel4.StylePriority.UseBackColor = false;
|
||||
this.xrLabel4.StylePriority.UseFont = false;
|
||||
this.xrLabel4.Text = "Abrechnung Fachleistungsstunden Ambulant unterstütztes Wohnen";
|
||||
this.xrLabel4.WordWrap = false;
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
|
||||
//
|
||||
// Sammelrechnung
|
||||
//
|
||||
@@ -606,6 +634,8 @@ namespace DiakonischesWerkRegensburg
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
this.Version = "23.2";
|
||||
xrWatermark1.Id = "Watermark1";
|
||||
this.Watermarks.Add(xrWatermark1);
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
|
||||
|
||||
@@ -28,26 +28,6 @@ namespace DiakonischesWerkRegensburg
|
||||
pRO.ServiceInvoicePeriods.Sort((a, b) => a.Customer.LastName.CompareTo(b.Customer.LastName));
|
||||
foreach (var sip in pRO.ServiceInvoicePeriods)
|
||||
{
|
||||
if (sip.Customer != null)
|
||||
{
|
||||
String anrede = "";
|
||||
if (sip.Customer.Sex.HasValue && sip.Customer.Sex.Value == Sex.Male)
|
||||
{
|
||||
anrede = "Herr";
|
||||
}
|
||||
else
|
||||
{
|
||||
anrede = "Frau";
|
||||
}
|
||||
|
||||
String name = String.Format("{0} {1} {2}", anrede, sip.Customer.FirstName, sip.Customer.LastName);
|
||||
|
||||
if (!sb.ToString().Contains("name"))
|
||||
{
|
||||
sb.AppendLine(name);
|
||||
}
|
||||
}
|
||||
|
||||
if (sip.ServiceInvoiceItems != null)
|
||||
{
|
||||
foreach (var ii in sip.ServiceInvoiceItems)
|
||||
@@ -77,10 +57,10 @@ namespace DiakonischesWerkRegensburg
|
||||
|
||||
|
||||
}
|
||||
if (pRO.RecipientOrganisation.Contains("TWG"))
|
||||
{
|
||||
lblBetreff.Text = "Therapeutische Wohngemeinschaft";
|
||||
}
|
||||
//if (pRO.RecipientOrganisation.Contains("TWG"))
|
||||
//{
|
||||
// lblBetreff.Text = "Therapeutische Wohngemeinschaft";
|
||||
//}
|
||||
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
}
|
||||
@@ -95,10 +75,10 @@ namespace DiakonischesWerkRegensburg
|
||||
{
|
||||
sb.AppendLine(pRO.RecipientOrganisation);
|
||||
}
|
||||
if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
|
||||
{
|
||||
sb.AppendLine(pRO.RecipientContactPerson);
|
||||
}
|
||||
//if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
|
||||
//{
|
||||
// sb.AppendLine(pRO.RecipientContactPerson);
|
||||
//}
|
||||
if (!String.IsNullOrEmpty(pRO.RecipientDivision))
|
||||
{
|
||||
sb.AppendLine(pRO.RecipientDivision);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,76 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Windows;
|
||||
using BeWo.Data;
|
||||
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;
|
||||
|
||||
namespace DiakonischesWerkRegensburg.Service
|
||||
{
|
||||
public class CustomAccountingService : AccountingService
|
||||
{
|
||||
// entspricht dem Original, außer dass die Bewilligung des Hilfeplans abgelaufen sein kann bzw. kein Enddate hat
|
||||
public override List<ServiceInvoiceDC> GenerateInitialServiceInvoices(long costBearerOid, long? supportConceptOid, DateTimeSpan invoicePeriod)
|
||||
{
|
||||
var cs = PluginLoader.FindClass<CustomerService>();
|
||||
IEnumerable<CompactSupportConceptDC> supportConcepts;
|
||||
// GetAllActiveSupportConceptCostbearer returns a "Flat" SupportConcept List, one for each CostBearer2SupportConcept!
|
||||
if (!supportConceptOid.HasValue)
|
||||
{
|
||||
supportConcepts = cs.GetAllActiveSupportConceptCostbearer(false, true, 0)
|
||||
.Where(i => i.CostBearerOids2CostBearerRelOids.ContainsKey(costBearerOid));
|
||||
}
|
||||
else
|
||||
{
|
||||
supportConcepts = cs.GetCompactSupportConcepts(supportConceptOid.Value, null)
|
||||
.Where(i => i.CostBearerOids2CostBearerRelOids.ContainsKey(costBearerOid));
|
||||
}
|
||||
|
||||
DateTimeSpan newSpan = null;
|
||||
if (invoicePeriod != null)
|
||||
{
|
||||
//invoicePeriod.StartDateTime = invoicePeriod.StartDateTime.Date;
|
||||
//invoicePeriod.EndDateTime = invoicePeriod.EndDateTime.Date;
|
||||
newSpan = new DateTimeSpan();
|
||||
newSpan.StartDateTime = invoicePeriod.StartDateTime.Date;
|
||||
newSpan.EndDateTime = invoicePeriod.EndDateTime.Date.AddDays(1).AddTicks(-1);
|
||||
// if (!supportConceptOid.HasValue)
|
||||
// {
|
||||
//supportConcepts =
|
||||
// supportConcepts.Where(sc => sc.StartDate < newSpan.EndDateTime); //&& sc.EndDate >= newSpan.StartDate);
|
||||
// }
|
||||
}
|
||||
var supportConcepts2ServiceRecords = supportConcepts.ToDictionary(
|
||||
i => i,
|
||||
i => MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(
|
||||
DAOFactory.SearchDAO.FindServiceRecordsInSpan(i.CostBearerRelOids[0], newSpan)));
|
||||
var cb = DAOFactory.GenericDAO.LoadByID<CostBearer>(costBearerOid);
|
||||
String tenant = PluginLoader.Tenant;
|
||||
var factory = PluginLoader.FindClass<InvoiceFactory>(cb.ID);
|
||||
if (factory == null)
|
||||
{
|
||||
factory = InvoiceFactory.GetInstance(cb.ID, tenant);
|
||||
}
|
||||
|
||||
var creator = factory.CreateInvoiceCreator(cb.ID, tenant, supportConcepts2ServiceRecords);
|
||||
var newInvoices = creator.GenerateServiceInvoices(costBearerOid, invoicePeriod, supportConcepts2ServiceRecords);
|
||||
|
||||
|
||||
//Prüfe ob Rechnungen neu sind oder Diff vorhanden
|
||||
var differenzRechnungChecks = GetNewInvoices(newInvoices, invoicePeriod?.StartDate, invoicePeriod?.EndDate);
|
||||
var resultList = ErstelleNeueRechnungen(differenzRechnungChecks);
|
||||
|
||||
|
||||
return resultList;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,14 +19,18 @@ namespace HausDuelken.Invoicing
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var list in supportConcepts2ServiceRecords.Values)
|
||||
// in der Finanzauswertung funktioniert die getrennte Rechnungsstellung nicht, da sonst nur ASS als Betrag ausgewiesen wurde
|
||||
if (specificId != null && specificId != "Finanzauswertung")
|
||||
{
|
||||
foreach (var sr in list)
|
||||
foreach (var list in supportConcepts2ServiceRecords.Values)
|
||||
{
|
||||
var sd = sr.ServiceDescription.Category;
|
||||
var ic = GetInvoiceCreatorForCategory(sd);
|
||||
if (ic != null)
|
||||
return ic;
|
||||
foreach (var sr in list)
|
||||
{
|
||||
var sd = sr.ServiceDescription.Category;
|
||||
var ic = GetInvoiceCreatorForCategory(sd);
|
||||
if (ic != null)
|
||||
return ic;
|
||||
}
|
||||
}
|
||||
}
|
||||
return new InvoiceCreation();
|
||||
|
||||
@@ -84,9 +84,6 @@ namespace LebenshilfeBadKreuznachWohnstaette.Invoicing
|
||||
|
||||
if (invoice != null)
|
||||
{
|
||||
//invoice.InvoiceBase.InvoiceId = "Alltag";
|
||||
//if (catName.Contains("Selbstzahlung"))
|
||||
// invoice.InvoiceBase.InvoiceTypeText = "Selbstzahlung";
|
||||
invoiceList.Add(invoice);
|
||||
invoiceCounter++;
|
||||
}
|
||||
@@ -327,7 +324,7 @@ namespace LebenshilfeBadKreuznachWohnstaette.Invoicing
|
||||
}
|
||||
else
|
||||
{
|
||||
additionalServices = additionalServices.Where(a => a.AdditionalServiceRegion.AdditionalService.Name != "TSA").ToList();
|
||||
additionalServices = additionalServices.Where(a => a.AdditionalServiceRegion.AdditionalService.Name != "TSA" && !a.AdditionalServiceRegion.AdditionalService.Name.Contains("gelöscht")).ToList();
|
||||
}
|
||||
anwesendTage += additionalServices.Where(service => service.CustomerOidDict.TryGetValue(customer.Oid.Value, out var isPresent) && isPresent).Count();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user