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
This commit is contained in:
Waldi
2017-02-16 13:27:31 +01:00
parent 10b5eccd9f d584a53575
commit 0ffea88dc4
43 changed files with 1967 additions and 1700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
BeWo/View/Detail/CustomerView.xaml.cs
View File

@@ -125,11 +125,11 @@ namespace BeWo.View.Detail
{
tabitem_documents.Visibility = Visibility.Collapsed;
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings))
{
//CB EINKOMMENTIEREN
//if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings))
//{
tabitem_chatservice.Visibility = Visibility.Collapsed;
}
//}
comboBox_Nationalitaet.ItemsSource = pCustomerVM.Nationalitaeten;
comboBox_Aufenthalt.ItemsSource = pCustomerVM.AufenthaltsStatuse;
@@ -506,11 +506,11 @@ namespace BeWo.View.Detail
{
grid_EmployeeRelation.Columns["Role"].EditSettings = new ComboBoxEditSettings { ItemsSource = ViewModel.EmployeeRelations.PossibleRoles };
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings))
{
grid_EmployeeRelation.Columns["Chatpartner"].Visible = false;
}
//CB EINKOMMENTIEREN
//if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings))
//{
// grid_EmployeeRelation.Columns["Chatpartner"].Visible = false;
//}
}
if (grid_TeamRelation == null)