diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 3bdb6226..7fadf8a1 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1974,13 +1974,30 @@ Public Class FormularManagerNEU listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "") End If - Select Case usrCntl.cboSprache._value - Case "EN" + Dim dat As Date = Now + + If IsDate(usrCntl.txtVmDat.Text) Then + dat = CDate(usrCntl.txtVmDat.Text) + End If + + If dat < CDate("01.01.2023") Then + + Select Case usrCntl.cboSprache._value + Case "EN" + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_EN_001", listTowrite) + Case Else + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_001", listTowrite) + End Select + Else + Select Case usrCntl.cboSprache._value + Case "EN" + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_EN", listTowrite) + Case Else + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT", listTowrite) + End Select + + End If - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_EN", listTowrite) - Case Else - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT", listTowrite) - End Select Return "" End Function diff --git a/SDL/Resources/Zoll/EORI_UID.dotx b/SDL/Resources/Zoll/EORI_UID.dotx index dad3d234..365c4236 100644 Binary files a/SDL/Resources/Zoll/EORI_UID.dotx and b/SDL/Resources/Zoll/EORI_UID.dotx differ