only mark fields with missing account as error if required, re-add selected field for checkboxes in file list, make automatic price calculation configurable
This commit is contained in:
@@ -91,7 +91,7 @@ Public Class frmImportMain
|
||||
lookupMandator.ForceInitialize()
|
||||
lookupMandator.Properties.View.BestFitColumns()
|
||||
|
||||
DocumentLoader = New Documents.DocumentLoader(LogConfig, Winline, My.MappingConfiguration, My.TemplateConfiguration)
|
||||
DocumentLoader = New Documents.DocumentLoader(LogConfig, Winline, My.MappingConfiguration, My.TemplateConfiguration, ConfigManager.Config)
|
||||
DocumentCleaner = New Documents.DocumentCleaner(LogConfig, CurrentTemplate)
|
||||
|
||||
GridLoader = New GridLoader(LogConfig)
|
||||
@@ -600,19 +600,21 @@ Public Class frmImportMain
|
||||
Next
|
||||
|
||||
txtCurrentFile.Caption = String.Format(My.Resources.frmImportMainExtra.Aktuelle_Datei___0_, pDocument.FileName)
|
||||
txtErrors.Caption = String.Format("Fehler: {0}", pDocument.Errors.Count)
|
||||
|
||||
CurrentDocument = pDocument
|
||||
If pDocument.Errors.Count > 0 Then
|
||||
txtErrors.Caption = String.Format("Fehler: {0}", pDocument.Errors.Count)
|
||||
txtErrors.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||
Else
|
||||
txtErrors.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||
End If
|
||||
|
||||
SetDocumentButtonsEnabled(True)
|
||||
|
||||
If CurrentDocument.HasErrors = True Then
|
||||
If pDocument.HasErrors = True Then
|
||||
btnCalculatePrices.Enabled = False
|
||||
Else
|
||||
btnCalculatePrices.Enabled = True
|
||||
End If
|
||||
|
||||
If CurrentDocument.Mandator Is Nothing Then
|
||||
If pDocument.Mandator Is Nothing Then
|
||||
RibbonPageGroupEdit.Enabled = False
|
||||
RibbonPageGroupTransfer.Enabled = False
|
||||
CurrentDocumentReadOnly = True
|
||||
@@ -624,6 +626,9 @@ Public Class frmImportMain
|
||||
CurrentDocumentReadOnly = False
|
||||
End If
|
||||
|
||||
CurrentDocument = pDocument
|
||||
SetDocumentButtonsEnabled(True)
|
||||
|
||||
Catch ex As Exception
|
||||
SetDocumentButtonsEnabled(False)
|
||||
Logger.Error(ex)
|
||||
|
||||
Reference in New Issue
Block a user