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:
#	BeWo/ServiceProxy/Generated.cs
This commit is contained in:
Waldi
2017-04-28 14:12:18 +02:00
parent 84131f271e ef17a3c906
commit f612cb382b
384 changed files with 2967 additions and 2107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -37,7 +37,7 @@ using DevExpress.Xpf.Docking;
using DevExpress.Xpf.Docking.Platform;
using DevExpress.Xpf.Editors;
using DevExpress.XtraPrinting.Native;
using DevExpress.XtraRichEdit;
using Microsoft.Win32;
using VerticalAlignment = System.Windows.VerticalAlignment;
@@ -266,7 +266,11 @@ namespace BeWo.View.Detail
ConfigureEndDate();
UnterschriftenHeader.Visible = BeWoApp.AppSettings.ShowSignatures;
//richEdit.HorizontalRulerVisibility = Visibility.Collapsed;
//richEdit.VerticalRulerVisibility = Visibility.Collapsed;
//richEdit.ActiveViewType = RichEditViewType.Simple;
}
private void ConfigureEndDate() {
@@ -1748,7 +1752,9 @@ namespace BeWo.View.Detail
private bool SaveServiceRecord()
{
var lValid = ValidationTrigger.Validate(root, new Collection<string> { "BedarfsmedikationsGrid" });
//var lValid = ValidationTrigger.Validate(root, new Collection<string> { "BedarfsmedikationsGrid" });
var lValid = ValidationTrigger.Validate(root);
if (lValid)
{