Add support for multiple functions per field, add ADDRESS function
This commit is contained in:
@@ -110,6 +110,7 @@ Public Class frmMain
|
||||
TemplateLoader = New TemplateLoader(LogConfig, Database)
|
||||
Await TemplateLoader.LoadTemplates()
|
||||
Await TemplateLoader.LoadTemplateConfiguration()
|
||||
Await TemplateLoader.LoadTemplateFunctions()
|
||||
Await TemplateLoader.LoadGeneralConfiguration()
|
||||
Await TemplateLoader.LoadMappingConfiguration()
|
||||
Await TemplateLoader.LoadMandatorConfiguration()
|
||||
|
||||
@@ -272,11 +272,11 @@ Public Class frmRowEditor
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If oColumn.Config?.Function?.Name = FUNCTION_GLN Then
|
||||
If oColumn.Config?.Functions.Any(Function(f) f.Name = FUNCTION_GLN) Then
|
||||
e.RepositoryItem = AccountPicker
|
||||
End If
|
||||
|
||||
If oColumn.Config?.Function?.Name = FUNCTION_EAN Then
|
||||
If oColumn.Config?.Functions.Any(Function(f) f.Name = FUNCTION_EAN) Then
|
||||
e.RepositoryItem = ArticlePicker
|
||||
End If
|
||||
|
||||
|
||||
Reference in New Issue
Block a user