First pass of new mandator selection

MultiTool.Form/CREATE_DATABASE.sql

@@ -4,85 +4,78 @@ ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_TYPES]
 GO
 ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_NODES]
 GO
+ALTER TABLE [dbo].[TBEDI_XML_TYPES] DROP CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TYPES] DROP CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_TABLES_ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_TABLES_ADDED_WHO]
+GO
 ALTER TABLE [dbo].[TBEDI_XML_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_NODES_IS_HEAD]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED]
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY]
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_VALUE_MAPPING_ORDER_KEY]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED]
 GO
 ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VISIBLE]
 GO
 ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_READ_ONLY]
 GO
-/****** Object:  View [dbo].[VWEDI_XML_ITEMS]    Script Date: 18.11.2021 13:29:24 ******/
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] DROP CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] DROP CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHO]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_MAPPING_ENTITY]    Script Date: 19.11.2021 11:36:10 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_MAPPING_ENTITY]') AND type in (N'U'))
+DROP TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_MAPPING_CONFIG]    Script Date: 19.11.2021 11:36:10 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_MAPPING_CONFIG]') AND type in (N'U'))
+DROP TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG]
+GO
+/****** Object:  View [dbo].[VWEDI_XML_ITEMS]    Script Date: 19.11.2021 11:36:10 ******/
 DROP VIEW [dbo].[VWEDI_XML_ITEMS]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_ITEMS]    Script Date: 18.11.2021 13:29:24 ******/
+/****** Object:  Table [dbo].[TBEDI_XML_ITEMS]    Script Date: 19.11.2021 11:36:10 ******/
 IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_ITEMS]') AND type in (N'U'))
 DROP TABLE [dbo].[TBEDI_XML_ITEMS]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_TABLES]    Script Date: 18.11.2021 13:29:24 ******/
+/****** Object:  Table [dbo].[TBEDI_XML_FUNCTIONS]    Script Date: 19.11.2021 11:36:10 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TABLES]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_TABLES]
-GO
-/****** Object:  Table [dbo].[TBEDI_XML_FUNCTIONS]    Script Date: 18.11.2021 13:29:24 ******/
 IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_FUNCTIONS]') AND type in (N'U'))
 DROP TABLE [dbo].[TBEDI_XML_FUNCTIONS]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_TYPES]    Script Date: 18.11.2021 13:29:24 ******/
+/****** Object:  Table [dbo].[TBEDI_XML_TYPES]    Script Date: 19.11.2021 11:36:10 ******/
 IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TYPES]') AND type in (N'U'))
 DROP TABLE [dbo].[TBEDI_XML_TYPES]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_TEMPLATES]    Script Date: 18.11.2021 13:29:24 ******/
+/****** Object:  Table [dbo].[TBEDI_XML_TEMPLATES]    Script Date: 19.11.2021 11:36:10 ******/
 IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TEMPLATES]') AND type in (N'U'))
 DROP TABLE [dbo].[TBEDI_XML_TEMPLATES]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_TEMPLATES]    Script Date: 18.11.2021 13:29:24 ******/
+/****** Object:  Table [dbo].[TBEDI_XML_TABLES]    Script Date: 19.11.2021 11:36:10 ******/
-SET ANSI_NULLS ON
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TABLES]') AND type in (N'U'))
+DROP TABLE [dbo].[TBEDI_XML_TABLES]
 GO
-SET QUOTED_IDENTIFIER ON
+/****** Object:  Table [dbo].[TBEDI_XML_TABLES]    Script Date: 19.11.2021 11:36:10 ******/
-GO
-CREATE TABLE [dbo].[TBEDI_XML_TEMPLATES](
-	[GUID] [int] IDENTITY(1,1) NOT NULL,
-	[NAME] [nvarchar](20) NOT NULL,
-	[DESCRIPTION] [nvarchar](max) NULL,
-PRIMARY KEY CLUSTERED 
-(
-	[GUID] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-/****** Object:  Table [dbo].[TBEDI_XML_TYPES]    Script Date: 18.11.2021 13:29:24 ******/
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-CREATE TABLE [dbo].[TBEDI_XML_TYPES](
-	[GUID] [int] IDENTITY(1,1) NOT NULL,
-	[NAME] [nvarchar](20) NOT NULL,
-PRIMARY KEY CLUSTERED 
-(
-	[GUID] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY]
-GO
-/****** Object:  Table [dbo].[TBEDI_XML_FUNCTIONS]    Script Date: 18.11.2021 13:29:24 ******/
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-CREATE TABLE [dbo].[TBEDI_XML_FUNCTIONS](
-	[GUID] [int] IDENTITY(1,1) NOT NULL,
-	[NAME] [nvarchar](max) NOT NULL,
-	[DESCRIPTION] [nvarchar](max) NOT NULL,
-	[PARAMETERS] [nvarchar](max) NULL,
-PRIMARY KEY CLUSTERED 
-(
-	[GUID] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-/****** Object:  Table [dbo].[TBEDI_XML_TABLES]    Script Date: 18.11.2021 13:29:24 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
@@ -92,34 +85,101 @@ CREATE TABLE [dbo].[TBEDI_XML_TABLES](
 	[NAME] [nvarchar](max) NOT NULL,
 	[TEMPLATE_ID] [int] NOT NULL,
 	[IS_HEAD] [bit] NOT NULL,
+	[ADDED_WHO] [nvarchar](50) NOT NULL,
+	[ADDED_WHEN] [datetime] NULL,
+	[CHANGED_WHO] [nvarchar](50) NULL,
+	[CHANGED_WHEN] [datetime] NULL,
+ CONSTRAINT [PK__TBEDI_XM__15B69B8E6F74D014] PRIMARY KEY CLUSTERED 
+(
+	[GUID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_TEMPLATES]    Script Date: 19.11.2021 11:36:10 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[TBEDI_XML_TEMPLATES](
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
+	[NAME] [nvarchar](20) NOT NULL,
+	[DESCRIPTION] [nvarchar](max) NULL,
+	[FILE_NAME] [nvarchar](100) NULL,
+	[IS_IMPORT] [bit] NULL,
+	[ADDED_WHO] [nvarchar](50) NOT NULL,
+	[ADDED_WHEN] [datetime] NULL,
+	[CHANGED_WHO] [nvarchar](50) NULL,
+	[CHANGED_WHEN] [datetime] NULL,
+ CONSTRAINT [PK__TBEDI_XM__15B69B8E8C482F3B] PRIMARY KEY CLUSTERED 
+(
+	[GUID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_TYPES]    Script Date: 19.11.2021 11:36:10 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[TBEDI_XML_TYPES](
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
+	[NAME] [nvarchar](20) NOT NULL,
+	[ADDED_WHO] [nvarchar](50) NOT NULL,
+	[ADDED_WHEN] [datetime] NULL,
+	[CHANGED_WHO] [nvarchar](50) NULL,
+	[CHANGED_WHEN] [datetime] NULL,
+ CONSTRAINT [PK__TBEDI_XM__15B69B8E5B32E7AF] PRIMARY KEY CLUSTERED 
+(
+	[GUID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_FUNCTIONS]    Script Date: 19.11.2021 11:36:10 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[TBEDI_XML_FUNCTIONS](
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
+	[NAME] [nvarchar](max) NOT NULL,
+	[DESCRIPTION] [nvarchar](max) NOT NULL,
+	[PARAMETERS] [nvarchar](max) NULL,
+	[ADDED_WHO] [nvarchar](50) NOT NULL,
+	[ADDED_WHEN] [datetime] NULL,
+	[CHANGED_WHO] [nvarchar](50) NULL,
+	[CHANGED_WHEN] [datetime] NULL,
 PRIMARY KEY CLUSTERED 
 (
 	[GUID] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_ITEMS]    Script Date: 18.11.2021 13:29:24 ******/
+/****** Object:  Table [dbo].[TBEDI_XML_ITEMS]    Script Date: 19.11.2021 11:36:10 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
 CREATE TABLE [dbo].[TBEDI_XML_ITEMS](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
+	[ORDER_KEY] [int] NOT NULL,
 	[XML_NAME] [nvarchar](50) NOT NULL,
 	[XML_TABLE_ID] [int] NOT NULL,
 	[XML_TYPE_ID] [int] NOT NULL,
 	[IS_READ_ONLY] [bit] NOT NULL,
 	[IS_VISIBLE] [bit] NOT NULL,
-	[ORDER_KEY] [int] NOT NULL,
-	[FUNCTION_ID] [int] NULL,
 	[IS_REQUIRED] [bit] NOT NULL,
-PRIMARY KEY CLUSTERED 
+	[FUNCTION_ID] [int] NULL,
+	[ADDED_WHO] [nvarchar](50) NOT NULL,
+	[ADDED_WHEN] [datetime] NULL,
+	[CHANGED_WHO] [nvarchar](50) NULL,
+	[CHANGED_WHEN] [datetime] NULL,
+ CONSTRAINT [PK__TBEDI_XM__15B69B8E6125D501] PRIMARY KEY CLUSTERED 
 (
 	[GUID] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
-/****** Object:  View [dbo].[VWEDI_XML_ITEMS]    Script Date: 18.11.2021 13:29:24 ******/
+/****** Object:  View [dbo].[VWEDI_XML_ITEMS]    Script Date: 19.11.2021 11:36:10 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
@@ -148,80 +208,156 @@ AS
 		INNER JOIN [dbo].[TBEDI_XML_TEMPLATES] [TBTEMPLATES] ON [TBTABLES].[TEMPLATE_ID] = [TBTEMPLATES].[GUID]
 		LEFT OUTER JOIN [dbo].[TBEDI_XML_FUNCTIONS] [TBFUNCTIONS] ON [TBITEMS].[FUNCTION_ID] = [TBFUNCTIONS].[GUID]
 		
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_MAPPING_CONFIG]    Script Date: 19.11.2021 11:36:10 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG](
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
+	[ORDER_KEY] [int] NOT NULL,
+	[SOURCE_ENTITY_ID] [int] NOT NULL,
+	[SOURCE_REGEX] [nvarchar](100) NOT NULL,
+	[DESTINATION_ENTITY_ID] [int] NOT NULL,
+	[DESTINATION_VALUE] [nvarchar](100) NOT NULL,
+	[ADDED_WHO] [nvarchar](50) NOT NULL,
+	[ADDED_WHEN] [datetime] NULL,
+	[CHANGED_WHO] [nvarchar](50) NULL,
+	[CHANGED_WHEN] [nchar](10) NULL
+) ON [PRIMARY]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_MAPPING_ENTITY]    Script Date: 19.11.2021 11:36:10 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY](
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
+	[NAME] [nvarchar](100) NULL,
+	[ADDED_WHO] [nvarchar](50) NOT NULL,
+	[ADDED_WHEN] [datetime] NULL,
+	[CHANGED_WHO] [nvarchar](50) NULL,
+	[CHANGED_WHEN] [datetime] NULL
+) ON [PRIMARY]
 GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_FUNCTIONS] ON 
 
-INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS]) VALUES (1, N'GLN', N'Finds an WinLine Account Number by GLN', NULL)
+INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'GLN', N'Finds an WinLine Account Number by GLN', NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS]) VALUES (2, N'EAN', N'Finds an WinLine Article Number by EAN', NULL)
+INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'EAN', N'Finds an WinLine Article Number by EAN', NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS]) VALUES (3, N'SQL', N'Finds a Value by SQL Query', NULL)
+INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'SQL', N'Finds a Value by SQL Query', N'Query', N'DEFAULT', NULL, NULL, NULL)
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_FUNCTIONS] OFF
 GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_ITEMS] ON 
 
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (1, N'BELEGKEY', 1, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, 0, N'BELEGKEY', 1, 1, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (2, N'Fakt_Kontonummer', 1, 1, 0, 1, 0, 1, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, 0, N'Fakt_Kontonummer', 1, 1, 0, 1, 0, 1, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (3, N'Laufnummer', 1, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, 0, N'Laufnummer', 1, 1, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (4, N'Bestellt_von', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (4, 0, N'Bestellt_von', 1, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (5, N'Lief_Kontonummer', 1, 1, 0, 1, 0, 1, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, 0, N'Lief_Kontonummer', 1, 1, 0, 1, 0, 1, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (6, N'Lief_Name', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, 0, N'Lief_Name', 1, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (7, N'Lief_Strasse', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (7, 0, N'Lief_Strasse', 1, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (8, N'Lief_PLZ', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, 0, N'Lief_PLZ', 1, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (9, N'Lief_Ort', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (9, 0, N'Lief_Ort', 1, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (10, N'Belegart', 1, 2, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (10, 0, N'Belegart', 1, 2, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (11, N'Datum_Auftrag-Bestellung', 1, 3, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, 0, N'Datum_Auftrag-Bestellung', 1, 3, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (12, N'Auftrags-Bestellnummer', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, 0, N'Auftrags-Bestellnummer', 1, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (13, N'Leistungsdatum', 1, 3, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (13, 0, N'Leistungsdatum', 1, 3, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (14, N'Infotext', 1, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (14, 0, N'Infotext', 1, 1, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (15, N'BELEGKEY', 2, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (15, 0, N'BELEGKEY', 2, 1, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (16, N'Zeilennummer', 2, 1, 0, 1, 1, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (16, 1, N'Zeilennummer', 2, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (17, N'Datentyp', 2, 2, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (17, 0, N'Datentyp', 2, 2, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (18, N'Artikelnummer', 2, 1, 0, 1, 2, 2, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (18, 2, N'Artikelnummer', 2, 1, 0, 1, 0, 2, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (19, N'Bezeichnung', 2, 1, 0, 1, 3, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (19, 3, N'Bezeichnung', 2, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (20, N'Lieferantenartikelnummer', 2, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (20, 0, N'Lieferantenartikelnummer', 2, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (21, N'Menge_bestellt', 2, 5, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (21, 0, N'Menge_bestellt', 2, 5, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (22, N'Menge_geliefert', 2, 5, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (22, 0, N'Menge_geliefert', 2, 5, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (23, N'Colli', 2, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (23, 0, N'Colli', 2, 1, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (24, N'Einzelpreis', 2, 5, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (24, 0, N'Einzelpreis', 2, 5, 0, 1, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (25, N'Zeilenrabatt1', 2, 5, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (25, 0, N'Zeilenrabatt1', 2, 5, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (26, N'Zeilenrabatt2', 2, 5, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (26, 0, N'Zeilenrabatt2', 2, 5, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (27, N'Zeilenrabatt3', 2, 5, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (27, 0, N'Zeilenrabatt3', 2, 5, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (28, N'Zeilenrabatt4', 2, 5, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (28, 0, N'Zeilenrabatt4', 2, 5, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (29, N'Umsatzsteuerprozent_Zeile', 2, 2, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (29, 0, N'Umsatzsteuerprozent_Zeile', 2, 2, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (30, N'EDI_Infotext', 2, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [FUNCTION_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (30, 0, N'EDI_Infotext', 2, 1, 0, 0, 0, NULL, N'DEFAULT', NULL, NULL, NULL)
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_ITEMS] OFF
 GO
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ON 
+
+INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, 1, 2, N'^R[a-zA-Z0-9\-_\s]+$', 1, N'SHGT', N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, 2, 2, N'NIE\-[a-zA-Z0-9]*', 1, N'SIVT', N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, 3, 2, N'NIE\-[a-zA-Z0-9]*', 3, N'106', N'DEFAULT', NULL, NULL, NULL)
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] OFF
+GO
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] ON 
+
+INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'MANDATOR', N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'ARTICLE', N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'DOCUMENTTYPE', N'DEFAULT', NULL, NULL, NULL)
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] OFF
+GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TABLES] ON 
 
-INSERT [dbo].[TBEDI_XML_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD]) VALUES (1, N'EXIM-VRG_ordersT025', 1, 1)
+INSERT [dbo].[TBEDI_XML_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'EXIM-VRG_ordersT025', 1, 1, N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD]) VALUES (2, N'EXIM-VRG_ordersT026', 1, 0)
+INSERT [dbo].[TBEDI_XML_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'EXIM-VRG_ordersT026', 1, 0, N'DEFAULT', NULL, NULL, NULL)
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TABLES] OFF
 GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATES] ON 
 
-INSERT [dbo].[TBEDI_XML_TEMPLATES] ([GUID], [NAME], [DESCRIPTION]) VALUES (1, N'EXIM-VRG_orders', N'Schaum EDI Aufträge')
+INSERT [dbo].[TBEDI_XML_TEMPLATES] ([GUID], [NAME], [DESCRIPTION], [FILE_NAME], [IS_IMPORT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'EXIM-VRG_orders', N'Schaum EDI Aufträge', N'MESOBelegeEXIM-VRG_orders.xsd', 1, N'DEFAULT', NULL, NULL, NULL)
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATES] OFF
 GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TYPES] ON 
 
-INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (1, N'STRING')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'STRING', N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (2, N'INTEGER')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'INTEGER', N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (3, N'DATE')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'DATE', N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (4, N'BOOLEAN')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (4, N'BOOLEAN', N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (5, N'DECIMAL')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, N'DECIMAL', N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (6, N'ACCOUNT')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, N'ACCOUNT', N'DEFAULT', NULL, NULL, NULL)
-INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (7, N'ARTICLE')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (7, N'ARTICLE', N'DEFAULT', NULL, NULL, NULL)
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TYPES] OFF
 GO
+ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] ADD  CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] ADD  CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
+GO
 ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_READ_ONLY]  DEFAULT ((0)) FOR [IS_READ_ONLY]
 GO
 ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VISIBLE]  DEFAULT ((0)) FOR [IS_VISIBLE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
-GO
 ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED]  DEFAULT ((0)) FOR [IS_REQUIRED]
 GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_VALUE_MAPPING_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+GO
 ALTER TABLE [dbo].[TBEDI_XML_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_NODES_IS_HEAD]  DEFAULT ((0)) FOR [IS_HEAD]
 GO
+ALTER TABLE [dbo].[TBEDI_XML_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_TABLES_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_TABLES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] ADD  CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] ADD  CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TYPES] ADD  CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TYPES] ADD  CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+GO
 ALTER TABLE [dbo].[TBEDI_XML_ITEMS]  WITH CHECK ADD  CONSTRAINT [FK_TBEDI_XML_NODES] FOREIGN KEY([XML_TABLE_ID])
 REFERENCES [dbo].[TBEDI_XML_ITEMS] ([GUID])
 GO

MultiTool.Form/GlobalSuppressions.vb

@@ -1,8 +0,0 @@
-' This file is used by Code Analysis to maintain SuppressMessage
-' attributes that are applied to this project.
-' Project-level suppressions either have no target or are given
-' a specific target and scoped to a namespace, type, member, etc.
-
-Imports System.Diagnostics.CodeAnalysis
-
-<Assembly: SuppressMessage("Style", "IDE1006:Benennungsstile", Justification:="<Ausstehend>", Scope:="member", Target:="~M:MultiTool.Form.frmRowEditor.btnApplyFromWinline_ItemClick(System.Object,DevExpress.XtraBars.ItemClickEventArgs)")>

MultiTool.Form/GridLoader.vb

@@ -12,7 +12,7 @@ Public Class GridLoader
         MyBase.New(pLogConfig, pLogConfig.GetLogger())
     End Sub
 
-    Public Function GetGridFromElement(pGrid As GridControl, pTable As Schemas.Schema.Table) As GridControl
+    Public Function GetGridFromElement(pGrid As GridControl, pTable As Templates.Template.Table) As GridControl
         pGrid.Name = pTable.Name
         pGrid.ForceInitialize()
         pGrid.MainView.PopulateColumns()
@@ -62,7 +62,7 @@ Public Class GridLoader
         Return pGrid
     End Function
 
-    Private Function GetColumnType(pColumn As Schemas.Schema.Column)
+    Private Function GetColumnType(pColumn As Templates.Template.Column)
         Select Case pColumn.DataType
             Case ColumnType.Boolean
                 Return DevExpress.Data.UnboundColumnType.Boolean

MultiTool.Form/MultiTool.Form.vbproj

@@ -181,7 +181,7 @@
     <Compile Include="frmRowEditor.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GlobalSuppressions.vb" />
+    <Compile Include="MyApplication.vb" />
     <Compile Include="Reports\OrderReport.Designer.vb">
       <DependentUpon>OrderReport.vb</DependentUpon>
     </Compile>
@@ -325,6 +325,8 @@
   <ItemGroup>
     <Content Include="CREATE_DATABASE.sql" />
     <Content Include="MultiTool.ico" />
+    <None Include="Resources\support.svg" />
+    <None Include="Resources\actions_send3.svg" />
     <None Include="Resources\squarified.svg" />
     <None Include="Resources\logical1.svg" />
     <None Include="Resources\charthorizontalaxis_logscale.svg" />

MultiTool.Form/My Project/Resources.Designer.vb

@@ -150,6 +150,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_send3() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_send3", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -480,6 +490,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property support() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("support", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

MultiTool.Form/My Project/Resources.resx

@@ -121,15 +121,15 @@
   <data name="logical" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="logical1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logical1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\redo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="logical1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logical1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="bo_unknown1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_unknown1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -142,11 +142,17 @@
   <data name="tableproperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="actions_send3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -160,12 +166,15 @@
   <data name="togglefieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="open21" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="bo_product" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_product.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -181,9 +190,6 @@
   <data name="charthorizontalaxis_logscale" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\charthorizontalaxis_logscale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_arrow4down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="deletetablerows" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -208,14 +214,14 @@
   <data name="bo_validation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_checkcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_arrow4down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -253,10 +259,10 @@
   <data name="resetview" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_checkcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="support" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

MultiTool.Form/MyApplication.vb

@@ -0,0 +1,10 @@
+Imports MultiTool.Shared.Templates
+
+Namespace My
+    <HideModuleName()>
+    Module MyExtensions
+        Friend Property TemplateConfiguration As TemplateConfig
+        Friend Property MappingConfiguration As MappingConfig
+        Friend Property MandatorConfiguration As MandatorConfig
+    End Module
+End Namespace

MultiTool.Form/Reports/OrderReport.Designer.vb

@@ -36,6 +36,7 @@ Partial Public Class OrderReport
         Me.pageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo()
         Me.pageInfo2 = New DevExpress.XtraReports.UI.XRPageInfo()
         Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand()
+        Me.XrLabel4 = New DevExpress.XtraReports.UI.XRLabel()
         Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel()
         Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel()
         Me.Detail = New DevExpress.XtraReports.UI.DetailBand()
@@ -46,6 +47,9 @@ Partial Public Class OrderReport
         Me.XrTableRow5 = New DevExpress.XtraReports.UI.XRTableRow()
         Me.XrTableCell9 = New DevExpress.XtraReports.UI.XRTableCell()
         Me.XrTableCell10 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableRow4 = New DevExpress.XtraReports.UI.XRTableRow()
+        Me.XrTableCell11 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell12 = New DevExpress.XtraReports.UI.XRTableCell()
         Me.XrTable1 = New DevExpress.XtraReports.UI.XRTable()
         Me.XrTableRow1 = New DevExpress.XtraReports.UI.XRTableRow()
         Me.XrTableCell1 = New DevExpress.XtraReports.UI.XRTableCell()
@@ -84,9 +88,6 @@ Partial Public Class OrderReport
         Me.GroupFooter1 = New DevExpress.XtraReports.UI.GroupFooterBand()
         Me.label2 = New DevExpress.XtraReports.UI.XRLabel()
         Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
-        Me.XrTableRow4 = New DevExpress.XtraReports.UI.XRTableRow()
-        Me.XrTableCell11 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell12 = New DevExpress.XtraReports.UI.XRTableCell()
         CType(Me.XrTable2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.XrTable1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.table3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -228,10 +229,10 @@ Partial Public Class OrderReport
         '
         'pageInfo1
         '
-        Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(12.0!, 12.0!)
+        Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(12.0!, 11.99999!)
         Me.pageInfo1.Name = "pageInfo1"
         Me.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime
-        Me.pageInfo1.SizeF = New System.Drawing.SizeF(438.0!, 26.0!)
+        Me.pageInfo1.SizeF = New System.Drawing.SizeF(272.2448!, 26.0!)
         Me.pageInfo1.StyleName = "PageInfo"
         Me.pageInfo1.TextFormatString = "{0:dddd, d. MMMM yyyy HH:mm' Uhr'}"
         '
@@ -246,10 +247,24 @@ Partial Public Class OrderReport
         '
         'ReportHeader
         '
-        Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel2, Me.XrLabel1})
+        Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel4, Me.XrLabel2, Me.XrLabel1})
         Me.ReportHeader.HeightF = 76.24998!
         Me.ReportHeader.Name = "ReportHeader"
         '
+        'XrLabel4
+        '
+        Me.XrLabel4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Filename]")})
+        Me.XrLabel4.Font = New System.Drawing.Font("Arial", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrLabel4.LocationFloat = New DevExpress.Utils.PointFloat(652.6498!, 10.00001!)
+        Me.XrLabel4.Multiline = True
+        Me.XrLabel4.Name = "XrLabel4"
+        Me.XrLabel4.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+        Me.XrLabel4.SizeF = New System.Drawing.SizeF(417.3502!, 23.0!)
+        Me.XrLabel4.StylePriority.UseFont = False
+        Me.XrLabel4.StylePriority.UseTextAlignment = False
+        Me.XrLabel4.Text = "XrLabel1"
+        Me.XrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight
+        '
         'XrLabel2
         '
         Me.XrLabel2.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Subtitle]")})
@@ -338,6 +353,29 @@ Partial Public Class OrderReport
         Me.XrTableCell10.TextFormatString = "{0:yyyy-MM-dd}"
         Me.XrTableCell10.Weight = 1.0R
         '
+        'XrTableRow4
+        '
+        Me.XrTableRow4.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell11, Me.XrTableCell12})
+        Me.XrTableRow4.Name = "XrTableRow4"
+        Me.XrTableRow4.Weight = 1.0R
+        '
+        'XrTableCell11
+        '
+        Me.XrTableCell11.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell11.Multiline = True
+        Me.XrTableCell11.Name = "XrTableCell11"
+        Me.XrTableCell11.StylePriority.UseFont = False
+        Me.XrTableCell11.Text = "Bestellt von"
+        Me.XrTableCell11.Weight = 1.0R
+        '
+        'XrTableCell12
+        '
+        Me.XrTableCell12.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Text5]")})
+        Me.XrTableCell12.Multiline = True
+        Me.XrTableCell12.Name = "XrTableCell12"
+        Me.XrTableCell12.Text = "XrTableCell12"
+        Me.XrTableCell12.Weight = 1.0R
+        '
         'XrTable1
         '
         Me.XrTable1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
@@ -628,32 +666,9 @@ Partial Public Class OrderReport
         '
         'ObjectDataSource1
         '
-        Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].ReportSource)
+        Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].Report.ReportSource)
         Me.ObjectDataSource1.Name = "ObjectDataSource1"
         '
-        'XrTableRow4
-        '
-        Me.XrTableRow4.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell11, Me.XrTableCell12})
-        Me.XrTableRow4.Name = "XrTableRow4"
-        Me.XrTableRow4.Weight = 1.0R
-        '
-        'XrTableCell11
-        '
-        Me.XrTableCell11.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell11.Multiline = True
-        Me.XrTableCell11.Name = "XrTableCell11"
-        Me.XrTableCell11.StylePriority.UseFont = False
-        Me.XrTableCell11.Text = "Bestellt von"
-        Me.XrTableCell11.Weight = 1.0R
-        '
-        'XrTableCell12
-        '
-        Me.XrTableCell12.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Text5]")})
-        Me.XrTableCell12.Multiline = True
-        Me.XrTableCell12.Name = "XrTableCell12"
-        Me.XrTableCell12.Text = "XrTableCell12"
-        Me.XrTableCell12.Weight = 1.0R
-        '
         'OrderReport
         '
         Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.Detail, Me.DetailReport})
@@ -742,4 +757,5 @@ Partial Public Class OrderReport
     Friend WithEvents XrTableRow4 As DevExpress.XtraReports.UI.XRTableRow
     Friend WithEvents XrTableCell11 As DevExpress.XtraReports.UI.XRTableCell
     Friend WithEvents XrTableCell12 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrLabel4 As DevExpress.XtraReports.UI.XRLabel
 End Class

MultiTool.Form/Resources/actions_send3.svg

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="Send">
+    <polygon points="2,20 8,22.4 24,10 12,24 12,30 16.3,25.7 22,28 30,2  " class="Blue" />
+  </g>
+</svg>

MultiTool.Form/Resources/support.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{display:none;}
+	.st2{display:inline;fill:#039C23;}
+	.st3{display:inline;fill:#D11C1C;}
+	.st4{display:inline;fill:#727272;}
+</style>
+  <g id="Support">
+    <path d="M29,2H3C2.5,2,2,2.5,2,3v22c0,0.5,0.5,1,1,1h5v0v6l6-6h15c0.5,0,1-0.5,1-1V3C30,2.5,29.5,2,29,2z M16,22   c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C18,21.1,17.1,22,16,22z M20.7,11.5c-0.2,0.4-0.4,0.8-0.6,1.1   c-0.3,0.3-0.5,0.6-0.8,0.8c-0.3,0.2-0.6,0.4-0.9,0.6c-0.3,0.2-0.5,0.5-0.7,0.7c-0.2,0.3-0.3,0.6-0.4,1V16h-2.7v-0.4   c0-0.6,0.2-1.1,0.3-1.5c0.2-0.4,0.4-0.7,0.6-1c0.2-0.3,0.5-0.5,0.8-0.7c0.3-0.2,0.5-0.4,0.8-0.6c0.2-0.2,0.4-0.4,0.6-0.7   c0.1-0.2,0.2-0.5,0.2-0.9c0-0.6-0.2-1.1-0.5-1.4c-0.3-0.3-0.7-0.4-1.3-0.4c-0.4,0-0.7,0.1-0.9,0.2c-0.3,0.1-0.5,0.3-0.7,0.6   c-0.2,0.2-0.3,0.5-0.4,0.8C14,10.3,14,10.7,14,11h-3c0-0.7,0.1-1.4,0.4-2c0.2-0.6,0.6-1.1,1-1.6c0.4-0.4,0.9-0.8,1.5-1   c0.6-0.3,1.3-0.4,2-0.4c1,0,1.8,0.1,2.4,0.4c0.6,0.3,1.2,0.6,1.6,1c0.4,0.4,0.7,0.8,0.8,1.3C20.9,9.1,21,9.5,21,9.9   C21,10.6,20.9,11.1,20.7,11.5z" class="Blue" />
+  </g>
+</svg>

MultiTool.Form/frmImportMain.Designer.vb

@@ -29,13 +29,12 @@ Partial Class frmImportMain
         Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
         Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
         Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView()
-        Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
         Me.colSelected = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
-        Me.gridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
         Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
         Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
         Me.colMandator = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
         Me.cmbMandators = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
+        Me.BandedGridColumn1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
         Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.txtVersion = New DevExpress.XtraBars.BarStaticItem()
         Me.txtFilesLoaded = New DevExpress.XtraBars.BarStaticItem()
@@ -56,6 +55,7 @@ Partial Class frmImportMain
         Me.btnRemoveRow = New DevExpress.XtraBars.BarButtonItem()
         Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem()
         Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components)
+        Me.btnTestTransferFile = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -85,6 +85,9 @@ Partial Class frmImportMain
         Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.BehaviorManager = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components)
         Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
+        Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
+        Me.GridBand2 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerMain.SuspendLayout()
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -136,8 +139,8 @@ Partial Class frmImportMain
         '
         'GridViewFiles
         '
-        Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand1, Me.gridBand3})
+        Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand1, Me.GridBand2})
-        Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt})
+        Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt, Me.BandedGridColumn1})
         Me.GridViewFiles.GridControl = Me.GridControlFiles
         Me.GridViewFiles.Name = "GridViewFiles"
         Me.GridViewFiles.OptionsView.ShowBands = False
@@ -145,12 +148,6 @@ Partial Class frmImportMain
         Me.GridViewFiles.OptionsView.ShowGroupPanel = False
         Me.GridViewFiles.OptionsView.ShowIndicator = False
         '
-        'gridBand1
-        '
-        resources.ApplyResources(Me.gridBand1, "gridBand1")
-        Me.gridBand1.Columns.Add(Me.colSelected)
-        Me.gridBand1.VisibleIndex = 0
-        '
         'colSelected
         '
         Me.colSelected.AutoFillDown = True
@@ -163,18 +160,10 @@ Partial Class frmImportMain
         Me.colSelected.OptionsColumn.FixedWidth = True
         Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean]
         '
-        'gridBand3
-        '
-        resources.ApplyResources(Me.gridBand3, "gridBand3")
-        Me.gridBand3.Columns.Add(Me.colFilename)
-        Me.gridBand3.Columns.Add(Me.colCreatedAt)
-        Me.gridBand3.Columns.Add(Me.colMandator)
-        Me.gridBand3.VisibleIndex = 1
-        '
         'colFilename
         '
         resources.ApplyResources(Me.colFilename, "colFilename")
-        Me.colFilename.FieldName = "Name"
+        Me.colFilename.FieldName = "FileName"
         Me.colFilename.Name = "colFilename"
         Me.colFilename.OptionsColumn.AllowEdit = False
         Me.colFilename.OptionsColumn.ReadOnly = True
@@ -194,7 +183,7 @@ Partial Class frmImportMain
         Me.colMandator.ColumnEdit = Me.cmbMandators
         Me.colMandator.FieldName = "MandatorId"
         Me.colMandator.Name = "colMandator"
-        Me.colMandator.RowIndex = 2
+        Me.colMandator.RowIndex = 1
         '
         'cmbMandators
         '
@@ -203,12 +192,18 @@ Partial Class frmImportMain
         Me.cmbMandators.Items.AddRange(New Object() {resources.GetString("cmbMandators.Items")})
         Me.cmbMandators.Name = "cmbMandators"
         '
+        'BandedGridColumn1
+        '
+        resources.ApplyResources(Me.BandedGridColumn1, "BandedGridColumn1")
+        Me.BandedGridColumn1.FieldName = "Mandator"
+        Me.BandedGridColumn1.Name = "BandedGridColumn1"
+        '
         'RibbonControl
         '
         Me.RibbonControl.ExpandCollapseItem.Id = 0
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.txtCulture, Me.btnRemoveRow, Me.BarWorkspaceMenuItem1})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.txtCulture, Me.btnRemoveRow, Me.BarWorkspaceMenuItem1, Me.btnTestTransferFile, Me.BarButtonItem1})
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.MaxItemId = 29
+        Me.RibbonControl.MaxItemId = 31
         Me.RibbonControl.Name = "RibbonControl"
         Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1)
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
@@ -364,6 +359,14 @@ Partial Class frmImportMain
         Me.WorkspaceManager1.TargetControl = Me
         Me.WorkspaceManager1.TransitionType = PushTransition1
         '
+        'btnTestTransferFile
+        '
+        resources.ApplyResources(Me.btnTestTransferFile, "btnTestTransferFile")
+        Me.btnTestTransferFile.Id = 29
+        Me.btnTestTransferFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.support
+        Me.btnTestTransferFile.ImageOptions.SvgImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.CommonPalette
+        Me.btnTestTransferFile.Name = "btnTestTransferFile"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup7})
@@ -389,6 +392,7 @@ Partial Class frmImportMain
         Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
         Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTransferFile)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTransferAllFiles)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTestTransferFile)
         Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
         resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
         '
@@ -561,6 +565,26 @@ Partial Class frmImportMain
         '
         Me.SplashScreenManager.ClosingDelay = 500
         '
+        'gridBand1
+        '
+        resources.ApplyResources(Me.gridBand1, "gridBand1")
+        Me.gridBand1.Columns.Add(Me.colSelected)
+        Me.gridBand1.VisibleIndex = 0
+        '
+        'GridBand2
+        '
+        resources.ApplyResources(Me.GridBand2, "GridBand2")
+        Me.GridBand2.Columns.Add(Me.colFilename)
+        Me.GridBand2.Columns.Add(Me.colCreatedAt)
+        Me.GridBand2.Columns.Add(Me.colMandator)
+        Me.GridBand2.VisibleIndex = 1
+        '
+        'BarButtonItem1
+        '
+        resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
+        Me.BarButtonItem1.Id = 30
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
         'frmImportMain
         '
         resources.ApplyResources(Me, "$this")
@@ -661,8 +685,11 @@ Partial Class frmImportMain
     Friend WithEvents GridView3 As GridView
     Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridView4 As GridView
-    Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
-    Friend WithEvents gridBand3 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
     Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem
     Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager
+    Friend WithEvents btnTestTransferFile As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BandedGridColumn1 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn
+    Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
+    Friend WithEvents GridBand2 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
 End Class

MultiTool.Form/frmImportMain.resx

@@ -150,7 +150,7 @@
   <data name="gridBand1.Width" type="System.Int32, mscorlib">
     <value>27</value>
   </data>
-  <data name="gridBand3.Caption" xml:space="preserve">
+  <data name="GridBand2.Caption" xml:space="preserve">
     <value>gridBand3</value>
   </data>
   <data name="colFilename.Caption" xml:space="preserve">
@@ -160,7 +160,7 @@
     <value>True</value>
   </data>
   <data name="colFilename.Width" type="System.Int32, mscorlib">
-    <value>303</value>
+    <value>683</value>
   </data>
   <data name="colCreatedAt.Caption" xml:space="preserve">
     <value>Eingegangen</value>
@@ -169,7 +169,7 @@
     <value>True</value>
   </data>
   <data name="colCreatedAt.Width" type="System.Int32, mscorlib">
-    <value>303</value>
+    <value>299</value>
   </data>
   <data name="colMandator.Caption" xml:space="preserve">
     <value>Mandant</value>
@@ -184,14 +184,23 @@
   <data name="cmbMandators.Items" xml:space="preserve">
     <value>SIVT</value>
   </data>
+  <data name="colMandator.Visible" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
   <data name="colMandator.Width" type="System.Int32, mscorlib">
-    <value>144</value>
+    <value>384</value>
   </data>
-  <data name="gridBand3.Name" xml:space="preserve">
+  <data name="GridBand2.Name" xml:space="preserve">
-    <value>gridBand3</value>
+    <value>GridBand2</value>
   </data>
-  <data name="gridBand3.Width" type="System.Int32, mscorlib">
+  <data name="GridBand2.Width" type="System.Int32, mscorlib">
-    <value>303</value>
+    <value>683</value>
+  </data>
+  <data name="BandedGridColumn1.Caption" xml:space="preserve">
+    <value>BandedGridColumn1</value>
+  </data>
+  <data name="BandedGridColumn1.Visible" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
   <data name="txtVersion.Caption" xml:space="preserve">
     <value>Version 1.0.0.0</value>
@@ -262,6 +271,9 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>1215, 746</value>
   </data>
+  <data name="BarButtonItem1.Caption" xml:space="preserve">
+    <value>BarButtonItem1</value>
+  </data>
   <data name="RibbonStatusBar.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 722</value>
   </data>
@@ -311,24 +323,12 @@
   <data name="&gt;&gt;GridViewFiles.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;gridBand1.Name" xml:space="preserve">
-    <value>gridBand1</value>
-  </data>
-  <data name="&gt;&gt;gridBand1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;colSelected.Name" xml:space="preserve">
     <value>colSelected</value>
   </data>
   <data name="&gt;&gt;colSelected.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;gridBand3.Name" xml:space="preserve">
-    <value>gridBand3</value>
-  </data>
-  <data name="&gt;&gt;gridBand3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;colFilename.Name" xml:space="preserve">
     <value>colFilename</value>
   </data>
@@ -353,6 +353,12 @@
   <data name="&gt;&gt;cmbMandators.Type" xml:space="preserve">
     <value>DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;BandedGridColumn1.Name" xml:space="preserve">
+    <value>BandedGridColumn1</value>
+  </data>
+  <data name="&gt;&gt;BandedGridColumn1.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;txtVersion.Name" xml:space="preserve">
     <value>txtVersion</value>
   </data>
@@ -467,6 +473,12 @@
   <data name="&gt;&gt;WorkspaceManager1.Type" xml:space="preserve">
     <value>DevExpress.Utils.WorkspaceManager, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;btnTestTransferFile.Name" xml:space="preserve">
+    <value>btnTestTransferFile</value>
+  </data>
+  <data name="&gt;&gt;btnTestTransferFile.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -575,12 +587,33 @@
   <data name="&gt;&gt;SplashScreenManager.Type" xml:space="preserve">
     <value>DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;gridBand1.Name" xml:space="preserve">
+    <value>gridBand1</value>
+  </data>
+  <data name="&gt;&gt;gridBand1.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;GridBand2.Name" xml:space="preserve">
+    <value>GridBand2</value>
+  </data>
+  <data name="&gt;&gt;GridBand2.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
+    <value>BarButtonItem1</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmImportMain</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="btnTestTransferFile.Caption" xml:space="preserve">
+    <value>Übermittlung Testen</value>
+  </data>
   <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>

MultiTool.Form/frmImportMain.vb

@@ -10,8 +10,10 @@ Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports MultiTool.Shared
 Imports MultiTool.Shared.Documents
-Imports MultiTool.Shared.Schemas
+Imports MultiTool.Shared.Report
+Imports MultiTool.Shared.Templates
 Imports MultiTool.Shared.Winline
+Imports MultiTool.Shared.Winline.Entities
 Imports MultiTool.Shared.Constants
 Imports MultiTool.Shared.Exceptions
 Imports DevExpress.XtraReports.UI
@@ -25,7 +27,7 @@ Public Class frmImportMain
     Private Database As MSSQLServer
     Private Winline As WinlineData
     Private FileEx As DigitalData.Modules.Filesystem.File
-    Private WebService As WebService
+    Private WebService As WebServiceData
     Private DocumentLoader As DocumentLoader
     Private FormHelper As FormHelper
 
@@ -33,18 +35,18 @@ Public Class frmImportMain
     Private GridLoader As GridLoader
     Private GridBuilder As GridBuilder
 
-    Private ReadOnly CurrentSchema As Schema = Nothing
+    Private ReadOnly CurrentTemplate As Template = Nothing
 
     ' Runtime variables
     Private CurrentGrid As GridControl = Nothing
     Private CurrentDocument As Document = Nothing
 
-    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pSchema As Schema)
+    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pTemplate As Template)
         InitializeComponent()
 
         LogConfig = pLogConfig
         ConfigManager = pConfigManager
-        CurrentSchema = pSchema
+        CurrentTemplate = pTemplate
 
         BehaviorManager.Attach(Of PersistenceBehavior)(Me, AddressOf LoadPersistenceSettings)
     End Sub
@@ -74,8 +76,8 @@ Public Class frmImportMain
             GridViewFiles.OptionsView.ShowAutoFilterRow = False
 
             FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
-            Winline = New WinlineData(LogConfig, Database, ConfigManager.Config)
+            Winline = New WinlineData(LogConfig, Database, ConfigManager.Config, My.MappingConfiguration, My.MandatorConfiguration)
-            WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
+            WebService = New WebServiceData(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
             AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
 
         Catch ex As Exception
@@ -85,7 +87,7 @@ Public Class frmImportMain
 
         txtVersion.Caption = String.Format(My.Resources.frmImportMainExtra.Version__0_, My.Application.Info.Version.ToString)
         txtCulture.Caption = String.Format(My.Resources.frmImportMainExtra.Culture___0_, My.Application.UICulture.ToString)
-        Text = String.Format(My.Resources.frmShared._0____WebService_Multitool_für_WinLine, CurrentSchema.Name)
+        Text = String.Format(My.Resources.frmShared._0____WebService_Multitool_für_WinLine, CurrentTemplate.Name)
     End Sub
 
     Private Async Sub frmImportMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
@@ -119,12 +121,7 @@ Public Class frmImportMain
 
             SplashScreenManager.SetWaitFormDescription(My.Resources.frmImportMainExtra.Lade_Vorlagen)
 
-            'SchemaLoader.LoadFiles(ConfigManager.Config.SchemaDirectory)
+            Grids = CreateGridsAndColumns(CurrentTemplate)
-            'CurrentSchemaName = SchemaLoader.SchemaList.First().FullName
-            'CurrentSchema = SchemaLoader.GetSchemaFromFile(CurrentSchemaName)
-            'CurrentSchema = SchemaLoader.UpdateSchemaWithDatabaseConfiguration(CurrentSchema, SchemaLoader.TemplateConfiguration)
-
-            Grids = CreateGridsAndColumns(CurrentSchema)
 
             For Each oGrid As GridControl In Grids
                 AddHandler oGrid.GotFocus, AddressOf Grid_Focus
@@ -141,11 +138,11 @@ Public Class frmImportMain
         CurrentGrid = sender
     End Sub
 
-    Private Function CreateGridsAndColumns(pSchema As Schemas.Schema) As List(Of GridControl)
+    Private Function CreateGridsAndColumns(pTemplate As Templates.Template) As List(Of GridControl)
         Dim oGrids As New List(Of GridControl)
         Dim oTableCounter = 0
 
-        For Each oTable In pSchema.Tables
+        For Each oTable In pTemplate.Tables
             If oTableCounter = 0 Then
                 Dim oGrid = GridLoader.GetGridFromElement(GridControl1, oTable)
                 AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick
@@ -203,7 +200,7 @@ Public Class frmImportMain
             Dim oDocumentRow = CurrentDocument.Rows.
                 Where(Function(r) r.Id.ToString = oRow.Item(COLUMN_GUID)).
                 SingleOrDefault()
-            Dim oSchemaTable = CurrentSchema.Tables.
+            Dim oTemplateTable = CurrentTemplate.Tables.
                 Where(Function(t) t.Name = oGrid.Name).
                 SingleOrDefault()
 
@@ -213,7 +210,7 @@ Public Class frmImportMain
                 oDocumentRow,
                 CurrentDocument.Mandator,
                 Winline,
-                oSchemaTable
+                oTemplateTable
             )
             If oForm.ShowDialog() = DialogResult.OK Then
                 Dim oModifiedRow = oForm.DocumentRow
@@ -241,7 +238,11 @@ Public Class frmImportMain
                                                             SplashScreenManager.SetWaitFormDescription(oMessage)
                                                         End Sub
 
-            If DocumentLoader.LoadFiles(ConfigManager.Config.InputDirectory, CurrentSchema, lookupMandator.EditValue) Then
+            If DocumentLoader.LoadFiles(
+                ConfigManager.Config.InputDirectory,
+                CurrentTemplate,
+                lookupMandator.EditValue
+            ) Then
                 GridControlFiles.DataSource = Nothing
                 GridControlFiles.DataSource = DocumentLoader.Files
 
@@ -275,8 +276,7 @@ Public Class frmImportMain
         Try
             If oResult = DialogResult.Yes Then
                 Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
-
+                Dim oNewDocument = DocumentLoader.LoadFile(oDocument.File, CurrentTemplate, lookupMandator.EditValue)
-                Dim oNewDocument = DocumentLoader.LoadFile(oDocument.File, CurrentSchema, lookupMandator.EditValue)
                 Dim oIndex = DocumentLoader.Files.IndexOf(oDocument)
                 DocumentLoader.Files.Item(oIndex) = oNewDocument
 
@@ -320,7 +320,7 @@ Public Class frmImportMain
             Next
 
             ' Create initial Datatable for each Root Element
-            For Each oTable In CurrentSchema.Tables
+            For Each oTable In CurrentTemplate.Tables
                 Dim oDataTable As New DataTable()
 
                 ' This is makes it possible to fetch the DocumentRow later
@@ -364,7 +364,7 @@ Public Class frmImportMain
                 oGrid.DataSource = oDataTable
             Next
 
-            txtCurrentFile.Caption = String.Format(My.Resources.frmImportMainExtra.Aktuelle_Datei___0_, pDocument.Name)
+            txtCurrentFile.Caption = String.Format(My.Resources.frmImportMainExtra.Aktuelle_Datei___0_, pDocument.FileName)
 
             CurrentDocument = pDocument
             SetDocumentButtonsEnabled(True)
@@ -515,8 +515,6 @@ Public Class frmImportMain
     End Sub
 
     Private Function GenerateReport(pDocument As Document) As ReportPrintTool
-
-
         Dim oPrintTool As ReportPrintTool = Nothing
 
         Dim oMapperConfig As New Mapper(LogConfig)
@@ -550,6 +548,7 @@ Public Class frmImportMain
         Dim oReportHead = oHeadMapper.Map(Of Dictionary(Of String, FieldValue), ReportHead)(oHeadRow)
         oReportHead.Title = "EDI Bestellung (orders)"
         oReportHead.Subtitle = "Schaum"
+        oReportHead.Filename = pDocument.FileName
 
         Dim oReportPositions As New List(Of ReportPosition)
 
@@ -612,4 +611,33 @@ Public Class frmImportMain
             e.Appearance.BackColor = Color.LightCoral
         End If
     End Sub
+
+    Private Async Sub btnTestTransferFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnTestTransferFile.ItemClick
+        Try
+            SplashScreenManager.ShowWaitForm()
+            SetDocumentButtonsEnabled(False)
+            GridControlFiles.Enabled = False
+            btnLoadFiles.Enabled = False
+            SplitContainerGrids.Enabled = False
+
+            Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
+            Await WebService.TransferDocumentToWinline(oDocument, lookupMandator.EditValue, pIsTest:=True)
+
+            MsgBox(My.Resources.frmImportMainExtra.Datei_erfolgreich_in_die_WinLine_übertragen, MsgBoxStyle.Information, Text)
+        Catch ex As HttpRequestException
+            FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine, My.Resources.frmImportMainExtra.Die_Verbindung_zum_WinLine_Server_ist_fehlgeschlagen)
+
+        Catch ex As Exception
+            FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine)
+
+        Finally
+            SplitContainerGrids.Enabled = True
+            btnLoadFiles.Enabled = True
+            GridControlFiles.Enabled = True
+            SetDocumentButtonsEnabled(True)
+            SplashScreenManager.CloseWaitForm()
+        End Try
+    End Sub
+
+
 End Class

MultiTool.Form/frmMain.Designer.vb

@@ -28,7 +28,6 @@ Partial Class frmMain
         Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
@@ -39,6 +38,7 @@ Partial Class frmMain
         Me.colName = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colDescription = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colFileName = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -103,17 +103,10 @@ Partial Class frmMain
         '
         'RibbonPageGroup1
         '
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.btnOpenImportExportForm)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         Me.RibbonPageGroup1.Text = "Start"
         '
-        'RibbonPageGroup3
-        '
-        Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenImportExportForm)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        Me.RibbonPageGroup3.Text = "RibbonPageGroup3"
-        '
         'RibbonPage3
         '
         Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
@@ -186,6 +179,13 @@ Partial Class frmMain
         Me.colFileName.Visible = True
         Me.colFileName.VisibleIndex = 2
         '
+        'RibbonPageGroup3
+        '
+        Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
+        Me.RibbonPageGroup3.Text = "RibbonPageGroup3"
+        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

MultiTool.Form/frmMain.vb

@@ -5,14 +5,14 @@ Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Schemas
+Imports MultiTool.Shared.Templates
 
 Public Class frmMain
     Private LogConfig As LogConfig
     Private Logger As Logger
     Private ConfigManager As ConfigManager(Of [Shared].Config)
     Private Database As MSSQLServer
-    Private SchemaLoader As SchemaLoader
+    Private TemplateLoader As TemplateLoader
     Private GridBuilder As GridBuilder
     Private FormHelper As FormHelper
 
@@ -52,13 +52,20 @@ Public Class frmMain
             Database = New MSSQLServer(LogConfig, oConnectionString)
 
             ' Initialize Schemas
-            SchemaLoader = New SchemaLoader(LogConfig, Database)
+            TemplateLoader = New TemplateLoader(LogConfig, Database)
-            Await SchemaLoader.LoadTemplates()
+            Await TemplateLoader.LoadTemplates()
-            Await SchemaLoader.LoadTemplateConfiguration()
+            Await TemplateLoader.LoadTemplateConfiguration()
+            Await TemplateLoader.LoadMappingConfiguration()
+            Await TemplateLoader.LoadMandatorConfiguration()
 
-            Dim oBindingSource = New BindingList(Of Schema)
+            ' Save Schema data in 'My' Namespace
-            For Each oSchema As Schema In SchemaLoader.SchemaList
+            My.MappingConfiguration = TemplateLoader.MappingConfiguration
-                oBindingSource.Add(oSchema)
+            My.TemplateConfiguration = TemplateLoader.TemplateConfiguration
+            My.MandatorConfiguration = TemplateLoader.MandatorConfiguration
+
+            Dim oBindingSource = New BindingList(Of Template)
+            For Each oTemplate As Template In TemplateLoader.TemplateList
+                oBindingSource.Add(oTemplate)
             Next
 
             GridControl1.DataSource = oBindingSource
@@ -70,18 +77,22 @@ Public Class frmMain
 
     Private Sub btnOpenImportExportForm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenImportExportForm.ItemClick
         Try
-            Dim oSchema = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle)
+            Dim oTemplate As Template = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle)
 
-            If oSchema Is Nothing Then
+            If oTemplate Is Nothing Then
                 MsgBox("Keine Vorlage ausgewählt! Bitte wählen Sie eine Vorlage aus!", MsgBoxStyle.Exclamation, Text)
                 Exit Sub
             End If
 
-            oSchema = SchemaLoader.UpdateSchemaFromFile(oSchema, ConfigManager.Config.SchemaDirectory)
+            oTemplate = TemplateLoader.UpdateTemplateFromFile(oTemplate, ConfigManager.Config.SchemaDirectory)
-            oSchema = SchemaLoader.UpdateSchemaFromDatabase(oSchema, SchemaLoader.TemplateConfiguration)
+            oTemplate = TemplateLoader.UpdateTemplateFromDatabase(oTemplate, TemplateLoader.TemplateConfiguration)
 
-            Dim oForm As New frmImportMain(LogConfig, ConfigManager, oSchema)
+            If oTemplate.IsImport Then
-            oForm.ShowDialog()
+                Dim oForm As New frmImportMain(LogConfig, ConfigManager, oTemplate)
+                oForm.ShowDialog()
+            Else
+                MsgBox("Export-Vorlagen werden noch nicht unterstützt!", MsgBoxStyle.Exclamation, Text)
+            End If
 
         Catch ex As Exception
             FormHelper.ShowError(ex, My.Resources.frmMainExtra.Laden_der_Vorlage)

MultiTool.Form/frmRowEditor.vb

@@ -2,7 +2,8 @@
 Imports MultiTool.Shared.Documents
 Imports MultiTool.Shared.Documents.DocumentRow
 Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Schemas
+Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Shared.Templates
 Imports MultiTool.Shared.Constants
 Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Logging
@@ -15,7 +16,7 @@ Public Class frmRowEditor
     Private ReadOnly Logger As Logger
     Private ReadOnly FormHelper As FormHelper
 
-    Private ReadOnly _Table As Schema.Table
+    Private ReadOnly _Table As Template.Table
     Private ReadOnly _Columns As List(Of String)
     Private ReadOnly _DataTable As New DataTable
     Private ReadOnly _Accounts As List(Of Account)
@@ -40,7 +41,7 @@ Public Class frmRowEditor
         End Get
     End Property
 
-    Public Sub New(pLogConfig As LogConfig, pColumns As List(Of String), pDocumentRow As DocumentRow, pMandator As Mandator, pWinline As WinlineData, pTable As Schema.Table)
+    Public Sub New(pLogConfig As LogConfig, pColumns As List(Of String), pDocumentRow As DocumentRow, pMandator As Mandator, pWinline As WinlineData, pTable As Template.Table)
         InitializeComponent()
 
         Logger = pLogConfig.GetLogger()

MultiTool.Shared/Constants.vb

@@ -1,25 +1,48 @@
 Public Class Constants
     Public Const COLUMN_GUID = "GUID"
 
-    Public Enum XmlFunction
-        None = 0
-        GLN = 1
-        EAN = 2
-    End Enum
-
     Public Const FUNCTION_GLN = "GLN"
     Public Const FUNCTION_EAN = "EAN"
 
-    Public Const SCHEMA_TYPE_DATE = "xs:date"
+    Public Const TEMPLATE_TYPE_DATE = "xs:date"
-    Public Const SCHEMA_TYPE_INTEGER = "xs:integer"
+    Public Const TEMPLATE_TYPE_INTEGER = "xs:integer"
-    Public Const SCHEMA_TYPE_DECIMAL = "xs:decimal"
+    Public Const TEMPLATE_TYPE_DECIMAL = "xs:decimal"
-    Public Const SCHEMA_TYPE_BOOLEAN = "xs:boolean"
+    Public Const TEMPLATE_TYPE_BOOLEAN = "xs:boolean"
 
     Public Const DB_TYPE_DATE = "DATE"
     Public Const DB_TYPE_INTEGER = "INTEGER"
     Public Const DB_TYPE_DECIMAL = "DECIMAL"
     Public Const DB_TYPE_BOOLEAN = "BOOLEAN"
 
+    Public Const ALL_MESOCOMP = "mesocomp"
+
+    Public Const V21_ARTICLENUMBER = "c002"
+    Public Const V21_ARTICLEDESCRIPTION = "c003"
+    Public Const V21_MAINARTICLENUMBER = "c011"
+    Public Const V21_REPLACEMENTARTICLENUMBER = "c123"
+    Public Const V21_EAN = "c075"
+
+    Public Const V50_ACCOUNTNUMBER = "c002"
+    Public Const V50_ACCOUNTNAME = "c003"
+    Public Const V50_STREETNAME = "c050"
+    Public Const V50_ZIPCODE = "c051"
+    Public Const V50_CITYNAME = "c052"
+    Public Const V50_GLN = "c260"
+
+    Public Const T45_KEY = "c000"
+    Public Const T45_NAME = "c001"
+    Public Const T45_CONTACTNUMBER = "c063"
+
+    Public Const V05_ACCOUNTID = "c002"
+    Public Const V05_ACCOUNTNAME = "c003"
+
+    Public Const T357_KINDID = "c030"
+    Public Const T357_KINDNAME = "c001"
+
+    Public Const T01_DATABASEINFO = "c004"
+    Public Const T01_MANDATORID = "c000"
+    Public Const T01_MANDATORNAME = "c003"
+
     Public Enum ColumnType As Integer
         [String]
         [Integer]
@@ -27,4 +50,9 @@
         [Boolean]
         [Decimal]
     End Enum
+    Public Enum XmlFunction
+        None = 0
+        GLN = 1
+        EAN = 2
+    End Enum
 End Class

MultiTool.Shared/DataRowEx.vb

@@ -0,0 +1,13 @@
+Imports System.Runtime.CompilerServices
+Imports DigitalData.Modules.Language
+
+Public Module DataRowEx
+    <Extension()>
+    Public Function ItemEx(Of T)(pRow As DataRow, pFieldName As String, Optional pDefaultValue As T = Nothing) As T
+        Try
+            Return Utils.NotNull(pRow.Item(pFieldName), pDefaultValue)
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+End Module

MultiTool.Shared/Documents/Document.vb

@@ -1,12 +1,12 @@
 Imports System.IO
-Imports MultiTool.Shared.Schemas
+Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline
+Imports MultiTool.Shared.Winline.Entities
 
 Namespace Documents
     Public Class Document
         Public File As FileInfo
         Public Property Type As DocumentType
-        Public Schema As Schema
+        Public Schema As Template
         Public Mandator As Mandator
 
         Public TemplateName As String
@@ -23,7 +23,7 @@ Namespace Documents
 
         Public ReadOnly Property HasErrors As Boolean
             Get
-                Return Rows.Any(Function(r As DocumentRow) r.HasErrors)
+                Return Mandator Is Nothing Or Rows.Any(Function(r As DocumentRow) r.HasErrors)
             End Get
         End Property
 
@@ -45,7 +45,7 @@ Namespace Documents
             End Get
         End Property
 
-        Public ReadOnly Property Name As String
+        Public ReadOnly Property FileName As String
             Get
                 Return File?.Name
             End Get

MultiTool.Shared/Documents/DocumentLoader.vb

@@ -1,9 +1,9 @@
-Imports System.Globalization
+Imports System.IO
-Imports System.IO
 Imports DigitalData.Modules.Logging
 Imports MultiTool.Shared.Exceptions
-Imports MultiTool.Shared.Schemas
+Imports MultiTool.Shared.Templates
 Imports MultiTool.Shared.Winline
+Imports MultiTool.Shared.Winline.Entities
 
 Namespace Documents
     Public Class DocumentLoader
@@ -25,7 +25,7 @@ Namespace Documents
         End Sub
 
 
-        Public Function LoadFiles(pInputDirectory As String, pSchema As Schema, pMandator As Mandator) As Boolean
+        Public Function LoadFiles(pInputDirectory As String, pTemplate As Template, pMandator As Mandator) As Boolean
             If pInputDirectory = String.Empty Then
                 Throw New ArgumentNullException("InputDirectory")
             End If
@@ -41,7 +41,7 @@ Namespace Documents
 
                 For Each oFile In oFiles
                     Try
-                        Dim oDocument = LoadFile(oFile, pSchema, pMandator)
+                        Dim oDocument = LoadFile(oFile, pTemplate, pMandator)
                         Files.Add(oDocument)
 
                         Dim oInfo As FileLoadInfo
@@ -49,6 +49,7 @@ Namespace Documents
                         oInfo.FilesTotal = oFiles.Count
 
                         RaiseEvent FileLoadComplete(Me, oInfo)
+
                     Catch ex As MissingAttributeException
                         Logger.Error(ex)
                         Throw New DocumentLoaderException($"Missing Attribute '{ex.Message}' in File '{oFile.Name}'")
@@ -68,16 +69,16 @@ Namespace Documents
             End Try
         End Function
 
-        Public Function LoadFile(pFileInfo As FileInfo, pSchema As Schema, pMandator As Mandator) As Document
+        Public Function LoadFile(pFileInfo As FileInfo, pTemplate As Template, pMandator As Mandator) As Document
             Dim oFileList As New List(Of FileInfo) From {pFileInfo}
             Logger.Info("Loading file [{0}]", pFileInfo.Name)
 
             Try
                 Return oFileList.
                     Select(AddressOf WrapFileInfo).
-                    Select(Function(d) IncludeSchema(d, pSchema)).
+                    Select(Function(d) IncludeSchema(d, pTemplate)).
-                    Select(Function(d) LoadDocumentData(d, pSchema)).
+                    Select(Function(d) LoadDocumentData(d, pTemplate)).
-                    Select(Function(d) MatchDataFromWinLine(d, Winline.Mandators, pMandator, pSchema)).
+                    Select(Function(d) MatchDataFromWinLine(d, Winline.Mandators, pMandator, pTemplate)).
                     SingleOrDefault()
             Catch ex As Exception
                 Logger.Error(ex)
@@ -86,8 +87,8 @@ Namespace Documents
         End Function
 
 
-        Private Function IncludeSchema(pDocument As Document, pSchema As Schema) As Document
+        Private Function IncludeSchema(pDocument As Document, pTemplate As Template) As Document
-            pDocument.Schema = pSchema
+            pDocument.Schema = pTemplate
             Return pDocument
         End Function
 
@@ -105,7 +106,7 @@ Namespace Documents
         ''' </MESOWebService>
         '''
         ''' </example>
-        Private Function LoadDocumentData(pDocument As Document, pSchema As Schema) As Document
+        Private Function LoadDocumentData(pDocument As Document, pTemplate As Template) As Document
             Dim oText As String = IO.File.ReadAllText(pDocument.FullName)
             Dim oDoc = XDocument.Parse(oText)
 
@@ -137,7 +138,7 @@ Namespace Documents
             ' The first level of Elements are the document Rows
             Dim oTopLevelElements As List(Of XElement) = oRootElement.Elements.ToList
             Dim oDocumentRows As New List(Of DocumentRow)
-            Dim oSortKey As Integer = 0
+            Dim oRowSortKey As Integer = 0
 
             ' TODO: Somehow add all fields in the correct order
             ' 
@@ -147,12 +148,14 @@ Namespace Documents
             '
             ' leads to unordered fields.
             For Each oTopLevelElement As XElement In oTopLevelElements
+                Dim oColumnSortKey = 0
                 Dim oFields As New Dictionary(Of String, DocumentRow.FieldValue)
                 Dim oSubElements = oTopLevelElement.Descendants().ToList()
-                Dim oTable = pSchema.Tables.
+                Dim oTable = pTemplate.Tables.
                     Where(Function(t) t.Name = oTopLevelElement.Name).
                     FirstOrDefault()
 
+
                 For Each oColumn In oTable.Columns
                     Dim oSubElement = oSubElements.
                         Where(Function(e) e.Name = oColumn.Name).
@@ -163,7 +166,7 @@ Namespace Documents
                         Dim oValue = oSubElement.Value.Trim()
 
                         ' TODO: Needed when we have time for date times
-                        'If oSchemaField.DataType = Constants.ColumnType.Date Then
+                        'If oTemplateField.DataType = Constants.ColumnType.Date Then
                         '    Dim oDate = Date.ParseExact(oValue, "yyyy-MM-dd", CultureInfo.InvariantCulture)
                         '    oValue = oDate.ToString("d")
                         'End If
@@ -172,7 +175,8 @@ Namespace Documents
                             .Original = oValue,
                             .Final = oValue,
                             .DataType = oColumn.DataType,
-                            .Required = oRequired
+                            .Required = oRequired,
+                            .SortKey = oColumnSortKey
                         })
                     Else
                         Dim oColumnError = DocumentRow.FieldError.None
@@ -181,21 +185,24 @@ Namespace Documents
                         End If
 
                         oFields.Add(oColumn.Name, New DocumentRow.FieldValue With {
-                            .[Error] = oColumnError
+                            .[Error] = oColumnError,
+                            .SortKey = oColumnSortKey
                         })
                     End If
+
+                    oColumnSortKey += 1
                 Next
 
                 'For Each oSubElement As XElement In oSubElements
-                '    Dim oSchemaField = oTable.Columns.
+                '    Dim oTemplateField = oTable.Columns.
                 '        Where(Function(c) c.Name = oSubElement.Name).
                 '        SingleOrDefault()
 
-                '    Dim oRequired = oSchemaField.IsRequired
+                '    Dim oRequired = oTemplateField.IsRequired
                 '    Dim oValue = oSubElement.Value.Trim()
 
                 '    ' TODO: Needed when we have time for date times
-                '    'If oSchemaField.DataType = Constants.ColumnType.Date Then
+                '    'If oTemplateField.DataType = Constants.ColumnType.Date Then
                 '    '    Dim oDate = Date.ParseExact(oValue, "yyyy-MM-dd", CultureInfo.InvariantCulture)
                 '    '    oValue = oDate.ToString("d")
                 '    'End If
@@ -203,7 +210,7 @@ Namespace Documents
                 '    oFields.Add(oSubElement.Name.ToString, New DocumentRow.FieldValue With {
                 '        .Original = oValue,
                 '        .Final = oValue,
-                '        .DataType = oSchemaField.DataType,
+                '        .DataType = oTemplateField.DataType,
                 '        .Required = oRequired
                 '    })
 
@@ -229,12 +236,12 @@ Namespace Documents
 
                 ' Create a DocumentRow object for each Top Level Element
                 Dim oRow = New DocumentRow With {
-                    .SortKey = oSortKey,
+                    .SortKey = oRowSortKey,
                     .Name = oTopLevelElement.Name.ToString,
                     .Fields = oFields
                 }
 
-                oSortKey += 1
+                oRowSortKey += 1
                 oDocumentRows.Add(oRow)
             Next
 
@@ -249,8 +256,8 @@ Namespace Documents
         End Function
 
 
-        Private Function MatchDataFromWinLine(pDocument As Document, pMandators As List(Of Mandator), pMandator As Mandator, pSchema As Schema) As Document
+        Private Function MatchDataFromWinLine(pDocument As Document, pMandators As List(Of Mandator), pMandator As Mandator, pTemplate As Template) As Document
-            Dim oMandators As List(Of Winline.Mandator) = pMandators.
+            Dim oMandators As List(Of Mandator) = pMandators.
                 Where(Function(m) m.IsWhitelisted = True).
                 OrderBy(Function(m) m.Order).
                 ToList()
@@ -264,16 +271,15 @@ Namespace Documents
 
             If oMandator Is Nothing Then
                 Logger.Warn("Mandator not found for File [{0}]", pDocument.File.Name)
-                Throw New Exceptions.NoMandatorException($"Mandator not found for file [{pDocument.File.Name}]")
+            Else
+                pDocument = MatchDocumentData(pDocument, oMandator, pTemplate)
             End If
 
-            pDocument = MatchDocumentData(pDocument, oMandator, pSchema)
             pDocument.Mandator = oMandator
-
             Return pDocument
         End Function
 
-        Private Function MatchDocumentData(pDocument As Document, pMandator As Winline.Mandator, pSchema As Schema) As Document
+        Private Function MatchDocumentData(pDocument As Document, pMandator As Mandator, pTemplate As Template) As Document
             Dim oYear = Winline.GetWinLineYear()
 
             If pMandator Is Nothing Then
@@ -281,7 +287,7 @@ Namespace Documents
             End If
 
             For Each oRow As DocumentRow In pDocument.Rows
-                Dim oTable = pSchema.Tables.Where(Function(t) t.Name = oRow.Name).SingleOrDefault()
+                Dim oTable = pTemplate.Tables.Where(Function(t) t.Name = oRow.Name).SingleOrDefault()
 
                 For Each oField In oRow.Fields
                     If oTable Is Nothing Then
@@ -342,7 +348,7 @@ Namespace Documents
             Return pDocument
         End Function
 
-        Private Sub SetAccountByGLN(oRow As DocumentRow, pMandator As Winline.Mandator, pNumberField As String, pNameField As String)
+        Private Sub SetAccountByGLN(oRow As DocumentRow, pMandator As Mandator, pNumberField As String, pNameField As String)
             ' Try to read the Account number (which is a GLN really) and account Name
             Dim oNumberItem As DocumentRow.FieldValue = oRow.Fields.GetOrDefault(pNumberField)
             Dim oNameItem As DocumentRow.FieldValue = oRow.Fields.GetOrDefault(pNameField)

MultiTool.Shared/Documents/DocumentMatch.vb

@@ -1,28 +0,0 @@
-Namespace Documents
-    Public Class DocumentMatch
-        Public Shared Property TypeMatchingTable As New Dictionary(Of String, DocumentType) From {
-            {"orders", DocumentType.Order},
-            {"ordrsp", DocumentType.OrderResponse},
-            {"desadv", DocumentType.DispatchNotification},
-            {"invoic", DocumentType.Invoice}
-        }
-
-        Public Shared Property SchemaMatchingTable As New Dictionary(Of DocumentType, Type) From {
-            {DocumentType.Order, GetType(Schemas.OrderSchema)}
-        }
-
-        Public Shared Function GetDocumentTypeFromTemplateName(pTemplateName As String) As DocumentType
-            Return TypeMatchingTable.
-            Where(Function(kv) pTemplateName.Contains(kv.Key)).
-            Select(Function(kv) kv.Value).
-            FirstOrDefault()
-        End Function
-
-        Public Shared Function GetDocumentSchemaFromDocumentType(pDocumentType As DocumentType) As Type
-            Return SchemaMatchingTable.
-            Where(Function(kv) pDocumentType = kv.Key).
-            Select(Function(kv) kv.Value).
-            FirstOrDefault()
-        End Function
-    End Class
-End Namespace

MultiTool.Shared/Documents/DocumentRow.vb

@@ -57,6 +57,7 @@
             Public Property External As String = ""
             Public Property Final As String = ""
             Public Property Required As Boolean = False
+            Public Property SortKey As Integer = 0
 
             Public ReadOnly Property HasError As Boolean
                 Get

MultiTool.Shared/Helpers.vb

@@ -1,19 +1,2 @@
-Imports DigitalData.Modules.Language
+Friend Class Helpers
-
-Public Class Helpers
-    Public Shared Function GetRowItem(Of T)(pRow As DataRow, pFieldName As String, Optional pDefaultValue As T = Nothing) As T
-        Try
-            Return Utils.NotNull(pRow.Item(pFieldName), pDefaultValue)
-        Catch ex As Exception
-            Return Nothing
-        End Try
-    End Function
-
-    Private Function TryGetDictionaryItem(Of T)(pDictionary As IDictionary(Of String, T), pKey As String) As T
-        If pDictionary.ContainsKey(pKey) Then
-            Return pDictionary.Item(pKey)
-        Else
-            Return Nothing
-        End If
-    End Function
 End Class

MultiTool.Shared/Mapper.vb

@@ -7,8 +7,8 @@ Imports MultiTool.Shared.Documents.DocumentRow
 
 Public Class Mapper
     Private MapperConfig As MapperConfiguration
-    Private LogConfig As LogConfig
+    Private ReadOnly LogConfig As LogConfig
-    Private Logger As Logger
+    Private ReadOnly Logger As Logger
 
     Public Sub New(pLogConfig As LogConfig)
         LogConfig = pLogConfig
@@ -31,7 +31,7 @@ Public Class Mapper
     Public Class MappingProfile(Of T)
         Inherits Profile
 
-        Private LogConfig As LogConfig
+        Private ReadOnly LogConfig As LogConfig
 
         Public Overrides ReadOnly Property ProfileName As String
             Get
@@ -48,21 +48,19 @@ Public Class Mapper
     Private Class ReportTypeConverter(Of TDestination)
         Implements ITypeConverter(Of Dictionary(Of String, FieldValue), TDestination)
 
-        Private PropertyMap As Dictionary(Of String, String)
+        Private ReadOnly PropertyMap As Dictionary(Of String, String)
-        Private KeyWithSubkey As New Regex("(?<Key>[\w\s-]+)(?:\[(?<Subkey>[\w]+)\])?")
+        Private ReadOnly KeyWithSubkey As New Regex("(?<Key>[\w\s-]+)(?:\[(?<Subkey>[\w]+)\])?")
 
-        Private LogConfig As LogConfig
+        Private ReadOnly Logger As Logger
-        Private Logger As Logger
 
         Public Sub New(pLogConfig As LogConfig, pPropertyMap As Dictionary(Of String, String))
             MyBase.New()
-            LogConfig = pLogConfig
             Logger = pLogConfig.GetLogger()
             PropertyMap = pPropertyMap
         End Sub
 
-        Public Function Convert(source As Dictionary(Of String, FieldValue), destination As TDestination, context As ResolutionContext) As TDestination Implements ITypeConverter(Of Dictionary(Of String, FieldValue), TDestination).Convert
+        Public Function Convert(pSource As Dictionary(Of String, FieldValue), pDestination As TDestination, pContext As ResolutionContext) As TDestination Implements ITypeConverter(Of Dictionary(Of String, FieldValue), TDestination).Convert
-            If source Is Nothing Then
+            If pSource Is Nothing Then
                 Return Nothing
             End If
 
@@ -83,9 +81,9 @@ Public Class Mapper
                     Dim oSourceSubkey As String = oMatch.Groups("Subkey")?.Value
 
                     ' Set property value if property exists in source
-                    If source.ContainsKey(oSourceKey) Then
+                    If pSource.ContainsKey(oSourceKey) Then
                         ' Try to get the value from 'source'
-                        Dim oFieldValue As FieldValue = source.Item(oSourceKey)
+                        Dim oFieldValue As FieldValue = pSource.Item(oSourceKey)
 
                         ' Get the destination property by DestinationKey
                         Dim oProperty = GetType(TDestination).
@@ -94,7 +92,7 @@ Public Class Mapper
 
                         ' Set the property if it exists
                         If oProperty IsNot Nothing Then
-                            Dim oValue = GetFieldValue(oFieldValue, oSourceKey, oSourceSubkey)
+                            Dim oValue = GetFieldValue(oFieldValue, oSourceSubkey)
                             Logger.Info("Transferring value [{0}] from [{1}] -> [{2}]", oValue, oSourceKeyCombined, oDestinationKey)
                             oProperty.SetValue(oResult, oValue)
 
@@ -113,11 +111,11 @@ Public Class Mapper
             Return oResult
         End Function
 
-        Private Function GetFieldValue(pValue As FieldValue, pKey As String, pSubKey As String) As String
+        Private Function GetFieldValue(pValue As FieldValue, pKey As String) As String
-            If pSubKey = "Original" Then
+            If pKey = "Original" Then
                 Return pValue.Original
 
-            ElseIf pSubKey = "External" Then
+            ElseIf pKey = "External" Then
                 Return pValue.External
 
             Else

MultiTool.Shared/MultiTool.Shared.vbproj

@@ -98,8 +98,8 @@
     <Compile Include="BaseClass.vb" />
     <Compile Include="Config.vb" />
     <Compile Include="Constants.vb" />
+    <Compile Include="DataRowEx.vb" />
     <Compile Include="Documents\Document.vb" />
-    <Compile Include="Documents\DocumentMatch.vb" />
     <Compile Include="Documents\DocumentRow.vb" />
     <Compile Include="Documents\DocumentType.vb" />
     <Compile Include="Documents\DocumentLoader.vb" />
@@ -124,26 +124,26 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="Schemas\BaseSchema.vb" />
+    <Compile Include="Templates\MandatorConfig.vb" />
-    <Compile Include="Schemas\Orders\Helpers.vb" />
+    <Compile Include="Templates\MandatorConfigItem.vb" />
-    <Compile Include="Schemas\Orders\Input.vb" />
+    <Compile Include="Templates\MappingConfig.vb" />
-    <Compile Include="Schemas\Orders\OrderSchema.vb" />
+    <Compile Include="Templates\MappingConfigItem.vb" />
-    <Compile Include="Schemas\Report\ReportHead.vb" />
+    <Compile Include="Report\ReportHead.vb" />
-    <Compile Include="Schemas\Report\ReportPosition.vb" />
+    <Compile Include="Report\ReportPosition.vb" />
-    <Compile Include="Schemas\Report\ReportSource.vb" />
+    <Compile Include="Report\ReportSource.vb" />
-    <Compile Include="Schemas\Response.vb" />
+    <Compile Include="Winline\Entities\Response.vb" />
-    <Compile Include="Schemas\Schema.vb" />
+    <Compile Include="Templates\Template.vb" />
-    <Compile Include="Schemas\SchemaLoader.vb" />
+    <Compile Include="Templates\TemplateLoader.vb" />
     <Compile Include="Serializer.vb" />
-    <Compile Include="Schemas\Configuration.vb" />
+    <Compile Include="Templates\TemplateConfig.vb" />
     <Compile Include="Winline\Entities\Account.vb" />
     <Compile Include="Winline\WinlineData.vb" />
     <Compile Include="Winline\Entities\Article.vb" />
     <Compile Include="Winline\Entities\Contact.vb" />
     <Compile Include="Winline\Entities\DocumentKind.vb" />
     <Compile Include="Winline\Entities\Mandator.vb" />
-    <Compile Include="Schemas\ColumnConfig.vb" />
+    <Compile Include="Templates\TemplateConfigItem.vb" />
-    <Compile Include="Winline\WebService.vb" />
+    <Compile Include="Winline\WebServiceData.vb" />
     <Compile Include="XmlData.vb" />
   </ItemGroup>
   <ItemGroup>

MultiTool.Shared/Report/ReportHead.vb

@@ -0,0 +1,23 @@
+Namespace Report
+    Public Class ReportHead
+        Public Property Title As String
+        Public Property Subtitle As String
+        Public Property Filename As String
+
+        Public Property DateCreated As Date
+        Public Property Id As String
+
+        Public Property Text1 As String
+        Public Property Text2 As String
+        Public Property Text3 As String
+        Public Property Text4 As String
+        Public Property Text5 As String
+        Public Property Text6 As String
+        Public Property Text7 As String
+        Public Property Text8 As String
+        Public Property Text9 As String
+        Public Property Text10 As String
+    End Class
+
+End Namespace
+

MultiTool.Shared/Report/ReportPosition.vb

@@ -0,0 +1,27 @@
+Namespace Report
+    Public Class ReportPosition
+        Public Property Id As String
+
+        Public Property Text1 As String
+        Public Property Text2 As String
+        Public Property Text3 As String
+        Public Property Text4 As String
+        Public Property Text5 As String
+        Public Property Text6 As String
+        Public Property Text7 As String
+        Public Property Text8 As String
+        Public Property Text9 As String
+        Public Property Text10 As String
+        Public Property Text11 As String
+        Public Property Text12 As String
+        Public Property Text13 As String
+        Public Property Text14 As String
+        Public Property Text15 As String
+        Public Property Text16 As String
+        Public Property Text17 As String
+        Public Property Text18 As String
+        Public Property Text19 As String
+        Public Property Text20 As String
+    End Class
+
+End Namespace

MultiTool.Shared/Report/ReportSource.vb

@@ -0,0 +1,18 @@
+Imports System.ComponentModel
+Imports DevExpress.DataAccess.ObjectBinding
+
+Namespace Report
+    <HighlightedClass, DisplayName("ReportSource")>
+    Public Class ReportSource
+        <HighlightedMember>
+        Public Property Head As ReportHead
+        <HighlightedMember>
+        Public Property Positions As IEnumerable(Of ReportPosition)
+        <HighlightedMember>
+        Public Iterator Function GetPositionList() As IEnumerable(Of ReportPosition)
+            For Each oPosition In Positions
+                Yield oPosition
+            Next
+        End Function
+    End Class
+End Namespace

MultiTool.Shared/Schemas/BaseSchema.vb

@@ -1,8 +0,0 @@
-Namespace Schemas
-    Public Class BaseSchema
-        Public Property Template As String
-        Public Property TemplateType As Integer
-        Public Property [Option] As Integer
-        Public Property PrintVoucher As Integer
-    End Class
-End Namespace

MultiTool.Shared/Schemas/Orders/Helpers.vb

@@ -1,28 +0,0 @@
-Namespace Schemas.Orders
-    'Public Class Helpers
-    '    Public Shared Function GetOrderHead(Of T)(pData As IMesoWebservice) As T
-    '        Dim oHead As T = pData.Items.
-    '            Where(Function(i) TypeOf i Is T).
-    '            FirstOrDefault()
-    '        Return oHead
-    '    End Function
-
-    '    Public Shared Sub SetOrderHead(Of T)(pData As IMesoWebservice, pUpdateFunction As Action(Of T))
-    '        Dim oHead As T = pData.Items.
-    '            Where(Function(i) TypeOf i Is T).
-    '            SetValue(Sub(pObject As T)
-    '                         pUpdateFunction(pObject)
-    '                     End Sub).
-    '            FirstOrDefault()
-
-    '    End Sub
-
-    '    Public Shared Function GetOrderPositions(Of T)(pData As IMesoWebservice) As List(Of T)
-    '        Dim oPositions As List(Of T) = pData.Items.
-    '            Where(Function(i) TypeOf i Is T).
-    '            Select(Of T)(Function(i) i).
-    '            ToList()
-    '        Return oPositions
-    '    End Function
-    'End Class
-End Namespace

MultiTool.Shared/Schemas/Orders/Input.vb

@@ -1,713 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict Off
-Option Explicit On
-
-Imports System.Xml.Serialization
-
-'
-'This source code was auto-generated by xsd, Version=4.8.3928.0.
-'
-Namespace Schemas.Orders.Input
-
-    '''<remarks/>
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),
-     System.SerializableAttribute(),
-     System.Diagnostics.DebuggerStepThroughAttribute(),
-     System.ComponentModel.DesignerCategoryAttribute("code"),
-     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=True),
-     System.Xml.Serialization.XmlRootAttribute([Namespace]:="", IsNullable:=False)>
-    Partial Public Class MESOWebService
-
-        Private itemsField() As Object
-
-        Private templateTypeField As String
-
-        Private templateField As String
-
-        Private optionField As String
-
-        Private amountField As String
-
-        Private extEntryField As String
-
-        Private printVoucherField As String
-
-        Private extInsertField As String
-
-        Private changeLotSizeField As String
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute("EXIM-VRG_ordersT025", GetType(MESOWebServiceEXIMVRG_ordersT025), Form:=System.Xml.Schema.XmlSchemaForm.Unqualified),
-         System.Xml.Serialization.XmlElementAttribute("EXIM-VRG_ordersT026", GetType(MESOWebServiceEXIMVRG_ordersT026), Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
-        Public Property Items() As Object()
-            Get
-                Return Me.itemsField
-            End Get
-            Set
-                Me.itemsField = Value
-            End Set
-        End Property
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlAttributeAttribute(DataType:="string")>
-        Public Property TemplateType() As String
-            Get
-                Return Me.templateTypeField
-            End Get
-            Set
-                Me.templateTypeField = Value
-            End Set
-        End Property
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlAttributeAttribute()>
-        Public Property Template() As String
-            Get
-                Return Me.templateField
-            End Get
-            Set
-                Me.templateField = Value
-            End Set
-        End Property
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlAttributeAttribute(DataType:="string")>
-        Public Property [option]() As String
-            Get
-                Return Me.optionField
-            End Get
-            Set
-                Me.optionField = Value
-            End Set
-        End Property
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlAttributeAttribute(DataType:="string")>
-        Public Property amount() As String
-            Get
-                Return Me.amountField
-            End Get
-            Set
-                Me.amountField = Value
-            End Set
-        End Property
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlAttributeAttribute(DataType:="string")>
-        Public Property extEntry() As String
-            Get
-                Return Me.extEntryField
-            End Get
-            Set
-                Me.extEntryField = Value
-            End Set
-        End Property
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlAttributeAttribute(DataType:="string")>
-        Public Property printVoucher() As String
-            Get
-                Return Me.printVoucherField
-            End Get
-            Set
-                Me.printVoucherField = Value
-            End Set
-        End Property
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlAttributeAttribute(DataType:="string")>
-        Public Property extInsert() As String
-            Get
-                Return Me.extInsertField
-            End Get
-            Set
-                Me.extInsertField = Value
-            End Set
-        End Property
-
-        '''<remarks/>
-        <System.Xml.Serialization.XmlAttributeAttribute(DataType:="string")>
-        Public Property ChangeLotSize() As String
-            Get
-                Return Me.changeLotSizeField
-            End Get
-            Set
-                Me.changeLotSizeField = Value
-            End Set
-        End Property
-    End Class
-
-    '''<remarks/>
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),  _
-     System.SerializableAttribute(),  _
-     System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.ComponentModel.DesignerCategoryAttribute("code"),  _
-     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=true)>  _
-    Partial Public Class MESOWebServiceEXIMVRG_ordersT025
-        
-        Private bELEGKEYField As String
-        
-        Private fakt_KontonummerField As String
-        
-        Private laufnummerField As String
-        
-        Private fakt_NameField As String
-        
-        Private fakt_StrasseField As String
-        
-        Private fakt_PLZField As String
-        
-        Private fakt_OrtField As String
-        
-        Private fakt_AnsprechpartnerField As String
-        
-        Private lief_KontonummerField As String
-        
-        Private lief_NameField As String
-        
-        Private lief_StrasseField As String
-        
-        Private lief_PLZField As String
-        
-        Private lief_OrtField As String
-        
-        Private belegartField As String
-        
-        Private datum_AuftragBestellungField As String
-        
-        Private datum_AuftragBestellungFieldSpecified As Boolean
-        
-        Private auftragsBestellnummerField As String
-        
-        Private leistungsdatumField As String
-        
-        Private leistungsdatumFieldSpecified As Boolean
-        
-        Private auftragsreferenzField As String
-        
-        Private infotextField As String
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
-        Public Property BELEGKEY() As String
-            Get
-                Return Me.bELEGKEYField
-            End Get
-            Set
-                Me.bELEGKEYField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Fakt_Kontonummer() As String
-            Get
-                Return Me.fakt_KontonummerField
-            End Get
-            Set
-                Me.fakt_KontonummerField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Laufnummer() As String
-            Get
-                Return Me.laufnummerField
-            End Get
-            Set
-                Me.laufnummerField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Fakt_Name() As String
-            Get
-                Return Me.fakt_NameField
-            End Get
-            Set
-                Me.fakt_NameField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Fakt_Strasse() As String
-            Get
-                Return Me.fakt_StrasseField
-            End Get
-            Set
-                Me.fakt_StrasseField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Fakt_PLZ() As String
-            Get
-                Return Me.fakt_PLZField
-            End Get
-            Set
-                Me.fakt_PLZField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Fakt_Ort() As String
-            Get
-                Return Me.fakt_OrtField
-            End Get
-            Set
-                Me.fakt_OrtField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Fakt_Ansprechpartner() As String
-            Get
-                Return Me.fakt_AnsprechpartnerField
-            End Get
-            Set
-                Me.fakt_AnsprechpartnerField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Lief_Kontonummer() As String
-            Get
-                Return Me.lief_KontonummerField
-            End Get
-            Set
-                Me.lief_KontonummerField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Lief_Name() As String
-            Get
-                Return Me.lief_NameField
-            End Get
-            Set
-                Me.lief_NameField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Lief_Strasse() As String
-            Get
-                Return Me.lief_StrasseField
-            End Get
-            Set
-                Me.lief_StrasseField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Lief_PLZ() As String
-            Get
-                Return Me.lief_PLZField
-            End Get
-            Set
-                Me.lief_PLZField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Lief_Ort() As String
-            Get
-                Return Me.lief_OrtField
-            End Get
-            Set
-                Me.lief_OrtField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Belegart() As String
-            Get
-                Return Me.belegartField
-            End Get
-            Set
-                Me.belegartField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute("Datum_Auftrag-Bestellung", Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
-        Public Property Datum_AuftragBestellung() As String
-            Get
-                Return Me.datum_AuftragBestellungField
-            End Get
-            Set
-                Me.datum_AuftragBestellungField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
-        Public Property Datum_AuftragBestellungSpecified() As Boolean
-            Get
-                Return Me.datum_AuftragBestellungFieldSpecified
-            End Get
-            Set
-                Me.datum_AuftragBestellungFieldSpecified = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute("Auftrags-Bestellnummer", Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property AuftragsBestellnummer() As String
-            Get
-                Return Me.auftragsBestellnummerField
-            End Get
-            Set
-                Me.auftragsBestellnummerField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
-        Public Property Leistungsdatum() As String
-            Get
-                Return Me.leistungsdatumField
-            End Get
-            Set
-                Me.leistungsdatumField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
-        Public Property LeistungsdatumSpecified() As Boolean
-            Get
-                Return Me.leistungsdatumFieldSpecified
-            End Get
-            Set
-                Me.leistungsdatumFieldSpecified = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Auftragsreferenz() As String
-            Get
-                Return Me.auftragsreferenzField
-            End Get
-            Set
-                Me.auftragsreferenzField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Infotext() As String
-            Get
-                Return Me.infotextField
-            End Get
-            Set
-                Me.infotextField = value
-            End Set
-        End Property
-    End Class
-    
-    '''<remarks/>
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),  _
-     System.SerializableAttribute(),  _
-     System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.ComponentModel.DesignerCategoryAttribute("code"),  _
-     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=true)>  _
-    Partial Public Class MESOWebServiceEXIMVRG_ordersT026
-        
-        Private bELEGKEYField As String
-        
-        Private zeilennummerField As String
-        
-        Private datentypField As String
-        
-        Private artikelnummerField As String
-        
-        Private bezeichnungField As String
-        
-        Private notizblockField As String
-        
-        Private lieferantenartikelnummerField As String
-        
-        Private menge_bestelltField As String
-        
-        Private menge_bestelltFieldSpecified As Boolean
-        
-        Private menge_geliefertField As String
-        
-        Private colliField As String
-        
-        Private einzelpreisField As String
-        
-        Private einzelpreisFieldSpecified As Boolean
-        
-        Private zeilenrabatt1Field As String
-        
-        Private zeilenrabatt1FieldSpecified As Boolean
-        
-        Private zeilenrabatt2Field As String
-        
-        Private zeilenrabatt2FieldSpecified As Boolean
-        
-        Private zeilenrabatt3Field As String
-        
-        Private zeilenrabatt3FieldSpecified As Boolean
-        
-        Private zeilenrabatt4Field As String
-        
-        Private zeilenrabatt4FieldSpecified As Boolean
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
-        Public Property BELEGKEY() As String
-            Get
-                Return Me.bELEGKEYField
-            End Get
-            Set
-                Me.bELEGKEYField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
-        Public Property Zeilennummer() As String
-            Get
-                Return Me.zeilennummerField
-            End Get
-            Set
-                Me.zeilennummerField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Datentyp() As String
-            Get
-                Return Me.datentypField
-            End Get
-            Set
-                Me.datentypField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Artikelnummer() As String
-            Get
-                Return Me.artikelnummerField
-            End Get
-            Set
-                Me.artikelnummerField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Bezeichnung() As String
-            Get
-                Return Me.bezeichnungField
-            End Get
-            Set
-                Me.bezeichnungField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Notizblock() As String
-            Get
-                Return Me.notizblockField
-            End Get
-            Set
-                Me.notizblockField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Lieferantenartikelnummer() As String
-            Get
-                Return Me.lieferantenartikelnummerField
-            End Get
-            Set
-                Me.lieferantenartikelnummerField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Menge_bestellt() As String
-            Get
-                Return Me.menge_bestelltField
-            End Get
-            Set
-                Me.menge_bestelltField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
-        Public Property Menge_bestelltSpecified() As Boolean
-            Get
-                Return Me.menge_bestelltFieldSpecified
-            End Get
-            Set
-                Me.menge_bestelltFieldSpecified = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Menge_geliefert() As String
-            Get
-                Return Me.menge_geliefertField
-            End Get
-            Set
-                Me.menge_geliefertField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Colli() As String
-            Get
-                Return Me.colliField
-            End Get
-            Set
-                Me.colliField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Einzelpreis() As String
-            Get
-                Return Me.einzelpreisField
-            End Get
-            Set
-                Me.einzelpreisField = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
-        Public Property EinzelpreisSpecified() As Boolean
-            Get
-                Return Me.einzelpreisFieldSpecified
-            End Get
-            Set
-                Me.einzelpreisFieldSpecified = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Zeilenrabatt1() As String
-            Get
-                Return Me.zeilenrabatt1Field
-            End Get
-            Set
-                Me.zeilenrabatt1Field = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
-        Public Property Zeilenrabatt1Specified() As Boolean
-            Get
-                Return Me.zeilenrabatt1FieldSpecified
-            End Get
-            Set
-                Me.zeilenrabatt1FieldSpecified = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Zeilenrabatt2() As String
-            Get
-                Return Me.zeilenrabatt2Field
-            End Get
-            Set
-                Me.zeilenrabatt2Field = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
-        Public Property Zeilenrabatt2Specified() As Boolean
-            Get
-                Return Me.zeilenrabatt2FieldSpecified
-            End Get
-            Set
-                Me.zeilenrabatt2FieldSpecified = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Zeilenrabatt3() As String
-            Get
-                Return Me.zeilenrabatt3Field
-            End Get
-            Set
-                Me.zeilenrabatt3Field = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
-        Public Property Zeilenrabatt3Specified() As Boolean
-            Get
-                Return Me.zeilenrabatt3FieldSpecified
-            End Get
-            Set
-                Me.zeilenrabatt3FieldSpecified = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
-        Public Property Zeilenrabatt4() As String
-            Get
-                Return Me.zeilenrabatt4Field
-            End Get
-            Set
-                Me.zeilenrabatt4Field = value
-            End Set
-        End Property
-        
-        '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
-        Public Property Zeilenrabatt4Specified() As Boolean
-            Get
-                Return Me.zeilenrabatt4FieldSpecified
-            End Get
-            Set
-                Me.zeilenrabatt4FieldSpecified = value
-            End Set
-        End Property
-    End Class
-End Namespace
-

MultiTool.Shared/Schemas/Orders/OrderSchema.vb

@@ -1,55 +0,0 @@
-Imports System.ComponentModel
-
-
-Namespace Schemas
-
-    ''' <summary>
-    ''' XML Schema to import the Data-Files
-    ''' </summary>
-    Public Class OrderSchema
-        Inherits BaseSchema
-
-        <Description("EXIM-VRG_ordersT025")>
-        Public Property Head As New OrderHead
-
-        <Description("EXIM-VRG_ordersT026")>
-        Public Property Positions As New List(Of OrderPosition)
-
-
-        Public Class OrderHead
-            <Description("BELEGKEY")>
-            Public Property DocumentKey As String
-            <Description("Fakt_Kontonummer")>
-            Public Property AccountNumber As String
-            <Description("Laufnummer")>
-            Public Property RunningNumber As String
-            <Description("Bestellt_von")>
-            Public Property OrderedBy As String
-            <Description("Lief_Kontonummer")>
-            Public Property AccountNumber2 As String
-            <Description("Belegart")>
-            Public Property DocumentType As Integer
-            <Description("Datum_Auftrag-Bestellung")>
-            Public Property OrderDate As Date
-            <Description("Auftrags-Bestellnummer")>
-            Public Property OrderNumber As String
-            <Description("Infotext")>
-            Public Property InfoText As String
-        End Class
-
-
-        Public Class OrderPosition
-            <Description("BELEGKEY")>
-            Public Property DocumentKey As String
-            <Description("Zeilennummer")>
-            Public Property LineNumber As String
-            <Description("Artikelnummer")>
-            Public Property ArticleNumber As String
-            <Description("Bezeichnung")>
-            Public Property ArticleDescription As String
-            <Description("Lieferantenartikelnummer")>
-            Public Property VendorNumber As String
-        End Class
-
-    End Class
-End Namespace

MultiTool.Shared/Schemas/Report/ReportHead.vb

@@ -1,18 +0,0 @@
-Public Class ReportHead
-    Public Property Title As String
-    Public Property Subtitle As String
-
-    Public Property DateCreated As Date
-    Public Property Id As String
-
-    Public Property Text1 As String
-    Public Property Text2 As String
-    Public Property Text3 As String
-    Public Property Text4 As String
-    Public Property Text5 As String
-    Public Property Text6 As String
-    Public Property Text7 As String
-    Public Property Text8 As String
-    Public Property Text9 As String
-    Public Property Text10 As String
-End Class

MultiTool.Shared/Schemas/Report/ReportPosition.vb

@@ -1,24 +0,0 @@
-Public Class ReportPosition
-    Public Property Id As String
-
-    Public Property Text1 As String
-    Public Property Text2 As String
-    Public Property Text3 As String
-    Public Property Text4 As String
-    Public Property Text5 As String
-    Public Property Text6 As String
-    Public Property Text7 As String
-    Public Property Text8 As String
-    Public Property Text9 As String
-    Public Property Text10 As String
-    Public Property Text11 As String
-    Public Property Text12 As String
-    Public Property Text13 As String
-    Public Property Text14 As String
-    Public Property Text15 As String
-    Public Property Text16 As String
-    Public Property Text17 As String
-    Public Property Text18 As String
-    Public Property Text19 As String
-    Public Property Text20 As String
-End Class

MultiTool.Shared/Schemas/Report/ReportSource.vb

@@ -1,16 +0,0 @@
-Imports System.ComponentModel
-Imports DevExpress.DataAccess.ObjectBinding
-
-<HighlightedClass, DisplayName("ReportSource")>
-Public Class ReportSource
-    <HighlightedMember>
-    Public Property Head As ReportHead
-    <HighlightedMember>
-    Public Property Positions As IEnumerable(Of ReportPosition)
-    <HighlightedMember>
-    Public Iterator Function GetPositionList() As IEnumerable(Of ReportPosition)
-        For Each oPosition In Positions
-            Yield oPosition
-        Next
-    End Function
-End Class

MultiTool.Shared/Schemas/SchemaLoader.vb

@@ -1,194 +0,0 @@
-Imports System.IO
-Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Helpers
-
-Namespace Schemas
-    Public Class SchemaLoader
-        Inherits BaseClass
-
-        Private ReadOnly ns As XNamespace = "http://www.w3.org/2001/XMLSchema"
-
-        Public SchemaList As List(Of Schema)
-        Public TemplateConfiguration As New Configuration
-
-        Private ReadOnly Database As MSSQLServer
-
-        Private Const VWEDI_XML_ITEMS = "VWEDI_XML_ITEMS"
-
-        Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer)
-            MyBase.New(pLogConfig, pLogConfig.GetLogger)
-            Database = pMSSQL
-        End Sub
-
-        Public Async Function LoadTemplates() As Task(Of Boolean)
-            Try
-                Dim oSql = $"SELECT * FROM [DD_ECM].[dbo].[TBEDI_XML_TEMPLATES]"
-                Dim oTable As DataTable = Await Database.GetDatatableAsync(oSql)
-                Dim oTemplates As New List(Of Schema)
-
-                For Each oRow As DataRow In oTable.Rows
-                    Dim oTemplate As New Schema With {
-                        .Name = GetRowItem(oRow, "NAME", String.Empty),
-                        .Description = GetRowItem(oRow, "DESCRIPTION", String.Empty),
-                        .FileName = GetRowItem(oRow, "FILE_NAME", String.Empty),
-                        .IsImport = GetRowItem(oRow, "IS_IMPORT", True)
-                    }
-
-                    oTemplates.Add(oTemplate)
-                Next
-
-                SchemaList = oTemplates
-
-                Return True
-            Catch ex As Exception
-                Logger.Error(ex)
-                Return False
-
-            End Try
-        End Function
-
-        Public Async Function LoadTemplateConfiguration() As Task(Of Boolean)
-            Try
-                Dim oSql = $"SELECT * FROM [DD_ECM].[dbo].[{VWEDI_XML_ITEMS}]"
-                Dim oTable As DataTable = Await Database.GetDatatableAsync(oSql)
-                Dim oItems As New List(Of ColumnConfig)
-
-                For Each oRow As DataRow In oTable.Rows
-                    Dim oColumn As New ColumnConfig() With {
-                        .Template = GetRowItem(oRow, "TEMPLATE_NAME", String.Empty),
-                        .Table = GetRowItem(oRow, "XML_TABLE", String.Empty),
-                        .Name = GetRowItem(oRow, "XML_ITEM", String.Empty),
-                        .Type = ColumnConfig.ConvertType(GetRowItem(oRow, "DATA_TYPE", String.Empty)),
-                        .OrderKey = GetRowItem(oRow, "ORDER_KEY", 0),
-                        .IsReadOnly = GetRowItem(oRow, "IS_READ_ONLY", False),
-                        .IsVisible = GetRowItem(oRow, "IS_VISIBLE", True),
-                        .IsRequired = GetRowItem(oRow, "IS_REQUIRED", False),
-                        .IsHead = GetRowItem(oRow, "IS_HEAD", True),
-                        .[Function] = New ColumnConfig.ColumnFunction With {
-                            .Id = GetRowItem(oRow, "FUNCTION_ID", 0),
-                            .Name = GetRowItem(oRow, "FUNCTION_NAME", String.Empty),
-                            .Params = GetRowItem(oRow, "FUNCTION_PARAMETERS", String.Empty)
-                        }
-                    }
-
-                    oItems.Add(oColumn)
-                Next
-
-                TemplateConfiguration = New Configuration With {
-                    .Columns = oItems
-                }
-
-                Return True
-
-            Catch ex As Exception
-                Logger.Error(ex)
-                Return False
-
-            End Try
-        End Function
-
-        Public Function UpdateSchemaFromFile(pSchema As Schema, pInputDirectory As String) As Schema
-            Dim oFullPath = Path.Combine(pInputDirectory, pSchema.FileName)
-
-            If Not IO.File.Exists(oFullPath) Then
-                Throw New FileNotFoundException(oFullPath)
-            End If
-
-            Dim oElements = GetSchemaElements(oFullPath)
-
-            For Each oElement In oElements
-                Dim oColumns = GetElementColumns(oElement)
-                Dim oSchemaColumns As New List(Of Schema.Column)
-
-                For Each oColumn As XElement In oColumns
-                    Dim oName = XmlData.GetElementAttribute(oColumn, "name")
-                    Dim oMinOccurs = XmlData.GetElementAttribute(oColumn, "minOccurs")
-                    Dim oMaxOccurs = XmlData.GetElementAttribute(oColumn, "maxOccurs")
-                    Dim oType = GetElementType(oColumn)
-                    Dim oRequired = False
-
-                    If oMinOccurs = 1 And oMaxOccurs = 1 Then
-                        oRequired = True
-                    End If
-
-                    Dim oSchemaColumn As New Schema.Column With {
-                        .Name = oName,
-                        .DataType = oType,
-                        .IsRequired = oRequired
-                    }
-                    oSchemaColumns.Add(oSchemaColumn)
-                Next
-
-                pSchema.Tables.Add(New Schema.Table With {
-                    .Name = XmlData.GetElementAttribute(oElement, "name"),
-                    .Columns = oSchemaColumns
-                })
-
-            Next
-
-            Return pSchema
-        End Function
-
-        Public Function UpdateSchemaFromDatabase(pSchema As Schema, pTemplateConfig As Configuration) As Schema
-            If pTemplateConfig Is Nothing Then
-                Return pSchema
-            End If
-
-            For Each oTable In pSchema.Tables
-                For Each oColumn As Schema.Column In oTable.Columns
-                    Dim oConfig = pTemplateConfig.GetColumn(oColumn.Name)
-
-                    If oConfig Is Nothing Then
-                        oConfig = New ColumnConfig With {
-                            .IsRequired = oColumn.IsRequired,
-                            .Name = oColumn.Name
-                        }
-                    End If
-
-                    oColumn.Config = oConfig
-                Next
-            Next
-
-            Return pSchema
-        End Function
-
-        Public Function GetElementType(pElement As XElement) As Constants.ColumnType
-            Dim oTypeString = XmlData.GetElementAttribute(pElement, "type")
-
-            If oTypeString Is Nothing Then
-                Dim oRestrictionElement As XElement = pElement.
-                    Descendants(ns + "restriction").
-                    FirstOrDefault()
-
-                oTypeString = XmlData.GetElementAttribute(oRestrictionElement, "base")
-            End If
-
-            Select Case oTypeString
-                Case Constants.SCHEMA_TYPE_DATE
-                    Return Constants.ColumnType.Date
-                Case Constants.SCHEMA_TYPE_INTEGER
-                    Return Constants.ColumnType.Integer
-                Case Constants.SCHEMA_TYPE_DECIMAL
-                    Return Constants.ColumnType.Decimal
-                Case Constants.SCHEMA_TYPE_BOOLEAN
-                    Return Constants.ColumnType.Boolean
-                Case Else
-                    Return Constants.ColumnType.String
-            End Select
-        End Function
-
-        Public Function GetSchemaElements(pSchemaFilePath As String) As List(Of XElement)
-            Dim oText As String = IO.File.ReadAllText(pSchemaFilePath)
-            Dim oDoc = XDocument.Parse(oText)
-
-            Return XmlData.GetElementsFromElement(oDoc, "choice", ns)
-        End Function
-
-        Public Function GetElementColumns(pElement As XElement) As List(Of XElement)
-            Return XmlData.GetElementsFromElement(pElement, "sequence", ns)
-        End Function
-    End Class
-
-End Namespace

MultiTool.Shared/Templates/MandatorConfig.vb

@@ -0,0 +1,5 @@
+Namespace Templates
+    Public Class MandatorConfig
+        Public Property Items As New List(Of MandatorConfigItem)
+    End Class
+End Namespace

MultiTool.Shared/Templates/MandatorConfigItem.vb

@@ -0,0 +1,7 @@
+Namespace Templates
+    Public Class MandatorConfigItem
+        Public Property Name As String
+        Public Property OrderKey As Integer
+    End Class
+
+End Namespace

MultiTool.Shared/Templates/MappingConfig.vb

@@ -0,0 +1,6 @@
+Namespace Templates
+    Public Class MappingConfig
+        Public Property Items As New List(Of MappingConfigItem)
+    End Class
+
+End Namespace

MultiTool.Shared/Templates/MappingConfigItem.vb

@@ -0,0 +1,12 @@
+Namespace Templates
+    Public Class MappingConfigItem
+        Public Property OrderKey As Integer
+        Public Property SourceName As String
+        Public Property SourceItem As String
+        Public Property SourceRegex As String
+        Public Property DestinationName As String
+        Public Property DestinationItem As String
+        Public Property DestinationValue As String
+    End Class
+
+End Namespace

MultiTool.Shared/Templates/Template.vb

@@ -1,8 +1,5 @@
-Imports System.IO
+Namespace Templates
-Imports MultiTool.Shared.Winline
+    Public Class Template
-
-Namespace Schemas
-    Public Class Schema
         Public Property Name As String
         Public Property FileName As String
         Public Property Description As String
@@ -22,7 +19,7 @@ Namespace Schemas
             ''' Required value from Schema. This value will be written in the ColumnConfig and is not relevant from that point on.
             ''' </summary>
             Public Property IsRequired As Boolean
-            Public Property Config As ColumnConfig
+            Public Property Config As TemplateConfigItem
         End Class
     End Class
 End Namespace

MultiTool.Shared/Templates/TemplateConfig.vb

@@ -1,15 +1,15 @@
 
 Imports MultiTool.Shared.Winline
 
-Namespace Schemas
+Namespace Templates
     ''' <summary>
     ''' Class for loading column/field config from database
     ''' </summary>
-    Public Class Configuration
+    Public Class TemplateConfig
-        Public Columns As List(Of ColumnConfig)
+        Public Property Items As List(Of TemplateConfigItem)
 
-        Public Function GetColumn(pName As String) As ColumnConfig
+        Public Function GetColumn(pName As String) As TemplateConfigItem
-            Return Columns.
+            Return Items.
                 Where(Function(c) c.Name = pName).
                 FirstOrDefault()
         End Function

MultiTool.Shared/Templates/TemplateConfigItem.vb

@@ -1,7 +1,7 @@
 Imports MultiTool.Shared.Constants
 
-Namespace Schemas
+Namespace Templates
-    Public Class ColumnConfig
+    Public Class TemplateConfigItem
         Public Property Name As String
         Public Property Table As String
         Public Property Type As ColumnType

MultiTool.Shared/Templates/TemplateLoader.vb

@@ -0,0 +1,252 @@
+Imports System.IO
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+
+Namespace Templates
+    Public Class TemplateLoader
+        Inherits BaseClass
+
+        Private ReadOnly ns As XNamespace = "http://www.w3.org/2001/XMLSchema"
+
+        Public Property TemplateList As List(Of Template)
+        Public Property TemplateConfiguration As New TemplateConfig
+        Public Property MappingConfiguration As New MappingConfig
+        Public Property MandatorConfiguration As New MandatorConfig
+
+        Private ReadOnly Database As MSSQLServer
+
+        Private Const VWEDI_XML_ITEMS = "VWEDI_XML_ITEMS"
+        Private Const VWEDI_XML_MAPPING = "VWEDI_XML_MAPPING"
+        Private Const TBEDI_XML_MANDATORS = "TBEDI_XML_MANDATORS"
+        Private Const TBEDI_XML_TEMPLATES = "TBEDI_XML_TEMPLATES"
+
+        Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer)
+            MyBase.New(pLogConfig, pLogConfig.GetLogger)
+            Database = pMSSQL
+        End Sub
+
+        Public Async Function LoadTemplates() As Task(Of Boolean)
+            Try
+                Dim oSql = $"SELECT * FROM [DD_ECM].[dbo].[{TBEDI_XML_TEMPLATES}]"
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(oSql)
+                Dim oTemplates As New List(Of Template)
+
+                For Each oRow As DataRow In oTable.Rows
+                    Dim oTemplate As New Template With {
+                        .Name = oRow.ItemEx("NAME", String.Empty),
+                        .Description = oRow.ItemEx("DESCRIPTION", String.Empty),
+                        .FileName = oRow.ItemEx("FILE_NAME", String.Empty),
+                        .IsImport = oRow.ItemEx("IS_IMPORT", True)
+                    }
+
+                    oTemplates.Add(oTemplate)
+                Next
+
+                TemplateList = oTemplates
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+
+            End Try
+        End Function
+
+        Public Async Function LoadMappingConfiguration() As Task(Of Boolean)
+            Try
+                Dim oSql = $"SELECT * FROM [DD_ECM].[dbo].[{VWEDI_XML_MAPPING}]"
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(oSql)
+                Dim oMappingConfig As New MappingConfig
+
+                For Each oRow As DataRow In oTable.Rows
+                    Dim oTemplate As New MappingConfigItem With {
+                        .OrderKey = oRow.ItemEx("ORDER_KEY", String.Empty),
+                        .SourceName = oRow.ItemEx("SOURCE_NAME", String.Empty),
+                        .SourceItem = oRow.ItemEx("SOURCE_ITEM", String.Empty),
+                        .SourceRegex = oRow.ItemEx("SOURCE_REGEX", String.Empty),
+                        .DestinationName = oRow.ItemEx("DESTINATION_NAME", String.Empty),
+                        .DestinationItem = oRow.ItemEx("DESTINATION_ITEM", String.Empty),
+                        .DestinationValue = oRow.ItemEx("DESTINATION_VALUE", String.Empty)
+                    }
+
+                    oMappingConfig.Items.Add(oTemplate)
+                Next
+
+                MappingConfiguration = oMappingConfig
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+
+            End Try
+        End Function
+
+        Public Async Function LoadMandatorConfiguration() As Task(Of Boolean)
+            Try
+                Dim oSql = $"SELECT * FROM [DD_ECM].[dbo].[{TBEDI_XML_MANDATORS}] ORDER BY ORDER_KEY"
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(oSql)
+                Dim oMandatorConfig As New MandatorConfig
+
+                For Each oRow As DataRow In oTable.Rows
+                    Dim oMandator As New MandatorConfigItem With {
+                        .OrderKey = oRow.ItemEx("ORDER_KEY", String.Empty),
+                        .Name = oRow.ItemEx("NAME", String.Empty)
+                    }
+
+                    oMandatorConfig.Items.Add(oMandator)
+                Next
+
+                MandatorConfiguration = oMandatorConfig
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+
+            End Try
+        End Function
+
+        Public Async Function LoadTemplateConfiguration() As Task(Of Boolean)
+            Try
+                Dim oSql = $"SELECT * FROM [DD_ECM].[dbo].[{VWEDI_XML_ITEMS}]"
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(oSql)
+                Dim oItems As New List(Of TemplateConfigItem)
+
+                For Each oRow As DataRow In oTable.Rows
+                    Dim oColumn As New TemplateConfigItem() With {
+                        .Template = oRow.ItemEx("TEMPLATE_NAME", String.Empty),
+                        .Table = oRow.ItemEx("XML_TABLE", String.Empty),
+                        .Name = oRow.ItemEx("XML_ITEM", String.Empty),
+                        .Type = TemplateConfigItem.ConvertType(ItemEx(oRow, "DATA_TYPE", String.Empty)),
+                        .OrderKey = oRow.ItemEx("ORDER_KEY", 0),
+                        .IsReadOnly = oRow.ItemEx("IS_READ_ONLY", False),
+                        .IsVisible = oRow.ItemEx("IS_VISIBLE", True),
+                        .IsRequired = oRow.ItemEx("IS_REQUIRED", False),
+                        .IsHead = oRow.ItemEx("IS_HEAD", True),
+                        .[Function] = New TemplateConfigItem.ColumnFunction With {
+                            .Id = oRow.ItemEx("FUNCTION_ID", 0),
+                            .Name = oRow.ItemEx("FUNCTION_NAME", String.Empty),
+                            .Params = oRow.ItemEx("FUNCTION_PARAMETERS", String.Empty)
+                        }
+                    }
+
+                    oItems.Add(oColumn)
+                Next
+
+                TemplateConfiguration = New TemplateConfig With {
+                    .Items = oItems
+                }
+
+                Return True
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+
+            End Try
+        End Function
+
+        Public Function UpdateTemplateFromFile(pTemplate As Template, pInputDirectory As String) As Template
+            Dim oFullPath = Path.Combine(pInputDirectory, pTemplate.FileName)
+
+            If Not IO.File.Exists(oFullPath) Then
+                Throw New FileNotFoundException(oFullPath)
+            End If
+
+            Dim oElements = GetTemplateElements(oFullPath)
+
+            For Each oElement In oElements
+                Dim oColumns = GetElementColumns(oElement)
+                Dim oTemplateColumns As New List(Of Template.Column)
+
+                For Each oColumn As XElement In oColumns
+                    Dim oName = XmlData.GetElementAttribute(oColumn, "name")
+                    Dim oMinOccurs = XmlData.GetElementAttribute(oColumn, "minOccurs")
+                    Dim oMaxOccurs = XmlData.GetElementAttribute(oColumn, "maxOccurs")
+                    Dim oType = GetElementType(oColumn)
+                    Dim oRequired = False
+
+                    If oMinOccurs = 1 And oMaxOccurs = 1 Then
+                        oRequired = True
+                    End If
+
+                    Dim oTemplateColumn As New Template.Column With {
+                        .Name = oName,
+                        .DataType = oType,
+                        .IsRequired = oRequired
+                    }
+                    oTemplateColumns.Add(oTemplateColumn)
+                Next
+
+                pTemplate.Tables.Add(New Template.Table With {
+                    .Name = XmlData.GetElementAttribute(oElement, "name"),
+                    .Columns = oTemplateColumns
+                })
+
+            Next
+
+            Return pTemplate
+        End Function
+
+        Public Function UpdateTemplateFromDatabase(pTemplate As Template, pTemplateConfig As TemplateConfig) As Template
+            If pTemplateConfig Is Nothing Then
+                Return pTemplate
+            End If
+
+            For Each oTable In pTemplate.Tables
+                For Each oColumn As Template.Column In oTable.Columns
+                    Dim oConfig = pTemplateConfig.GetColumn(oColumn.Name)
+
+                    If oConfig Is Nothing Then
+                        oConfig = New TemplateConfigItem With {
+                            .IsRequired = oColumn.IsRequired,
+                            .Name = oColumn.Name
+                        }
+                    End If
+
+                    oColumn.Config = oConfig
+                Next
+            Next
+
+            Return pTemplate
+        End Function
+
+        Public Function GetElementType(pElement As XElement) As Constants.ColumnType
+            Dim oTypeString = XmlData.GetElementAttribute(pElement, "type")
+
+            If oTypeString Is Nothing Then
+                Dim oRestrictionElement As XElement = pElement.
+                    Descendants(ns + "restriction").
+                    FirstOrDefault()
+
+                oTypeString = XmlData.GetElementAttribute(oRestrictionElement, "base")
+            End If
+
+            Select Case oTypeString
+                Case Constants.TEMPLATE_TYPE_DATE
+                    Return Constants.ColumnType.Date
+                Case Constants.TEMPLATE_TYPE_INTEGER
+                    Return Constants.ColumnType.Integer
+                Case Constants.TEMPLATE_TYPE_DECIMAL
+                    Return Constants.ColumnType.Decimal
+                Case Constants.TEMPLATE_TYPE_BOOLEAN
+                    Return Constants.ColumnType.Boolean
+                Case Else
+                    Return Constants.ColumnType.String
+            End Select
+        End Function
+
+        Public Function GetTemplateElements(pTemplateFilePath As String) As List(Of XElement)
+            Dim oText As String = IO.File.ReadAllText(pTemplateFilePath)
+            Dim oDoc = XDocument.Parse(oText)
+
+            Return XmlData.GetElementsFromElement(oDoc, "choice", ns)
+        End Function
+
+        Public Function GetElementColumns(pElement As XElement) As List(Of XElement)
+            Return XmlData.GetElementsFromElement(pElement, "sequence", ns)
+        End Function
+    End Class
+
+End Namespace

MultiTool.Shared/Winline/Entities/Account.vb

@@ -1,4 +1,4 @@
-Namespace Winline
+Namespace Winline.Entities
     Public Class Account
         Public Property Id As String
         Public Property Name As String

MultiTool.Shared/Winline/Entities/Article.vb

@@ -1,4 +1,4 @@
-Namespace Winline
+Namespace Winline.Entities
     Public Class Article
         Public Property Id
         Public Property Name

MultiTool.Shared/Winline/Entities/Contact.vb

@@ -1,4 +1,4 @@
-Namespace Winline
+Namespace Winline.Entities
     Public Class Contact
         Public Property Id As Integer
         Public Property Number As String

MultiTool.Shared/Winline/Entities/DocumentKind.vb

@@ -1,4 +1,4 @@
-Namespace Winline
+Namespace Winline.Entities
     Public Class DocumentKind
         Public Property Id As Integer
         Public Property Name As String

MultiTool.Shared/Winline/Entities/Mandator.vb

@@ -1,4 +1,4 @@
-Namespace Winline
+Namespace Winline.Entities
     Public Class Mandator
         Public Property Id As String
         Public Property Name As String

MultiTool.Shared/Winline/Entities/Response.vb

@@ -11,20 +11,18 @@
 Option Strict Off
 Option Explicit On
 
-Imports System.Xml.Serialization
-
 '
 'This source code was auto-generated by xsd, Version=4.8.3928.0.
 '
-Namespace Schemas
+Namespace Templates.Entities
-    
+
     '''<remarks/>
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),  _
+    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),
-     System.SerializableAttribute(),  _
+     System.SerializableAttribute(),
-     System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.Diagnostics.DebuggerStepThroughAttribute(),
-     System.ComponentModel.DesignerCategoryAttribute("code"),  _
+     System.ComponentModel.DesignerCategoryAttribute("code"),
-     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=true),  _
+     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=True),
-     System.Xml.Serialization.XmlRootAttribute([Namespace]:="", IsNullable:=false)>  _
+     System.Xml.Serialization.XmlRootAttribute([Namespace]:="", IsNullable:=False)>
     Partial Public Class MESOWebServiceResult
 
         Private overallSuccessField As Boolean
@@ -90,7 +88,7 @@ Namespace Schemas
                 Return Me.errorCodeField
             End Get
             Set
-                Me.errorCodeField = value
+                Me.errorCodeField = Value
             End Set
         End Property
 
@@ -101,7 +99,7 @@ Namespace Schemas
                 Return Me.errorTextField
             End Get
             Set
-                Me.errorTextField = value
+                Me.errorTextField = Value
             End Set
         End Property
 

MultiTool.Shared/Winline/WebServiceData.vb

@@ -2,11 +2,11 @@
 Imports System.Text
 Imports System.Net.Http
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Filesystem
 Imports MultiTool.Shared.Documents
+Imports MultiTool.Shared.Winline.Entities
 
 Namespace Winline
-    Public Class WebService
+    Public Class WebServiceData
         Inherits BaseClass
 
         Private ReadOnly Config As Config
@@ -22,7 +22,7 @@ Namespace Winline
             AppDataPath = pAppDataPath
         End Sub
 
-        Public Async Function TransferDocumentToWinline(pDocument As Document, pMandator As Mandator) As Task(Of Boolean)
+        Public Async Function TransferDocumentToWinline(pDocument As Document, pMandator As Mandator, Optional pIsTest As Boolean = False) As Task(Of Boolean)
             Dim oBytes As Byte() = GetBytesFromDocument(pDocument)
             Dim oWS As Config.WebServiceConfig = Config.Webservice
 
@@ -68,9 +68,12 @@ Namespace Winline
             Dim oTemplateName = pDocument.TemplateName
 
             ' ActionCode: Should this be a test or not?
-            ' 0 = Testcall
+            ' 0 = Test call
             ' 1 = Real call
             Dim oActionCode = 1
+            If pIsTest = True Then
+                oActionCode = 0
+            End If
 
             ' Byref: Should data be supplied as file or as string?
             ' 0 = As String
@@ -102,7 +105,7 @@ Namespace Winline
             pResponse.EnsureSuccessStatusCode()
             Dim oResponseBody As String = Await pResponse.Content.ReadAsStringAsync()
             Dim oContentType = pResponse.Content.Headers.ContentType.MediaType
-            Dim oSerializer = Serializer.GetSerializer(GetType(Schemas.MESOWebServiceResult))
+            Dim oSerializer = Serializer.GetSerializer(GetType(Templates.Entities.MESOWebServiceResult))
 
             RaiseEvent WebServiceProgress(Me, "Antwort verarbeiten")
 
@@ -112,10 +115,10 @@ Namespace Winline
 
                     Dim oBytes As Byte() = Encoding.UTF8.GetBytes(oResponseBody)
                     Using oStream As New IO.MemoryStream(oBytes)
-                        Dim oResponseObject As Schemas.MESOWebServiceResult = oSerializer.Deserialize(oStream)
+                        Dim oResponseObject As Templates.Entities.MESOWebServiceResult = oSerializer.Deserialize(oStream)
                         Dim oErrorStrings As New List(Of String)
 
-                        For Each oDetails As Schemas.MESOWebServiceResultResultDetails In oResponseObject.ResultDetails
+                        For Each oDetails As Templates.Entities.MESOWebServiceResultResultDetails In oResponseObject.ResultDetails
 
                             If oDetails.Success = True Then
                                 Logger.Info("KeyValue: [{0}]", oDetails.KeyValue)
@@ -202,36 +205,6 @@ Namespace Winline
             End Using
         End Function
 
-        'Private Function TransformOrderToOutput(pData As Schemas.Orders.Input.MESOWebService) As Schemas.Orders.Output.MESOWebService
-        '    Dim oData As Schemas.Orders.Input.MESOWebService = pData
-        '    Dim oResult As Schemas.Orders.Output.MESOWebService = Mapper.Map(Of Schemas.Orders.Output.MESOWebService)(oData)
-
-        '    Dim oItems = oData.Items.
-        '    Select(Function(i)
-        '               If TypeOf i Is Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT025 Then
-        '                   Return Mapper.Map(Of Schemas.Orders.Output.MESOWebServiceEXIMVRG_ordersT025)(i)
-        '               Else
-        '                   Return Mapper.Map(Of Schemas.Orders.Output.MESOWebServiceEXIMVRG_ordersT026)(i)
-        '               End If
-        '           End Function).
-        '    ToList()
-
-        '    oResult.Items = oItems.ToArray()
-        '    Return oResult
-        'End Function
-
-        'Private Function SerializeOrder(pData As Schemas.Orders.Output.MESOWebService, pFileName As String) As String
-        '    Dim oSerializer = Serializer.GetSerializer(GetType(Schemas.Orders.Output.MESOWebService))
-        '    Dim oPath As String = GetBaseWebServicePath()
-        '    Dim oFilePath As String = IO.Path.Combine(oPath, pFileName)
-
-        '    Using oWriter = XmlWriter.Create(oFilePath, New XmlWriterSettings With {.Indent = True})
-        '        oSerializer.Serialize(oWriter, pData)
-        '    End Using
-
-        '    Return oFilePath
-        'End Function
-
         Private Function GetBaseWebServicePath() As String
             Return IO.Path.Combine(AppDataPath, "WebService")
         End Function

MultiTool.Shared/Winline/WinlineData.vb

@@ -1,8 +1,9 @@
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Database
-Imports MultiTool.Shared.Helpers
+Imports MultiTool.Shared.Winline.Entities
 Imports System.Text.RegularExpressions
+Imports MultiTool.Shared.Templates
+Imports MultiTool.Shared.Constants
 
 Namespace Winline
     Public Class WinlineData
@@ -10,6 +11,8 @@ Namespace Winline
 
         Private ReadOnly Database As MSSQLServer
         Private ReadOnly Config As Config
+        Private ReadOnly MandatorConfig As MandatorConfig
+        Private ReadOnly MappingConfig As MappingConfig
 
         Public Articles As New List(Of Article)
         Public Accounts As New List(Of Account)
@@ -18,39 +21,12 @@ Namespace Winline
 
         Public Years As List(Of Integer)
 
-        Public Const ALL_MESOCOMP = "mesocomp"
+        Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pConfig As Config, pMappingConfig As MappingConfig, pMandatorConfig As MandatorConfig)
-
-        Public Const V21_ARTICLENUMBER = "c002"
-        Public Const V21_ARTICLEDESCRIPTION = "c003"
-        Public Const V21_MAINARTICLENUMBER = "c011"
-        Public Const V21_REPLACEMENTARTICLENUMBER = "c123"
-        Public Const V21_EAN = "c075"
-
-        Public Const V50_ACCOUNTNUMBER = "c002"
-        Public Const V50_ACCOUNTNAME = "c003"
-        Public Const V50_STREETNAME = "c050"
-        Public Const V50_ZIPCODE = "c051"
-        Public Const V50_CITYNAME = "c052"
-        Public Const V50_GLN = "c260"
-
-        Public Const T45_KEY = "c000"
-        Public Const T45_NAME = "c001"
-        Public Const T45_CONTACTNUMBER = "c063"
-
-        Public Const V05_ACCOUNTID = "c002"
-        Public Const V05_ACCOUNTNAME = "c003"
-
-        Public Const T357_KINDID = "c030"
-        Public Const T357_KINDNAME = "c001"
-
-        Public Const T01_DATABASEINFO = "c004"
-        Public Const T01_MANDATORID = "c000"
-        Public Const T01_MANDATORNAME = "c003"
-
-        Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pConfig As Config)
             MyBase.New(pLogConfig, pLogConfig.GetLogger())
             Database = pDatabase
             Config = pConfig
+            MandatorConfig = pMandatorConfig
+            MappingConfig = pMappingConfig
         End Sub
 
         <DebuggerStepThrough>
@@ -82,9 +58,9 @@ Namespace Winline
                 Dim oArticles As New List(Of Article)
 
                 For Each oRow As DataRow In oTable.Rows
-                    Dim oArticleId As String = GetRowItem(oRow, V21_ARTICLENUMBER, String.Empty)
+                    Dim oArticleId As String = ItemEx(oRow, V21_ARTICLENUMBER, String.Empty)
-                    Dim oArticleDescription As String = GetRowItem(oRow, V21_ARTICLEDESCRIPTION, String.Empty)
+                    Dim oArticleDescription As String = ItemEx(oRow, V21_ARTICLEDESCRIPTION, String.Empty)
-                    Dim oEAN As String = GetRowItem(oRow, V21_EAN, String.Empty)
+                    Dim oEAN As String = ItemEx(oRow, V21_EAN, String.Empty)
 
                     oArticles.Add(New Article With {
                         .Id = oArticleId,
@@ -124,12 +100,12 @@ Namespace Winline
                 Dim oAccounts As New List(Of Account)
 
                 For Each oRow As DataRow In oTable.Rows
-                    Dim oAccountNumber As String = GetRowItem(oRow, V50_ACCOUNTNUMBER, String.Empty)
+                    Dim oAccountNumber As String = ItemEx(oRow, V50_ACCOUNTNUMBER, String.Empty)
-                    Dim oAccountName As String = GetRowItem(oRow, V50_ACCOUNTNAME, String.Empty)
+                    Dim oAccountName As String = ItemEx(oRow, V50_ACCOUNTNAME, String.Empty)
-                    Dim oStreetName As String = GetRowItem(oRow, V50_STREETNAME, String.Empty)
+                    Dim oStreetName As String = ItemEx(oRow, V50_STREETNAME, String.Empty)
-                    Dim oZipCode As String = GetRowItem(oRow, V50_ZIPCODE, String.Empty)
+                    Dim oZipCode As String = ItemEx(oRow, V50_ZIPCODE, String.Empty)
-                    Dim oCityName As String = GetRowItem(oRow, V50_CITYNAME, String.Empty)
+                    Dim oCityName As String = ItemEx(oRow, V50_CITYNAME, String.Empty)
-                    Dim oGLN As String = GetRowItem(oRow, V50_GLN, String.Empty)
+                    Dim oGLN As String = ItemEx(oRow, V50_GLN, String.Empty)
 
                     oAccounts.Add(New Account With {
                         .Id = oAccountNumber,
@@ -159,23 +135,21 @@ Namespace Winline
                 For Each oRow As DataRow In oTable.Rows
                     Dim oDbInfo = SplitConnectionInfo(oRow)
                     Dim oMandator = New Mandator With {
-                        .Id = GetRowItem(oRow, T01_MANDATORID, String.Empty),
+                        .Id = ItemEx(oRow, T01_MANDATORID, String.Empty),
-                        .Name = GetRowItem(oRow, T01_MANDATORNAME, String.Empty),
+                        .Name = ItemEx(oRow, T01_MANDATORNAME, String.Empty),
                         .Database = oDbInfo.Item1,
                         .Server = oDbInfo.Item2
                     }
 
-                    Dim oMandatorConfig As Config.MandatorConfig = Config.Mandators.
+                    Dim oMandatorConfig As MandatorConfigItem = MandatorConfig.Items.
-                        Where(Function(m) oMandator.Id = m.Name).
+                        Where(Function(item) item.Name = oMandator.Id).
                         SingleOrDefault()
 
                     If oMandatorConfig IsNot Nothing Then
                         oMandator.IsWhitelisted = True
-                        oMandator.Regex = oMandatorConfig.ArticleRegex
+                        oMandator.Order = oMandatorConfig.OrderKey
-                        oMandator.Order = oMandatorConfig.Order
                     End If
 
-
                     Mandators.Add(oMandator)
                 Next
 
@@ -213,8 +187,8 @@ Namespace Winline
 
                 For Each oRow As DataRow In oTable.Rows
                     oKinds.Add(New DocumentKind With {
-                        .Id = GetRowItem(oRow, T357_KINDID, String.Empty),
+                        .Id = ItemEx(oRow, T357_KINDID, String.Empty),
-                        .Name = GetRowItem(oRow, T357_KINDNAME, String.Empty),
+                        .Name = ItemEx(oRow, T357_KINDNAME, String.Empty),
                         .Mandator = pMandator
                     })
                 Next
@@ -263,11 +237,11 @@ Namespace Winline
                 End If
 
                 Dim oRow As DataRow = oTable.Rows.Item(0)
-                Dim oAccountNumber As String = GetRowItem(oRow, V50_ACCOUNTNUMBER, String.Empty)
+                Dim oAccountNumber As String = ItemEx(oRow, V50_ACCOUNTNUMBER, String.Empty)
-                Dim oAccountName As String = GetRowItem(oRow, V50_ACCOUNTNAME, String.Empty)
+                Dim oAccountName As String = ItemEx(oRow, V50_ACCOUNTNAME, String.Empty)
-                Dim oStreetName As String = GetRowItem(oRow, V50_STREETNAME, String.Empty)
+                Dim oStreetName As String = ItemEx(oRow, V50_STREETNAME, String.Empty)
-                Dim oZipCode As String = GetRowItem(oRow, V50_ZIPCODE, String.Empty)
+                Dim oZipCode As String = ItemEx(oRow, V50_ZIPCODE, String.Empty)
-                Dim oCityName As String = GetRowItem(oRow, V50_CITYNAME, String.Empty)
+                Dim oCityName As String = ItemEx(oRow, V50_CITYNAME, String.Empty)
 
                 Return New Account With {
                     .Id = oAccountNumber,
@@ -313,7 +287,7 @@ Namespace Winline
                 End If
 
                 Dim oRow As DataRow = oTable.Rows.Item(0)
-                Dim oArticleNumber As String = GetRowItem(oRow, V21_MAINARTICLENUMBER, String.Empty)
+                Dim oArticleNumber As String = ItemEx(oRow, V21_MAINARTICLENUMBER, String.Empty)
                 Return oArticleNumber
 
             Catch ex As Exception
@@ -346,9 +320,9 @@ Namespace Winline
 
                 For Each oRow In oTable.Rows
                     oContacts.Add(New Contact With {
-                        .Id = GetRowItem(Of String)(oRow, T45_KEY, Nothing),
+                        .Id = ItemEx(Of String)(oRow, T45_KEY, Nothing),
-                        .Name = GetRowItem(Of String)(oRow, T45_NAME, Nothing),
+                        .Name = ItemEx(Of String)(oRow, T45_NAME, Nothing),
-                        .Number = GetRowItem(Of String)(oRow, T45_CONTACTNUMBER, Nothing)
+                        .Number = ItemEx(Of String)(oRow, T45_CONTACTNUMBER, Nothing)
                     })
                 Next
 
@@ -388,7 +362,7 @@ Namespace Winline
                 End If
 
                 Dim oRow As DataRow = oTable.Rows.Item(0)
-                Dim oReplacementArticleNumber = GetRowItem(Of String)(oRow, V21_REPLACEMENTARTICLENUMBER, Nothing)
+                Dim oReplacementArticleNumber = ItemEx(Of String)(oRow, V21_REPLACEMENTARTICLENUMBER, Nothing)
 
                 If oReplacementArticleNumber Is Nothing Then
                     Return pArticleNumber
@@ -410,17 +384,20 @@ Namespace Winline
                            If p.Fields.ContainsKey("Artikelnummer") Then
                                Return p.Fields.Item("Artikelnummer").Original
                            Else
-                               ' TODO: Throw or ignore?
+                               Return Nothing
-                               Throw New Exceptions.MissingAttributeException("Artikelnummer")
                            End If
                        End Function).
+                Where(Function(ean) ean IsNot Nothing).
                 Distinct().
                 ToList()
 
             Dim oYear = GetWinLineYear()
             Dim oMandatorId As String = String.Empty
+
+            ' TODO: Instead load whitelisted mandators from database
             Dim oWhitelistedMandators = Mandators.
                 Where(Function(m) m.IsWhitelisted = True).
+                OrderBy(Function(m) m.Order).
                 ToList()
 
             For Each oEANNumber In oEANNumbers
@@ -449,18 +426,22 @@ Namespace Winline
                     End If
 
                     Dim oRow As DataRow = oTable.Rows.Item(0)
-                    Dim oArticleNumber As String = GetRowItem(oRow, V21_MAINARTICLENUMBER, String.Empty)
+                    Dim oArticleNumber As String = ItemEx(oRow, V21_MAINARTICLENUMBER, String.Empty)
 
                     ' EAN was found, now we need to check it against the Regex of the current Mandantor, if one exists
-                    If oMandator.Regex <> String.Empty Then
+                    Dim oMappingConfigItem = MappingConfig.Items.
+                        Where(Function(item) item.DestinationName = "MANDATOR" And item.DestinationValue = oMandator.Id And item.SourceName = "ARTICLE").
+                        SingleOrDefault()
+
+                    If oMappingConfigItem IsNot Nothing Then
+
                         Try
-                            Dim oRegex As New Regex(oMandator.Regex)
+                            Dim oRegex As New Regex(oMappingConfigItem.SourceRegex)
                             Dim oMatch = oRegex.Match(oArticleNumber)
 
                             ' If ArticleNumber matches the regex, we assign it and exit
                             If oMatch.Success Then
-                                oMandatorId = oMandator.Id
+                                Return oMandator
-                                Exit For
                             Else
                                 ' If it does not match, continue to the next mandator
                             End If
@@ -468,21 +449,15 @@ Namespace Winline
                             Logger.Error(ex)
                             Logger.Warn("Regex [{0}] could not be parsed. Skipping.", oMandator.Regex)
                         End Try
+
                     Else
-                        ' If no regex was found, we assume the number matches
+                        Continue For
-                        oMandatorId = oMandator.Id
+
                     End If
                 Next
             Next
 
-            If oMandatorId = String.Empty Then
+            Return Nothing
-                Return Nothing
-            Else
-                Return oWhitelistedMandators.
-                Where(Function(m) m.Id = oMandatorId).
-                Take(1).
-                SingleOrDefault()
-            End If
         End Function
 
         ''' <summary>

MultiTool.Shared/XmlData.vb

@@ -2,7 +2,7 @@
 
 Public Class XmlData
 
-    '<DebuggerStepThrough>
+    <DebuggerStepThrough>
     Public Shared Function GetElementAttribute(pElement As XElement, pName As String) As String
         Try
             Dim oAttribute As XAttribute = pElement.Attribute(pName)