MS_17.03

2016-03-21 17:13:25 +01:00
parent 9cda976105
commit 50646acd1d
17 changed files with 4998 additions and 5211 deletions
--- a/app/DD-Record-Organiser/DD_DMSDataSet.xsd
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.xsd
@@ -1299,19 +1299,19 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                  </DbCommand>
                </DeleteCommand>
                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>INSERT INTO TBDD_USER
                         (PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, RECORD_ADMIN, ADDED_WHO, MODULE_RECORD_ORG, LANGUAGE)
 VALUES        (@PRENAME,@NAME,@USERNAME,@EMAIL,@LOGGED_IN, 0,@ADDED_WHO, 1,@LANGUAG);   
 SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, RECORD_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="PRENAME" ColumnName="PRENAME" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="PRENAME" ColumnName="PRENAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="EMAIL" ColumnName="EMAIL" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="EMAIL" ColumnName="EMAIL" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LOGGED_IN" ColumnName="LOGGED_IN" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOGGED_IN" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOGGED_IN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LOGGED_IN" ColumnName="LOGGED_IN" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOGGED_IN" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOGGED_IN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LANGUAG" ColumnName="LANGUAGE" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(5)" DbType="AnsiString" Direction="Input" ParameterName="@LANGUAG" Precision="0" ProviderType="VarChar" Scale="0" Size="5" SourceColumn="LANGUAGE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LANGUAG" ColumnName="LANGUAGE" DataSourceName="" DataTypeServer="varchar(5)" DbType="AnsiString" Direction="Input" ParameterName="@LANGUAG" Precision="0" ProviderType="VarChar" Scale="0" Size="5" SourceColumn="LANGUAGE" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
@@ -1320,26 +1320,27 @@ SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHE
                    <CommandText>SELECT        GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, RECORD_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, 
                         LANGUAGE
 FROM            TBDD_USER
-WHERE        (MODULE_RECORD_ORG = 1)</CommandText>
+WHERE        (MODULE_RECORD_ORG = 1)
 ORDER BY USERNAME</CommandText>
                    <Parameters />
                  </DbCommand>
                </SelectCommand>
                <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>UPDATE       TBDD_USER
 SET                PRENAME = @PRENAME, NAME = @NAME, USERNAME = @USERNAME, EMAIL = @EMAIL, RECORD_ADMIN = @RECORD_ADMIN, CHANGED_WHO = @CHANGED_WHO, LANGUAGE = @LANGUAGE
 WHERE        (GUID = @Original_GUID);  
 SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, RECORD_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="PRENAME" ColumnName="PRENAME" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="PRENAME" ColumnName="PRENAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="EMAIL" ColumnName="EMAIL" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="EMAIL" ColumnName="EMAIL" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="RECORD_ADMIN" ColumnName="RECORD_ADMIN" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@RECORD_ADMIN" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="RECORD_ADMIN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="RECORD_ADMIN" ColumnName="RECORD_ADMIN" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@RECORD_ADMIN" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="RECORD_ADMIN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LANGUAGE" ColumnName="LANGUAGE" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="varchar(5)" DbType="AnsiString" Direction="Input" ParameterName="@LANGUAGE" Precision="0" ProviderType="VarChar" Scale="0" Size="5" SourceColumn="LANGUAGE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LANGUAGE" ColumnName="LANGUAGE" DataSourceName="" DataTypeServer="varchar(5)" DbType="AnsiString" Direction="Input" ParameterName="@LANGUAGE" Precision="0" ProviderType="VarChar" Scale="0" Size="5" SourceColumn="LANGUAGE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBDD_USER" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </UpdateCommand>
@@ -1440,37 +1441,38 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                  </DbCommand>
                </DeleteCommand>
                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>INSERT INTO TBDD_USER_GROUPS
                         (NAME, ADDED_WHO, COMMENT)
 VALUES        (@NAME,@ADDED_WHO,@COMMENT);  
 SELECT GUID, NAME, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER_GROUPS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBDD_USER_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBDD_USER_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM.dbo.TBDD_USER_GROUPS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>SELECT        GUID, NAME, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT
-FROM            TBDD_USER_GROUPS</CommandText>
+FROM            TBDD_USER_GROUPS
 ORDER BY NAME</CommandText>
                    <Parameters />
                  </DbCommand>
                </SelectCommand>
                <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>UPDATE       TBDD_USER_GROUPS
 SET                NAME = @NAME, CHANGED_WHO = @CHANGED_WHO, COMMENT = @COMMENT
 WHERE        (GUID = @Original_GUID);  
 SELECT GUID, NAME, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER_GROUPS WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBDD_USER_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBDD_USER_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM.dbo.TBDD_USER_GROUPS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBDD_USER_GROUPS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBDD_USER_GROUPS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </UpdateCommand>
--- a/app/DD-Record-Organiser/DD_DMSDataSet.xss
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.xss
@@ -4,51 +4,51 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="245" ViewPortY="-27" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:TBPMO_FORM" ZOrder="47" X="70" Y="70" Height="286" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:VWPMO_CONTROL_SCREEN" ZOrder="31" X="78" Y="352" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWPMO_CONTROL_SCREEN" ZOrder="33" X="78" Y="352" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:TBPMO_FORM_VIEW" ZOrder="44" X="454" Y="68" Height="324" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPMO_RECORD" ZOrder="30" X="875" Y="408" Height="172" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TBPMO_RECORD" ZOrder="32" X="875" Y="408" Height="172" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:VWPMO_DOKUMENTTYPES" ZOrder="7" X="555" Y="415" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:VWPMO_DOKUMENTTYPES" ZOrder="9" X="555" Y="415" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:TBPMO_WD_FVIEW_DT_INDEX" ZOrder="61" X="819" Y="147" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK" ZOrder="29" X="603" Y="718" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK" ZOrder="31" X="603" Y="718" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
    <Shape ID="DesignTable:TBPMO_WORKFLOW_TASK_STATE" ZOrder="60" X="950" Y="736" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:VWPMO_GUI_ENTITY" ZOrder="26" X="395" Y="443" Height="134" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:VWPMO_GUI_ENTITY" ZOrder="28" X="395" Y="443" Height="134" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
    <Shape ID="DesignTable:TBPMO_WORKFLOW" ZOrder="56" X="192" Y="678" Height="210" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
    <Shape ID="DesignTable:TBPMO_WORKFLOW_FORM" ZOrder="57" X="137" Y="932" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:VWPMO_WF_USER_ACTIVE" ZOrder="4" X="1878" Y="564" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWPMO_WF_USER_ACTIVE" ZOrder="6" X="1878" Y="564" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VWPMO_WF_OVERVIEW_AUTHORITY" ZOrder="28" X="877" Y="44" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:VWPMO_WF_OVERVIEW_AUTHORITY" ZOrder="30" X="877" Y="44" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
    <Shape ID="DesignTable:TBDD_DOKUMENTART" ZOrder="42" X="1349" Y="450" Height="344" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:TBDD_EINGANGSARTEN" ZOrder="53" X="1701" Y="652" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBDD_INDEX_AUTOM" ZOrder="21" X="1687" Y="332" Height="282" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="192" />
+    <Shape ID="DesignTable:TBDD_INDEX_AUTOM" ZOrder="23" X="1687" Y="332" Height="282" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="192" />
    <Shape ID="DesignTable:TBPMO_WD_FORMVIEW_DOKTYPES" ZOrder="52" X="427" Y="-11" Height="287" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:TBPMO_KONFIGURATION" ZOrder="48" X="1644" Y="247" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
    <Shape ID="DesignTable:TBDD_USER" ZOrder="43" X="1632" Y="12" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
    <Shape ID="DesignTable:TBPMO_FORM_TYPE" ZOrder="46" X="1357" Y="80" Height="191" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBDD_USER_GROUPS" ZOrder="41" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBDD_USER_GROUPS" ZOrder="1" X="842" Y="-46" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
-    <Shape ID="DesignTable:VWPMO_USERS_GROUPS" ZOrder="40" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:VWPMO_USERS_GROUPS" ZOrder="41" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="39" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="2" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBWH_DOKART_MODULE" ZOrder="38" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBWH_DOKART_MODULE" ZOrder="40" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="1" X="1185" Y="-27" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="3" X="1185" Y="-27" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:TBPMO_WD_OBJECTTYPE" ZOrder="35" X="-1" Y="1" Height="229" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:TBPMO_WD_OBJECTTYPE" ZOrder="37" X="-1" Y="1" Height="229" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBPMO_FILES_USER" ZOrder="10" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBPMO_FILES_USER" ZOrder="12" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_FOLLOW_UP_EMAIL" ZOrder="9" X="903" Y="388" Height="204" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="136" />
+    <Shape ID="DesignTable:TBPMO_FOLLOW_UP_EMAIL" ZOrder="11" X="903" Y="388" Height="204" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="136" />
-    <Shape ID="DesignTable:TBPMO_FOLLUPEMAIL_USER" ZOrder="34" X="59" Y="77" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBPMO_FOLLUPEMAIL_USER" ZOrder="36" X="59" Y="77" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_RECORD_LOG_CONFIG" ZOrder="27" X="1128" Y="408" Height="300" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="232" />
+    <Shape ID="DesignTable:TBPMO_RECORD_LOG_CONFIG" ZOrder="29" X="1128" Y="408" Height="300" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="232" />
-    <Shape ID="DesignTable:VWPMO_RECORD_CHANGES" ZOrder="32" X="1673" Y="790" Height="173" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:VWPMO_RECORD_CHANGES" ZOrder="34" X="1673" Y="790" Height="173" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:VWPMO_WF_ACTIVE" ZOrder="5" X="525" Y="19" Height="381" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="294" />
+    <Shape ID="DesignTable:VWPMO_WF_ACTIVE" ZOrder="7" X="525" Y="19" Height="381" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="294" />
-    <Shape ID="DesignTable:TBDD_EMAIL_ACCOUNT" ZOrder="6" X="844" Y="43" Height="267" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBDD_EMAIL_ACCOUNT" ZOrder="8" X="844" Y="43" Height="267" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="25" X="462" Y="673" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
+    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="27" X="462" Y="673" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
-    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="11" X="1246" Y="352" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="13" X="1246" Y="352" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VWDDINDEX_AUTOM" ZOrder="22" X="1300" Y="812" Height="305" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWDDINDEX_AUTOM" ZOrder="24" X="1300" Y="812" Height="305" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPMO_TEMPLATE" ZOrder="20" X="2444" Y="43" Height="229" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:TBPMO_TEMPLATE" ZOrder="22" X="2444" Y="43" Height="229" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBPMO_TEMPLATE_ENTITY" ZOrder="19" X="2068" Y="300" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:TBPMO_TEMPLATE_ENTITY" ZOrder="21" X="2068" Y="300" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBPMO_TEMPLATE_PATTERN" ZOrder="16" X="2348" Y="521" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBPMO_TEMPLATE_PATTERN" ZOrder="18" X="2348" Y="521" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:TBTEMP_QUICKDISPLAY" ZOrder="14" X="2117" Y="51" Height="115" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TBTEMP_QUICKDISPLAY" ZOrder="16" X="2117" Y="51" Height="115" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:TBPMO_LANGUAGE_OBJECT" ZOrder="8" X="1161" Y="308" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBPMO_LANGUAGE_OBJECT" ZOrder="10" X="1161" Y="308" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:TBDD_CLIENT" ZOrder="3" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBDD_CLIENT" ZOrder="5" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_CONSTRUCTOR_USER_SQL" ZOrder="2" X="258" Y="41" Height="280" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="212" />
+    <Shape ID="DesignTable:TBPMO_CONSTRUCTOR_USER_SQL" ZOrder="4" X="258" Y="41" Height="280" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="212" />
  </Shapes>
  <Connectors>
    <Connector ID="DesignRelation:FK_TBPMO_FORM_VIEW_FORM_ID" ZOrder="62" LineWidth="11">
@@ -171,27 +171,19 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_GROUP_ID" ZOrder="37" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_GROUP_ID" ZOrder="39" LineWidth="11">
      <RoutePoints>
        <Point>
-          <X>62</X>
+          <X>842</X>
-          <Y>0</Y>
+          <Y>53</Y>
        </Point>
        <Point>
-          <X>62</X>
+          <X>158</X>
-          <Y>-30</Y>
+          <Y>53</Y>
        </Point>
        <Point>
          <X>62</X>
          <Y>-30</Y>
        </Point>
        <Point>
          <X>62</X>
          <Y>0</Y>
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="36" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="38" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>107</X>
@@ -211,7 +203,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" ZOrder="33" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID" ZOrder="35" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>1632</X>
@@ -223,7 +215,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="24" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="26" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>1358</X>
@@ -235,7 +227,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" ZOrder="23" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID" ZOrder="25" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>282</X>
@@ -251,7 +243,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" ZOrder="18" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID" ZOrder="20" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>299</X>
@@ -263,7 +255,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" ZOrder="17" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID" ZOrder="19" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2461</X>
@@ -279,7 +271,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" ZOrder="15" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_TEMPLATE_PATTERN_TEMPLATE_ENT_ID" ZOrder="17" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2358</X>
@@ -291,7 +283,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" ZOrder="13" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID" ZOrder="15" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2134</X>
@@ -307,7 +299,7 @@
        </Point>
      </RoutePoints>
    </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" ZOrder="12" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FOLLOW_UP_EMAIL_DONE_CTRL_ID" ZOrder="14" LineWidth="11">
      <RoutePoints>
        <Point>
          <X>2142</X>
--- a/app/DD-Record-Organiser/DD_DMSDataSet1.Designer.vb
+++ b/app/DD-Record-Organiser/DD_DMSDataSet1.Designer.vb
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
-<Assembly: AssemblyVersion("2.4.4.5")> 
+<Assembly: AssemblyVersion("2.4.4.6")> 
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 <Assembly: NeutralResourcesLanguageAttribute("")> 
--- a/app/DD-Record-Organiser/frmConfig_Basic.vb
+++ b/app/DD-Record-Organiser/frmConfig_Basic.vb
@@ -338,12 +338,10 @@ Public Class frmConfig_Basic
                USER_LANGUAGE = cmbLanguage.Text
                If ClassDatabase.Execute_non_Query(update, True) = True Then
                    SetLanguage()
                    If USER_LANGUAGE = "de-DE" Then
-                        MsgBox("Die Sprache wurde erfolgreich geändert!", MsgBoxStyle.Information)
+                        MsgBox("Die Sprache wurde erfolgreich geändert und nach einem Neustart angewendet!", MsgBoxStyle.Information)
                    Else
-                        MsgBox("The language was changed successfully!", MsgBoxStyle.Information)
+                        MsgBox("The language was changed successfully and will be set after App-Restart", MsgBoxStyle.Information)
                    End If
                    LANGUAGE_CHANGED = True
                End If
@@ -353,21 +351,6 @@ Public Class frmConfig_Basic
            formloaded = True
        End If
    End Sub
    Public Sub SetLanguage()
        Dim sz = Me.Size
        Dim pt = Me.Location
        Dim de = System.Globalization.CultureInfo.CurrentUICulture
        'Neue Sprache festlegen und entfernen aller Controls
        Thread.CurrentThread.CurrentUICulture = New CultureInfo(USER_LANGUAGE)
        Me.Controls.Clear()
        'Me.Events.Dispose()
        InitializeComponent()
        'Wiederherstellen der Fensterposition
        Me.Size = sz
        Me.Location = pt
    End Sub
    Private Sub chkbxUserAut_CheckedChanged(sender As Object, e As EventArgs) Handles chkbxUserAut.CheckedChanged
        If chkbxUserAut.Checked Then
            Me.txtPasswort.Enabled = False
--- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
@@ -51,8 +51,8 @@ Partial Class frmConstructorDesigner
        Dim ADDED_WHENLabel2 As System.Windows.Forms.Label
        Dim CHANGED_WHOLabel2 As System.Windows.Forms.Label
        Dim CHANGED_WHENLabel2 As System.Windows.Forms.Label
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
        Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter()
@@ -1054,8 +1054,8 @@ Partial Class frmConstructorDesigner
        '
        Me.dgvResult.AllowUserToAddRows = False
        Me.dgvResult.AllowUserToDeleteRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
-        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        resources.ApplyResources(Me.dgvResult, "dgvResult")
        Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvResult.Name = "dgvResult"
@@ -1065,8 +1065,8 @@ Partial Class frmConstructorDesigner
        '
        Me.dgvPlaceholders.AllowUserToAddRows = False
        Me.dgvPlaceholders.AllowUserToDeleteRows = False
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
-        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
        Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
--- a/app/DD-Record-Organiser/frmConstructorDesigner.resx
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx
--- a/app/DD-Record-Organiser/frmConstructorDesigner.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb
@@ -34,13 +34,13 @@ Public Class frmConstructorDesigner
            Me.TBPMO_FORM_CONSTRUCTORTableAdapter.Connection.ConnectionString = MyConnectionString
            Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter.Connection.ConnectionString = MyConnectionString
            Load_Head()
-            Dim sql1 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.SHOW_FORM_CONSTRUCT = 1 AND T1.SCREEN_ID = 1 ORDER BY T1.FORM_TITLE"
+            Dim sql1 As String = "SELECT T.GUID, [dbo].[FNPMO_GETOBJECTCAPTION]('" & USER_LANGUAGE & "','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), 1) AS FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.SHOW_FORM_CONSTRUCT = 1 AND T1.SCREEN_ID = 1 ORDER BY T1.FORM_TITLE"
            Dim DTFORMS As DataTable = ClassDatabase.Return_Datatable(sql1, "")
            'FORM_IDComboBox.DataSource = DTFORMS
            'FORM_IDComboBox.DisplayMember = DTFORMS.Columns(1).ColumnName
            'FORM_IDComboBox.ValueMember = DTFORMS.Columns(0).ColumnName
-            Dim sql2 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.FORM_TYPE_ID IN (1,2) AND T.GUID = T1.FORM_ID AND T.SHOW_FORM_CONSTRUCT = 1 AND T1.SCREEN_ID = 1 ORDER BY T1.FORM_TITLE"
+            Dim sql2 As String = "SELECT T.GUID, [dbo].[FNPMO_GETOBJECTCAPTION]('" & USER_LANGUAGE & "','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), 1) AS FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.FORM_TYPE_ID IN (1,2) AND T.GUID = T1.FORM_ID AND T.SHOW_FORM_CONSTRUCT = 1 AND T1.SCREEN_ID = 1 ORDER BY T1.FORM_TITLE"
            Dim DTParent As DataTable = ClassDatabase.Return_Datatable(sql2, "")
            'PARENT_IDComboBox.DataSource = DTParent
            'PARENT_IDComboBox.DisplayMember = DTParent.Columns(1).ColumnName
@@ -114,10 +114,15 @@ Public Class frmConstructorDesigner
            Dim DT_USER = ClassDatabase.Return_Datatable(Sql)
            Sql = String.Format("SELECT T1.GUID, T.USERNAME + ' - ' + CASE T1.HOME_MENUE WHEN 1 THEN 'HOME' ELSE 'STANDARD' END AS USERNAME FROM TBDD_USER T, TBPMO_CONSTRUCTOR_USER T1 WHERE T1.USER_ID = T.GUID AND T1.CONSTRUCT_ID = {0} ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
            Dim DT_USER_CONSTR As DataTable = ClassDatabase.Return_Datatable(Sql, "LOAD USERS FOR CONSTRUCT")
-            chksbxUserConstructor.Items.Clear()
+            Try
-            For Each row As DataRow In DT_USER.Rows
+                chksbxUserConstructor.Items.Clear()
-                chksbxUserConstructor.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
+                For Each row As DataRow In DT_USER.Rows
-            Next
+                    chksbxUserConstructor.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
                Next
            Catch ex As Exception
            End Try
            ListBoxUsersFORConstructor.DataSource = DT_USER_CONSTR
            ListBoxUsersFORConstructor.DisplayMember = DT_USER_CONSTR.Columns(1).ColumnName
@@ -647,14 +652,16 @@ Public Class frmConstructorDesigner
    Private Sub btnAddUser2ConstructorREL_Click(sender As Object, e As EventArgs) Handles btnAddUser2ConstructorREL.Click
        Try
-            For Each obj As Object In chklbxClient.CheckedItems
+            For Each obj As Object In chksbxUserConstructor.CheckedItems
                Dim item As MyListBoxItem = CType(obj, MyListBoxItem)
                Dim home As Integer = CInt(CheckBoxHome.Checked)
                Dim insert = "INSERT INTO TBPMO_CONSTRUCTOR_USER (CONSTRUCT_ID, USER_ID,ADDED_WHO,HOME_MENUE) VALUES (" & CONSTRUCTOR_IDTextBox.Text & ", " & item.ExtraData & ",'" & Environment.UserName & "'," & home & ")"
                If ClassDatabase.Execute_non_Query(insert, True) Then
-                    Load_ConstructorUser()
+
                End If
            Next
            chksbxUserConstructor.ClearSelected()
            Load_ConstructorUser()
        Catch ex As Exception
            MsgBox("Error while adding user to Constructor-Relation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
--- a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb
+++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb
@@ -62,6 +62,7 @@ Partial Class frmDokumentart_Konfig
        Me.ToolStripButton16 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton17 = New System.Windows.Forms.ToolStripButton()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.txtDocTypeSearch1 = New System.Windows.Forms.TextBox()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.ListBox3 = New System.Windows.Forms.ListBox()
@@ -80,7 +81,7 @@ Partial Class frmDokumentart_Konfig
        Me.ERSTELLTWANNTextBox = New System.Windows.Forms.TextBox()
        Me.GEANDERTWERTextBox = New System.Windows.Forms.TextBox()
        Me.GEAENDERTWANNTextBox = New System.Windows.Forms.TextBox()
-        Me.ListBox1 = New System.Windows.Forms.ListBox()
+        Me.lbxDoctypes = New System.Windows.Forms.ListBox()
        Me.TBDD_EINGANGSARTENBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TBDD_EINGANGSARTENTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_EINGANGSARTENTableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
@@ -131,10 +132,9 @@ Partial Class frmDokumentart_Konfig
        Me.TBPMO_WD_FORMVIEW_DOKTYPESBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.Label1 = New System.Windows.Forms.Label()
        Me.btnAddDokart_Entity = New System.Windows.Forms.Button()
-        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
+        Me.cmbEntity_Doctype = New System.Windows.Forms.ComboBox()
        Me.TBPMO_FORM_VIEWBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components)
        Me.ToolStripButton8 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel()
        Me.ToolStripButton9 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton10 = New System.Windows.Forms.ToolStripButton()
@@ -396,6 +396,7 @@ Partial Class frmDokumentart_Konfig
        '
        'GroupBox1
        '
        Me.GroupBox1.Controls.Add(Me.txtDocTypeSearch1)
        Me.GroupBox1.Controls.Add(Me.Button1)
        Me.GroupBox1.Controls.Add(Me.Label4)
        Me.GroupBox1.Controls.Add(Me.ListBox3)
@@ -423,12 +424,18 @@ Partial Class frmDokumentart_Konfig
        Me.GroupBox1.Controls.Add(Me.GEANDERTWERTextBox)
        Me.GroupBox1.Controls.Add(GEAENDERTWANNLabel)
        Me.GroupBox1.Controls.Add(Me.GEAENDERTWANNTextBox)
-        Me.GroupBox1.Controls.Add(Me.ListBox1)
+        Me.GroupBox1.Controls.Add(Me.lbxDoctypes)
        Me.GroupBox1.Controls.Add(Me.TBDD_DOKUMENTARTBindingNavigator)
        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
        Me.GroupBox1.Name = "GroupBox1"
        Me.GroupBox1.TabStop = False
        '
        'txtDocTypeSearch1
        '
        Me.txtDocTypeSearch1.BackColor = System.Drawing.Color.SandyBrown
        resources.ApplyResources(Me.txtDocTypeSearch1, "txtDocTypeSearch1")
        Me.txtDocTypeSearch1.Name = "txtDocTypeSearch1"
        '
        'Button1
        '
        resources.ApplyResources(Me.Button1, "Button1")
@@ -555,16 +562,16 @@ Partial Class frmDokumentart_Konfig
        Me.GEAENDERTWANNTextBox.ReadOnly = True
        Me.GEAENDERTWANNTextBox.TabStop = False
        '
-        'ListBox1
+        'lbxDoctypes
        '
-        Me.ListBox1.BackColor = System.Drawing.SystemColors.GradientActiveCaption
+        Me.lbxDoctypes.BackColor = System.Drawing.SystemColors.GradientActiveCaption
-        Me.ListBox1.DataSource = Me.TBDD_DOKUMENTARTBindingSource
+        Me.lbxDoctypes.DataSource = Me.TBDD_DOKUMENTARTBindingSource
-        Me.ListBox1.DisplayMember = "BEZEICHNUNG"
+        Me.lbxDoctypes.DisplayMember = "BEZEICHNUNG"
-        resources.ApplyResources(Me.ListBox1, "ListBox1")
+        resources.ApplyResources(Me.lbxDoctypes, "lbxDoctypes")
-        Me.ListBox1.FormattingEnabled = True
+        Me.lbxDoctypes.FormattingEnabled = True
-        Me.ListBox1.Name = "ListBox1"
+        Me.lbxDoctypes.Name = "lbxDoctypes"
-        Me.ListBox1.TabStop = False
+        Me.lbxDoctypes.TabStop = False
-        Me.ListBox1.ValueMember = "GUID"
+        Me.lbxDoctypes.ValueMember = "GUID"
        '
        'TBDD_EINGANGSARTENBindingSource
        '
@@ -578,6 +585,7 @@ Partial Class frmDokumentart_Konfig
        'TableAdapterManager
        '
        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
        Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
        Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Me.TBDD_DOKUMENTARTTableAdapter
        Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Me.TBDD_EINGANGSARTENTableAdapter
@@ -586,6 +594,7 @@ Partial Class frmDokumentart_Konfig
        Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Me.TBDD_INDEX_AUTOMTableAdapter
        Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing
@@ -858,7 +867,7 @@ Partial Class frmDokumentart_Konfig
        Me.XtraTabPage2.Controls.Add(Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView)
        Me.XtraTabPage2.Controls.Add(Me.Label1)
        Me.XtraTabPage2.Controls.Add(Me.btnAddDokart_Entity)
-        Me.XtraTabPage2.Controls.Add(Me.ComboBox1)
+        Me.XtraTabPage2.Controls.Add(Me.cmbEntity_Doctype)
        Me.XtraTabPage2.Controls.Add(Me.BindingNavigator1)
        Me.XtraTabPage2.Name = "XtraTabPage2"
        '
@@ -948,14 +957,14 @@ Partial Class frmDokumentart_Konfig
        Me.btnAddDokart_Entity.Name = "btnAddDokart_Entity"
        Me.btnAddDokart_Entity.UseVisualStyleBackColor = False
        '
-        'ComboBox1
+        'cmbEntity_Doctype
        '
-        Me.ComboBox1.DataSource = Me.TBPMO_FORM_VIEWBindingSource
+        Me.cmbEntity_Doctype.DataSource = Me.TBPMO_FORM_VIEWBindingSource
-        Me.ComboBox1.DisplayMember = "FORM_TITLE"
+        Me.cmbEntity_Doctype.DisplayMember = "FORM_TITLE"
-        Me.ComboBox1.FormattingEnabled = True
+        Me.cmbEntity_Doctype.FormattingEnabled = True
-        resources.ApplyResources(Me.ComboBox1, "ComboBox1")
+        resources.ApplyResources(Me.cmbEntity_Doctype, "cmbEntity_Doctype")
-        Me.ComboBox1.Name = "ComboBox1"
+        Me.cmbEntity_Doctype.Name = "cmbEntity_Doctype"
-        Me.ComboBox1.ValueMember = "GUID"
+        Me.cmbEntity_Doctype.ValueMember = "GUID"
        '
        'TBPMO_FORM_VIEWBindingSource
        '
@@ -964,12 +973,12 @@ Partial Class frmDokumentart_Konfig
        '
        'BindingNavigator1
        '
-        Me.BindingNavigator1.AddNewItem = Me.ToolStripButton8
+        Me.BindingNavigator1.AddNewItem = Nothing
        Me.BindingNavigator1.BindingSource = Me.TBPMO_WD_FORMVIEW_DOKTYPESBindingSource
        Me.BindingNavigator1.CountItem = Me.ToolStripLabel2
        Me.BindingNavigator1.CountItemFormat = "of {0} Mappings"
        Me.BindingNavigator1.DeleteItem = Me.ToolStripButton9
-        Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton10, Me.ToolStripButton11, Me.ToolStripSeparator4, Me.ToolStripTextBox2, Me.ToolStripLabel2, Me.ToolStripSeparator5, Me.ToolStripButton12, Me.ToolStripButton13, Me.ToolStripSeparator6, Me.ToolStripButton8, Me.ToolStripButton9, Me.ToolStripButton14, Me.ToolStripButton15})
+        Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton10, Me.ToolStripButton11, Me.ToolStripSeparator4, Me.ToolStripTextBox2, Me.ToolStripLabel2, Me.ToolStripSeparator5, Me.ToolStripButton12, Me.ToolStripButton13, Me.ToolStripSeparator6, Me.ToolStripButton9, Me.ToolStripButton14, Me.ToolStripButton15})
        resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1")
        Me.BindingNavigator1.MoveFirstItem = Me.ToolStripButton10
        Me.BindingNavigator1.MoveLastItem = Me.ToolStripButton13
@@ -978,12 +987,6 @@ Partial Class frmDokumentart_Konfig
        Me.BindingNavigator1.Name = "BindingNavigator1"
        Me.BindingNavigator1.PositionItem = Me.ToolStripTextBox2
        '
        'ToolStripButton8
        '
        Me.ToolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton8, "ToolStripButton8")
        Me.ToolStripButton8.Name = "ToolStripButton8"
        '
        'ToolStripLabel2
        '
        Me.ToolStripLabel2.Name = "ToolStripLabel2"
@@ -1125,7 +1128,7 @@ Partial Class frmDokumentart_Konfig
    Friend WithEvents TBDD_INDEX_AUTOMTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_INDEX_AUTOMTableAdapter
    Friend WithEvents TBDD_INDEX_AUTOMBindingSource As System.Windows.Forms.BindingSource
    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
-    Friend WithEvents ListBox1 As System.Windows.Forms.ListBox
+    Friend WithEvents lbxDoctypes As System.Windows.Forms.ListBox
    Friend WithEvents GUIDTextBox As System.Windows.Forms.TextBox
    Friend WithEvents BEZEICHNUNGTextBox As System.Windows.Forms.TextBox
    Friend WithEvents KURZNAMETextBox As System.Windows.Forms.TextBox
@@ -1167,7 +1170,6 @@ Partial Class frmDokumentart_Konfig
    Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents OBJEKTTYPComboBox As System.Windows.Forms.ComboBox
    Friend WithEvents BindingNavigator1 As System.Windows.Forms.BindingNavigator
    Friend WithEvents ToolStripButton8 As System.Windows.Forms.ToolStripButton
    Friend WithEvents ToolStripLabel2 As System.Windows.Forms.ToolStripLabel
    Friend WithEvents ToolStripButton9 As System.Windows.Forms.ToolStripButton
    Friend WithEvents ToolStripButton10 As System.Windows.Forms.ToolStripButton
@@ -1183,7 +1185,7 @@ Partial Class frmDokumentart_Konfig
    Friend WithEvents TBPMO_FORM_VIEWTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter
    Friend WithEvents TBPMO_WD_FORMVIEW_DOKTYPESBindingSource As System.Windows.Forms.BindingSource
    Friend WithEvents TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter
-    Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox
+    Friend WithEvents cmbEntity_Doctype As System.Windows.Forms.ComboBox
    Friend WithEvents btnAddDokart_Entity As System.Windows.Forms.Button
    Friend WithEvents TBPMO_WD_FORMVIEW_DOKTYPESDataGridView As System.Windows.Forms.DataGridView
    Friend WithEvents Label1 As System.Windows.Forms.Label
@@ -1210,4 +1212,5 @@ Partial Class frmDokumentart_Konfig
    Friend WithEvents Button1 As System.Windows.Forms.Button
    Friend WithEvents SQL_RESULTTextBox As System.Windows.Forms.TextBox
    Friend WithEvents ToolTipController1 As DevExpress.Utils.ToolTipController
    Friend WithEvents txtDocTypeSearch1 As System.Windows.Forms.TextBox
 End Class
--- a/app/DD-Record-Organiser/frmDokumentart_Konfig.resx
+++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.resx
@@ -150,7 +150,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;GUIDLabel.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
  </data>
  <metadata name="BEZEICHNUNGLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -183,7 +183,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;BEZEICHNUNGLabel.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
  </data>
  <metadata name="KURZNAMELabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -216,7 +216,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;KURZNAMELabel.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
  </data>
  <metadata name="ZIEL_PFADLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -249,7 +249,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;ZIEL_PFADLabel.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
  </data>
  <metadata name="BESCHREIBUNGLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -282,7 +282,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;BESCHREIBUNGLabel.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>17</value>
  </data>
  <metadata name="ERSTELLTWERLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -315,7 +315,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;ERSTELLTWERLabel.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>20</value>
  </data>
  <metadata name="ERSTELLTWANNLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -348,7 +348,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;ERSTELLTWANNLabel.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>22</value>
  </data>
  <metadata name="GEANDERTWERLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -381,7 +381,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;GEANDERTWERLabel.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>24</value>
  </data>
  <metadata name="GEAENDERTWANNLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -414,7 +414,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;GEAENDERTWANNLabel.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>26</value>
  </data>
  <metadata name="GUIDLabel1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -687,7 +687,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;OBJEKTTYPLabel.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
  </data>
  <metadata name="SQL_RESULTLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
@@ -932,7 +932,31 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;TBDD_DOKUMENTARTBindingNavigator.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>29</value>
  </data>
  <data name="txtDocTypeSearch1.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="txtDocTypeSearch1.Location" type="System.Drawing.Point, System.Drawing">
    <value>4, 47</value>
  </data>
  <data name="txtDocTypeSearch1.Size" type="System.Drawing.Size, System.Drawing">
    <value>305, 22</value>
  </data>
  <data name="txtDocTypeSearch1.TabIndex" type="System.Int32, mscorlib">
    <value>81</value>
  </data>
  <data name="&gt;&gt;txtDocTypeSearch1.Name" xml:space="preserve">
    <value>txtDocTypeSearch1</value>
  </data>
  <data name="&gt;&gt;txtDocTypeSearch1.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;txtDocTypeSearch1.Parent" xml:space="preserve">
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;txtDocTypeSearch1.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="Button1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -957,7 +981,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;Button1.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
  </data>
  <data name="Label4.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Right</value>
@@ -990,7 +1014,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
  </data>
  <data name="ListBox3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Right</value>
@@ -1023,7 +1047,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;ListBox3.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
  </data>
  <data name="lblSaveDokart.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -1035,13 +1059,13 @@
    <value>315, 279</value>
  </data>
  <data name="lblSaveDokart.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 17</value>
+    <value>98, 17</value>
  </data>
  <data name="lblSaveDokart.TabIndex" type="System.Int32, mscorlib">
    <value>77</value>
  </data>
  <data name="lblSaveDokart.Text" xml:space="preserve">
-    <value>Dokumentart erfolgreich gespeichert!</value>
+    <value>Doctype saved</value>
  </data>
  <data name="lblSaveDokart.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
@@ -1056,7 +1080,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;lblSaveDokart.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
  </data>
  <data name="btnNamenkonvention.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt, style=Bold</value>
@@ -1086,7 +1110,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnNamenkonvention.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
  </data>
  <data name="OBJEKTTYPComboBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1110,7 +1134,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;OBJEKTTYPComboBox.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
  </data>
  <data name="btnZielpfad.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1137,7 +1161,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnZielpfad.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
  </data>
  <data name="GUIDTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1161,7 +1185,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;GUIDTextBox.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
  </data>
  <data name="BEZEICHNUNGTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1185,7 +1209,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;BEZEICHNUNGTextBox.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
  </data>
  <data name="KURZNAMETextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1209,7 +1233,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;KURZNAMETextBox.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
  </data>
  <data name="ZIEL_PFADTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1233,7 +1257,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;ZIEL_PFADTextBox.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
  </data>
  <data name="BESCHREIBUNGTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1260,7 +1284,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;BESCHREIBUNGTextBox.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>18</value>
  </data>
  <data name="AKTIVCheckBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1287,7 +1311,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;AKTIVCheckBox.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>19</value>
  </data>
  <data name="ERSTELLTWERTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1311,7 +1335,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;ERSTELLTWERTextBox.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>21</value>
  </data>
  <data name="ERSTELLTWANNTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1335,7 +1359,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;ERSTELLTWANNTextBox.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>23</value>
  </data>
  <data name="GEANDERTWERTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1359,7 +1383,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;GEANDERTWERTextBox.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>25</value>
  </data>
  <data name="GEAENDERTWANNTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
@@ -1383,34 +1407,34 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;GEAENDERTWANNTextBox.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>27</value>
  </data>
-  <data name="ListBox1.Font" type="System.Drawing.Font, System.Drawing">
+  <data name="lbxDoctypes.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI Semibold, 9pt, style=Bold</value>
  </data>
-  <data name="ListBox1.ItemHeight" type="System.Int32, mscorlib">
+  <data name="lbxDoctypes.ItemHeight" type="System.Int32, mscorlib">
    <value>15</value>
  </data>
-  <data name="ListBox1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="lbxDoctypes.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 44</value>
+    <value>3, 74</value>
  </data>
-  <data name="ListBox1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="lbxDoctypes.Size" type="System.Drawing.Size, System.Drawing">
-    <value>306, 244</value>
+    <value>306, 229</value>
  </data>
-  <data name="ListBox1.TabIndex" type="System.Int32, mscorlib">
+  <data name="lbxDoctypes.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
  </data>
-  <data name="&gt;&gt;ListBox1.Name" xml:space="preserve">
+  <data name="&gt;&gt;lbxDoctypes.Name" xml:space="preserve">
-    <value>ListBox1</value>
+    <value>lbxDoctypes</value>
  </data>
-  <data name="&gt;&gt;ListBox1.Type" xml:space="preserve">
+  <data name="&gt;&gt;lbxDoctypes.Type" xml:space="preserve">
    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;ListBox1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;lbxDoctypes.Parent" xml:space="preserve">
    <value>GroupBox1</value>
  </data>
-  <data name="&gt;&gt;ListBox1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;lbxDoctypes.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>28</value>
  </data>
  <data name="GroupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Top</value>
@@ -1572,13 +1596,13 @@
    <value>827, 25</value>
  </data>
  <data name="lblSaveIndex.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 17</value>
+    <value>81, 17</value>
  </data>
  <data name="lblSaveIndex.TabIndex" type="System.Int32, mscorlib">
    <value>78</value>
  </data>
  <data name="lblSaveIndex.Text" xml:space="preserve">
-    <value>Index erfolgreich gespeichert!</value>
+    <value>Index saved</value>
  </data>
  <data name="lblSaveIndex.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
@@ -1806,7 +1830,7 @@
    <value>0, 25</value>
  </data>
  <data name="ListBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>305, 227</value>
+    <value>305, 224</value>
  </data>
  <data name="ListBox2.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -1994,7 +2018,7 @@
    <value>0, 0</value>
  </data>
  <data name="TBDD_INDEX_AUTOMBindingNavigator.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 25</value>
+    <value>1261, 25</value>
  </data>
  <data name="TBDD_INDEX_AUTOMBindingNavigator.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -2015,7 +2039,7 @@
    <value>22</value>
  </data>
  <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 252</value>
+    <value>1261, 249</value>
  </data>
  <data name="XtraTabPage1.Text" xml:space="preserve">
    <value>Automatische Indexe</value>
@@ -2179,51 +2203,30 @@
  <metadata name="TBPMO_FORM_VIEWBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>940, 56</value>
  </metadata>
-  <data name="ComboBox1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="cmbEntity_Doctype.Location" type="System.Drawing.Point, System.Drawing">
    <value>11, 77</value>
  </data>
-  <data name="ComboBox1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="cmbEntity_Doctype.Size" type="System.Drawing.Size, System.Drawing">
    <value>274, 21</value>
  </data>
-  <data name="ComboBox1.TabIndex" type="System.Int32, mscorlib">
+  <data name="cmbEntity_Doctype.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
-  <data name="&gt;&gt;ComboBox1.Name" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntity_Doctype.Name" xml:space="preserve">
-    <value>ComboBox1</value>
+    <value>cmbEntity_Doctype</value>
  </data>
-  <data name="&gt;&gt;ComboBox1.Type" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntity_Doctype.Type" xml:space="preserve">
    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;ComboBox1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntity_Doctype.Parent" xml:space="preserve">
    <value>XtraTabPage2</value>
  </data>
-  <data name="&gt;&gt;ComboBox1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntity_Doctype.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>786, 56</value>
  </metadata>
  <data name="ToolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
        rkJggg==
 </value>
  </data>
  <data name="ToolStripButton8.RightToLeftAutoMirrorImage" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="ToolStripButton8.Size" type="System.Drawing.Size, System.Drawing">
    <value>23, 22</value>
  </data>
  <data name="ToolStripButton8.Text" xml:space="preserve">
    <value>Neu hinzufügen</value>
  </data>
  <data name="ToolStripLabel2.Size" type="System.Drawing.Size, System.Drawing">
    <value>91, 22</value>
  </data>
@@ -2380,7 +2383,7 @@
    <value>0, 0</value>
  </data>
  <data name="BindingNavigator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 25</value>
+    <value>1261, 25</value>
  </data>
  <data name="BindingNavigator1.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -2401,7 +2404,7 @@
    <value>5</value>
  </data>
  <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 252</value>
+    <value>1261, 249</value>
  </data>
  <data name="XtraTabPage2.Text" xml:space="preserve">
    <value>Zurodnung Dokumentart - Entität</value>
@@ -2764,12 +2767,6 @@
  <data name="&gt;&gt;TBPMO_FORM_VIEWBindingSource.Type" xml:space="preserve">
    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;ToolStripButton8.Name" xml:space="preserve">
    <value>ToolStripButton8</value>
  </data>
  <data name="&gt;&gt;ToolStripButton8.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;ToolStripLabel2.Name" xml:space="preserve">
    <value>ToolStripLabel2</value>
  </data>
--- a/app/DD-Record-Organiser/frmDokumentart_Konfig.vb
+++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.vb
@@ -53,6 +53,11 @@
    End Sub
    Sub Save_Dokart()
        Try
            Dim msg = "Dokumentart gespeichert - " & Now.ToString
            If USER_LANGUAGE <> "de-DE" Then
                msg = "Doctype saved - " & Now.ToString
            End If
            lblSaveDokart.Text = msg
            Me.TBDD_DOKUMENTARTBindingSource.EndEdit()
            If DD_DMSDataSet.TBDD_DOKUMENTART.GetChanges Is Nothing = False Then
                Me.GEANDERTWERTextBox.Text = Environment.UserName
@@ -154,8 +159,8 @@
        End With
    End Sub
-    Private Sub ListBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox1.SelectedIndexChanged
+    Private Sub ListBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lbxDoctypes.SelectedIndexChanged
-        If ListBox1.SelectedIndex <> -1 Then
+        If lbxDoctypes.SelectedIndex <> -1 Then
            Refresh_Indexe_Auto(GUIDTextBox.Text)
            akt_DokartID = GUIDTextBox.Text
            Refresh_DokID_FORM_VIEW()
@@ -202,7 +207,7 @@
    End Sub
    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddDokart_Entity.Click
-        Me.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter.cmdInsert(Me.ComboBox1.SelectedValue, Me.GUIDTextBox.Text, Me.OBJEKTTYPComboBox.Text, Environment.UserName)
+        Me.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter.cmdInsert(Me.cmbEntity_Doctype.SelectedValue, Me.GUIDTextBox.Text, Me.OBJEKTTYPComboBox.Text, Environment.UserName)
        Refresh_DokID_FORM_VIEW()
    End Sub
@@ -217,10 +222,24 @@
    Private Sub btnNamenkonvention_Click(sender As Object, e As EventArgs) Handles btnNamenkonvention.Click
        Save_Dokart()
        Dim _temp As String
        akt_DokartID = GUIDTextBox.Text
        Dim sql As String = "select COUNT(T.GUID) FROM TBPMO_WD_FORMVIEW_DOKTYPES T, TBPMO_FORM_VIEW T1 WHERE T.FORMVIEW_ID = T1.GUID AND T1.SCREEN_ID = 1 AND T.DOCTYPE_ID = " & akt_DokartID
        Dim count = ClassDatabase.Execute_Scalar(sql, True)
        If count > 0 Then
            frmDokumentart_NameConvention.ShowDialog()
        Else
            Dim msg As String = "Achtung: Sie haben der Dokumentart noch keine Entitäten zugeordnet!"
            If USER_LANGUAGE <> "de-DE" Then
                msg = "Attention: You did not assign at least one entity to the document-type!"
            End If
            MsgBox(msg, MsgBoxStyle.Exclamation)
            XtraTabControl1.SelectedTabPageIndex = 1
            cmbEntity_Doctype.DroppedDown = True
        End If
        '_temp = Me.NAMENKONVENTIONTextBox.Text
        'akt_Namenkonvention = _temp
-        akt_DokartID = GUIDTextBox.Text
+     
        frmDokumentart_NameConvention.ShowDialog()
        'Me.NAMENKONVENTIONTextBox.Text = akt_Namenkonvention
        'If _temp <> NAMENKONVENTIONTextBox.Text Then
        '    Save_Dokart()
@@ -311,8 +330,16 @@
                If INDEXNAMEComboBox.Text = "(ONLY for Nameconvention)" Then
                    COMMENTTextBox.Text = "Please insert a description for this placeholder"
                End If
            End If
        End If
    End Sub
    Private Sub txtDocTypeSearch1_TextChanged(sender As Object, e As EventArgs) Handles txtDocTypeSearch1.TextChanged
        Dim i As Integer = lbxDoctypes.FindString(txtDocTypeSearch1.Text)
        lbxDoctypes.SelectedIndex = i
        If txtDocTypeSearch1.Text = "" Then
            lbxDoctypes.SelectedIndex = -1
        End If
    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb
+++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb
@@ -48,7 +48,7 @@
            Dim DTAUTOINDEX As DataTable = ClassDatabase.Return_Datatable(autoIIndex, "LOAD AUTOINDEXE")
            'Me.TBDD_INDEX_AUTOMTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_INDEX_AUTOM, frmDokumentart_Konfig.akt_DokartID)
-            DT_ENTITIES = ClassDatabase.Return_Datatable("select T.GUID, T.FORMVIEW_ID, T1.FORM_TITLE FROM TBPMO_WD_FORMVIEW_DOKTYPES T, TBPMO_FORM_VIEW T1 WHERE T.FORMVIEW_ID = T1.GUID AND T1.SCREEN_ID = 1 AND T.DOCTYPE_ID = " & frmDokumentart_Konfig.akt_DokartID & " ORDER BY T1.FORM_TITLE", "Load NameConventionData")
+            DT_ENTITIES = ClassDatabase.Return_Datatable("select T.GUID, T.FORMVIEW_ID, [dbo].[FNPMO_GETOBJECTCAPTION]('" & USER_LANGUAGE & "','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T.FORMVIEW_ID), 1) AS 'FORM_TITLE' FROM TBPMO_WD_FORMVIEW_DOKTYPES T, TBPMO_FORM_VIEW T1 WHERE T.FORMVIEW_ID = T1.GUID AND T1.SCREEN_ID = 1 AND T.DOCTYPE_ID = " & frmDokumentart_Konfig.akt_DokartID & " ORDER BY T1.FORM_TITLE", "Load NameConventionData")
            cmbEntity.DataSource = DT_ENTITIES
            cmbEntity.DisplayMember = DT_ENTITIES.Columns(2).ColumnName
            cmbEntity.ValueMember = DT_ENTITIES.Columns(0).ColumnName
--- a/app/DD-Record-Organiser/frmEntities.vb
+++ b/app/DD-Record-Organiser/frmEntities.vb
@@ -48,9 +48,10 @@ Public Class frmEntities
    End Sub
    Sub Load_TreeView()
        Try
            Dim DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _
                                       "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 1 AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2}))", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
            If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Level 0 >>" & DT_SQL, False)
            Dim DT As DataTable = ClassDatabase.Return_Datatable(DT_SQL)
            If DT.Rows.Count > 0 Then
                TreeViewEntity.Nodes.Clear()
@@ -61,7 +62,8 @@ Public Class frmEntities
                    Node.BackColor = Color.Orange
                    'Jetzt die Ebene1Knoten einhängen
                    DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _
-                                           "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (2,5) AND T.PARENT_ID = {2} AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, Row.Item("GUID"), USER_GUID)
+                                           "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (2,5) AND T.PARENT_ID = {2} AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {3})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, Row.Item("GUID"), USER_GUID)
                    If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Level 1 >>" & DT_SQL, False)
                    'Dim sql As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (2,5) AND T.PARENT_ID = " & Row.Item("GUID") & " ORDER BY LEVEL"
                    Dim dtEbene1 As DataTable = ClassDatabase.Return_Datatable(DT_SQL)
                    If dtEbene1.Rows.Count > 0 Then
@@ -71,6 +73,7 @@ Public Class frmEntities
                            Node1.Tag = row1.Item("GUID")
                            DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _
                                                   "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (3,5) AND T.PARENT_ID = {2} AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {3})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, row1.Item("GUID"), USER_GUID)
                            If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Level 2 >>" & DT_SQL, False)
                            ' Dim sql1 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (3,5) AND T.PARENT_ID = " & row1.Item("GUID") & " ORDER BY LEVEL"
                            'Jetzt die Ebene2 Knoten einhängen
                            Dim dtEbene2 As DataTable = ClassDatabase.Return_Datatable(DT_SQL)
@@ -90,6 +93,7 @@ Public Class frmEntities
                                       "FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 4 AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2})) ORDER BY CAPTION", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
                'Dim sql2 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 4 AND T.PARENT_ID = 0 ORDER BY T1.FORM_TITLE"
                Dim DT3 As DataTable = ClassDatabase.Return_Datatable(DT_SQL)
                If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Indepentent Entities >>" & DT_SQL, False)
                If DT3.Rows.Count > 0 Then
                    Dim Node As TreeNode
                    Node = TreeViewEntity.Nodes.Add("INDEPENDENT ENTITIES")
--- a/app/DD-Record-Organiser/frmUserKonfig.Designer.vb
+++ b/app/DD-Record-Organiser/frmUserKonfig.Designer.vb
@@ -175,6 +175,11 @@ Partial Class frmUserKonfig
        Me.Label5 = New System.Windows.Forms.Label()
        Me.lstbxUserMandant = New System.Windows.Forms.ListBox()
        Me.TBDD_CLIENTTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_CLIENTTableAdapter()
        Me.txtUserSearch1 = New System.Windows.Forms.TextBox()
        Me.txtUserSearch2 = New System.Windows.Forms.TextBox()
        Me.txtUserSearch3 = New System.Windows.Forms.TextBox()
        Me.txtUserSearch4 = New System.Windows.Forms.TextBox()
        Me.txtUserSearch5 = New System.Windows.Forms.TextBox()
        GUIDLabel = New System.Windows.Forms.Label()
        PRENAMELabel = New System.Windows.Forms.Label()
        NAMELabel = New System.Windows.Forms.Label()
@@ -419,13 +424,13 @@ Partial Class frmUserKonfig
        '
        'TBDD_USERBindingNavigator
        '
        resources.ApplyResources(Me.TBDD_USERBindingNavigator, "TBDD_USERBindingNavigator")
        Me.TBDD_USERBindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem
        Me.TBDD_USERBindingNavigator.BindingSource = Me.TBDD_USERBindingSource
        Me.TBDD_USERBindingNavigator.CountItem = Me.BindingNavigatorCountItem
        Me.TBDD_USERBindingNavigator.CountItemFormat = "von {0} Usern"
        Me.TBDD_USERBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem
        Me.TBDD_USERBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBDD_USERBindingNavigatorSaveItem, Me.tbRefreshUsers, Me.tsAddUser})
        resources.ApplyResources(Me.TBDD_USERBindingNavigator, "TBDD_USERBindingNavigator")
        Me.TBDD_USERBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem
        Me.TBDD_USERBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem
        Me.TBDD_USERBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem
@@ -435,37 +440,37 @@ Partial Class frmUserKonfig
        '
        'BindingNavigatorAddNewItem
        '
        resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem")
        Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem")
        Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem"
        '
        'BindingNavigatorCountItem
        '
        resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
        Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem"
        resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
        '
        'BindingNavigatorDeleteItem
        '
        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
        Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
        Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
        '
        'BindingNavigatorMoveFirstItem
        '
        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem")
        Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem")
        Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem"
        '
        'BindingNavigatorMovePreviousItem
        '
        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem")
        Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem")
        Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem"
        '
        'BindingNavigatorSeparator
        '
        resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator")
        Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator"
        resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator")
        '
        'BindingNavigatorPositionItem
        '
@@ -474,145 +479,145 @@ Partial Class frmUserKonfig
        '
        'BindingNavigatorSeparator1
        '
        resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1")
        Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1"
        resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1")
        '
        'BindingNavigatorMoveNextItem
        '
        resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem")
        Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem")
        Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem"
        '
        'BindingNavigatorMoveLastItem
        '
        resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem")
        Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem")
        Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem"
        '
        'BindingNavigatorSeparator2
        '
        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
        Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
        '
        'TBDD_USERBindingNavigatorSaveItem
        '
        resources.ApplyResources(Me.TBDD_USERBindingNavigatorSaveItem, "TBDD_USERBindingNavigatorSaveItem")
        Me.TBDD_USERBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.TBDD_USERBindingNavigatorSaveItem, "TBDD_USERBindingNavigatorSaveItem")
        Me.TBDD_USERBindingNavigatorSaveItem.Name = "TBDD_USERBindingNavigatorSaveItem"
        '
        'tbRefreshUsers
        '
        resources.ApplyResources(Me.tbRefreshUsers, "tbRefreshUsers")
        Me.tbRefreshUsers.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        Me.tbRefreshUsers.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
        resources.ApplyResources(Me.tbRefreshUsers, "tbRefreshUsers")
        Me.tbRefreshUsers.Name = "tbRefreshUsers"
        '
        'tsAddUser
        '
        resources.ApplyResources(Me.tsAddUser, "tsAddUser")
        Me.tsAddUser.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
        Me.tsAddUser.Image = Global.DD_Record_Organiser.My.Resources.Resources.benutzer3
        resources.ApplyResources(Me.tsAddUser, "tsAddUser")
        Me.tsAddUser.Name = "tsAddUser"
        '
        'USER_GUIDTextBox
        '
        resources.ApplyResources(Me.USER_GUIDTextBox, "USER_GUIDTextBox")
        Me.USER_GUIDTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.USER_GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "GUID", True))
        resources.ApplyResources(Me.USER_GUIDTextBox, "USER_GUIDTextBox")
        Me.USER_GUIDTextBox.Name = "USER_GUIDTextBox"
        Me.USER_GUIDTextBox.ReadOnly = True
        '
        'PRENAMETextBox
        '
        resources.ApplyResources(Me.PRENAMETextBox, "PRENAMETextBox")
        Me.PRENAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "PRENAME", True))
        resources.ApplyResources(Me.PRENAMETextBox, "PRENAMETextBox")
        Me.PRENAMETextBox.Name = "PRENAMETextBox"
        '
        'NAMETextBox
        '
        resources.ApplyResources(Me.NAMETextBox, "NAMETextBox")
        Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "NAME", True))
        resources.ApplyResources(Me.NAMETextBox, "NAMETextBox")
        Me.NAMETextBox.Name = "NAMETextBox"
        '
        'USERNAMETextBox
        '
        resources.ApplyResources(Me.USERNAMETextBox, "USERNAMETextBox")
        Me.USERNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "USERNAME", True))
        resources.ApplyResources(Me.USERNAMETextBox, "USERNAMETextBox")
        Me.USERNAMETextBox.Name = "USERNAMETextBox"
        '
        'EMAILTextBox
        '
        resources.ApplyResources(Me.EMAILTextBox, "EMAILTextBox")
        Me.EMAILTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "EMAIL", True))
        resources.ApplyResources(Me.EMAILTextBox, "EMAILTextBox")
        Me.EMAILTextBox.Name = "EMAILTextBox"
        '
        'LOGGED_INCheckBox
        '
        resources.ApplyResources(Me.LOGGED_INCheckBox, "LOGGED_INCheckBox")
        Me.LOGGED_INCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_USERBindingSource, "LOGGED_IN", True))
        resources.ApplyResources(Me.LOGGED_INCheckBox, "LOGGED_INCheckBox")
        Me.LOGGED_INCheckBox.Name = "LOGGED_INCheckBox"
        Me.LOGGED_INCheckBox.UseVisualStyleBackColor = True
        '
        'LOGGED_WHERETextBox
        '
        resources.ApplyResources(Me.LOGGED_WHERETextBox, "LOGGED_WHERETextBox")
        Me.LOGGED_WHERETextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.LOGGED_WHERETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "LOGGED_WHERE", True))
        resources.ApplyResources(Me.LOGGED_WHERETextBox, "LOGGED_WHERETextBox")
        Me.LOGGED_WHERETextBox.Name = "LOGGED_WHERETextBox"
        Me.LOGGED_WHERETextBox.ReadOnly = True
        '
        'LOG_IN_WHENTextBox
        '
        resources.ApplyResources(Me.LOG_IN_WHENTextBox, "LOG_IN_WHENTextBox")
        Me.LOG_IN_WHENTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.LOG_IN_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "LOG_IN_WHEN", True))
        resources.ApplyResources(Me.LOG_IN_WHENTextBox, "LOG_IN_WHENTextBox")
        Me.LOG_IN_WHENTextBox.Name = "LOG_IN_WHENTextBox"
        Me.LOG_IN_WHENTextBox.ReadOnly = True
        '
        'LOG_OUT_WHENTextBox
        '
        resources.ApplyResources(Me.LOG_OUT_WHENTextBox, "LOG_OUT_WHENTextBox")
        Me.LOG_OUT_WHENTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.LOG_OUT_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "LOG_OUT_WHEN", True))
        resources.ApplyResources(Me.LOG_OUT_WHENTextBox, "LOG_OUT_WHENTextBox")
        Me.LOG_OUT_WHENTextBox.Name = "LOG_OUT_WHENTextBox"
        Me.LOG_OUT_WHENTextBox.ReadOnly = True
        '
        'RECORG_ADMINCheckBox
        '
        resources.ApplyResources(Me.RECORG_ADMINCheckBox, "RECORG_ADMINCheckBox")
        Me.RECORG_ADMINCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_USERBindingSource, "RECORD_ADMIN", True))
        resources.ApplyResources(Me.RECORG_ADMINCheckBox, "RECORG_ADMINCheckBox")
        Me.RECORG_ADMINCheckBox.Name = "RECORG_ADMINCheckBox"
        Me.RECORG_ADMINCheckBox.UseVisualStyleBackColor = True
        '
        'ADDED_WHOTextBox
        '
        resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox")
        Me.ADDED_WHOTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "ADDED_WHO", True))
        resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox")
        Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox"
        Me.ADDED_WHOTextBox.ReadOnly = True
        '
        'ADDED_WHENTextBox
        '
        resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox")
        Me.ADDED_WHENTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "ADDED_WHEN", True))
        resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox")
        Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox"
        Me.ADDED_WHENTextBox.ReadOnly = True
        '
        'CHANGED_WHOTextBox
        '
        resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox")
        Me.CHANGED_WHOTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "CHANGED_WHO", True))
        resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox")
        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
        Me.CHANGED_WHOTextBox.ReadOnly = True
        '
        'CHANGED_WHENTextBox
        '
        resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox")
        Me.CHANGED_WHENTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "CHANGED_WHEN", True))
        resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox")
        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
        Me.CHANGED_WHENTextBox.ReadOnly = True
        '
@@ -641,21 +646,21 @@ Partial Class frmUserKonfig
        '
        'TabControl1
        '
        resources.ApplyResources(Me.TabControl1, "TabControl1")
        Me.TabControl1.Controls.Add(Me.TabPage1)
        Me.TabControl1.Controls.Add(Me.TabPage2)
        resources.ApplyResources(Me.TabControl1, "TabControl1")
        Me.TabControl1.Name = "TabControl1"
        Me.TabControl1.SelectedIndex = 0
        '
        'TabPage1
        '
        resources.ApplyResources(Me.TabPage1, "TabPage1")
        Me.TabPage1.Controls.Add(Me.Label1)
        Me.TabPage1.Controls.Add(Me.btnRemoveUserFromGroup)
        Me.TabPage1.Controls.Add(Me.cmbGroup)
        Me.TabPage1.Controls.Add(Me.Label2)
        Me.TabPage1.Controls.Add(Me.btnAddUserToGroup)
        Me.TabPage1.Controls.Add(Me.lbGroups)
        resources.ApplyResources(Me.TabPage1, "TabPage1")
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.UseVisualStyleBackColor = True
        '
@@ -666,17 +671,17 @@ Partial Class frmUserKonfig
        '
        'btnRemoveUserFromGroup
        '
        resources.ApplyResources(Me.btnRemoveUserFromGroup, "btnRemoveUserFromGroup")
        Me.btnRemoveUserFromGroup.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
        resources.ApplyResources(Me.btnRemoveUserFromGroup, "btnRemoveUserFromGroup")
        Me.btnRemoveUserFromGroup.Name = "btnRemoveUserFromGroup"
        Me.btnRemoveUserFromGroup.UseVisualStyleBackColor = True
        '
        'cmbGroup
        '
        resources.ApplyResources(Me.cmbGroup, "cmbGroup")
        Me.cmbGroup.DataSource = Me.TBDD_USER_GROUPSBindingSource
        Me.cmbGroup.DisplayMember = "NAME"
        Me.cmbGroup.FormattingEnabled = True
        resources.ApplyResources(Me.cmbGroup, "cmbGroup")
        Me.cmbGroup.Name = "cmbGroup"
        Me.cmbGroup.ValueMember = "GUID"
        '
@@ -692,8 +697,8 @@ Partial Class frmUserKonfig
        '
        'btnAddUserToGroup
        '
        resources.ApplyResources(Me.btnAddUserToGroup, "btnAddUserToGroup")
        Me.btnAddUserToGroup.Image = Global.DD_Record_Organiser.My.Resources.Resources.add1
        resources.ApplyResources(Me.btnAddUserToGroup, "btnAddUserToGroup")
        Me.btnAddUserToGroup.Name = "btnAddUserToGroup"
        Me.btnAddUserToGroup.UseVisualStyleBackColor = True
        '
@@ -706,7 +711,8 @@ Partial Class frmUserKonfig
        '
        'TabPage2
        '
-        resources.ApplyResources(Me.TabPage2, "TabPage2")
+        Me.TabPage2.Controls.Add(Me.txtUserSearch3)
        Me.TabPage2.Controls.Add(Me.txtUserSearch2)
        Me.TabPage2.Controls.Add(Me.btndeleteUserfromGroup)
        Me.TabPage2.Controls.Add(Me.lblUserforGroup)
        Me.TabPage2.Controls.Add(Me.chklbxUserForGroup)
@@ -715,13 +721,14 @@ Partial Class frmUserKonfig
        Me.TabPage2.Controls.Add(Me.clbUsersGroups)
        Me.TabPage2.Controls.Add(Me.Label3)
        Me.TabPage2.Controls.Add(Me.cmbGroups_Group2User)
        resources.ApplyResources(Me.TabPage2, "TabPage2")
        Me.TabPage2.Name = "TabPage2"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
        'btndeleteUserfromGroup
        '
        resources.ApplyResources(Me.btndeleteUserfromGroup, "btndeleteUserfromGroup")
        Me.btndeleteUserfromGroup.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
        resources.ApplyResources(Me.btndeleteUserfromGroup, "btndeleteUserfromGroup")
        Me.btndeleteUserfromGroup.Name = "btndeleteUserfromGroup"
        Me.btndeleteUserfromGroup.UseVisualStyleBackColor = True
        '
@@ -739,8 +746,8 @@ Partial Class frmUserKonfig
        '
        'btnaddSelectedUser2Group
        '
        resources.ApplyResources(Me.btnaddSelectedUser2Group, "btnaddSelectedUser2Group")
        Me.btnaddSelectedUser2Group.Image = Global.DD_Record_Organiser.My.Resources.Resources.add1
        resources.ApplyResources(Me.btnaddSelectedUser2Group, "btnaddSelectedUser2Group")
        Me.btnaddSelectedUser2Group.Name = "btnaddSelectedUser2Group"
        Me.btnaddSelectedUser2Group.UseVisualStyleBackColor = True
        '
@@ -763,16 +770,15 @@ Partial Class frmUserKonfig
        '
        'cmbGroups_Group2User
        '
        resources.ApplyResources(Me.cmbGroups_Group2User, "cmbGroups_Group2User")
        Me.cmbGroups_Group2User.DataSource = Me.TBDD_USER_GROUPSBindingSource
        Me.cmbGroups_Group2User.DisplayMember = "NAME"
        Me.cmbGroups_Group2User.FormattingEnabled = True
        resources.ApplyResources(Me.cmbGroups_Group2User, "cmbGroups_Group2User")
        Me.cmbGroups_Group2User.Name = "cmbGroups_Group2User"
        Me.cmbGroups_Group2User.ValueMember = "GUID"
        '
        'TabGruppendefinition
        '
        resources.ApplyResources(Me.TabGruppendefinition, "TabGruppendefinition")
        Me.TabGruppendefinition.Controls.Add(COMMENTLabel)
        Me.TabGruppendefinition.Controls.Add(Me.COMMENTTextBox)
        Me.TabGruppendefinition.Controls.Add(Me.ListBox1)
@@ -790,67 +796,68 @@ Partial Class frmUserKonfig
        Me.TabGruppendefinition.Controls.Add(Me.CHANGED_WHENTextBox1)
        Me.TabGruppendefinition.Controls.Add(Me.BindingNavigator1)
        Me.TabGruppendefinition.Name = "TabGruppendefinition"
        resources.ApplyResources(Me.TabGruppendefinition, "TabGruppendefinition")
        '
        'COMMENTTextBox
        '
        resources.ApplyResources(Me.COMMENTTextBox, "COMMENTTextBox")
        Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USER_GROUPSBindingSource, "COMMENT", True))
        resources.ApplyResources(Me.COMMENTTextBox, "COMMENTTextBox")
        Me.COMMENTTextBox.Name = "COMMENTTextBox"
        '
        'ListBox1
        '
        resources.ApplyResources(Me.ListBox1, "ListBox1")
        Me.ListBox1.DataSource = Me.TBDD_USER_GROUPSBindingSource
        Me.ListBox1.DisplayMember = "NAME"
        Me.ListBox1.FormattingEnabled = True
        resources.ApplyResources(Me.ListBox1, "ListBox1")
        Me.ListBox1.Name = "ListBox1"
        Me.ListBox1.ValueMember = "GUID"
        '
        'GUIDTextBox1
        '
        resources.ApplyResources(Me.GUIDTextBox1, "GUIDTextBox1")
        Me.GUIDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USER_GROUPSBindingSource, "GUID", True))
        resources.ApplyResources(Me.GUIDTextBox1, "GUIDTextBox1")
        Me.GUIDTextBox1.Name = "GUIDTextBox1"
        '
        'NAMETextBox1
        '
        resources.ApplyResources(Me.NAMETextBox1, "NAMETextBox1")
        Me.NAMETextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USER_GROUPSBindingSource, "NAME", True))
        resources.ApplyResources(Me.NAMETextBox1, "NAMETextBox1")
        Me.NAMETextBox1.Name = "NAMETextBox1"
        '
        'ADDED_WHOTextBox1
        '
        resources.ApplyResources(Me.ADDED_WHOTextBox1, "ADDED_WHOTextBox1")
        Me.ADDED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USER_GROUPSBindingSource, "ADDED_WHO", True))
        resources.ApplyResources(Me.ADDED_WHOTextBox1, "ADDED_WHOTextBox1")
        Me.ADDED_WHOTextBox1.Name = "ADDED_WHOTextBox1"
        '
        'ADDED_WHENTextBox1
        '
        resources.ApplyResources(Me.ADDED_WHENTextBox1, "ADDED_WHENTextBox1")
        Me.ADDED_WHENTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USER_GROUPSBindingSource, "ADDED_WHEN", True))
        resources.ApplyResources(Me.ADDED_WHENTextBox1, "ADDED_WHENTextBox1")
        Me.ADDED_WHENTextBox1.Name = "ADDED_WHENTextBox1"
        '
        'CHANGED_WHOTextBox1
        '
        resources.ApplyResources(Me.CHANGED_WHOTextBox1, "CHANGED_WHOTextBox1")
        Me.CHANGED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USER_GROUPSBindingSource, "CHANGED_WHO", True))
        resources.ApplyResources(Me.CHANGED_WHOTextBox1, "CHANGED_WHOTextBox1")
        Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1"
        '
        'CHANGED_WHENTextBox1
        '
        resources.ApplyResources(Me.CHANGED_WHENTextBox1, "CHANGED_WHENTextBox1")
        Me.CHANGED_WHENTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USER_GROUPSBindingSource, "CHANGED_WHEN", True))
        resources.ApplyResources(Me.CHANGED_WHENTextBox1, "CHANGED_WHENTextBox1")
        Me.CHANGED_WHENTextBox1.Name = "CHANGED_WHENTextBox1"
        '
        'BindingNavigator1
        '
        resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1")
        Me.BindingNavigator1.AddNewItem = Me.ToolStripButton1
        Me.BindingNavigator1.BindingSource = Me.TBDD_USER_GROUPSBindingSource
        Me.BindingNavigator1.CountItem = Me.ToolStripLabel1
        Me.BindingNavigator1.CountItemFormat = "of {0}"
        Me.BindingNavigator1.DeleteItem = Me.ToolStripButton2
        Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton3, Me.ToolStripButton4, Me.ToolStripSeparator1, Me.ToolStripTextBox1, Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton5, Me.ToolStripButton6, Me.ToolStripSeparator3, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton7, Me.ToolStripButton8})
        resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1")
        Me.BindingNavigator1.MoveFirstItem = Me.ToolStripButton3
        Me.BindingNavigator1.MoveLastItem = Me.ToolStripButton6
        Me.BindingNavigator1.MoveNextItem = Me.ToolStripButton5
@@ -860,37 +867,37 @@ Partial Class frmUserKonfig
        '
        'ToolStripButton1
        '
        resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1")
        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1")
        Me.ToolStripButton1.Name = "ToolStripButton1"
        '
        'ToolStripLabel1
        '
        resources.ApplyResources(Me.ToolStripLabel1, "ToolStripLabel1")
        Me.ToolStripLabel1.Name = "ToolStripLabel1"
        resources.ApplyResources(Me.ToolStripLabel1, "ToolStripLabel1")
        '
        'ToolStripButton2
        '
        resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2")
        Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2")
        Me.ToolStripButton2.Name = "ToolStripButton2"
        '
        'ToolStripButton3
        '
        resources.ApplyResources(Me.ToolStripButton3, "ToolStripButton3")
        Me.ToolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton3, "ToolStripButton3")
        Me.ToolStripButton3.Name = "ToolStripButton3"
        '
        'ToolStripButton4
        '
        resources.ApplyResources(Me.ToolStripButton4, "ToolStripButton4")
        Me.ToolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton4, "ToolStripButton4")
        Me.ToolStripButton4.Name = "ToolStripButton4"
        '
        'ToolStripSeparator1
        '
        resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1")
        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
        resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1")
        '
        'ToolStripTextBox1
        '
@@ -899,37 +906,37 @@ Partial Class frmUserKonfig
        '
        'ToolStripSeparator2
        '
        resources.ApplyResources(Me.ToolStripSeparator2, "ToolStripSeparator2")
        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
        resources.ApplyResources(Me.ToolStripSeparator2, "ToolStripSeparator2")
        '
        'ToolStripButton5
        '
        resources.ApplyResources(Me.ToolStripButton5, "ToolStripButton5")
        Me.ToolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton5, "ToolStripButton5")
        Me.ToolStripButton5.Name = "ToolStripButton5"
        '
        'ToolStripButton6
        '
        resources.ApplyResources(Me.ToolStripButton6, "ToolStripButton6")
        Me.ToolStripButton6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton6, "ToolStripButton6")
        Me.ToolStripButton6.Name = "ToolStripButton6"
        '
        'ToolStripSeparator3
        '
        resources.ApplyResources(Me.ToolStripSeparator3, "ToolStripSeparator3")
        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
        resources.ApplyResources(Me.ToolStripSeparator3, "ToolStripSeparator3")
        '
        'ToolStripButton7
        '
        resources.ApplyResources(Me.ToolStripButton7, "ToolStripButton7")
        Me.ToolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton7, "ToolStripButton7")
        Me.ToolStripButton7.Name = "ToolStripButton7"
        '
        'ToolStripButton8
        '
        resources.ApplyResources(Me.ToolStripButton8, "ToolStripButton8")
        Me.ToolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        Me.ToolStripButton8.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
        resources.ApplyResources(Me.ToolStripButton8, "ToolStripButton8")
        Me.ToolStripButton8.Name = "ToolStripButton8"
        '
        'XtraTabPage2
@@ -940,15 +947,14 @@ Partial Class frmUserKonfig
        '
        'TabControl3
        '
        resources.ApplyResources(Me.TabControl3, "TabControl3")
        Me.TabControl3.Controls.Add(Me.TabPage5)
        Me.TabControl3.Controls.Add(Me.TabPage6)
        resources.ApplyResources(Me.TabControl3, "TabControl3")
        Me.TabControl3.Name = "TabControl3"
        Me.TabControl3.SelectedIndex = 0
        '
        'TabPage5
        '
        resources.ApplyResources(Me.TabPage5, "TabPage5")
        Me.TabPage5.Controls.Add(Me.BindingNavigator2)
        Me.TabPage5.Controls.Add(Me.Label7)
        Me.TabPage5.Controls.Add(Me.GUIDTextBox)
@@ -968,17 +974,18 @@ Partial Class frmUserKonfig
        Me.TabPage5.Controls.Add(Me.ADDED_WHOTextBox2)
        Me.TabPage5.Controls.Add(Label12)
        Me.TabPage5.Controls.Add(Me.ADDED_WHENTextBox2)
        resources.ApplyResources(Me.TabPage5, "TabPage5")
        Me.TabPage5.Name = "TabPage5"
        Me.TabPage5.UseVisualStyleBackColor = True
        '
        'BindingNavigator2
        '
        resources.ApplyResources(Me.BindingNavigator2, "BindingNavigator2")
        Me.BindingNavigator2.AddNewItem = Me.ToolStripButton17
        Me.BindingNavigator2.CountItem = Me.ToolStripLabel3
        Me.BindingNavigator2.CountItemFormat = "of {0} Clients"
        Me.BindingNavigator2.DeleteItem = Me.ToolStripButton18
        Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton19, Me.ToolStripButton20, Me.ToolStripSeparator7, Me.ToolStripTextBox3, Me.ToolStripLabel3, Me.ToolStripSeparator8, Me.ToolStripButton21, Me.ToolStripButton22, Me.ToolStripSeparator9, Me.ToolStripButton17, Me.ToolStripButton18, Me.ToolStripButton23, Me.ToolStripButton24})
        resources.ApplyResources(Me.BindingNavigator2, "BindingNavigator2")
        Me.BindingNavigator2.MoveFirstItem = Me.ToolStripButton19
        Me.BindingNavigator2.MoveLastItem = Me.ToolStripButton22
        Me.BindingNavigator2.MoveNextItem = Me.ToolStripButton21
@@ -988,37 +995,37 @@ Partial Class frmUserKonfig
        '
        'ToolStripButton17
        '
        resources.ApplyResources(Me.ToolStripButton17, "ToolStripButton17")
        Me.ToolStripButton17.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton17, "ToolStripButton17")
        Me.ToolStripButton17.Name = "ToolStripButton17"
        '
        'ToolStripLabel3
        '
        resources.ApplyResources(Me.ToolStripLabel3, "ToolStripLabel3")
        Me.ToolStripLabel3.Name = "ToolStripLabel3"
        resources.ApplyResources(Me.ToolStripLabel3, "ToolStripLabel3")
        '
        'ToolStripButton18
        '
        resources.ApplyResources(Me.ToolStripButton18, "ToolStripButton18")
        Me.ToolStripButton18.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton18, "ToolStripButton18")
        Me.ToolStripButton18.Name = "ToolStripButton18"
        '
        'ToolStripButton19
        '
        resources.ApplyResources(Me.ToolStripButton19, "ToolStripButton19")
        Me.ToolStripButton19.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton19, "ToolStripButton19")
        Me.ToolStripButton19.Name = "ToolStripButton19"
        '
        'ToolStripButton20
        '
        resources.ApplyResources(Me.ToolStripButton20, "ToolStripButton20")
        Me.ToolStripButton20.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton20, "ToolStripButton20")
        Me.ToolStripButton20.Name = "ToolStripButton20"
        '
        'ToolStripSeparator7
        '
        resources.ApplyResources(Me.ToolStripSeparator7, "ToolStripSeparator7")
        Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
        resources.ApplyResources(Me.ToolStripSeparator7, "ToolStripSeparator7")
        '
        'ToolStripTextBox3
        '
@@ -1027,37 +1034,37 @@ Partial Class frmUserKonfig
        '
        'ToolStripSeparator8
        '
        resources.ApplyResources(Me.ToolStripSeparator8, "ToolStripSeparator8")
        Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
        resources.ApplyResources(Me.ToolStripSeparator8, "ToolStripSeparator8")
        '
        'ToolStripButton21
        '
        resources.ApplyResources(Me.ToolStripButton21, "ToolStripButton21")
        Me.ToolStripButton21.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton21, "ToolStripButton21")
        Me.ToolStripButton21.Name = "ToolStripButton21"
        '
        'ToolStripButton22
        '
        resources.ApplyResources(Me.ToolStripButton22, "ToolStripButton22")
        Me.ToolStripButton22.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton22, "ToolStripButton22")
        Me.ToolStripButton22.Name = "ToolStripButton22"
        '
        'ToolStripSeparator9
        '
        resources.ApplyResources(Me.ToolStripSeparator9, "ToolStripSeparator9")
        Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
        resources.ApplyResources(Me.ToolStripSeparator9, "ToolStripSeparator9")
        '
        'ToolStripButton23
        '
        resources.ApplyResources(Me.ToolStripButton23, "ToolStripButton23")
        Me.ToolStripButton23.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        resources.ApplyResources(Me.ToolStripButton23, "ToolStripButton23")
        Me.ToolStripButton23.Name = "ToolStripButton23"
        '
        'ToolStripButton24
        '
        resources.ApplyResources(Me.ToolStripButton24, "ToolStripButton24")
        Me.ToolStripButton24.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
        Me.ToolStripButton24.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
        resources.ApplyResources(Me.ToolStripButton24, "ToolStripButton24")
        Me.ToolStripButton24.Name = "ToolStripButton24"
        '
        'Label7
@@ -1068,8 +1075,8 @@ Partial Class frmUserKonfig
        '
        'GUIDTextBox
        '
        resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox")
        Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "GUID", True))
        resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox")
        Me.GUIDTextBox.Name = "GUIDTextBox"
        Me.GUIDTextBox.ReadOnly = True
        '
@@ -1080,8 +1087,8 @@ Partial Class frmUserKonfig
        '
        'CLIENT_NAMETextBox
        '
        resources.ApplyResources(Me.CLIENT_NAMETextBox, "CLIENT_NAMETextBox")
        Me.CLIENT_NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "CLIENT_NAME", True))
        resources.ApplyResources(Me.CLIENT_NAMETextBox, "CLIENT_NAMETextBox")
        Me.CLIENT_NAMETextBox.Name = "CLIENT_NAMETextBox"
        '
        'ListBox2
@@ -1096,47 +1103,48 @@ Partial Class frmUserKonfig
        '
        'SHORTNAMETextBox
        '
        resources.ApplyResources(Me.SHORTNAMETextBox, "SHORTNAMETextBox")
        Me.SHORTNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "SHORTNAME", True))
        resources.ApplyResources(Me.SHORTNAMETextBox, "SHORTNAMETextBox")
        Me.SHORTNAMETextBox.Name = "SHORTNAMETextBox"
        '
        'CHANGED_WHENTextBox2
        '
        resources.ApplyResources(Me.CHANGED_WHENTextBox2, "CHANGED_WHENTextBox2")
        Me.CHANGED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "CHANGED_WHEN", True))
        resources.ApplyResources(Me.CHANGED_WHENTextBox2, "CHANGED_WHENTextBox2")
        Me.CHANGED_WHENTextBox2.Name = "CHANGED_WHENTextBox2"
        Me.CHANGED_WHENTextBox2.ReadOnly = True
        '
        'COMMENTTextBox1
        '
        resources.ApplyResources(Me.COMMENTTextBox1, "COMMENTTextBox1")
        Me.COMMENTTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "COMMENT", True))
        resources.ApplyResources(Me.COMMENTTextBox1, "COMMENTTextBox1")
        Me.COMMENTTextBox1.Name = "COMMENTTextBox1"
        '
        'CHANGED_WHOTextBox2
        '
        resources.ApplyResources(Me.CHANGED_WHOTextBox2, "CHANGED_WHOTextBox2")
        Me.CHANGED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "CHANGED_WHO", True))
        resources.ApplyResources(Me.CHANGED_WHOTextBox2, "CHANGED_WHOTextBox2")
        Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2"
        Me.CHANGED_WHOTextBox2.ReadOnly = True
        '
        'ADDED_WHOTextBox2
        '
        resources.ApplyResources(Me.ADDED_WHOTextBox2, "ADDED_WHOTextBox2")
        Me.ADDED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "ADDED_WHO", True))
        resources.ApplyResources(Me.ADDED_WHOTextBox2, "ADDED_WHOTextBox2")
        Me.ADDED_WHOTextBox2.Name = "ADDED_WHOTextBox2"
        Me.ADDED_WHOTextBox2.ReadOnly = True
        '
        'ADDED_WHENTextBox2
        '
        resources.ApplyResources(Me.ADDED_WHENTextBox2, "ADDED_WHENTextBox2")
        Me.ADDED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "ADDED_WHEN", True))
        resources.ApplyResources(Me.ADDED_WHENTextBox2, "ADDED_WHENTextBox2")
        Me.ADDED_WHENTextBox2.Name = "ADDED_WHENTextBox2"
        Me.ADDED_WHENTextBox2.ReadOnly = True
        '
        'TabPage6
        '
-        resources.ApplyResources(Me.TabPage6, "TabPage6")
+        Me.TabPage6.Controls.Add(Me.txtUserSearch5)
        Me.TabPage6.Controls.Add(Me.txtUserSearch4)
        Me.TabPage6.Controls.Add(Me.btndeleteUserfromClient)
        Me.TabPage6.Controls.Add(Me.lblUser2Client)
        Me.TabPage6.Controls.Add(Me.chklbxUsersforClient)
@@ -1145,13 +1153,14 @@ Partial Class frmUserKonfig
        Me.TabPage6.Controls.Add(Me.chklbxUserClient)
        Me.TabPage6.Controls.Add(Me.Label17)
        Me.TabPage6.Controls.Add(Me.cmbClientsforUser)
        resources.ApplyResources(Me.TabPage6, "TabPage6")
        Me.TabPage6.Name = "TabPage6"
        Me.TabPage6.UseVisualStyleBackColor = True
        '
        'btndeleteUserfromClient
        '
        resources.ApplyResources(Me.btndeleteUserfromClient, "btndeleteUserfromClient")
        Me.btndeleteUserfromClient.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
        resources.ApplyResources(Me.btndeleteUserfromClient, "btndeleteUserfromClient")
        Me.btndeleteUserfromClient.Name = "btndeleteUserfromClient"
        Me.btndeleteUserfromClient.UseVisualStyleBackColor = True
        '
@@ -1169,8 +1178,8 @@ Partial Class frmUserKonfig
        '
        'btnsaddUser2Client
        '
        resources.ApplyResources(Me.btnsaddUser2Client, "btnsaddUser2Client")
        Me.btnsaddUser2Client.Image = Global.DD_Record_Organiser.My.Resources.Resources.add1
        resources.ApplyResources(Me.btnsaddUser2Client, "btnsaddUser2Client")
        Me.btnsaddUser2Client.Name = "btnsaddUser2Client"
        Me.btnsaddUser2Client.UseVisualStyleBackColor = True
        '
@@ -1193,10 +1202,10 @@ Partial Class frmUserKonfig
        '
        'cmbClientsforUser
        '
        resources.ApplyResources(Me.cmbClientsforUser, "cmbClientsforUser")
        Me.cmbClientsforUser.DataSource = Me.TBDD_CLIENTBindingSource
        Me.cmbClientsforUser.DisplayMember = "CLIENT_NAME"
        Me.cmbClientsforUser.FormattingEnabled = True
        resources.ApplyResources(Me.cmbClientsforUser, "cmbClientsforUser")
        Me.cmbClientsforUser.Name = "cmbClientsforUser"
        Me.cmbClientsforUser.ValueMember = "GUID"
        '
@@ -1221,10 +1230,10 @@ Partial Class frmUserKonfig
        '
        'LANGUAGEComboBox
        '
        resources.ApplyResources(Me.LANGUAGEComboBox, "LANGUAGEComboBox")
        Me.LANGUAGEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "LANGUAGE", True))
        Me.LANGUAGEComboBox.FormattingEnabled = True
        Me.LANGUAGEComboBox.Items.AddRange(New Object() {resources.GetString("LANGUAGEComboBox.Items"), resources.GetString("LANGUAGEComboBox.Items1")})
        resources.ApplyResources(Me.LANGUAGEComboBox, "LANGUAGEComboBox")
        Me.LANGUAGEComboBox.Name = "LANGUAGEComboBox"
        '
        'TBDD_GROUPS_USERBindingSource
@@ -1239,8 +1248,8 @@ Partial Class frmUserKonfig
        '
        'lstbxUserMandant
        '
        resources.ApplyResources(Me.lstbxUserMandant, "lstbxUserMandant")
        Me.lstbxUserMandant.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
        resources.ApplyResources(Me.lstbxUserMandant, "lstbxUserMandant")
        Me.lstbxUserMandant.FormattingEnabled = True
        Me.lstbxUserMandant.Name = "lstbxUserMandant"
        '
@@ -1248,10 +1257,41 @@ Partial Class frmUserKonfig
        '
        Me.TBDD_CLIENTTableAdapter.ClearBeforeFill = True
        '
        'txtUserSearch1
        '
        Me.txtUserSearch1.BackColor = System.Drawing.Color.SandyBrown
        resources.ApplyResources(Me.txtUserSearch1, "txtUserSearch1")
        Me.txtUserSearch1.Name = "txtUserSearch1"
        '
        'txtUserSearch2
        '
        Me.txtUserSearch2.BackColor = System.Drawing.Color.SandyBrown
        resources.ApplyResources(Me.txtUserSearch2, "txtUserSearch2")
        Me.txtUserSearch2.Name = "txtUserSearch2"
        '
        'txtUserSearch3
        '
        Me.txtUserSearch3.BackColor = System.Drawing.Color.SandyBrown
        resources.ApplyResources(Me.txtUserSearch3, "txtUserSearch3")
        Me.txtUserSearch3.Name = "txtUserSearch3"
        '
        'txtUserSearch4
        '
        Me.txtUserSearch4.BackColor = System.Drawing.Color.SandyBrown
        resources.ApplyResources(Me.txtUserSearch4, "txtUserSearch4")
        Me.txtUserSearch4.Name = "txtUserSearch4"
        '
        'txtUserSearch5
        '
        Me.txtUserSearch5.BackColor = System.Drawing.Color.SandyBrown
        resources.ApplyResources(Me.txtUserSearch5, "txtUserSearch5")
        Me.txtUserSearch5.Name = "txtUserSearch5"
        '
        'frmUserKonfig
        '
        resources.ApplyResources(Me, "$this")
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.Controls.Add(Me.txtUserSearch1)
        Me.Controls.Add(Me.lstbxUserMandant)
        Me.Controls.Add(Me.Label5)
        Me.Controls.Add(LANGUAGELabel)
@@ -1445,4 +1485,9 @@ Partial Class frmUserKonfig
    Friend WithEvents lblUser2Client As System.Windows.Forms.Label
    Friend WithEvents chklbxUsersforClient As System.Windows.Forms.CheckedListBox
    Friend WithEvents ADDED_WHENTextBox2 As System.Windows.Forms.TextBox
    Friend WithEvents txtUserSearch1 As System.Windows.Forms.TextBox
    Friend WithEvents txtUserSearch3 As System.Windows.Forms.TextBox
    Friend WithEvents txtUserSearch2 As System.Windows.Forms.TextBox
    Friend WithEvents txtUserSearch5 As System.Windows.Forms.TextBox
    Friend WithEvents txtUserSearch4 As System.Windows.Forms.TextBox
 End Class
--- a/app/DD-Record-Organiser/frmUserKonfig.en-US.resx
+++ b/app/DD-Record-Organiser/frmUserKonfig.en-US.resx
@@ -252,6 +252,12 @@
  <data name="USER_GUIDTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="lbUsers.Location" type="System.Drawing.Point, System.Drawing">
    <value>835, 81</value>
  </data>
  <data name="lbUsers.Size" type="System.Drawing.Size, System.Drawing">
    <value>217, 199</value>
  </data>
  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>91, 13</value>
  </data>
--- a/app/DD-Record-Organiser/frmUserKonfig.resx
+++ b/app/DD-Record-Organiser/frmUserKonfig.resx
--- a/app/DD-Record-Organiser/frmUserKonfig.vb
+++ b/app/DD-Record-Organiser/frmUserKonfig.vb
@@ -225,7 +225,6 @@
                Me.CHANGED_WHOTextBox1.Text = Environment.UserName
                Me.TBDD_USER_GROUPSBindingSource.EndEdit()
                Me.TBDD_USER_GROUPSTableAdapter.Update(Me.DD_DMSDataSet.TBDD_USER_GROUPS)
                MsgBox("Changes saved successfully.", MsgBoxStyle.Information)
            End If
        Catch ex As Exception
            MsgBox("Error in Save Groups:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -448,4 +447,44 @@
        Next
        LoadUserForClient()
    End Sub
    Private Sub txtUserSearch1_TextChanged(sender As Object, e As EventArgs) Handles txtUserSearch1.TextChanged
        Dim i As Integer = lbUsers.FindString(txtUserSearch1.Text)
        lbUsers.SelectedIndex = i
        If txtUserSearch1.Text = "" Then
            lbUsers.SelectedIndex = -1
        End If
    End Sub
    Private Sub txtUserSearch2_TextChanged(sender As Object, e As EventArgs) Handles txtUserSearch2.TextChanged
        Dim i As Integer = chklbxUserForGroup.FindString(txtUserSearch2.Text)
        chklbxUserForGroup.SelectedIndex = i
        If txtUserSearch2.Text = "" Then
            chklbxUserForGroup.SelectedIndex = -1
        End If
    End Sub
    Private Sub txtUserSearch3_TextChanged(sender As Object, e As EventArgs) Handles txtUserSearch3.TextChanged
        Dim i As Integer = clbUsersGroups.FindString(txtUserSearch3.Text)
        clbUsersGroups.SelectedIndex = i
        If txtUserSearch3.Text = "" Then
            clbUsersGroups.SelectedIndex = -1
        End If
    End Sub
    Private Sub txtUserSearch4_TextChanged(sender As Object, e As EventArgs) Handles txtUserSearch4.TextChanged
        Dim i As Integer = chklbxUserClient.FindString(txtUserSearch4.Text)
        chklbxUserClient.SelectedIndex = i
        If txtUserSearch2.Text = "" Then
            chklbxUserClient.SelectedIndex = -1
        End If
    End Sub
    Private Sub txtUserSearch5_TextChanged(sender As Object, e As EventArgs) Handles txtUserSearch5.TextChanged
        Dim i As Integer = chklbxUsersforClient.FindString(txtUserSearch5.Text)
        chklbxUsersforClient.SelectedIndex = i
        If txtUserSearch2.Text = "" Then
            chklbxUsersforClient.SelectedIndex = -1
        End If
    End Sub
 End Class