From bb25b9f7ff56bd6504b224468f3a1f08068a0d84 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Mon, 28 May 2018 15:02:55 +0200
Subject: [PATCH] cb

---
 BeWo/View/Detail/CustomerView.xaml.cs         | 29 ++++++--
 BeWo/View/Detail/OrganisationView.xaml        | 55 +++++++++------
 BeWo/ViewModel/OrganisationVM.cs              | 70 ++++++++++++++++++-
 BeWo/ViewModel/ServiceRecordVM.cs             | 57 ++++++++++-----
 BeWoPlanerMobil/Controllers/MainController.cs | 16 +++--
 BeWoPlanerMobil/Models/MainModel.cs           |  2 +-
 BeWoPlanerMobil/Views/Main/Main.cshtml        |  6 +-
 Data/Entities/Organisation.cs                 | 20 ++++++
 Data/Mappings/Organisation.hbm.xml            |  1 +
 ReportImp/AlphaEv/AlphaEv.csproj              |  2 +
 ReportImp/AlphaEv/CustomReportCreator.cs      | 62 +++++++++++++++-
 .../Properties/licenses.licx                  |  1 +
 .../Properties/licenses.licx                  |  1 +
 .../FreundeskreisSuchthilfe.csproj            | 40 +++++++++++
 .../Reporting/FfReportCreator.cs              | 10 +++
 ReportImp/Hiba/Hiba.csproj                    | 24 +++++++
 .../Hiba/ServicesOverviewReport.Designer.cs   | 22 +++---
 ReportImp/Hiba/ServicesOverviewReport.cs      | 32 +++++++++
 ReportImp/VKMAachen/VKMAachen.csproj          | 14 ++++
 Service/Core/SettingsLogic.cs                 |  7 +-
 .../CompactOrganisationDC_Organisation.cs     |  3 +-
 .../OrganisationDC_Organisation.cs            |  6 ++
 Service/Plugins/PluginLoader.cs               |  5 +-
 Service/Plugins/TranslationDictionary.cs      |  2 +
 .../CustomerServiceImp.cs                     |  3 +-
 .../Compact/CompactOrganisationDC.cs          |  6 ++
 Shared/DataContracts/OrganisationDC.cs        | 14 +++-
 27 files changed, 431 insertions(+), 79 deletions(-)

diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index 716e58b61..57f4fc78a 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -333,22 +333,37 @@ namespace BeWo.View.Detail
 
         internal override bool DoSaveCheck()
         {
-            if(IsDirty)
+            if (IsDirty)
             {
-                var cdc = ViewModel.CommitToDataContract();
-                var message = ServiceFacade.DoCustomerServiceSync(s => s.AllowSavingCustomer(cdc));
 
-                if(!string.IsNullOrEmpty(message))
+                MessageBoxResult lResult = this.ShowSaveQuestion();
+                if (lResult == MessageBoxResult.Cancel)
                 {
-                    MessageBox.Show(message, "Änderungen speichern", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    this.Focus();
                     return false;
                 }
+
+                if (lResult == MessageBoxResult.Yes)
+                {
+                    var cdc = ViewModel.CommitToDataContract();
+                    var message = ServiceFacade.DoCustomerServiceSync(s => s.AllowSavingCustomer(cdc));
+
+                    if (!string.IsNullOrEmpty(message))
+                    {
+                        MessageBox.Show(message, "Änderungen speichern", MessageBoxButton.OK,
+                            MessageBoxImage.Exclamation);
+                        return false;
+                    }
+
+                    this.SaveData();
+                }
             }
 
-            return base.DoSaveCheck();
+            return true;
+
         }
 
-     
+
         protected override void Save()
         {
             if (!_saveInProgress)
diff --git a/BeWo/View/Detail/OrganisationView.xaml b/BeWo/View/Detail/OrganisationView.xaml
index f285d3fc2..ff18576a5 100644
--- a/BeWo/View/Detail/OrganisationView.xaml
+++ b/BeWo/View/Detail/OrganisationView.xaml
@@ -100,25 +100,30 @@
                                             <RowDefinition Height="Auto" />
 											                      <RowDefinition Height="Auto" />
                                             <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
                                         </Grid.RowDefinitions>
                                         <Label Grid.Column="0" Grid.Row="0" Content="Name" />
                                         <TextBox VerticalAlignment="Top" Margin="10,3,3,3" Height="23" Grid.Column="1"
                                                 Grid.Row="0"
                                                 Text="{val:ValidationBinding Path=Name, UpdateSourceTrigger=PropertyChanged}"
                                                 Width="300" HorizontalAlignment="Left" />
-
-                                        <Label x:Name="lblDebitorNumber" Grid.Row="1" Content="{markup:Translate Kundennummer}" />
-                                        <TextBox x:Name="txtDebitorNumber" Grid.Column="1" Grid.Row="1" Margin="10,3,3,3" Height="23" 
+                                        <Label Grid.Column="0" Grid.Row="1" Content="{markup:Translate OrganisationAbteilung}" />
+                                        <TextBox VerticalAlignment="Top" Margin="10,3,3,3" Height="23" Grid.Column="1"
+                                                 Grid.Row="1"
+                                                 Text="{val:ValidationBinding Path=Name2, UpdateSourceTrigger=PropertyChanged}"
+                                                 Width="300" HorizontalAlignment="Left" />
+                                        <Label x:Name="lblDebitorNumber" Grid.Row="2" Content="{markup:Translate Kundennummer}" />
+                                        <TextBox x:Name="txtDebitorNumber" Grid.Column="1" Grid.Row="2" Margin="10,3,3,3" Height="23" 
                                                  Text="{val:ValidationBinding Path=DebitorNumber, UpdateSourceTrigger=PropertyChanged}" 
                                                  Width="300" HorizontalAlignment="Left" />
 
-                                      <Label Grid.Column="0" Grid.Row="2" Content="Funktion" />
-                                      <uc:NullItemComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="2" Margin="10,3,3,3" Height="23" Width="300" HorizontalAlignment="Left" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
+                                      <Label Grid.Column="0" Grid.Row="3" Content="Funktion" />
+                                      <uc:NullItemComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="3" Margin="10,3,3,3" Height="23" Width="300" HorizontalAlignment="Left" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
                                       
                                       
                                       
-										<Label x:Name="lblArchiviert" Grid.Column="0" Grid.Row="3" Content="Archiviert" />
-										<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="3" Margin="10,6,3,0" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
+										                  <Label x:Name="lblArchiviert" Grid.Column="0" Grid.Row="4" Content="Archiviert" />
+										                  <CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="4" Margin="10,6,3,0" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
                                     </Grid>
                                     <GroupBox Grid.Column="0" Grid.Row="1" Header="Adresse"
                                             Style="{StaticResource ObjectEditGroupBox}" Margin="0,8,0,0">
@@ -128,22 +133,26 @@
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
                                             </Grid.RowDefinitions>
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto" SharedSizeGroup="label" />
                                                 <ColumnDefinition Width="*" MaxWidth="200" />
                                             </Grid.ColumnDefinitions>
-                                            <Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">Straße</Label>
-                                            <Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Postleitzahl</Label>
-                                            <Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">Ort</Label>
-                                            <Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">Postfach</Label>
+                                            <Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">Adresszusatz</Label>
+                                            <Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Straße</Label>
+                                            <Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">Postleitzahl</Label>
+                                            <Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">Ort</Label>
+                                            <Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center">Postfach</Label>
                                             <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23"
-                                                    Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
+                                                     Text="{Binding Path=AddressLine1, UpdateSourceTrigger=PropertyChanged}" />
                                             <TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23"
-                                                    Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
+                                                    Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
                                             <TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
-                                                    Text="{Binding Path=Town, UpdateSourceTrigger=PropertyChanged}" />
+                                                    Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
                                             <TextBox Grid.Column="1" Grid.Row="3" Margin="3" Height="23"
+                                                    Text="{Binding Path=Town, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox Grid.Column="1" Grid.Row="4" Margin="3" Height="23"
                                                     Text="{Binding Path=POBox, UpdateSourceTrigger=PropertyChanged}" />
                                         </Grid>
                                     </GroupBox>
@@ -156,22 +165,26 @@
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
                                             </Grid.RowDefinitions>
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto" SharedSizeGroup="label" />
                                                 <ColumnDefinition Width="*" MaxWidth="200" />
                                             </Grid.ColumnDefinitions>
-                                            <Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">Straße</Label>
-                                            <Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Postleitzahl</Label>
-                                            <Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">Ort</Label>
-                                            <Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">Postfach</Label>
+                                            <Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">Adresszusatz</Label>
+                                            <Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Straße</Label>
+                                            <Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">Postleitzahl</Label>
+                                            <Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">Ort</Label>
+                                            <Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center">Postfach</Label>
                                             <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23"
-                                                    Text="{Binding Path=InvoiceAddressStreet, UpdateSourceTrigger=PropertyChanged}" />
+                                                     Text="{Binding Path=InvoiceAddressLine1, UpdateSourceTrigger=PropertyChanged}" />
                                             <TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23"
-                                                    Text="{Binding Path=InvoiceAddressPostalCode, UpdateSourceTrigger=PropertyChanged}" />
+                                                    Text="{Binding Path=InvoiceAddressStreet, UpdateSourceTrigger=PropertyChanged}" />
                                             <TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
-                                                    Text="{Binding Path=InvoiceAddressTown, UpdateSourceTrigger=PropertyChanged}" />
+                                                    Text="{Binding Path=InvoiceAddressPostalCode, UpdateSourceTrigger=PropertyChanged}" />
                                             <TextBox Grid.Column="1" Grid.Row="3" Margin="3" Height="23"
+                                                    Text="{Binding Path=InvoiceAddressTown, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox Grid.Column="1" Grid.Row="4" Margin="3" Height="23"
                                                     Text="{Binding Path=InvoiceAddressPOBox, UpdateSourceTrigger=PropertyChanged}" />
                                         </Grid>
                                     </GroupBox>
diff --git a/BeWo/ViewModel/OrganisationVM.cs b/BeWo/ViewModel/OrganisationVM.cs
index 0ed34df44..57e6dfe58 100644
--- a/BeWo/ViewModel/OrganisationVM.cs
+++ b/BeWo/ViewModel/OrganisationVM.cs
@@ -35,18 +35,21 @@ namespace BeWo.ViewModel
         public static string PropertyName_InvoiceAddressPOBox = "InvoiceAddressPOBox";
 
         public static string PropertyName_InvoiceAddressPostalCode = "InvoiceAddressPostalCode";
-
-        // public static string PropertyName_IsCostBearer = "IsCostBearer";
+        
         public static string PropertyName_InvoiceAddressStreet = "InvoiceAddressStreet";
 
         public static string PropertyName_InvoiceAddressTown = "InvoiceAddressTown";
 
+        public static string PropertyName_InvoiceAddressLine1 = "InvoiceAddressLine1";
+
         public static string PropertyName_IsCalculatingWithFactor = "IsCalculatingWithFactor";
 
         public static string PropertyName_IsSingleInvoicePerCustomer = "IsSingleInvoicePerCustomer";
 
         public static string PropertyName_Name = "Name";
 
+        public static string PropertyName_Name2 = "Name2";
+
         public static string PropertyName_Notice = "Notice";
 
         public static string PropertyName_POBox = "POBox";
@@ -63,6 +66,8 @@ namespace BeWo.ViewModel
 
         public static string PropertyName_Town = "Town";
 
+        public static string PropertyName_AddressLine1 = "AddressLine1";
+
         public static string PropertyName_Website = "Website";
 
         public static string PropertyName_DebitorNumber = "DebitorNumber";
@@ -101,12 +106,16 @@ namespace BeWo.ViewModel
 
         private string _InvoiceAddressTown;
 
+        private string _InvoiceAddressLine1;
+
         private bool _IsCalculatingWithFactor;
 
         private bool _IsSingleInvoicePerCustomer;
 
         private string _Name;
 
+        private string _Name2;
+
         private string _Notice;
 
         private string _POBox;
@@ -121,6 +130,8 @@ namespace BeWo.ViewModel
 
         private string _Town;
 
+        private string _AddressLine1;
+
         private string _Website;
 
         private string _DebitorNumber;
@@ -360,6 +371,21 @@ namespace BeWo.ViewModel
             }
         }
 
+        public string InvoiceAddressLine1
+        {
+            get { return this._InvoiceAddressLine1; }
+
+            set
+            {
+                if (this.AreDifferent(this._InvoiceAddressLine1, value))
+                {
+                    this._InvoiceAddressLine1 = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressLine1, value), PropertyName_InvoiceAddressLine1);
+                    this.FirePropertyChanged(PropertyName_InvoiceAddressLine1);
+                }
+            }
+        }
+
         public bool IsCalculatingWithFactor
         {
             get { return this._IsCalculatingWithFactor; }
@@ -441,6 +467,23 @@ namespace BeWo.ViewModel
             }
         }
 
+        public string Name2
+        {
+            get { return this._Name2; }
+
+            set
+            {
+                if (this.AreDifferent(this._Name2, value))
+                {
+                    this._Name2 = value;
+
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Name2, value), PropertyName_Name2);
+
+                    this.FirePropertyChanged(PropertyName_Name2);
+                }
+            }
+        }
+
         public string Notice
         {
             get { return this._Notice; }
@@ -566,6 +609,23 @@ namespace BeWo.ViewModel
             }
         }
 
+        public string AddressLine1
+        {
+            get { return this._AddressLine1; }
+
+            set
+            {
+                if (this.AreDifferent(this._AddressLine1, value))
+                {
+                    this._AddressLine1 = value;
+
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AddressLine1, value), PropertyName_AddressLine1);
+
+                    this.FirePropertyChanged(PropertyName_AddressLine1);
+                }
+            }
+        }
+
         public string Website
         {
             get { return this._Website; }
@@ -710,13 +770,16 @@ namespace BeWo.ViewModel
                 this._Bic = pDataContract.Bic;
                 this._IBAN = pDataContract.IBAN;
                 this._Name = pDataContract.Name;
+                this._Name2 = pDataContract.Name2;
                 this._Notice = pDataContract.OrganisationNotice;
                 this._PostalCode = pDataContract.PostalCode;
                 this._Street = pDataContract.Street;
                 this._Town = pDataContract.Town;
+                this._AddressLine1 = pDataContract.AddressLine1;
                 this._InvoiceAddressPostalCode = pDataContract.InvoiceAddressPostalCode;
                 this._InvoiceAddressStreet = pDataContract.InvoiceAddressStreet;
                 this._InvoiceAddressTown = pDataContract.InvoiceAddressTown;
+                this._InvoiceAddressLine1 = pDataContract.InvoiceAddressLine1;
                 this._IsCalculatingWithFactor = pDataContract.IsCalculatingWithFactor;
                 this._IsSingleInvoicePerCustomer = pDataContract.IsSingleInvoicePerCustomer;
                 this._DebitorNumber = pDataContract.DebitorNumber;
@@ -808,14 +871,17 @@ namespace BeWo.ViewModel
             pDataContract.Bic = this._Bic;
             pDataContract.IBAN = this._IBAN;
             pDataContract.Name = this._Name;
+            pDataContract.Name2 = this._Name2;
             pDataContract.OrganisationNotice = this._Notice;
             pDataContract.PostalCode = this._PostalCode;
             pDataContract.RelatedPersons = this._PersonRelations.CopyToDCList(doCommit);
             pDataContract.Street = this._Street;
             pDataContract.Town = this._Town;
+            pDataContract.AddressLine1 = this._AddressLine1;
             pDataContract.InvoiceAddressStreet = this._InvoiceAddressStreet;
             pDataContract.InvoiceAddressTown = this._InvoiceAddressTown;
             pDataContract.InvoiceAddressPostalCode = this._InvoiceAddressPostalCode;
+            pDataContract.InvoiceAddressLine1 = this._InvoiceAddressLine1;
             pDataContract.IsCalculatingWithFactor = this._IsCalculatingWithFactor;
             pDataContract.IsSingleInvoicePerCustomer = this._IsSingleInvoicePerCustomer;
             pDataContract.DebitorNumber = this._DebitorNumber;
diff --git a/BeWo/ViewModel/ServiceRecordVM.cs b/BeWo/ViewModel/ServiceRecordVM.cs
index 0beef14c7..e656f25ec 100644
--- a/BeWo/ViewModel/ServiceRecordVM.cs
+++ b/BeWo/ViewModel/ServiceRecordVM.cs
@@ -972,11 +972,17 @@ namespace BeWo.ViewModel
 							//{
 							//	StartTime = new DateTime(StartTime.Value.Year, StartTime.Value.Month, StartTime.Value.Day, StartTime.Value.Hour, 0, 0);
 							//}
+						    if (StartTime != null)
+						    {
+						        _StartTime = new DateTime(Date.Value.Year, Date.Value.Month, Date.Value.Day, StartTime.Value.Hour,
+						            StartTime.Value.Minute, StartTime.Value.Second);
+						    }
+						    else
+						    {
+						        _StartTime = new DateTime(Date.Value.Year, Date.Value.Month, Date.Value.Day, 0, 0, 1);
+                            }
 
-                            
-                            _StartTime = new DateTime(Date.Value.Year, Date.Value.Month, Date.Value.Day, StartTime.Value.Hour, StartTime.Value.Minute, StartTime.Value.Second);
-
-                            var diff = _EndTime.Value.Subtract(_StartTime.Value);
+						    var diff = _EndTime.Value.Subtract(_StartTime.Value);
 
                             if (_DurationInStunden == ZeiterfassungsDauer.Stunden)
                             {
@@ -2535,31 +2541,44 @@ namespace BeWo.ViewModel
         private void TimeCheck()
         {
             decimal duration = 0;
-            if (_Duration.HasValue)
+            if (BeWoApp.AppSettings.IsEndDateVisible)
             {
-                duration = _Duration.Value;
-            
-            }            
-                 StoreDirtyInformation(
+                if (_DurationSTD.HasValue)
+                {
+                    duration = _DurationSTD.Value;
+
+                }
+            }
+            else
+            {
+                if (_Duration.HasValue)
+                {
+                    duration = _Duration.Value;
+
+                }
+            }
+
+            StoreDirtyInformation(
                     AreDifferent(DataContract.End, (_Date.Value + _StartTime.Value.TimeOfDay).AddMinutes((double)duration)) ||
                     AreDifferent(DataContract.Start,_Date.Value + _StartTime.Value.TimeOfDay), "TIME");
 
-          
-                if (_StartTime != null)
-                {
-                    if(_DurationInStunden == ZeiterfassungsDauer.Minuten)
-                        _EndTime = _StartTime.Value.AddMinutes((double)duration);
-                    else
-                        _EndTime = _StartTime.Value.AddHours((double)duration);
+
+            if (_StartTime != null)
+            {
+                if (_DurationInStunden == ZeiterfassungsDauer.Minuten)
+                    _EndTime = _StartTime.Value.AddMinutes((double) duration);
+                else
+                    _EndTime = _StartTime.Value.AddHours((double) duration);
 
                 if (_EndTime.Value.Second > 1)
                 {
-                    _EndTime = new DateTime(_EndTime.Value.Year, _EndTime.Value.Month, _EndTime.Value.Day, _EndTime.Value.Hour, _EndTime.Value.Minute, 0);
+                    _EndTime = new DateTime(_EndTime.Value.Year, _EndTime.Value.Month, _EndTime.Value.Day,
+                        _EndTime.Value.Hour, _EndTime.Value.Minute, 0);
                 }
 
                 FirePropertyChanged(PropertyName_EndTime);
-                }
-                
+            }
+
         }
 
         private void TimeCheckMonatJahr()
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index bf03c0f11..6323f0b8a 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -127,7 +127,7 @@ namespace BeWoPlanerMobil.Controllers
                 }
                 else
                 {
-                    Model.SupportConcepts = CustomerService.GetAllActiveSupportConceptsByCustomers(Model.Customers.Select(c => c.CustomerOid));
+                    Model.SupportConcepts = CustomerService.GetAllActiveSupportConceptsByCustomers(myRelatedCustomers.Select(c => c.Customer.CustomerOid));
                 }
 
                 var test = Model.ServiceRecords.Any(a => a.GroupPersonCount != null && a.IsCreatedInMobileClient);
@@ -467,7 +467,7 @@ namespace BeWoPlanerMobil.Controllers
                                     ReminderInfo             = appointment.ReminderInfo,
                                     ResourceList             = appointment.ResourceList,
                                     StartDate                = termin.Start,
-                                    Subject                  = appointment.Subject,
+                                    Subject                  = appointment.Subject ?? "",
                                     Type                     = appointment.Type
                                 });
                             }
@@ -669,13 +669,19 @@ namespace BeWoPlanerMobil.Controllers
                 }
 
                 var textbausteine = OperationsService.GetAllTextModules();
-
-                if(MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen))
+                foreach (var tm in textbausteine)
+                {
+                    if (tm.Text == null)
+                    {
+                        tm.Text = "";
+                    }
+                }
+                if(!MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen))
                 {
                     textbausteine = textbausteine.Where(w => w.Employee.EmployeeOid == Model.Employee.EmployeeOid).ToList();
                 }
 
-                Model.Textbausteine = textbausteine.Where(w => w.ServiceCategory != null && w.ServiceCategory.ServiceCategoryOid == pServiceCategoryOid).ToList();
+                Model.Textbausteine = textbausteine.Where(w => w.ServiceCategory == null || w.ServiceCategory.ServiceCategoryOid == pServiceCategoryOid).ToList();
 
                 Model.Textbausteine.AddRangeIfElementsNotIn(Utils.GetParentTextModules(Model.Textbausteine));
 
diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs
index 628b19d7d..046c78598 100644
--- a/BeWoPlanerMobil/Models/MainModel.cs
+++ b/BeWoPlanerMobil/Models/MainModel.cs
@@ -102,7 +102,7 @@ namespace BeWoPlanerMobil.Models
 
 	    public static bool IsEmployeeSelectionVisible => MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees) || MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherTeamMember);
 
-	    public static bool IsTextbausteineVisible => MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen) || MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen);
+	    public static bool IsTextbausteineVisible => false; //MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen) || MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen);
 
 	    public bool ShowDistanceField { get; set; }
 
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index 50573e28e..a41f5374a 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -52,11 +52,11 @@
             @Html.LabelFor(m => m.ShowExpiredSupportConcepts, new {id = "LabelForShowExpiredSupportConceptsCB"})
         }
 
-        @using(Html.BeginForm("SetGroupBookingMode", "Main", FormMethod.Post))
+        @*@using(Html.BeginForm("SetGroupBookingMode", "Main", FormMethod.Post))
         {
             @Html.CheckBoxFor(m => m.IsInGroupBookingMode, new {onchange = "showSanduhr();this.form.submit();", id = "changeBookingModeCheckBox"})
             @Html.LabelFor(m => m.IsInGroupBookingMode, new {id = "labelForChangeBookingModeCheckBox"})
-        }
+        }*@
     
         @using(Html.BeginForm("SelectSupportConcept", "Main", FormMethod.Post, new {id = "selectSCForm"}))
         {
@@ -293,7 +293,7 @@
                                                                                                                           {
                                                                                                                               @Html.Raw("value=\"" + Model.SelectedServiceRecord.DistanceInMeter + "\"")
                                                                                                                           }}/>
-                            <label for="distance_textbox">Distanz</label>
+                            <label for="distance_textbox">Gefahrene Kilometer</label>
                         </div>
                     </td>
                 </tr>
diff --git a/Data/Entities/Organisation.cs b/Data/Entities/Organisation.cs
index 5477e9027..02c82a7da 100644
--- a/Data/Entities/Organisation.cs
+++ b/Data/Entities/Organisation.cs
@@ -18,6 +18,8 @@ namespace BeWo.Data.Entities
 
         public static string PropertyName_Name = "Name";
 
+        public static string PropertyName_Name2 = "Name2";
+
         public static string PropertyName_DebitorNumber = "DebitorNumber";
 
         public static string PropertyName_Organisation2PersonList = "Organisation2PersonList";
@@ -38,6 +40,8 @@ namespace BeWo.Data.Entities
 
         private string _Name;
 
+        private string _Name2;
+
         private string _DebitorNumber;
 
         private IList<Organisation2Person> _Organisation2PersonList;
@@ -145,6 +149,22 @@ namespace BeWo.Data.Entities
             }
         }
 
+        public virtual string Name2
+        {
+            get
+            {
+                return this._Name2;
+            }
+
+            set
+            {
+                if (this.AreDifferent(this._Name2, value))
+                {
+                    this._Name2 = value;
+                }
+            }
+        }
+
         public virtual string DebitorNumber
         {
             get
diff --git a/Data/Mappings/Organisation.hbm.xml b/Data/Mappings/Organisation.hbm.xml
index 2b2dbad34..32c7a8742 100644
--- a/Data/Mappings/Organisation.hbm.xml
+++ b/Data/Mappings/Organisation.hbm.xml
@@ -8,6 +8,7 @@
         <version type="Int64" column="Version" name="Version" />
         <property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
         <property column="Name" type="String" name="Name" not-null="true" length="256" />
+        <property column="Name2" type="String" name="Name2" not-null="true" length="256" />
         <property column="DebitorNumber" type="String" name="DebitorNumber" />
         <property column="Notice" type="String" name="Notice" length="1024" />
         <property column="InsTs" type="DateTime" name="InsTs" />
diff --git a/ReportImp/AlphaEv/AlphaEv.csproj b/ReportImp/AlphaEv/AlphaEv.csproj
index 8ff5c2f28..00c48dfb5 100644
--- a/ReportImp/AlphaEv/AlphaEv.csproj
+++ b/ReportImp/AlphaEv/AlphaEv.csproj
@@ -49,6 +49,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CustomReportCreator.cs" />
+    <Compile Include="Export\CustomDataExporter.cs" />
+    <Compile Include="Export\DiamantExporter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="InvoiceCustomerReport.cs">
       <SubType>Component</SubType>
diff --git a/ReportImp/AlphaEv/CustomReportCreator.cs b/ReportImp/AlphaEv/CustomReportCreator.cs
index 061771235..1d69ebf48 100644
--- a/ReportImp/AlphaEv/CustomReportCreator.cs
+++ b/ReportImp/AlphaEv/CustomReportCreator.cs
@@ -2,10 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using BeWo.Data;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
+using BS.Shared;
+using BS.Shared.Core;
 using DevExpress.XtraReports.UI;
 
 namespace AlphaEv
@@ -14,9 +17,12 @@ namespace AlphaEv
 	{
 		public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
 		{
-			List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
 
-			if (lROs.Count > 0)
+            //List<ServicesOverviewRO> lROs =
+            //    ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, false, null, true, false);
+		    List<ServicesOverviewRO> lROs =  Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
+
+            if (lROs.Count > 0)
 			{
 
 				var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid);
@@ -34,7 +40,57 @@ namespace AlphaEv
 			return new XtraReport();
 		}
 
-		public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
+        private List<ServicesOverviewRO> Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay, int endDay, long? serviceCategoryOid = null)
+        {
+            var roList = new List<ServicesOverviewRO>();
+
+            List<long> customerOids = new List<long>();
+
+            ApplicationUser loggedInUser = null;
+
+            if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+            {
+                loggedInUser = LoggedInUserOperationContextExt.Current.User;
+            }
+            else
+            {
+                loggedInUser = SessionFacade.LoggedInUser;
+            }
+
+            if (loggedInUser != null && loggedInUser.Employee != null)
+            {
+                foreach (var e2c in loggedInUser.Employee.Employee2CustomerList)
+                {
+                    foreach (var v2o in e2c.ValueList)
+                    {
+                        if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.Value.Contains("Hauptbetreuung"))
+                        {
+                            if (!customerOids.Contains(e2c.Customer.Oid.Value))
+                            {
+                                customerOids.Add(e2c.Customer.Oid.Value);
+                            }
+                        }
+                    }
+                    
+                }
+            }
+            
+            
+            foreach (var coid in customerOids)
+            {
+                var ro = ServicesOverviewRO.Create(coid, pMonth, pYear, true, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
+
+                //ServicesOverviewRO ro = ServicesOverviewRO.Create(customer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, searchServiceRecordsByEndDate, serviceCategoryOid);
+                if (ro != null)
+                {
+                    roList.Add(ro);
+                }
+            }
+
+            return roList;
+        }
+
+        public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
 		{
 			var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
 
diff --git a/ReportImp/BeWoColoniaKalayci/Properties/licenses.licx b/ReportImp/BeWoColoniaKalayci/Properties/licenses.licx
index e69de29bb..c7fd819d5 100644
--- a/ReportImp/BeWoColoniaKalayci/Properties/licenses.licx
+++ b/ReportImp/BeWoColoniaKalayci/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/BeWoColoniaMitarbeiter/Properties/licenses.licx b/ReportImp/BeWoColoniaMitarbeiter/Properties/licenses.licx
index e69de29bb..c7fd819d5 100644
--- a/ReportImp/BeWoColoniaMitarbeiter/Properties/licenses.licx
+++ b/ReportImp/BeWoColoniaMitarbeiter/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/FreundeskreisSuchthilfe/FreundeskreisSuchthilfe.csproj b/ReportImp/FreundeskreisSuchthilfe/FreundeskreisSuchthilfe.csproj
index b268e32e4..4654951d6 100644
--- a/ReportImp/FreundeskreisSuchthilfe/FreundeskreisSuchthilfe.csproj
+++ b/ReportImp/FreundeskreisSuchthilfe/FreundeskreisSuchthilfe.csproj
@@ -57,8 +57,20 @@
     <Compile Include="Finanzauswertung.designer.cs">
       <DependentUpon>Finanzauswertung.cs</DependentUpon>
     </Compile>
+    <Compile Include="InvoiceCustomerReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="InvoiceCustomerReport.Designer.cs">
+      <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Reporting\FfReportCreator.cs" />
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="ServicesOverviewReport.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -66,6 +78,18 @@
       <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
     </Compile>
     <Compile Include="Service\FfCustomerService.cs" />
+    <Compile Include="Briefkopf.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Briefkopf.Designer.cs">
+      <DependentUpon>Briefkopf.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SettlementReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport.Designer.cs">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Data\Data.csproj">
@@ -90,10 +114,26 @@
       <DependentUpon>Finanzauswertung.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="InvoiceCustomerReport.resx">
+      <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="ServicesOverviewReport.resx">
       <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Briefkopf.resx">
+      <DependentUpon>Briefkopf.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport.resx">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ReportImp/FreundeskreisSuchthilfe/Reporting/FfReportCreator.cs b/ReportImp/FreundeskreisSuchthilfe/Reporting/FfReportCreator.cs
index a90c0550c..7f62f9189 100644
--- a/ReportImp/FreundeskreisSuchthilfe/Reporting/FfReportCreator.cs
+++ b/ReportImp/FreundeskreisSuchthilfe/Reporting/FfReportCreator.cs
@@ -67,5 +67,15 @@ namespace FreundeskreisSuchthilfe.Reporting
 
 			return report as XtraReport;
 		}
+
+	    public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid)
+	    {
+	        var subreport = base.CreateSettlementReport(dcId, invoiceBaseOid);
+
+            var report = new Briefkopf();
+            report.SetSubReport(subreport);
+
+	        return report;
+	    }
 	}
 }
diff --git a/ReportImp/Hiba/Hiba.csproj b/ReportImp/Hiba/Hiba.csproj
index db7c3ba6b..4bfafb0d6 100644
--- a/ReportImp/Hiba/Hiba.csproj
+++ b/ReportImp/Hiba/Hiba.csproj
@@ -48,7 +48,15 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Invoicing\HibaDefaultInvoiceCreation.cs" />
+    <Compile Include="Invoicing\HibaInvoiceFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="ServicesOverviewReport.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -58,15 +66,31 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="ServicesOverviewReport.resx">
       <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Report\Report.csproj">
       <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
       <Name>Report</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Shared\Shared.csproj">
+      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ReportImp/Hiba/ServicesOverviewReport.Designer.cs b/ReportImp/Hiba/ServicesOverviewReport.Designer.cs
index 95ba27213..3854f067f 100644
--- a/ReportImp/Hiba/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/Hiba/ServicesOverviewReport.Designer.cs
@@ -62,7 +62,7 @@ namespace Hiba
             this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblBewilligt = new DevExpress.XtraReports.UI.XRLabel();
             this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
@@ -282,7 +282,7 @@ namespace Hiba
             this.lblTitel,
             this.xrLabel22,
             this.xrLabel23,
-            this.xrLabel11});
+            this.lblBewilligt});
             this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F);
             this.ReportHeader.HeightF = 218.8751F;
             this.ReportHeader.Name = "ReportHeader";
@@ -465,15 +465,15 @@ namespace Hiba
             this.xrLabel23.StylePriority.UseFont = false;
             this.xrLabel23.Text = "Monat:";
             // 
-            // xrLabel11
+            // lblBewilligt
             // 
-            this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.25F);
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(288F, 18F);
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.Text = "Bewilligte Fachleistungsstunden wöchentlich:";
+            this.lblBewilligt.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblBewilligt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.25F);
+            this.lblBewilligt.Name = "lblBewilligt";
+            this.lblBewilligt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblBewilligt.SizeF = new System.Drawing.SizeF(288F, 18F);
+            this.lblBewilligt.StylePriority.UseFont = false;
+            this.lblBewilligt.Text = "Bewilligte Fachleistungsstunden wöchentlich:";
             // 
             // formattingRuleServiceDesc
             // 
@@ -702,7 +702,7 @@ namespace Hiba
         private DevExpress.XtraReports.UI.XRLabel lblTitel;
         private DevExpress.XtraReports.UI.XRLabel xrLabel22;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel23;
-		private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+		private DevExpress.XtraReports.UI.XRLabel lblBewilligt;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
         private DevExpress.XtraReports.UI.XRLabel xrLabel6;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
diff --git a/ReportImp/Hiba/ServicesOverviewReport.cs b/ReportImp/Hiba/ServicesOverviewReport.cs
index a2490fc55..dbc401797 100644
--- a/ReportImp/Hiba/ServicesOverviewReport.cs
+++ b/ReportImp/Hiba/ServicesOverviewReport.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
+using BS.Shared;
 
 namespace Hiba
 {
@@ -45,10 +46,41 @@ namespace Hiba
                 }
             }
 
+            SetzeBewilligung(pRO);
             
 
             this.bindingSource1.DataSource = pRO;
         }
 
+        private void SetzeBewilligung(ServicesOverviewRO pRo)
+        {
+            string text = "Bewilligte Fachleistungsstunden wöchentlich:";
+            if (pRo.CostBearer2SupportConceptList != null && pRo.CostBearer2SupportConceptList.Count > 0)
+            {
+                var c2s = pRo.CostBearer2SupportConceptList[0];
+
+                foreach (var scap in c2s.ApprovalPeriodList)
+                {
+                    if (scap.StartDate <= pRo.EndDate && scap.EndDate >= pRo.StartDate)
+                    {
+                        if (scap.ApprovedBEInterval.HasValue &&
+                            scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
+                        {
+                            text = "Bewilligte Fachleistungsstunden monatlich:";
+                            pRo.ApprovedFLSPerWeek = scap.ApprovedBEPerInterval ?? 0;
+                        }
+                        if (scap.ApprovedBEInterval.HasValue &&
+                            scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Yearly)
+                        {
+                            text = "Bewilligte Fachleistungsstunden jährlich:";
+                            pRo.ApprovedFLSPerWeek = scap.ApprovedBEPerInterval ?? 0;
+                        }
+                    }
+                }
+
+            }
+            lblBewilligt.Text = text;
+
+        }
     }
 }
diff --git a/ReportImp/VKMAachen/VKMAachen.csproj b/ReportImp/VKMAachen/VKMAachen.csproj
index 933bc3f6f..9acd09096 100644
--- a/ReportImp/VKMAachen/VKMAachen.csproj
+++ b/ReportImp/VKMAachen/VKMAachen.csproj
@@ -61,6 +61,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Stundenuebersicht.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Stundenuebersicht.Designer.cs">
+      <DependentUpon>Stundenuebersicht.cs</DependentUpon>
+    </Compile>
     <Compile Include="VKMAachenReportCreator.cs" />
     <Compile Include="ServicesOverviewReportSP.cs">
       <SubType>Component</SubType>
@@ -96,6 +102,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Stundenuebersicht.resx">
+      <DependentUpon>Stundenuebersicht.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="ServicesOverviewReportSP.resx">
       <DependentUpon>ServicesOverviewReportSP.cs</DependentUpon>
     </EmbeddedResource>
@@ -115,6 +125,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Report\Report.csproj">
       <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
       <Name>Report</Name>
diff --git a/Service/Core/SettingsLogic.cs b/Service/Core/SettingsLogic.cs
index 3f4d79a68..6b133c9cb 100644
--- a/Service/Core/SettingsLogic.cs
+++ b/Service/Core/SettingsLogic.cs
@@ -40,7 +40,12 @@ namespace BeWo.Service.Core
                         try
                         {
                             T t = DAOFactory.GenericDAO.LoadByID<T>(oid);
-                            list.Add(t);
+
+                            //if (t.Oid.HasValue)
+                            //{
+                                var ttemp = DAOFactory.GenericDAO.Unproxy(t);
+                                list.Add(ttemp);
+                            //}
                         }
                         catch (Exception)
                         {
diff --git a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
index 59bfd9cd6..086e23ded 100644
--- a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
+++ b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
@@ -17,7 +17,8 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.OrganisationOid = pEntity.Oid.Value;
             pDataContract.OrganisationVersion = pEntity.Version.Value;
             pDataContract.Name = pEntity.Name;
-			pDataContract.ActivationType = pEntity.IsActive;
+            pDataContract.Name2 = pEntity.Name2;
+            pDataContract.ActivationType = pEntity.IsActive;
 			pDataContract.DebitorNumber = pEntity.DebitorNumber;
 			
             if (pEntity.CostBearer != null)
diff --git a/Service/DCEntityMapper/OrganisationDC_Organisation.cs b/Service/DCEntityMapper/OrganisationDC_Organisation.cs
index b490fa719..c4500e614 100644
--- a/Service/DCEntityMapper/OrganisationDC_Organisation.cs
+++ b/Service/DCEntityMapper/OrganisationDC_Organisation.cs
@@ -18,6 +18,7 @@ namespace BeWo.Service.DCEntityMapper
 
             pDataContract.OrganisationOid = pEntity.Oid;
             pDataContract.Name = pEntity.Name;
+            pDataContract.Name2 = pEntity.Name2;
             pDataContract.OrganisationVersion = pEntity.Version;
             pDataContract.OrganisationNotice = pEntity.Notice;
             pDataContract.DebitorNumber = pEntity.DebitorNumber;
@@ -36,6 +37,7 @@ namespace BeWo.Service.DCEntityMapper
                 pDataContract.Street = pEntity.Address.Street;
                 pDataContract.Town = pEntity.Address.Town;
                 pDataContract.PostalCode = pEntity.Address.PostalCode;
+                pDataContract.AddressLine1 = pEntity.Address.AddressLine1;
                 pDataContract.AddressVersion = pEntity.Address.Version;
             }
 
@@ -45,6 +47,7 @@ namespace BeWo.Service.DCEntityMapper
                 pDataContract.InvoiceAddressStreet = pEntity.InvoiceAddress.Street;
                 pDataContract.InvoiceAddressTown = pEntity.InvoiceAddress.Town;
                 pDataContract.InvoiceAddressPostalCode = pEntity.InvoiceAddress.PostalCode;
+                pDataContract.InvoiceAddressLine1 = pEntity.InvoiceAddress.AddressLine1;
                 pDataContract.InvoiceAddressVersion = pEntity.InvoiceAddress.Version;
             }
 
@@ -87,6 +90,7 @@ namespace BeWo.Service.DCEntityMapper
 
             pEntity.Oid = pDataContract.OrganisationOid;
             pEntity.Name = pDataContract.Name;
+            pEntity.Name2 = pDataContract.Name2;
             pEntity.Notice = pDataContract.OrganisationNotice;
             pEntity.DebitorNumber = pDataContract.DebitorNumber;
 			pEntity.IsActive = pDataContract.ActivationType;
@@ -111,6 +115,7 @@ namespace BeWo.Service.DCEntityMapper
                 this.ConcurrencyCheck(pDataContract.AddressVersion, pEntity.Address);
 
                 pEntity.Address.Oid = pDataContract.AddressOid;
+                pEntity.Address.AddressLine1 = pDataContract.AddressLine1;
                 pEntity.Address.Street = pDataContract.Street;
                 pEntity.Address.Town = pDataContract.Town;
                 pEntity.Address.PostalCode = pDataContract.PostalCode;
@@ -133,6 +138,7 @@ namespace BeWo.Service.DCEntityMapper
                 this.ConcurrencyCheck(pDataContract.InvoiceAddressVersion, pEntity.InvoiceAddress);
 
                 pEntity.InvoiceAddress.Oid = pDataContract.InvoiceAddressOid;
+                pEntity.InvoiceAddress.AddressLine1 = pDataContract.InvoiceAddressLine1;
                 pEntity.InvoiceAddress.Street = pDataContract.InvoiceAddressStreet;
                 pEntity.InvoiceAddress.Town = pDataContract.InvoiceAddressTown;
                 pEntity.InvoiceAddress.PostalCode = pDataContract.InvoiceAddressPostalCode;
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index ec0e1a589..83a67071f 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -160,14 +160,14 @@ namespace BeWo.Service.Plugins
                 //t = "1873138856"; // BUG e.V.
                 //t = "6463422907"; // Caritas Leverkusen
                 //t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch
-                t = "6548202677"; // VKM Aachen SBD
+                //t = "6548202677"; // VKM Aachen SBD
                 //t = "7803602698"; // Taubblindendienst
                 //t = "5518600303"; //Wetterleuchten e.V.
                 //t = "4096649015"; // AWO Dortmund
 			    //t = "3614251071"; // Pusteblume
 			    //t = "7755740484"; //Sawo
 			    //t = "8275654834"; //Twg Jonathan
-			    //t = "6586058528"; //Freundeskreis Suchtkrankenhilfe e.V.
+			    t = "6586058528"; //Freundeskreis Suchtkrankenhilfe e.V.
 			    //t = "2632162696"; // Pro BeWo Düren
 			    //t = "6340891020"; // Caritas Ahlen
 			    //t = "3659854106"; // alpha e.V.
@@ -177,6 +177,7 @@ namespace BeWo.Service.Plugins
 			    //t = "5426234256"; // SKM Leverkusen
 			    //t = "4137042939"; //MLG Lebengestalten / Haus Müllestumpe
 			    //t = "5260936181"; //LORI
+			    //t = "1931553444"; // HIBA
 
                 return t;
 #else
diff --git a/Service/Plugins/TranslationDictionary.cs b/Service/Plugins/TranslationDictionary.cs
index c6472c25f..064431568 100644
--- a/Service/Plugins/TranslationDictionary.cs
+++ b/Service/Plugins/TranslationDictionary.cs
@@ -42,6 +42,8 @@ namespace BeWo.Service.Plugins
             AddOrReplaceTranslation(dict, "VerwaltungMenuItem", "Verwaltung");
             AddOrReplaceTranslation(dict, "SupportMenuItem", "Support");
 
+            AddOrReplaceTranslation(dict, "OrganisationAbteilung", "Abteilung");
+
             
             //AddOrReplaceTranslation(dict, "StundenkontoTagesansicht", "Tagesansicht anzeigen");
 
diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs
index 55ab3187f..c5ce0ce0a 100644
--- a/Service/ServiceImplementations/CustomerServiceImp.cs
+++ b/Service/ServiceImplementations/CustomerServiceImp.cs
@@ -1908,7 +1908,8 @@ namespace BeWo.Service.ServiceImplementations
 
 				if (org.Address != null)
 				{
-					dc.Street = org.Address.Street;
+				    dc.AddressLine1 = org.Address.AddressLine1;
+                    dc.Street = org.Address.Street;
 					dc.PostalCode = org.Address.PostalCode;
 					dc.Town = org.Address.Town;
 				}
diff --git a/Shared/DataContracts/Compact/CompactOrganisationDC.cs b/Shared/DataContracts/Compact/CompactOrganisationDC.cs
index 0b88b3de6..f709a7a92 100644
--- a/Shared/DataContracts/Compact/CompactOrganisationDC.cs
+++ b/Shared/DataContracts/Compact/CompactOrganisationDC.cs
@@ -49,12 +49,18 @@ namespace BS.Shared.DataContracts.Compact
         [DataMember]
         public string Name { get; set; }
 
+        [DataMember]
+        public string Name2 { get; set; }
+
         [DataMember]
         public long OrganisationOid { get; set; }
 
         [DataMember]
         public long OrganisationVersion { get; set; }
 
+        [DataMember]
+        public string AddressLine1 { get; set; }
+
         [DataMember]
         public string PostalCode { get; set; }
 
diff --git a/Shared/DataContracts/OrganisationDC.cs b/Shared/DataContracts/OrganisationDC.cs
index 2391572d1..73036ba45 100644
--- a/Shared/DataContracts/OrganisationDC.cs
+++ b/Shared/DataContracts/OrganisationDC.cs
@@ -89,6 +89,9 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public string InvoiceAddressTown { get; set; }
 
+        [DataMember]
+        public string InvoiceAddressLine1 { get; set; }
+
         [DataMember]
         public long? InvoiceAddressVersion { get; set; }
 
@@ -101,6 +104,9 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public string Name { get; set; }
 
+        [DataMember]
+        public string Name2 { get; set; }
+
         [DataMember]
         public string OrganisationNotice { get; set; }
 
@@ -122,9 +128,12 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public string Town { get; set; }
 
+        [DataMember]
+        public string AddressLine1 { get; set; }
+
         public bool ContainsAddressData()
         {
-            return !Utils.AreAllNullOrEmpty(this.Street, this.PostalCode, this.Town);
+            return !Utils.AreAllNullOrEmpty(this.Street, this.PostalCode, this.Town, this.AddressLine1);
         }
 
         public bool ContainsBankAccountData()
@@ -139,7 +148,7 @@ namespace BS.Shared.DataContracts
 
         public bool ContainsInvoiceAddressData()
         {
-            return !Utils.AreAllNullOrEmpty(this.InvoiceAddressStreet, this.InvoiceAddressPostalCode, this.InvoiceAddressTown);
+            return !Utils.AreAllNullOrEmpty(this.InvoiceAddressStreet, this.InvoiceAddressPostalCode, this.InvoiceAddressTown, this.InvoiceAddressLine1);
         }
 
         [DataMember]
@@ -153,5 +162,6 @@ namespace BS.Shared.DataContracts
 
         [DataMember]
         public ValueListEntryDC Function { get; set; }
+        
     }
 }
\ No newline at end of file