diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 47912b11a..a98a8ee0a 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,13 +43,13 @@ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.231 + 2.0.1.232 true publish.htm false true 232 - 2.0.1.%2a + 2.0.1.232 false true true @@ -98,45 +98,52 @@ False ..\Lib\Blacklight.Wpf.Controls.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False @@ -2586,7 +2593,7 @@ True Assembly - + False @@ -2596,7 +2603,7 @@ True Assembly - + False @@ -2606,7 +2613,7 @@ True Assembly - + False @@ -2616,7 +2623,7 @@ True Assembly - + False @@ -2626,7 +2633,7 @@ True Assembly - + False @@ -2636,7 +2643,7 @@ True Assembly - + False @@ -2646,7 +2653,7 @@ True Assembly - + False @@ -2656,7 +2663,7 @@ True Assembly - + False @@ -2666,7 +2673,7 @@ True Assembly - + False @@ -2676,7 +2683,7 @@ True Assembly - + False @@ -2686,7 +2693,7 @@ True Assembly - + False @@ -2696,7 +2703,7 @@ True Assembly - + False @@ -2706,7 +2713,7 @@ True Assembly - + False @@ -2716,7 +2723,7 @@ True Assembly - + False @@ -2726,7 +2733,7 @@ True Assembly - + False @@ -2736,7 +2743,7 @@ True Assembly - + False @@ -2746,7 +2753,7 @@ True Assembly - + False @@ -2756,7 +2763,7 @@ True Assembly - + False @@ -2766,7 +2773,7 @@ True Assembly - + False @@ -2776,7 +2783,7 @@ True Assembly - + False @@ -2786,7 +2793,7 @@ True Assembly - + False @@ -2796,7 +2803,7 @@ True Assembly - + False @@ -2806,7 +2813,7 @@ True Assembly - + False @@ -2816,7 +2823,7 @@ True Assembly - + False @@ -2826,7 +2833,7 @@ True Assembly - + False @@ -2836,7 +2843,7 @@ True Assembly - + False @@ -2846,7 +2853,7 @@ True Assembly - + False @@ -2856,7 +2863,7 @@ True Assembly - + False @@ -2866,7 +2873,7 @@ True Assembly - + False @@ -2876,7 +2883,7 @@ True Assembly - + False @@ -2886,7 +2893,7 @@ True Assembly - + False @@ -2896,7 +2903,7 @@ True Assembly - + False @@ -2906,7 +2913,7 @@ True Assembly - + False @@ -2916,7 +2923,7 @@ True Assembly - + False @@ -2926,7 +2933,7 @@ True Assembly - + False @@ -2936,7 +2943,7 @@ True Assembly - + False @@ -2946,7 +2953,7 @@ True Assembly - + False @@ -2956,7 +2963,7 @@ True Assembly - + False diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index 51ff8990c..93dc2c0b3 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,7 +2,7 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\ - https://app.ownsoft.de/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/ + https://app.ownsoft.de/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/ https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/ diff --git a/BeWo/Properties/licenses.licx b/BeWo/Properties/licenses.licx index c7fd819d5..e69de29bb 100644 --- a/BeWo/Properties/licenses.licx +++ b/BeWo/Properties/licenses.licx @@ -1 +0,0 @@ -DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/BeWo/Scheduler/View/SchedulerView.xaml b/BeWo/Scheduler/View/SchedulerView.xaml index 1ab97d2d2..1fac64952 100644 --- a/BeWo/Scheduler/View/SchedulerView.xaml +++ b/BeWo/Scheduler/View/SchedulerView.xaml @@ -7,8 +7,8 @@ xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler" xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal" - xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core" - xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1" + xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v23.2.Core" + xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v23.2" xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys" xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:search="clr-namespace:BeWo.View.Search" diff --git a/BeWo/Scheduler/View/ServiceRecordScheduler.xaml b/BeWo/Scheduler/View/ServiceRecordScheduler.xaml index 44edd0378..3efd11382 100644 --- a/BeWo/Scheduler/View/ServiceRecordScheduler.xaml +++ b/BeWo/Scheduler/View/ServiceRecordScheduler.xaml @@ -6,7 +6,7 @@ xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" - xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1" + xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v23.2" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="600" dx:ThemeManager.ThemeName="Office2010Black"> diff --git a/BeWo/View/BargeldkassenView.xaml.cs b/BeWo/View/BargeldkassenView.xaml.cs index b60a023c1..7b46c2d4c 100644 --- a/BeWo/View/BargeldkassenView.xaml.cs +++ b/BeWo/View/BargeldkassenView.xaml.cs @@ -351,7 +351,10 @@ namespace BeWo.View { return; } - + if (!NewBargeldtransaktion.Betrag.HasValue || NewBargeldtransaktion.Zahlungstyp == null) + { + return; + } var transaktionsBetrag = NewBargeldtransaktion.Betrag * (NewBargeldtransaktion.Zahlungstyp.Enum == Zahlungstyp.Auszahlung ? -1 : 1); var latestTransactionDate = new DateTime(1, 1, 1); diff --git a/BeWo/View/Controls/ComboBoxTreeViewControlV2.xaml b/BeWo/View/Controls/ComboBoxTreeViewControlV2.xaml index cb678f2ec..fd4586440 100644 --- a/BeWo/View/Controls/ComboBoxTreeViewControlV2.xaml +++ b/BeWo/View/Controls/ComboBoxTreeViewControlV2.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v17.1" + xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v23.2" xmlns:shared="clr-namespace:BeWo.Core" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300"> diff --git a/BeWo/View/Controls/EnumComboBoxStyleSettings.cs b/BeWo/View/Controls/EnumComboBoxStyleSettings.cs index 5eb0193af..d28efa812 100644 --- a/BeWo/View/Controls/EnumComboBoxStyleSettings.cs +++ b/BeWo/View/Controls/EnumComboBoxStyleSettings.cs @@ -30,13 +30,18 @@ namespace BeWo.View.Controls cb.DisplayTextConverter = (IValueConverter)Application.Current.FindResource("enumToDescriptionConverter"); } - protected override Style GetItemContainerStyle(LookUpEditBase cb) + protected override Style GetItemContainerStyle(LookUpEditBase control) { - if (HasFlagsAttribute()) - return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.CheckBoxItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) }); - return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.DefaultItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) }); + throw new NotImplementedException(); } + //protected override Style GetItemContainerStyle(LookUpEditBase cb) + //{ + // if (HasFlagsAttribute()) + // return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.CheckBoxItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) }); + // return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.DefaultItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) }); + //} + //protected override SelectionMode SelectionMode diff --git a/BeWo/View/Detail/AdditionalServiceView.xaml b/BeWo/View/Detail/AdditionalServiceView.xaml index 632a4edf7..20d1fdc34 100644 --- a/BeWo/View/Detail/AdditionalServiceView.xaml +++ b/BeWo/View/Detail/AdditionalServiceView.xaml @@ -12,9 +12,9 @@ xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared" xmlns:sys="clr-namespace:System;assembly=mscorlib" - xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1" + xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v23.2" xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys" - xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1.Core" + xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v23.2.Core" xmlns:converter="clr-namespace:BeWo.Converter" xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:detail="clr-namespace:BeWo.View.Detail" @@ -705,7 +705,7 @@ - + diff --git a/BeWo/View/Detail/BudgetView.xaml b/BeWo/View/Detail/BudgetView.xaml index a431b07e8..3d6009736 100644 --- a/BeWo/View/Detail/BudgetView.xaml +++ b/BeWo/View/Detail/BudgetView.xaml @@ -1,12 +1,11 @@ - diff --git a/BeWo/View/Detail/NotizenKategorieView.xaml b/BeWo/View/Detail/NotizenKategorieView.xaml index b425f3f30..bd777589e 100644 --- a/BeWo/View/Detail/NotizenKategorieView.xaml +++ b/BeWo/View/Detail/NotizenKategorieView.xaml @@ -1,16 +1,15 @@ - - - + + @@ -20,7 +19,7 @@ - + diff --git a/BeWo/View/Detail/RatingTypeView.xaml b/BeWo/View/Detail/RatingTypeView.xaml index 10b93a2e7..07201a605 100644 --- a/BeWo/View/Detail/RatingTypeView.xaml +++ b/BeWo/View/Detail/RatingTypeView.xaml @@ -1,12 +1,11 @@ - @@ -25,11 +24,11 @@ - + - + - + - + - - - - + + + + - - - + + + - diff --git a/BeWo/View/Detail/Report/PivotGridReport.Designer.cs b/BeWo/View/Detail/Report/PivotGridReport.Designer.cs index 60d2d16e1..8baf25949 100644 --- a/BeWo/View/Detail/Report/PivotGridReport.Designer.cs +++ b/BeWo/View/Detail/Report/PivotGridReport.Designer.cs @@ -42,7 +42,7 @@ namespace BeWo.View.Detail.Report // this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPivotGrid1}); - this.Detail.Font = new System.Drawing.Font("Arial", 10F); + this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.Detail.HeightF = 60.00001F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -61,15 +61,15 @@ namespace BeWo.View.Detail.Report // // xrPivotGrid1 // - this.xrPivotGrid1.Appearance.Cell.Font = new System.Drawing.Font("Tahoma", 8.25F); - this.xrPivotGrid1.Appearance.CustomTotalCell.Font = new System.Drawing.Font("Tahoma", 8.25F); - this.xrPivotGrid1.Appearance.FieldHeader.Font = new System.Drawing.Font("Tahoma", 8.25F); - this.xrPivotGrid1.Appearance.FieldValue.Font = new System.Drawing.Font("Tahoma", 8.25F); - this.xrPivotGrid1.Appearance.FieldValueGrandTotal.Font = new System.Drawing.Font("Tahoma", 8.25F); - this.xrPivotGrid1.Appearance.FieldValueTotal.Font = new System.Drawing.Font("Tahoma", 8.25F); - this.xrPivotGrid1.Appearance.GrandTotalCell.Font = new System.Drawing.Font("Tahoma", 8.25F); - this.xrPivotGrid1.Appearance.Lines.Font = new System.Drawing.Font("Tahoma", 8.25F); - this.xrPivotGrid1.Appearance.TotalCell.Font = new System.Drawing.Font("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.Cell.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.CustomTotalCell.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.FieldHeader.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.FieldValue.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.FieldValueGrandTotal.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.FieldValueTotal.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.GrandTotalCell.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.Lines.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); + this.xrPivotGrid1.Appearance.TotalCell.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F); this.xrPivotGrid1.Fields.AddRange(new DevExpress.XtraReports.UI.PivotGrid.XRPivotGridField[] { this.pivotGridField3}); this.xrPivotGrid1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); @@ -90,12 +90,12 @@ namespace BeWo.View.Detail.Report this.topMarginBand1, this.bottomMarginBand1}); this.DataSource = this.bindingSource1; - this.Font = new System.Drawing.Font("Arial", 10F); + this.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 75); + this.Margins = new DevExpress.Drawing.DXMargins(75, 75, 75, 75); this.PageHeight = 827; this.PageWidth = 1169; - this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); diff --git a/BeWo/View/Detail/TextbausteinView.xaml b/BeWo/View/Detail/TextbausteinView.xaml index 476fc77dd..42c5e1c38 100644 --- a/BeWo/View/Detail/TextbausteinView.xaml +++ b/BeWo/View/Detail/TextbausteinView.xaml @@ -68,7 +68,7 @@