Improve config screen, add waiting days

MultiTool.Form/DS_DD_ECM.Designer.vb

@@ -5423,12 +5423,19 @@ Namespace DS_DD_ECMTableAdapters
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitCommandCollection()
-            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
+            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
             Me._commandCollection(0).CommandText = "SELECT        GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHE"& _ 
-                "N, ACTIVE, TEMPLATE_ID, COMMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBMT_CONFIG"
+                "N, ACTIVE, TEMPLATE_ID, COMMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBMT_CONFIG"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (TEMP"& _ 
+                "LATE_ID IS NOT NULL)"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(1).Connection = Me.Connection
+            Me._commandCollection(1).CommandText = "SELECT        GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHE"& _ 
+                "N, ACTIVE, TEMPLATE_ID, COMMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBMT_CONFIG"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (TEMP"& _ 
+                "LATE_ID IS NULL)"
+            Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5455,6 +5462,30 @@ Namespace DS_DD_ECMTableAdapters
             Return dataTable
         End Function
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)>  _
+        Public Overloads Overridable Function FillGeneral(ByVal dataTable As DS_DD_ECM.TBMT_CONFIGDataTable) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(1)
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], false)>  _
+        Public Overloads Overridable Function GetDataGeneral() As DS_DD_ECM.TBMT_CONFIGDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(1)
+            Dim dataTable As DS_DD_ECM.TBMT_CONFIGDataTable = New DS_DD_ECM.TBMT_CONFIGDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _

MultiTool.Form/DS_DD_ECM.xsd

@@ -304,56 +304,57 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBMT_FUNCTIONS WHERE (GUID = @GU
             <MainSource>
               <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBMT_CONFIG" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM TBMT_CONFIG
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" 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" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>INSERT INTO TBMT_CONFIG
                          ([KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT)
 VALUES        (@KEY,@VALUE,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@ACTIVE,@TEMPLATE_ID,@COMMENT)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="KEY" ColumnName="KEY" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@KEY" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="KEY" ColumnName="KEY" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@KEY" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(500)" DbType="String" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="" DataTypeServer="nvarchar(500)" DbType="String" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TEMPLATE_ID" ColumnName="TEMPLATE_ID" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TEMPLATE_ID" ColumnName="TEMPLATE_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT        GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT
-FROM            TBMT_CONFIG</CommandText>
+FROM            TBMT_CONFIG
+WHERE        (TEMPLATE_ID IS NOT NULL)</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>UPDATE       TBMT_CONFIG
 SET                [KEY] = @KEY, VALUE = @VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, ACTIVE = @ACTIVE, 
                          TEMPLATE_ID = @TEMPLATE_ID, COMMENT = @COMMENT
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="KEY" ColumnName="KEY" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@KEY" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="KEY" ColumnName="KEY" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@KEY" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(500)" DbType="String" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="" DataTypeServer="nvarchar(500)" DbType="String" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TEMPLATE_ID" ColumnName="TEMPLATE_ID" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TEMPLATE_ID" ColumnName="TEMPLATE_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBMT_CONFIG" 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" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -371,7 +372,18 @@ WHERE        (GUID = @Original_GUID)</CommandText>
               <Mapping SourceColumn="TEMPLATE_ID" DataSetColumn="TEMPLATE_ID" />
               <Mapping SourceColumn="COMMENT" DataSetColumn="COMMENT" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBMT_CONFIG" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillGeneral" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataGeneral" GeneratorSourceName="FillGeneral" GetMethodModifier="Public" GetMethodName="GetDataGeneral" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataGeneral" UserSourceName="FillGeneral">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT
+FROM            TBMT_CONFIG
+WHERE        (TEMPLATE_ID IS NULL)</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
         </Tables>
         <Sources />
@@ -381,7 +393,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
   <xs:element name="DS_DD_ECM" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_DD_ECM" msprop:Generator_UserDSName="DS_DD_ECM">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBMT_TEMPLATE_ITEMS" msprop:Generator_TableClassName="TBMT_TEMPLATE_ITEMSDataTable" msprop:Generator_TableVarName="tableTBMT_TEMPLATE_ITEMS" msprop:Generator_RowChangedName="TBMT_TEMPLATE_ITEMSRowChanged" msprop:Generator_TablePropName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowDeletingName="TBMT_TEMPLATE_ITEMSRowDeleting" msprop:Generator_RowChangingName="TBMT_TEMPLATE_ITEMSRowChanging" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATE_ITEMSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATE_ITEMSRowDeleted" msprop:Generator_RowClassName="TBMT_TEMPLATE_ITEMSRow" msprop:Generator_UserTableName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowEvArgName="TBMT_TEMPLATE_ITEMSRowChangeEvent">
+        <xs:element name="TBMT_TEMPLATE_ITEMS" msprop:Generator_TableClassName="TBMT_TEMPLATE_ITEMSDataTable" msprop:Generator_TableVarName="tableTBMT_TEMPLATE_ITEMS" msprop:Generator_TablePropName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowDeletingName="TBMT_TEMPLATE_ITEMSRowDeleting" msprop:Generator_RowChangingName="TBMT_TEMPLATE_ITEMSRowChanging" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATE_ITEMSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATE_ITEMSRowDeleted" msprop:Generator_UserTableName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowChangedName="TBMT_TEMPLATE_ITEMSRowChanged" msprop:Generator_RowEvArgName="TBMT_TEMPLATE_ITEMSRowChangeEvent" msprop:Generator_RowClassName="TBMT_TEMPLATE_ITEMSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -426,7 +438,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEDI_XML_TYPES" msprop:Generator_TableClassName="TBEDI_XML_TYPESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_TYPES" msprop:Generator_RowChangedName="TBEDI_XML_TYPESRowChanged" msprop:Generator_TablePropName="TBEDI_XML_TYPES" msprop:Generator_RowDeletingName="TBEDI_XML_TYPESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_TYPESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_TYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_TYPESRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_TYPESRow" msprop:Generator_UserTableName="TBEDI_XML_TYPES" msprop:Generator_RowEvArgName="TBEDI_XML_TYPESRowChangeEvent">
+        <xs:element name="TBEDI_XML_TYPES" msprop:Generator_TableClassName="TBEDI_XML_TYPESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_TYPES" msprop:Generator_TablePropName="TBEDI_XML_TYPES" msprop:Generator_RowDeletingName="TBEDI_XML_TYPESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_TYPESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_TYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_TYPESRowDeleted" msprop:Generator_UserTableName="TBEDI_XML_TYPES" msprop:Generator_RowChangedName="TBEDI_XML_TYPESRowChanged" msprop:Generator_RowEvArgName="TBEDI_XML_TYPESRowChangeEvent" msprop:Generator_RowClassName="TBEDI_XML_TYPESRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -440,7 +452,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBMT_TEMPLATES" msprop:Generator_TableClassName="TBMT_TEMPLATESDataTable" msprop:Generator_TableVarName="tableTBMT_TEMPLATES" msprop:Generator_RowChangedName="TBMT_TEMPLATESRowChanged" msprop:Generator_TablePropName="TBMT_TEMPLATES" msprop:Generator_RowDeletingName="TBMT_TEMPLATESRowDeleting" msprop:Generator_RowChangingName="TBMT_TEMPLATESRowChanging" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATESRowDeleted" msprop:Generator_RowClassName="TBMT_TEMPLATESRow" msprop:Generator_UserTableName="TBMT_TEMPLATES" msprop:Generator_RowEvArgName="TBMT_TEMPLATESRowChangeEvent">
+        <xs:element name="TBMT_TEMPLATES" msprop:Generator_TableClassName="TBMT_TEMPLATESDataTable" msprop:Generator_TableVarName="tableTBMT_TEMPLATES" msprop:Generator_TablePropName="TBMT_TEMPLATES" msprop:Generator_RowDeletingName="TBMT_TEMPLATESRowDeleting" msprop:Generator_RowChangingName="TBMT_TEMPLATESRowChanging" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATESRowDeleted" msprop:Generator_UserTableName="TBMT_TEMPLATES" msprop:Generator_RowChangedName="TBMT_TEMPLATESRowChanged" msprop:Generator_RowEvArgName="TBMT_TEMPLATESRowChangeEvent" msprop:Generator_RowClassName="TBMT_TEMPLATESRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -461,7 +473,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEDI_XML_NODES" msprop:Generator_TableClassName="TBEDI_XML_NODESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_NODES" msprop:Generator_RowChangedName="TBEDI_XML_NODESRowChanged" msprop:Generator_TablePropName="TBEDI_XML_NODES" msprop:Generator_RowDeletingName="TBEDI_XML_NODESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_NODESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_NODESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_NODESRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_NODESRow" msprop:Generator_UserTableName="TBEDI_XML_NODES" msprop:Generator_RowEvArgName="TBEDI_XML_NODESRowChangeEvent">
+        <xs:element name="TBEDI_XML_NODES" msprop:Generator_TableClassName="TBEDI_XML_NODESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_NODES" msprop:Generator_TablePropName="TBEDI_XML_NODES" msprop:Generator_RowDeletingName="TBEDI_XML_NODESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_NODESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_NODESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_NODESRowDeleted" msprop:Generator_UserTableName="TBEDI_XML_NODES" msprop:Generator_RowChangedName="TBEDI_XML_NODESRowChanged" msprop:Generator_RowEvArgName="TBEDI_XML_NODESRowChangeEvent" msprop:Generator_RowClassName="TBEDI_XML_NODESRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -477,7 +489,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBMT_FUNCTIONS" msprop:Generator_TableClassName="TBMT_FUNCTIONSDataTable" msprop:Generator_TableVarName="tableTBMT_FUNCTIONS" msprop:Generator_RowChangedName="TBMT_FUNCTIONSRowChanged" msprop:Generator_TablePropName="TBMT_FUNCTIONS" msprop:Generator_RowDeletingName="TBMT_FUNCTIONSRowDeleting" msprop:Generator_RowChangingName="TBMT_FUNCTIONSRowChanging" msprop:Generator_RowEvHandlerName="TBMT_FUNCTIONSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_FUNCTIONSRowDeleted" msprop:Generator_RowClassName="TBMT_FUNCTIONSRow" msprop:Generator_UserTableName="TBMT_FUNCTIONS" msprop:Generator_RowEvArgName="TBMT_FUNCTIONSRowChangeEvent">
+        <xs:element name="TBMT_FUNCTIONS" msprop:Generator_TableClassName="TBMT_FUNCTIONSDataTable" msprop:Generator_TableVarName="tableTBMT_FUNCTIONS" msprop:Generator_TablePropName="TBMT_FUNCTIONS" msprop:Generator_RowDeletingName="TBMT_FUNCTIONSRowDeleting" msprop:Generator_RowChangingName="TBMT_FUNCTIONSRowChanging" msprop:Generator_RowEvHandlerName="TBMT_FUNCTIONSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_FUNCTIONSRowDeleted" msprop:Generator_UserTableName="TBMT_FUNCTIONS" msprop:Generator_RowChangedName="TBMT_FUNCTIONSRowChanged" msprop:Generator_RowEvArgName="TBMT_FUNCTIONSRowChangeEvent" msprop:Generator_RowClassName="TBMT_FUNCTIONSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -505,7 +517,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBMT_CONFIG" msprop:Generator_TableClassName="TBMT_CONFIGDataTable" msprop:Generator_TableVarName="tableTBMT_CONFIG" msprop:Generator_RowChangedName="TBMT_CONFIGRowChanged" msprop:Generator_TablePropName="TBMT_CONFIG" msprop:Generator_RowDeletingName="TBMT_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBMT_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBMT_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_CONFIGRowDeleted" msprop:Generator_RowClassName="TBMT_CONFIGRow" msprop:Generator_UserTableName="TBMT_CONFIG" msprop:Generator_RowEvArgName="TBMT_CONFIGRowChangeEvent">
+        <xs:element name="TBMT_CONFIG" msprop:Generator_TableClassName="TBMT_CONFIGDataTable" msprop:Generator_TableVarName="tableTBMT_CONFIG" msprop:Generator_TablePropName="TBMT_CONFIG" msprop:Generator_RowDeletingName="TBMT_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBMT_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBMT_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_CONFIGRowDeleted" msprop:Generator_UserTableName="TBMT_CONFIG" msprop:Generator_RowChangedName="TBMT_CONFIGRowChanged" msprop:Generator_RowEvArgName="TBMT_CONFIGRowChangeEvent" msprop:Generator_RowClassName="TBMT_CONFIGRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -580,9 +592,9 @@ WHERE        (GUID = @Original_GUID)</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBMT_FUNCTIONS" msdata:parentkey="FUNCTION_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBMT_FUNCTIONS" msprop:Generator_ChildPropName="GetTBMT_FUNCTIONSRows" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" />
+      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBMT_FUNCTIONS" msdata:parentkey="FUNCTION_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBMT_FUNCTIONS" msprop:Generator_ChildPropName="GetTBMT_FUNCTIONSRows" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" />
-      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_TYPES" msdata:parentkey="XML_TYPE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBEDI_XML_TYPES" msprop:Generator_ChildPropName="GetTBEDI_XML_TYPESRows" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" />
+      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_TYPES" msdata:parentkey="XML_TYPE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBEDI_XML_TYPES" msprop:Generator_ChildPropName="GetTBEDI_XML_TYPESRows" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" />
-      <msdata:Relationship name="TBEDI_XML_NODES_TBMT_TEMPLATES" msdata:parent="TBEDI_XML_NODES" msdata:child="TBMT_TEMPLATES" msdata:parentkey="TEMPLATE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBMT_TEMPLATES" msprop:Generator_ChildPropName="GetTBMT_TEMPLATESRows" msprop:Generator_UserRelationName="TBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_ParentPropName="TBEDI_XML_NODESRow" msprop:Generator_RelationVarName="relationTBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_UserParentTable="TBEDI_XML_NODES" />
+      <msdata:Relationship name="TBEDI_XML_NODES_TBMT_TEMPLATES" msdata:parent="TBEDI_XML_NODES" msdata:child="TBMT_TEMPLATES" msdata:parentkey="TEMPLATE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBMT_TEMPLATES" msprop:Generator_ChildPropName="GetTBMT_TEMPLATESRows" msprop:Generator_UserRelationName="TBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_RelationVarName="relationTBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_UserParentTable="TBEDI_XML_NODES" msprop:Generator_ParentPropName="TBEDI_XML_NODESRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

MultiTool.Form/DS_DD_ECM.xss

@@ -11,7 +11,7 @@
     <Shape ID="DesignTable:TBMT_TEMPLATES" ZOrder="7" X="1069" Y="27" Height="134" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:TBEDI_XML_NODES" ZOrder="5" X="513" Y="22" Height="153" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:TBMT_FUNCTIONS" ZOrder="8" X="472" Y="347" Height="153" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:TBMT_CONFIG" ZOrder="2" X="-25" Y="383" Height="267" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBMT_CONFIG" ZOrder="2" X="-25" Y="383" Height="286" Width="230" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" ZOrder="6" LineWidth="11">

MultiTool.Form/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("WebService Multitool")>
 <Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("1.2.5.0")>
+<Assembly: AssemblyTrademark("1.2.6.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.2.5.0")>
+<Assembly: AssemblyVersion("1.2.6.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

MultiTool.Form/frmConfig.Designer.vb

@@ -67,6 +67,24 @@ Partial Class frmConfig
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
+        Me.txtYearOverride = New DevExpress.XtraEditors.TextEdit()
+        Me.txtWebserviceBaseurl = New DevExpress.XtraEditors.TextEdit()
+        Me.txtWebserviceUsername = New DevExpress.XtraEditors.TextEdit()
+        Me.txtWebservicePassword = New DevExpress.XtraEditors.TextEdit()
+        Me.txtWebserviceImportRelativePath = New DevExpress.XtraEditors.TextEdit()
+        Me.txtWebserviceImportBasePath = New DevExpress.XtraEditors.MemoEdit()
+        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.TBMT_TEMPLATE_ITEMSTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBMT_TEMPLATE_ITEMSTableAdapter()
         Me.TBMT_CONFIGTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBMT_CONFIGTableAdapter()
@@ -83,6 +101,25 @@ Partial Class frmConfig
         CType(Me.TBMT_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewConfig, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.LayoutControl1.SuspendLayout()
+        CType(Me.txtYearOverride.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtWebserviceBaseurl.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtWebserviceUsername.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtWebservicePassword.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtWebserviceImportRelativePath.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtWebserviceImportBasePath.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'XtraTabControl1
@@ -91,7 +128,7 @@ Partial Class frmConfig
         Me.XtraTabControl1.Location = New System.Drawing.Point(0, 63)
         Me.XtraTabControl1.Name = "XtraTabControl1"
         Me.XtraTabControl1.SelectedTabPage = Me.tabPageSchema
-        Me.XtraTabControl1.Size = New System.Drawing.Size(1093, 571)
+        Me.XtraTabControl1.Size = New System.Drawing.Size(1132, 607)
         Me.XtraTabControl1.TabIndex = 1
         Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabPageSchema, Me.tabPageConfig})
         '
@@ -99,7 +136,7 @@ Partial Class frmConfig
         '
         Me.tabPageSchema.Controls.Add(Me.GridSchema)
         Me.tabPageSchema.Name = "tabPageSchema"
-        Me.tabPageSchema.Size = New System.Drawing.Size(1091, 546)
+        Me.tabPageSchema.Size = New System.Drawing.Size(1130, 582)
         Me.tabPageSchema.Text = "Schema"
         '
         'GridSchema
@@ -109,7 +146,7 @@ Partial Class frmConfig
         Me.GridSchema.Location = New System.Drawing.Point(0, 0)
         Me.GridSchema.MainView = Me.GridViewSchema
         Me.GridSchema.Name = "GridSchema"
-        Me.GridSchema.Size = New System.Drawing.Size(1091, 546)
+        Me.GridSchema.Size = New System.Drawing.Size(1130, 582)
         Me.GridSchema.TabIndex = 0
         Me.GridSchema.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSchema})
         '
@@ -249,19 +286,20 @@ Partial Class frmConfig
         'tabPageConfig
         '
         Me.tabPageConfig.Controls.Add(Me.GridConfig)
+        Me.tabPageConfig.Controls.Add(Me.LayoutControl1)
         Me.tabPageConfig.Name = "tabPageConfig"
-        Me.tabPageConfig.Size = New System.Drawing.Size(1091, 546)
+        Me.tabPageConfig.Size = New System.Drawing.Size(1130, 582)
         Me.tabPageConfig.Text = "Konfiguration"
         '
         'GridConfig
         '
         Me.GridConfig.DataSource = Me.TBMT_CONFIGBindingSource
         Me.GridConfig.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GridConfig.Location = New System.Drawing.Point(0, 0)
+        Me.GridConfig.Location = New System.Drawing.Point(419, 0)
         Me.GridConfig.MainView = Me.GridViewConfig
         Me.GridConfig.MenuManager = Me.RibbonControl1
         Me.GridConfig.Name = "GridConfig"
-        Me.GridConfig.Size = New System.Drawing.Size(1091, 546)
+        Me.GridConfig.Size = New System.Drawing.Size(711, 582)
         Me.GridConfig.TabIndex = 0
         Me.GridConfig.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewConfig})
         '
@@ -287,7 +325,8 @@ Partial Class frmConfig
         Me.colKEY.FieldName = "KEY"
         Me.colKEY.Name = "colKEY"
         Me.colKEY.Visible = True
-        Me.colKEY.VisibleIndex = 0
+        Me.colKEY.VisibleIndex = 1
+        Me.colKEY.Width = 124
         '
         'colVALUE
         '
@@ -295,7 +334,8 @@ Partial Class frmConfig
         Me.colVALUE.FieldName = "VALUE"
         Me.colVALUE.Name = "colVALUE"
         Me.colVALUE.Visible = True
-        Me.colVALUE.VisibleIndex = 1
+        Me.colVALUE.VisibleIndex = 2
+        Me.colVALUE.Width = 124
         '
         'colADDED_WHO
         '
@@ -323,23 +363,28 @@ Partial Class frmConfig
         Me.colCOMMENT.FieldName = "COMMENT"
         Me.colCOMMENT.Name = "colCOMMENT"
         Me.colCOMMENT.Visible = True
-        Me.colCOMMENT.VisibleIndex = 2
+        Me.colCOMMENT.VisibleIndex = 4
+        Me.colCOMMENT.Width = 170
         '
         'colACTIVE
         '
         Me.colACTIVE.Caption = "Aktiv"
         Me.colACTIVE.FieldName = "ACTIVE"
+        Me.colACTIVE.MaxWidth = 40
+        Me.colACTIVE.MinWidth = 40
         Me.colACTIVE.Name = "colACTIVE"
         Me.colACTIVE.Visible = True
-        Me.colACTIVE.VisibleIndex = 3
+        Me.colACTIVE.VisibleIndex = 0
+        Me.colACTIVE.Width = 40
         '
         'colTEMPLATE_ID
         '
-        Me.colTEMPLATE_ID.Caption = "Vorlagen ID"
+        Me.colTEMPLATE_ID.Caption = "Vorlage"
         Me.colTEMPLATE_ID.FieldName = "TEMPLATE_ID"
         Me.colTEMPLATE_ID.Name = "colTEMPLATE_ID"
         Me.colTEMPLATE_ID.Visible = True
-        Me.colTEMPLATE_ID.VisibleIndex = 4
+        Me.colTEMPLATE_ID.VisibleIndex = 3
+        Me.colTEMPLATE_ID.Width = 87
         '
         'RibbonControl1
         '
@@ -353,7 +398,7 @@ Partial Class frmConfig
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
         Me.RibbonControl1.ShowToolbarCustomizeItem = False
-        Me.RibbonControl1.Size = New System.Drawing.Size(1093, 63)
+        Me.RibbonControl1.Size = New System.Drawing.Size(1132, 63)
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
         Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
         '
@@ -394,10 +439,176 @@ Partial Class frmConfig
         '
         'RibbonStatusBar1
         '
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 634)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 670)
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1093, 24)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1132, 24)
+        '
+        'LayoutControl1
+        '
+        Me.LayoutControl1.Controls.Add(Me.txtYearOverride)
+        Me.LayoutControl1.Controls.Add(Me.txtWebserviceBaseurl)
+        Me.LayoutControl1.Controls.Add(Me.txtWebserviceUsername)
+        Me.LayoutControl1.Controls.Add(Me.txtWebservicePassword)
+        Me.LayoutControl1.Controls.Add(Me.txtWebserviceImportRelativePath)
+        Me.LayoutControl1.Controls.Add(Me.txtWebserviceImportBasePath)
+        Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Left
+        Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControl1.Name = "LayoutControl1"
+        Me.LayoutControl1.Root = Me.Root
+        Me.LayoutControl1.Size = New System.Drawing.Size(419, 582)
+        Me.LayoutControl1.TabIndex = 1
+        Me.LayoutControl1.Text = "LayoutControl1"
+        '
+        'txtYearOverride
+        '
+        Me.txtYearOverride.Location = New System.Drawing.Point(152, 45)
+        Me.txtYearOverride.MenuManager = Me.RibbonControl1
+        Me.txtYearOverride.Name = "txtYearOverride"
+        Me.txtYearOverride.Size = New System.Drawing.Size(243, 20)
+        Me.txtYearOverride.StyleController = Me.LayoutControl1
+        Me.txtYearOverride.TabIndex = 4
+        '
+        'txtWebserviceBaseurl
+        '
+        Me.txtWebserviceBaseurl.Location = New System.Drawing.Point(152, 114)
+        Me.txtWebserviceBaseurl.MenuManager = Me.RibbonControl1
+        Me.txtWebserviceBaseurl.Name = "txtWebserviceBaseurl"
+        Me.txtWebserviceBaseurl.Size = New System.Drawing.Size(243, 20)
+        Me.txtWebserviceBaseurl.StyleController = Me.LayoutControl1
+        Me.txtWebserviceBaseurl.TabIndex = 5
+        '
+        'txtWebserviceUsername
+        '
+        Me.txtWebserviceUsername.Location = New System.Drawing.Point(152, 138)
+        Me.txtWebserviceUsername.MenuManager = Me.RibbonControl1
+        Me.txtWebserviceUsername.Name = "txtWebserviceUsername"
+        Me.txtWebserviceUsername.Size = New System.Drawing.Size(243, 20)
+        Me.txtWebserviceUsername.StyleController = Me.LayoutControl1
+        Me.txtWebserviceUsername.TabIndex = 6
+        '
+        'txtWebservicePassword
+        '
+        Me.txtWebservicePassword.Location = New System.Drawing.Point(152, 162)
+        Me.txtWebservicePassword.MenuManager = Me.RibbonControl1
+        Me.txtWebservicePassword.Name = "txtWebservicePassword"
+        Me.txtWebservicePassword.Properties.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42)
+        Me.txtWebservicePassword.Size = New System.Drawing.Size(243, 20)
+        Me.txtWebservicePassword.StyleController = Me.LayoutControl1
+        Me.txtWebservicePassword.TabIndex = 7
+        '
+        'txtWebserviceImportRelativePath
+        '
+        Me.txtWebserviceImportRelativePath.Location = New System.Drawing.Point(152, 299)
+        Me.txtWebserviceImportRelativePath.MenuManager = Me.RibbonControl1
+        Me.txtWebserviceImportRelativePath.Name = "txtWebserviceImportRelativePath"
+        Me.txtWebserviceImportRelativePath.Size = New System.Drawing.Size(243, 20)
+        Me.txtWebserviceImportRelativePath.StyleController = Me.LayoutControl1
+        Me.txtWebserviceImportRelativePath.TabIndex = 9
+        '
+        'txtWebserviceImportBasePath
+        '
+        Me.txtWebserviceImportBasePath.Location = New System.Drawing.Point(152, 231)
+        Me.txtWebserviceImportBasePath.MenuManager = Me.RibbonControl1
+        Me.txtWebserviceImportBasePath.Name = "txtWebserviceImportBasePath"
+        Me.txtWebserviceImportBasePath.Size = New System.Drawing.Size(243, 64)
+        Me.txtWebserviceImportBasePath.StyleController = Me.LayoutControl1
+        Me.txtWebserviceImportBasePath.TabIndex = 8
+        '
+        'Root
+        '
+        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
+        Me.Root.GroupBordersVisible = False
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.LayoutControlGroup2, Me.LayoutControlGroup3, Me.EmptySpaceItem1})
+        Me.Root.Name = "Root"
+        Me.Root.Size = New System.Drawing.Size(419, 582)
+        Me.Root.TextVisible = False
+        '
+        'LayoutControlGroup1
+        '
+        Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4})
+        Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 69)
+        Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(399, 117)
+        Me.LayoutControlGroup1.Text = "Webservice / EWL"
+        '
+        'LayoutControlItem4
+        '
+        Me.LayoutControlItem4.Control = Me.txtWebservicePassword
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 48)
+        Me.LayoutControlItem4.Name = "LayoutControlItem4"
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(375, 24)
+        Me.LayoutControlItem4.Text = "Webservice Passwort"
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(116, 13)
+        '
+        'LayoutControlItem3
+        '
+        Me.LayoutControlItem3.Control = Me.txtWebserviceUsername
+        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 24)
+        Me.LayoutControlItem3.Name = "LayoutControlItem3"
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(375, 24)
+        Me.LayoutControlItem3.Text = "Webservice Username"
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(116, 13)
+        '
+        'LayoutControlItem2
+        '
+        Me.LayoutControlItem2.Control = Me.txtWebserviceBaseurl
+        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem2.Name = "LayoutControlItem2"
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(375, 24)
+        Me.LayoutControlItem2.Text = "Server Adresse"
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(116, 13)
+        '
+        'LayoutControlGroup2
+        '
+        Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1})
+        Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlGroup2.Name = "LayoutControlGroup2"
+        Me.LayoutControlGroup2.Size = New System.Drawing.Size(399, 69)
+        Me.LayoutControlGroup2.Text = "Programmeinstellungen"
+        '
+        'LayoutControlItem1
+        '
+        Me.LayoutControlItem1.Control = Me.txtYearOverride
+        Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem1.Name = "LayoutControlItem1"
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(375, 24)
+        Me.LayoutControlItem1.Text = "Wirtschaftsjahr"
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(116, 13)
+        '
+        'LayoutControlGroup3
+        '
+        Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5, Me.LayoutControlItem6})
+        Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 186)
+        Me.LayoutControlGroup3.Name = "LayoutControlGroup3"
+        Me.LayoutControlGroup3.Size = New System.Drawing.Size(399, 137)
+        Me.LayoutControlGroup3.Text = "Import/Export Pfade"
+        '
+        'LayoutControlItem5
+        '
+        Me.LayoutControlItem5.Control = Me.txtWebserviceImportBasePath
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem5.Name = "LayoutControlItem5"
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(375, 68)
+        Me.LayoutControlItem5.Text = "WinLine Pfad (absolut)"
+        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(116, 13)
+        '
+        'LayoutControlItem6
+        '
+        Me.LayoutControlItem6.Control = Me.txtWebserviceImportRelativePath
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 68)
+        Me.LayoutControlItem6.Name = "LayoutControlItem6"
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(375, 24)
+        Me.LayoutControlItem6.Text = "Multiool Pfad (relativ)"
+        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(116, 13)
+        '
+        'EmptySpaceItem1
+        '
+        Me.EmptySpaceItem1.AllowHotTrack = False
+        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 323)
+        Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
+        Me.EmptySpaceItem1.Size = New System.Drawing.Size(399, 239)
+        Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
         '
         'RibbonPage2
         '
@@ -415,19 +626,19 @@ Partial Class frmConfig
         'TableAdapterManager
         '
         Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.TBEDI_XML_NODESTableAdapter = Nothing
+        Me.TableAdapterManager.TBEDI_XML_TYPESTableAdapter = Nothing
         Me.TableAdapterManager.TBMT_CONFIGTableAdapter = Me.TBMT_CONFIGTableAdapter
         Me.TableAdapterManager.TBMT_FUNCTIONSTableAdapter = Nothing
-        Me.TableAdapterManager.TBEDI_XML_NODESTableAdapter = Nothing
         Me.TableAdapterManager.TBMT_TEMPLATE_ITEMSTableAdapter = Me.TBMT_TEMPLATE_ITEMSTableAdapter
         Me.TableAdapterManager.TBMT_TEMPLATESTableAdapter = Nothing
-        Me.TableAdapterManager.TBEDI_XML_TYPESTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
         'frmConfig
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1093, 658)
+        Me.ClientSize = New System.Drawing.Size(1132, 694)
         Me.Controls.Add(Me.XtraTabControl1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
@@ -448,6 +659,25 @@ Partial Class frmConfig
         CType(Me.TBMT_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridViewConfig, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.LayoutControl1.ResumeLayout(False)
+        CType(Me.txtYearOverride.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtWebserviceBaseurl.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtWebserviceUsername.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtWebservicePassword.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtWebserviceImportRelativePath.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtWebserviceImportBasePath.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -498,4 +728,22 @@ Partial Class frmConfig
     Friend WithEvents colTEMPLATE_ID As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents LayoutControl1 As LayoutControl
+    Friend WithEvents txtYearOverride As TextEdit
+    Friend WithEvents txtWebserviceBaseurl As TextEdit
+    Friend WithEvents txtWebserviceUsername As TextEdit
+    Friend WithEvents txtWebservicePassword As TextEdit
+    Friend WithEvents txtWebserviceImportRelativePath As TextEdit
+    Friend WithEvents txtWebserviceImportBasePath As MemoEdit
+    Friend WithEvents Root As LayoutControlGroup
+    Friend WithEvents LayoutControlGroup1 As LayoutControlGroup
+    Friend WithEvents LayoutControlItem4 As LayoutControlItem
+    Friend WithEvents LayoutControlItem3 As LayoutControlItem
+    Friend WithEvents LayoutControlItem2 As LayoutControlItem
+    Friend WithEvents LayoutControlGroup2 As LayoutControlGroup
+    Friend WithEvents LayoutControlItem1 As LayoutControlItem
+    Friend WithEvents LayoutControlGroup3 As LayoutControlGroup
+    Friend WithEvents LayoutControlItem5 As LayoutControlItem
+    Friend WithEvents LayoutControlItem6 As LayoutControlItem
+    Friend WithEvents EmptySpaceItem1 As EmptySpaceItem
 End Class

MultiTool.Form/frmConfig.resx

@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="TBEDIXMLITEMSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>313, 17</value>
+  </metadata>
+  <metadata name="DS_DD_ECM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>194, 17</value>
+  </metadata>
   <metadata name="TBMT_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>758, 17</value>
   </metadata>
@@ -137,15 +143,6 @@
         IC8+DQo8L3N2Zz4L
 </value>
   </data>
-  <metadata name="TBEDIXMLITEMSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>313, 17</value>
-  </metadata>
-  <metadata name="DS_DD_ECM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>194, 17</value>
-  </metadata>
-  <metadata name="DS_DD_ECM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>194, 17</value>
-  </metadata>
   <metadata name="TBMT_TEMPLATE_ITEMSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>533, 17</value>
   </metadata>

MultiTool.Form/frmConfig.vb

@@ -4,6 +4,8 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+Imports MultiTool.Shared
+Imports MultiTool.Shared.Constants
 
 Public Class frmConfig
     Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Shared.Config)
@@ -12,6 +14,8 @@ Public Class frmConfig
     Private BindingSource As BindingSource = TBEDIXMLITEMSBindingSource
     Private View As GridView = GridViewSchema
 
+    Private TBMT_CONFIG_GENERAL As New DS_DD_ECM.TBMT_CONFIGDataTable
+
     Private ReadOnly Property Config As MultiTool.Shared.Config
         Get
             Return ConfigManager?.Config
@@ -45,14 +49,76 @@ Public Class frmConfig
 
         TBMT_CONFIGTableAdapter.Connection.ConnectionString = oBuilder.ToString()
         TBMT_CONFIGTableAdapter.Fill(DS_DD_ECM.TBMT_CONFIG)
+        TBMT_CONFIGTableAdapter.FillGeneral(TBMT_CONFIG_GENERAL)
+
+        LoadGeneralConfig(TBMT_CONFIG_GENERAL)
+    End Sub
+
+    Private Sub LoadGeneralConfig(TBMT_CONFIG_GENERAL As DS_DD_ECM.TBMT_CONFIGDataTable)
+        For Each oRow As DataRow In TBMT_CONFIG_GENERAL.Rows
+            Dim oConfigKey = oRow.ItemEx("KEY", "")
+            Dim oConfigValue = oRow.ItemEx("VALUE", "")
+
+            Select Case oConfigKey
+                Case "YEAR_OVERRIDE"
+                    txtYearOverride.EditValue = oConfigValue
+
+                Case "WEBSERVICE_BASEURL"
+                    txtWebserviceBaseurl.EditValue = oConfigValue
+
+                Case "WEBSERVICE_USERNAME"
+                    txtWebserviceUsername.EditValue = oConfigValue
+
+                Case "WEBSERIVCE_PASSWORD"
+                    txtWebservicePassword.EditValue = oConfigValue
+
+                Case "WEBSERVICE_IMPORT_BASE_PATH"
+                    txtWebserviceImportBasePath.EditValue = oConfigValue
+
+                Case "WEBSERVICE_IMPORT_RELATIVE_PATH"
+                    txtWebserviceImportRelativePath.EditValue = oConfigValue
+
+            End Select
+        Next
+    End Sub
+
+    Private Sub SaveGeneralConfig(TBMT_CONFIG_GENERAL As DS_DD_ECM.TBMT_CONFIGDataTable)
+        For Each oRow As DataRow In TBMT_CONFIG_GENERAL.Rows
+            Dim oConfigKey = oRow.ItemEx("KEY", "")
+
+            Select Case oConfigKey
+                Case "YEAR_OVERRIDE"
+                    oRow.Item("VALUE") = txtYearOverride.EditValue
+
+                Case "WEBSERVICE_BASEURL"
+                    oRow.Item("VALUE") = txtWebserviceBaseurl.EditValue
+
+                Case "WEBSERVICE_USERNAME"
+                    oRow.Item("VALUE") = txtWebserviceUsername.EditValue
+
+                Case "WEBSERIVCE_PASSWORD"
+                    oRow.Item("VALUE") = txtWebservicePassword.EditValue
+
+                Case "WEBSERVICE_IMPORT_BASE_PATH"
+                    oRow.Item("VALUE") = txtWebserviceImportBasePath.EditValue
+
+                Case "WEBSERVICE_IMPORT_RELATIVE_PATH"
+                    oRow.Item("VALUE") = txtWebserviceImportRelativePath.EditValue
+
+            End Select
+        Next
     End Sub
 
     Private Sub Save()
-        TBMT_CONFIGTableAdapter.Update(DS_DD_ECM.TBMT_CONFIG)
         DS_DD_ECM.TBMT_CONFIG.AcceptChanges()
+        TBMT_CONFIGTableAdapter.Update(DS_DD_ECM.TBMT_CONFIG)
+
+        TBMT_CONFIG_GENERAL.AcceptChanges()
+        SaveGeneralConfig(TBMT_CONFIG_GENERAL)
+        TBMT_CONFIGTableAdapter.Update(TBMT_CONFIG_GENERAL)
 
-        TBMT_TEMPLATE_ITEMSTableAdapter.Update(DS_DD_ECM.TBMT_TEMPLATE_ITEMS)
         DS_DD_ECM.TBMT_TEMPLATE_ITEMS.AcceptChanges()
+        TBMT_TEMPLATE_ITEMSTableAdapter.Update(DS_DD_ECM.TBMT_TEMPLATE_ITEMS)
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick

MultiTool.Form/frmExportMain.Designer.vb

@@ -86,6 +86,8 @@ Partial Class frmExportMain
         Me.colName2 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colId2 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
+        Me.comboYear = New DevExpress.XtraEditors.ComboBoxEdit()
+        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControlDocuments, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewDocuments, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -126,6 +128,8 @@ Partial Class frmExportMain
         CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.comboYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'RibbonControl1
@@ -412,6 +416,7 @@ Partial Class frmExportMain
         Me.LayoutControl1.Controls.Add(Me.dateDocDateTo)
         Me.LayoutControl1.Controls.Add(Me.comboDocumentType)
         Me.LayoutControl1.Controls.Add(Me.comboDocumentKind)
+        Me.LayoutControl1.Controls.Add(Me.comboYear)
         Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControl1.Name = "LayoutControl1"
@@ -460,7 +465,7 @@ Partial Class frmExportMain
         'dateDocDateFrom
         '
         Me.dateDocDateFrom.EditValue = Nothing
-        Me.dateDocDateFrom.Location = New System.Drawing.Point(112, 195)
+        Me.dateDocDateFrom.Location = New System.Drawing.Point(112, 225)
         Me.dateDocDateFrom.MenuManager = Me.RibbonControl1
         Me.dateDocDateFrom.Name = "dateDocDateFrom"
         Me.dateDocDateFrom.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@@ -473,7 +478,7 @@ Partial Class frmExportMain
         '
         'lookupAccount
         '
-        Me.lookupAccount.Location = New System.Drawing.Point(112, 105)
+        Me.lookupAccount.Location = New System.Drawing.Point(112, 135)
         Me.lookupAccount.MenuManager = Me.RibbonControl1
         Me.lookupAccount.Name = "lookupAccount"
         Me.lookupAccount.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear)})
@@ -510,7 +515,7 @@ Partial Class frmExportMain
         '
         'chkShowExported
         '
-        Me.chkShowExported.Location = New System.Drawing.Point(12, 252)
+        Me.chkShowExported.Location = New System.Drawing.Point(12, 282)
         Me.chkShowExported.MenuManager = Me.RibbonControl1
         Me.chkShowExported.Name = "chkShowExported"
         Me.chkShowExported.Properties.Caption = "Bereits exportierte Belege anzeigen"
@@ -520,7 +525,7 @@ Partial Class frmExportMain
         '
         'txtDocumentFrom
         '
-        Me.txtDocumentFrom.Location = New System.Drawing.Point(112, 135)
+        Me.txtDocumentFrom.Location = New System.Drawing.Point(112, 165)
         Me.txtDocumentFrom.MenuManager = Me.RibbonControl1
         Me.txtDocumentFrom.Name = "txtDocumentFrom"
         Me.txtDocumentFrom.Size = New System.Drawing.Size(171, 20)
@@ -529,7 +534,7 @@ Partial Class frmExportMain
         '
         'txtDocumentTo
         '
-        Me.txtDocumentTo.Location = New System.Drawing.Point(112, 165)
+        Me.txtDocumentTo.Location = New System.Drawing.Point(112, 195)
         Me.txtDocumentTo.MenuManager = Me.RibbonControl1
         Me.txtDocumentTo.Name = "txtDocumentTo"
         Me.txtDocumentTo.Size = New System.Drawing.Size(171, 20)
@@ -539,7 +544,7 @@ Partial Class frmExportMain
         'dateDocDateTo
         '
         Me.dateDocDateTo.EditValue = Nothing
-        Me.dateDocDateTo.Location = New System.Drawing.Point(112, 225)
+        Me.dateDocDateTo.Location = New System.Drawing.Point(112, 255)
         Me.dateDocDateTo.MenuManager = Me.RibbonControl1
         Me.dateDocDateTo.Name = "dateDocDateTo"
         Me.dateDocDateTo.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@@ -550,7 +555,7 @@ Partial Class frmExportMain
         '
         'comboDocumentType
         '
-        Me.comboDocumentType.Location = New System.Drawing.Point(112, 45)
+        Me.comboDocumentType.Location = New System.Drawing.Point(112, 75)
         Me.comboDocumentType.MenuManager = Me.RibbonControl1
         Me.comboDocumentType.Name = "comboDocumentType"
         Me.comboDocumentType.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@@ -570,7 +575,7 @@ Partial Class frmExportMain
         '
         'comboDocumentKind
         '
-        Me.comboDocumentKind.Location = New System.Drawing.Point(112, 75)
+        Me.comboDocumentKind.Location = New System.Drawing.Point(112, 105)
         Me.comboDocumentKind.MenuManager = Me.RibbonControl1
         Me.comboDocumentKind.Name = "comboDocumentKind"
         Me.comboDocumentKind.Properties.AllowMultiSelect = True
@@ -583,7 +588,7 @@ Partial Class frmExportMain
         '
         Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
         Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.LayoutControlItem3, Me.LayoutControlItem2, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlItem10, Me.LayoutControlItem9})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.LayoutControlItem3, Me.LayoutControlItem2, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlItem10, Me.LayoutControlItem9, Me.LayoutControlItem4})
         Me.Root.Name = "Root"
         Me.Root.Size = New System.Drawing.Size(298, 538)
         Me.Root.TextVisible = False
@@ -601,15 +606,15 @@ Partial Class frmExportMain
         'EmptySpaceItem1
         '
         Me.EmptySpaceItem1.AllowHotTrack = False
-        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 264)
+        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 294)
         Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
-        Me.EmptySpaceItem1.Size = New System.Drawing.Size(278, 254)
+        Me.EmptySpaceItem1.Size = New System.Drawing.Size(278, 224)
         Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
         '
         'LayoutControlItem3
         '
         Me.LayoutControlItem3.Control = Me.lookupAccount
-        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 90)
+        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 120)
         Me.LayoutControlItem3.Name = "LayoutControlItem3"
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem3.Size = New System.Drawing.Size(278, 30)
@@ -619,7 +624,7 @@ Partial Class frmExportMain
         'LayoutControlItem2
         '
         Me.LayoutControlItem2.Control = Me.dateDocDateFrom
-        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 180)
+        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 210)
         Me.LayoutControlItem2.Name = "LayoutControlItem2"
         Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem2.Size = New System.Drawing.Size(278, 30)
@@ -629,7 +634,7 @@ Partial Class frmExportMain
         'LayoutControlItem5
         '
         Me.LayoutControlItem5.Control = Me.chkShowExported
-        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 240)
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 270)
         Me.LayoutControlItem5.Name = "LayoutControlItem5"
         Me.LayoutControlItem5.Size = New System.Drawing.Size(278, 24)
         Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
@@ -638,7 +643,7 @@ Partial Class frmExportMain
         'LayoutControlItem6
         '
         Me.LayoutControlItem6.Control = Me.txtDocumentFrom
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 120)
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 150)
         Me.LayoutControlItem6.Name = "LayoutControlItem6"
         Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem6.Size = New System.Drawing.Size(278, 30)
@@ -648,7 +653,7 @@ Partial Class frmExportMain
         'LayoutControlItem7
         '
         Me.LayoutControlItem7.Control = Me.txtDocumentTo
-        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 150)
+        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 180)
         Me.LayoutControlItem7.Name = "LayoutControlItem7"
         Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem7.Size = New System.Drawing.Size(278, 30)
@@ -658,7 +663,7 @@ Partial Class frmExportMain
         'LayoutControlItem8
         '
         Me.LayoutControlItem8.Control = Me.dateDocDateTo
-        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 210)
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 240)
         Me.LayoutControlItem8.Name = "LayoutControlItem8"
         Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem8.Size = New System.Drawing.Size(278, 30)
@@ -668,7 +673,7 @@ Partial Class frmExportMain
         'LayoutControlItem10
         '
         Me.LayoutControlItem10.Control = Me.comboDocumentKind
-        Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 60)
+        Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 90)
         Me.LayoutControlItem10.Name = "LayoutControlItem10"
         Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem10.Size = New System.Drawing.Size(278, 30)
@@ -678,7 +683,7 @@ Partial Class frmExportMain
         'LayoutControlItem9
         '
         Me.LayoutControlItem9.Control = Me.comboDocumentType
-        Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 30)
+        Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 60)
         Me.LayoutControlItem9.Name = "LayoutControlItem9"
         Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem9.Size = New System.Drawing.Size(278, 30)
@@ -717,6 +722,26 @@ Partial Class frmExportMain
         '
         Me.SplashScreenManager.ClosingDelay = 500
         '
+        'comboYear
+        '
+        Me.comboYear.Location = New System.Drawing.Point(112, 45)
+        Me.comboYear.MenuManager = Me.RibbonControl1
+        Me.comboYear.Name = "comboYear"
+        Me.comboYear.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.comboYear.Size = New System.Drawing.Size(171, 20)
+        Me.comboYear.StyleController = Me.LayoutControl1
+        Me.comboYear.TabIndex = 15
+        '
+        'LayoutControlItem4
+        '
+        Me.LayoutControlItem4.Control = Me.comboYear
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 30)
+        Me.LayoutControlItem4.Name = "LayoutControlItem4"
+        Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(278, 30)
+        Me.LayoutControlItem4.Text = "Wirtschaftsjahr"
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(85, 13)
+        '
         'frmExportMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -772,6 +797,8 @@ Partial Class frmExportMain
         CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.comboYear.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -840,4 +867,6 @@ Partial Class frmExportMain
     Friend WithEvents colDocumentKind As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents comboDocumentKind As DevExpress.XtraEditors.CheckedComboBoxEdit
     Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents comboYear As DevExpress.XtraEditors.ComboBoxEdit
+    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
 End Class

MultiTool.Form/frmExportMain.vb

@@ -81,6 +81,8 @@ Public Class frmExportMain
             comboDocumentKind.Properties.EditValueType = Repository.EditValueTypeCollection.List
             comboDocumentKind.EditValue = New List(Of Object)
 
+            comboYear.Properties.Items.AddRange(Winline.Years)
+
             comboDocumentType.Properties.DisplayMember = "Key"
             comboDocumentType.Properties.ValueMember = "Value"
             comboDocumentType.Properties.DataSource = [Enum].
@@ -189,6 +191,7 @@ Public Class frmExportMain
             dateDocDateTo.DoValidate()
 
             Dim oMandator = lookupMandator.EditValue
+            Dim oYear = Utils.NotNull(comboYear.EditValue, 0)
             Dim oAccount = lookupAccount.EditValue
             Dim oKindsAsObjects As List(Of Object) = comboDocumentKind.EditValue
             Dim oKinds As List(Of DocumentKind) = oKindsAsObjects.Cast(Of DocumentKind).ToList()
@@ -214,7 +217,8 @@ Public Class frmExportMain
                 .DateTo = oDateTo,
                 .ShowExported = oShowExported,
                 .DocNumberFrom = oDocNumberFrom,
-                .DocNumberTo = oDocNumberTo
+                .DocNumberTo = oDocNumberTo,
+                .Year = oYear
             })
 
             GridControlDocuments.DataSource = oDocuments

MultiTool.Form/frmImportMain.vb

@@ -204,6 +204,8 @@ Public Class frmImportMain
         Dim oResult As DialogResult = MsgBox(oMessage, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text)
 
         Try
+            BeginLoadingUI()
+
             If oResult = DialogResult.Yes Then
                 Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
                 Dim oNewDocument = Await DocumentLoader.LoadFile(oDocument.File, CurrentTemplate, lookupMandator.EditValue)
@@ -222,6 +224,9 @@ Public Class frmImportMain
         Catch ex As Exception
             FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Neuladen_des_Dokuments)
 
+        Finally
+            EndLoadingUI()
+
         End Try
     End Sub
 

MultiTool.Shared/Documents/DocumentLoader.vb

@@ -420,6 +420,12 @@ Namespace Documents
             Dim oArticleNumberField As String = oFieldMap.GetOrDefault("Article", Nothing)
             Dim oArticleNumber As String = pRow.Fields.Item(oArticleNumberField).Final
 
+            Dim oQuantityField As String = oFieldMap.GetOrDefault("Quantity", Nothing)
+            Dim oQuantity As Integer = 1
+            If Integer.TryParse(pRow.Fields.Item(oQuantityField).Final, oQuantity) = False Then
+                Logger.Warn("Value for parameter Quantity could not be parsed. Setting to 1.")
+            End If
+
             ' These fields a fetched from the head row, ie. the first row
             Dim oAccountNumberField As String = oFieldMap.GetOrDefault("Account", Nothing)
             Dim oAccountNumber = pDocument.GetFieldValue(oAccountNumberField)
@@ -427,12 +433,21 @@ Namespace Documents
             Dim oDocumentDateField As String = oFieldMap.GetOrDefault("DocumentDate", Nothing)
             Dim oDocumentDate = pDocument.GetFieldValue(oDocumentDateField)
 
+            Dim oDocumentKindField As String = oFieldMap.GetOrDefault("DocumentKind", Nothing)
+            Dim oDocumentKind As Integer = 0
+            If Integer.TryParse(pDocument.GetFieldValue(oDocumentKindField), oDocumentKind) Then
+                Logger.Warn("Value for parameter DocumentKind could not be parsed. Setting to 0.")
+            End If
+
             ' TODO: Add Field Names as Constants
             ' TODO: Check for missing values
 
-            Dim oQuantity As Integer = 1
+            ' TODO: This function should not be hardcoded, but be replaced with virtual field or something..
+            ' It is related to customer SCHAUM and nothing general
+            Dim oWaitingDays As Integer = Await Winline.TryGetWaitingDays(oDocumentKind, pMandator)
+            ' END TODO
 
-            Dim oArticlePrice As Double = Await Winline.TryGetArticlePrice(oArticleNumber, oAccountNumber, oQuantity, oDocumentDate, pMandator, pTemplate)
+            Dim oArticlePrice As Double = Await Winline.TryGetArticlePrice(oArticleNumber, oAccountNumber, oQuantity, oDocumentDate, pMandator, pTemplate, oWaitingDays)
 
             If oArticlePrice > 0 Then
                 oPriceItem.External = oArticlePrice

MultiTool.Shared/Winline/WebServiceData.vb

@@ -55,7 +55,7 @@ Namespace Winline
 
             ' --- Build all teh filenamez and pathz
             Dim oBaseFileName As String = FileEx.GetDateTimeString()
-            Dim oFileName = FileEx.GetFilenameWithPrefix(oBaseFileName, pTemplate.Name, "xml")
+            Dim oFileName = $"{pTemplate.Name}-{oBaseFileName}-Request.xml"
 
             ' --- Get and create path for request/response files
             Dim oOutputDirectory = FileEx.CreateDateDirectory(pTemplate.OutputWebserviceDirectory)
@@ -124,18 +124,18 @@ Namespace Winline
             End Try
         End Function
 
-        Private Async Function HandleImportResponse(pResponse As HttpResponseMessage, pTemplate As Template, pBaseFileNAme As String) As Task
+        Private Async Function HandleImportResponse(pResponse As HttpResponseMessage, pTemplate As Template, pBaseFileName As String) As Task
             pResponse.EnsureSuccessStatusCode()
             Dim oResponseBody As String = Await pResponse.Content.ReadAsStringAsync()
             Dim oContentType = pResponse.Content.Headers.ContentType.MediaType
             Dim oSerializer = Serializer.GetSerializer(GetType(Templates.Entities.MESOWebServiceResult))
+            Dim oOutputDirectory = FileEx.CreateDateDirectory(pTemplate.OutputWebserviceDirectory)
 
             RaiseEvent WebServiceProgress(Me, "Antwort verarbeiten")
 
             Select Case oContentType
                 Case "text/xml"
-                    Dim oOutputDirectory = FileEx.CreateDateDirectory(pTemplate.OutputWebserviceDirectory)
+                    WriteResponseFile(oOutputDirectory, oResponseBody, $"{pTemplate.Name}-{pBaseFileName}-Response.xml")
-                    WriteResponseFileWithSuffix(oOutputDirectory, pBaseFileNAme, oResponseBody, "xml", $"{pTemplate.Name}-Response")
 
                     Dim oBytes As Byte() = Encoding.UTF8.GetBytes(oResponseBody)
                     Using oStream As New IO.MemoryStream(oBytes)
@@ -164,7 +164,7 @@ Namespace Winline
                     End Using
 
                 Case "text/html"
-                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileNAme, oResponseBody, "txt", $"{pTemplate.Name}-Response")
+                    WriteResponseFile(oOutputDirectory, oResponseBody, $"{pTemplate.Name}-{pBaseFileName}-Response.xml")
 
                     Throw New WebServiceException(oResponseBody)
 
@@ -221,15 +221,12 @@ Namespace Winline
 
             ' --- Build all teh filenamez and pathz
             Dim oBaseFileName As String = FileEx.GetDateTimeString()
-            Dim oFileName = FileEx.GetFilenameWithPrefix(oBaseFileName, pTemplate.Name, "xml")
+            Dim oFileName = $"{pTemplate.Name}-{oBaseFileName}.xml"
+            'Dim oFileName = FileEx.GetFilenameWithPrefix(oBaseFileName, pTemplate.Name, "xml")
 
             ' Save the filename to the document
             pDocument.FilenameExport = oFileName
 
-            ' Absolute Path to copy Request file
-            Dim oImportAbsolutePath = IO.Path.Combine(oWS.ImportBasePath, oWS.ImportRelativePath)
-            Dim oImportAbsoluteFilePath = IO.Path.Combine(FileEx.GetDateDirectory(oImportAbsolutePath), oFileName)
-
             RaiseEvent WebServiceProgress(Me, "Dateien schreiben")
 
             ' --- Prepare URL and HTTP Client
@@ -282,14 +279,14 @@ Namespace Winline
             Select Case oContentType
                 Case "text/xml"
                     ' Webservice
-                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "xml", pTemplate.Name)
+                    WriteResponseFile(pTemplate.OutputWebserviceDirectory, oResponseBody, $"{pTemplate.Name}-{pBaseFileName}-Response.xml")
                     ' XML
-                    WriteResponseFileWithSuffix(pTemplate.OutputXmlFileDirectory, pBaseFileName, oResponseBody, "xml", pTemplate.Name)
+                    WriteResponseFile(pTemplate.OutputXmlFileDirectory, oResponseBody, $"{pTemplate.Name}-{pBaseFileName}.xml")
                     ' Archive
-                    WriteResponseFileWithSuffix(FileEx.CreateDateDirectory(pTemplate.ArchiveDirectory), pBaseFileName, oResponseBody, "xml", pTemplate.Name)
+                    WriteResponseFile(FileEx.CreateDateDirectory(pTemplate.ArchiveDirectory), oResponseBody, $"{pTemplate.Name}-{pBaseFileName}.xml")
 
                 Case "text/html"
-                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "txt", pTemplate.Name)
+                    WriteResponseFile(pTemplate.OutputWebserviceDirectory, oResponseBody, $"{pTemplate.Name}-{pBaseFileName}-Response.txt")
 
                     Throw New ApplicationException(oResponseBody)
 
@@ -388,6 +385,18 @@ Namespace Winline
                 Return False
             End Try
         End Function
+
+        Private Function WriteResponseFile(pPath As String, pResponseBody As String, pFileName As String) As Boolean
+            Try
+                Dim oFilePath As String = IO.Path.Combine(pPath, pFileName)
+                IO.File.WriteAllText(oFilePath, pResponseBody)
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
     End Class
 
 End Namespace

MultiTool.Shared/Winline/WinlineData.vb

@@ -20,7 +20,7 @@ Namespace Winline
         Public Property Mandators As New List(Of Mandator)
         Public Property DocumentKinds As New List(Of DocumentKind)
 
-        Public Years As List(Of Integer)
+        Public Property Years As List(Of Integer)
 
         Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pConfig As GeneralConfig, pMappingConfig As MappingConfig, pMandatorConfig As MandatorConfig)
             MyBase.New(pLogConfig, pDatabase)
@@ -50,6 +50,7 @@ Namespace Winline
             Public Property DocNumberFrom As String
             Public Property DocNumberTo As String
             Public Property ShowExported As Boolean
+            Public Property Year As Integer
         End Class
 
 
@@ -133,6 +134,10 @@ Namespace Winline
                 Next
                 Accounts.AddRange(oAccounts)
 
+                If oAccounts.Count = 0 Then
+                    Logger.Warn("No Acconts loaded for Mandator [{0}]", pMandator)
+                End If
+
                 Logger.Info("[{0}] Accounts loaded for Mandator [{1}]", oAccounts.Count, pMandator)
             Catch ex As Exception
                 Logger.Warn("Could not load Accounts for Mandator [{0}]", pMandator)
@@ -322,19 +327,29 @@ Namespace Winline
         End Function
 
         Public Async Function TryGetArticlePrice(pArticle As String, pAccountNumber As String, pQuantity As String, pDocumentDate As Date, pMandator As Mandator, pTemplate As Template) As Task(Of Double)
+            Return Await TryGetArticlePrice(pArticle, pAccountNumber, pQuantity, pDocumentDate, pMandator, pTemplate, 0)
+        End Function
+
+        Public Async Function TryGetArticlePrice(pArticle As String, pAccountNumber As String, pQuantity As String, pDocumentDate As Date, pMandator As Mandator, pTemplate As Template, pWaitingDays As Integer) As Task(Of Double)
             Try
                 Dim oUserName = Environment.UserName
                 Dim oYear As Integer = Config.GetWinLineYear()
                 Dim oDebug = Convert.ToInt32(LogConfig.Debug)
 
+                ' TODO: pGroupPropertyID in config
+                ' TODO: pTempTableSuffix in config (nice to have)
+
+                Dim oDateFrom = pDocumentDate.AddDays(pWaitingDays * -1)
+                Dim oDateTo = pDocumentDate
+
                 Dim oSQL As String = $"
                 EXEC [{pMandator.Database}].[dbo].[PRCUST_GET_ACCOUNT_PRICE_CONDITION_VALUES] 
                     @pAccountNr = '{pAccountNumber}',
                     @pGroupNr = '*',
                     @pProductNr = '{pArticle}',
-                    @pProductQuantity = '*',
+                    @pProductQuantity = '<={pQuantity}',
-                    @pProductPriceDateFrom = '{pDocumentDate:dd.MM.yyyy}',
+                    @pProductPriceDateFrom = '{oDateFrom:dd.MM.yyyy}',
-                    @pProductPriceDateTo = '{pDocumentDate:dd.MM.yyyy}',
+                    @pProductPriceDateTo = '{oDateTo:dd.MM.yyyy}',
                     @pmesocomp = '{pMandator.Id}',
                     @pmesoyear = {oYear},
                     @pGroupPropertyID = 1008,
@@ -366,6 +381,34 @@ Namespace Winline
             End Try
         End Function
 
+        ''' <summary>
+        ''' This function is completely SCHAUM related.
+        ''' </summary>
+        Public Async Function TryGetWaitingDays(pDocumentKind As Integer, pMandator As Mandator) As Task(Of Integer)
+            Try
+                Dim oSql = $"
+                    SELECT [Karenztage].[u012] FROM [{pMandator.Database}].[dbo].[t670] As [Werksdefinition]
+                    INNER JOIN [{pMandator.Database}].[dbo].[t670] AS [Werkszuordnung] ON [Werksdefinition].[u007] = [Werkszuordnung].[u007]
+                    INNER JOIN [{pMandator.Database}].[dbo].[t670] AS [Karenztage] ON [Werksdefinition].[u000] = [Karenztage].[u032]
+                    WHERE [Werksdefinition].[u011] In ({pDocumentKind},{pDocumentKind}*10)
+                    AND [Werkszuordnung].[u006] = '%ConditionAccountNr%'
+                    AND [Karenztage].[u002] = 'Karenztage'
+                "
+                Dim oWaitingDays As Integer = Await Database.GetScalarValueAsync(oSql)
+
+                If IsNothing(oWaitingDays) Then
+                    oWaitingDays = 0
+                End If
+
+                Return oWaitingDays
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return 0
+
+            End Try
+        End Function
+
         Public Function TryGetArticleNumber(pEAN As String, pMandator As Mandator) As String
             Try
                 Dim oYear As Integer = Config.GetWinLineYear()
@@ -594,12 +637,16 @@ Namespace Winline
             Try
                 Dim oYear As Integer = Config.GetWinLineYear()
 
+                If pOptions.Year > 0 Then
+                    oYear = Config.GetWinLineYear(pOptions.Year)
+                End If
+
                 Dim oTypeConstraint
                 Select Case pDocumentType
                     Case DocumentType.OutgoingOffer
                         oTypeConstraint = $"T.c137 = 2 AND c139 = 1 AND "
 
-                    Case DocumentType.OutgoingOffer
+                    Case DocumentType.OutgoingOrder
                         oTypeConstraint = $"T.c137 = 2 AND c139 = 2 AND "
 
                     Case DocumentType.OutgoingDeliveryNote