ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source 
# Conflicts:
#	Data/Access/SearchDAO.cs
This commit is contained in:
Christian
2018-03-02 16:24:55 +01:00
parent 036c5218da 19c596dfe1
commit b76d6ea7d1
172 changed files with 42009 additions and 24911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
ReportImp/TeamGSReports/InvoiceCustomerReport.Designer.cs generated
View File

@@ -41,8 +41,6 @@ namespace BeWo.TeamGSReports
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -59,7 +57,6 @@ namespace BeWo.TeamGSReports
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -70,18 +67,13 @@ namespace BeWo.TeamGSReports
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrPictureBox5 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrPictureBox6 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.xrPictureBox4 = new DevExpress.XtraReports.UI.XRPictureBox();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -206,10 +198,6 @@ namespace BeWo.TeamGSReports
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox3,
this.xrPictureBox1,
this.xrPictureBox2,
this.xrLine2,
this.xrLabel1,
this.xrLabel9,
this.xrTable3,
@@ -223,22 +211,6 @@ namespace BeWo.TeamGSReports
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrPictureBox2
//
this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(619F, 179.37F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(148F, 114F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLine2
//
this.xrLine2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(157)))), ((int)(((byte)(34)))));
this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 157.29F);
this.xrLine2.Name = "xrLine2";
this.xrLine2.SizeF = new System.Drawing.SizeF(767F, 10.5F);
this.xrLine2.StylePriority.UseForeColor = false;
//
// xrLabel1
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -254,7 +226,7 @@ namespace BeWo.TeamGSReports
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(80F, 240.46F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(115F, 241.5F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -437,17 +409,9 @@ namespace BeWo.TeamGSReports
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
this.ruleRateFactorNull.DataSource = this.bindingSource1;
//
//
//
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
//
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -520,7 +484,7 @@ namespace BeWo.TeamGSReports
this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell23.BorderWidth = 2;
this.xrTableCell23.BorderWidth = 2F;
this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold);
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
@@ -540,46 +504,9 @@ namespace BeWo.TeamGSReports
//
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox5,
this.xrPictureBox6,
this.xrLine1,
this.xrPictureBox4});
this.bottomMarginBand1.HeightF = 90F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrPictureBox5
//
this.xrPictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox5.Image")));
this.xrPictureBox5.LocationFloat = new DevExpress.Utils.PointFloat(339.25F, 20F);
this.xrPictureBox5.Name = "xrPictureBox5";
this.xrPictureBox5.SizeF = new System.Drawing.SizeF(110.25F, 37.25F);
this.xrPictureBox5.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrPictureBox6
//
this.xrPictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox6.Image")));
this.xrPictureBox6.LocationFloat = new DevExpress.Utils.PointFloat(656.75F, 20F);
this.xrPictureBox6.Name = "xrPictureBox6";
this.xrPictureBox6.SizeF = new System.Drawing.SizeF(110F, 37.25F);
this.xrPictureBox6.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLine1
//
this.xrLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(157)))), ((int)(((byte)(34)))));
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3.54F);
this.xrLine1.Name = "xrLine1";
this.xrLine1.SizeF = new System.Drawing.SizeF(766.9999F, 10.50002F);
this.xrLine1.StylePriority.UseForeColor = false;
//
// xrPictureBox4
//
this.xrPictureBox4.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox4.Image")));
this.xrPictureBox4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20F);
this.xrPictureBox4.Name = "xrPictureBox4";
this.xrPictureBox4.SizeF = new System.Drawing.SizeF(90F, 13F);
this.xrPictureBox4.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -596,21 +523,9 @@ namespace BeWo.TeamGSReports
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
//
// xrPictureBox1
// bindingSource1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(220F, 40F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(330F, 112F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrPictureBox3
//
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(80F, 212.5F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(262F, 16F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
//
// InvoiceCustomerReport
//
@@ -629,11 +544,13 @@ namespace BeWo.TeamGSReports
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "11.1";
this.Version = "17.1";
this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("InvoiceCustomerReport.Watermark.Image")));
this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -679,13 +596,5 @@ namespace BeWo.TeamGSReports
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLine xrLine2;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox5;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox6;
private DevExpress.XtraReports.UI.XRLine xrLine1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox4;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
}
}

7156
ReportImp/TeamGSReports/InvoiceCustomerReport.resx
View File

File diff suppressed because it is too large Load Diff

1
ReportImp/TeamGSReports/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

45
ReportImp/TeamGSReports/ServicesOverviewReport.Designer.cs generated
View File

@@ -76,11 +76,9 @@ namespace BeWo.TeamGSReports
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldTotalMitFaktor = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldCustomerCount = new DevExpress.XtraReports.UI.CalculatedField();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -308,9 +306,6 @@ namespace BeWo.TeamGSReports
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
@@ -356,9 +351,9 @@ namespace BeWo.TeamGSReports
this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel4.BorderWidth = 2;
this.xrLabel4.BorderWidth = 2F;
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", this.bindingSource1, "TotalFLMBillable", "{0:0.##}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")});
this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(540.0001F, 0F);
this.xrLabel4.Name = "xrLabel4";
@@ -588,9 +583,6 @@ namespace BeWo.TeamGSReports
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
@@ -598,9 +590,6 @@ namespace BeWo.TeamGSReports
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
@@ -608,28 +597,14 @@ namespace BeWo.TeamGSReports
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
// topMarginBand1
//
this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1,
this.xrLine2});
this.topMarginBand1.HeightF = 191F;
this.topMarginBand1.Name = "topMarginBand1";
//
// xrLine2
//
this.xrLine2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(157)))), ((int)(((byte)(34)))));
this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 157.2917F);
this.xrLine2.Name = "xrLine2";
this.xrLine2.SizeF = new System.Drawing.SizeF(766.9999F, 10.50002F);
this.xrLine2.StylePriority.UseForeColor = false;
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30F;
@@ -637,26 +612,16 @@ namespace BeWo.TeamGSReports
//
// fieldTotalMitFaktor
//
this.fieldTotalMitFaktor.DataSource = this.bindingSource1;
this.fieldTotalMitFaktor.Expression = "[TotalFLMBillable] * [RateFactor]";
this.fieldTotalMitFaktor.Name = "fieldTotalMitFaktor";
//
// fieldCustomerCount
//
this.fieldCustomerCount.DataMember = "Services";
this.fieldCustomerCount.DataSource = this.bindingSource1;
this.fieldCustomerCount.Expression = "Iif([CustomerCount] > 1, [CustomerCount], \'\')";
this.fieldCustomerCount.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldCustomerCount.Name = "fieldCustomerCount";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(220F, 40F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(330F, 112F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -680,7 +645,9 @@ namespace BeWo.TeamGSReports
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "11.1";
this.Version = "17.1";
this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("Stundenzettel.Watermark.Image")));
this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -721,7 +688,6 @@ namespace BeWo.TeamGSReports
private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRLine xrLine2;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
@@ -739,7 +705,6 @@ namespace BeWo.TeamGSReports
private DevExpress.XtraReports.UI.CalculatedField fieldCustomerCount;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
}
}

3228
ReportImp/TeamGSReports/ServicesOverviewReport.resx
View File

File diff suppressed because it is too large Load Diff

1476
ReportImp/TeamGSReports/SettlementReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

7120
ReportImp/TeamGSReports/SettlementReport.resx
View File

File diff suppressed because it is too large Load Diff

9
ReportImp/TeamGSReports/TeamGSReports.csproj
View File

@@ -119,6 +119,12 @@
<Compile Include="ServicesOverviewReport.designer.cs">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReportAlt.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReportAlt.designer.cs">
<DependentUpon>SettlementReportAlt.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -134,6 +140,9 @@
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReportAlt.resx">
<DependentUpon>SettlementReportAlt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
</EmbeddedResource>