Merge branch 'newMaster2024' of https://verag.visualstudio.com/SDL/_git/SDL into newMaster2024

This commit is contained in:
2024-10-11 08:08:00 +02:00
12 changed files with 1134 additions and 408 deletions

View File

@@ -46,6 +46,8 @@ Partial Class usrcntlVerzollungspreise
Me.ZLeistung = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.ZPreis = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.cbxZollpflichtigeAbfertigung = New System.Windows.Forms.CheckBox()
Me.Label1 = New System.Windows.Forms.Label()
Me.MyComboBoxSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvZusatzleistung, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -190,10 +192,12 @@ Partial Class usrcntlVerzollungspreise
Me.txtZahlunsziel._DateTimeOnly = False
Me.txtZahlunsziel._numbersOnly = True
Me.txtZahlunsziel._numbersOnlyKommastellen = ""
Me.txtZahlunsziel._numbersOnlyTrennzeichen = True
Me.txtZahlunsziel._Prozent = False
Me.txtZahlunsziel._ShortDateNew = False
Me.txtZahlunsziel._ShortDateOnly = False
Me.txtZahlunsziel._TimeOnly = False
Me.txtZahlunsziel._TimeOnly_Seconds = False
Me.txtZahlunsziel._value = "10"
Me.txtZahlunsziel._Waehrung = False
Me.txtZahlunsziel._WaehrungZeichen = True
@@ -284,12 +288,35 @@ Partial Class usrcntlVerzollungspreise
Me.cbxZollpflichtigeAbfertigung.Text = "Zollpflichtige Abfertigung"
Me.cbxZollpflichtigeAbfertigung.UseVisualStyleBackColor = True
'
'Label1
'
Me.Label1.AutoSize = True
Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label1.Location = New System.Drawing.Point(8, 92)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(58, 13)
Me.Label1.TabIndex = 38
Me.Label1.Text = "Sprache:"
'
'MyComboBoxSprache
'
Me.MyComboBoxSprache._allowedValuesFreiText = Nothing
Me.MyComboBoxSprache._allowFreiText = False
Me.MyComboBoxSprache._value = ""
Me.MyComboBoxSprache.FormattingEnabled = True
Me.MyComboBoxSprache.Location = New System.Drawing.Point(72, 89)
Me.MyComboBoxSprache.Name = "MyComboBoxSprache"
Me.MyComboBoxSprache.Size = New System.Drawing.Size(144, 21)
Me.MyComboBoxSprache.TabIndex = 39
'
'usrcntlVerzollungspreise
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.WhiteSmoke
Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Controls.Add(Me.MyComboBoxSprache)
Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.cbxZollpflichtigeAbfertigung)
Me.Controls.Add(Me.dgvZusatzleistung)
Me.Controls.Add(Me.cboFirma)
@@ -339,4 +366,6 @@ Partial Class usrcntlVerzollungspreise
Friend WithEvents ZLeistung As System.Windows.Forms.DataGridViewTextBoxColumn
Friend WithEvents ZPreis As System.Windows.Forms.DataGridViewTextBoxColumn
Friend WithEvents cbxZollpflichtigeAbfertigung As CheckBox
Friend WithEvents Label1 As Label
Friend WithEvents MyComboBoxSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
End Class

View File

@@ -1,9 +1,9 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class usrcntlVollmacht_DE
Inherits System.Windows.Forms.UserControl
'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
<System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class usrcntlVollmacht_DE
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.lbl = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
@@ -53,6 +53,7 @@ Partial Class usrcntlVollmacht_DE
Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.cbxEinmaligeVollmachtCarnetATA = New System.Windows.Forms.CheckBox()
Me.txtEinmalig_CarnetATA = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.cbxVollmachtmitBefristung = New System.Windows.Forms.CheckBox()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@@ -140,7 +141,7 @@ Partial Class usrcntlVollmacht_DE
'
'btn
'
Me.btn.BackgroundImage = Global.SDL.My.Resources.search
Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.search
Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn.Location = New System.Drawing.Point(937, 34)
@@ -163,12 +164,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtAnsprechpartner._DateTimeOnly = False
Me.txtAnsprechpartner._numbersOnly = False
Me.txtAnsprechpartner._numbersOnlyKommastellen = ""
Me.txtAnsprechpartner._numbersOnlyTrennzeichen = True
Me.txtAnsprechpartner._Prozent = False
Me.txtAnsprechpartner._ShortDateNew = False
Me.txtAnsprechpartner._ShortDateOnly = False
Me.txtAnsprechpartner._TimeOnly = False
Me.txtAnsprechpartner._TimeOnly_Seconds = False
Me.txtAnsprechpartner._value = Nothing
Me.txtAnsprechpartner._Waehrung = False
Me.txtAnsprechpartner._WaehrungZeichen = True
Me.txtAnsprechpartner.ForeColor = System.Drawing.Color.Black
Me.txtAnsprechpartner.Location = New System.Drawing.Point(653, 9)
Me.txtAnsprechpartner.MaxLineLength = -1
@@ -183,12 +187,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtEinmalig_RgDat._DateTimeOnly = False
Me.txtEinmalig_RgDat._numbersOnly = False
Me.txtEinmalig_RgDat._numbersOnlyKommastellen = ""
Me.txtEinmalig_RgDat._numbersOnlyTrennzeichen = True
Me.txtEinmalig_RgDat._Prozent = False
Me.txtEinmalig_RgDat._ShortDateNew = False
Me.txtEinmalig_RgDat._ShortDateOnly = False
Me.txtEinmalig_RgDat._TimeOnly = False
Me.txtEinmalig_RgDat._TimeOnly_Seconds = False
Me.txtEinmalig_RgDat._value = Nothing
Me.txtEinmalig_RgDat._Waehrung = False
Me.txtEinmalig_RgDat._WaehrungZeichen = True
Me.txtEinmalig_RgDat.Enabled = False
Me.txtEinmalig_RgDat.ForeColor = System.Drawing.Color.Black
Me.txtEinmalig_RgDat.Location = New System.Drawing.Point(653, 162)
@@ -204,12 +211,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtEinmalig_RgNr._DateTimeOnly = False
Me.txtEinmalig_RgNr._numbersOnly = False
Me.txtEinmalig_RgNr._numbersOnlyKommastellen = ""
Me.txtEinmalig_RgNr._numbersOnlyTrennzeichen = True
Me.txtEinmalig_RgNr._Prozent = False
Me.txtEinmalig_RgNr._ShortDateNew = False
Me.txtEinmalig_RgNr._ShortDateOnly = False
Me.txtEinmalig_RgNr._TimeOnly = False
Me.txtEinmalig_RgNr._TimeOnly_Seconds = False
Me.txtEinmalig_RgNr._value = Nothing
Me.txtEinmalig_RgNr._Waehrung = False
Me.txtEinmalig_RgNr._WaehrungZeichen = True
Me.txtEinmalig_RgNr.Enabled = False
Me.txtEinmalig_RgNr.ForeColor = System.Drawing.Color.Black
Me.txtEinmalig_RgNr.Location = New System.Drawing.Point(363, 162)
@@ -225,12 +235,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtEmail._DateTimeOnly = False
Me.txtEmail._numbersOnly = False
Me.txtEmail._numbersOnlyKommastellen = ""
Me.txtEmail._numbersOnlyTrennzeichen = True
Me.txtEmail._Prozent = False
Me.txtEmail._ShortDateNew = False
Me.txtEmail._ShortDateOnly = False
Me.txtEmail._TimeOnly = False
Me.txtEmail._TimeOnly_Seconds = False
Me.txtEmail._value = Nothing
Me.txtEmail._Waehrung = False
Me.txtEmail._WaehrungZeichen = True
Me.txtEmail.ForeColor = System.Drawing.Color.Black
Me.txtEmail.Location = New System.Drawing.Point(254, 136)
Me.txtEmail.MaxLineLength = -1
@@ -245,12 +258,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtFax._DateTimeOnly = False
Me.txtFax._numbersOnly = False
Me.txtFax._numbersOnlyKommastellen = ""
Me.txtFax._numbersOnlyTrennzeichen = True
Me.txtFax._Prozent = False
Me.txtFax._ShortDateNew = False
Me.txtFax._ShortDateOnly = False
Me.txtFax._TimeOnly = False
Me.txtFax._TimeOnly_Seconds = False
Me.txtFax._value = Nothing
Me.txtFax._Waehrung = False
Me.txtFax._WaehrungZeichen = True
Me.txtFax.ForeColor = System.Drawing.Color.Black
Me.txtFax.Location = New System.Drawing.Point(653, 117)
Me.txtFax.MaxLineLength = -1
@@ -265,12 +281,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtTel._DateTimeOnly = False
Me.txtTel._numbersOnly = False
Me.txtTel._numbersOnlyKommastellen = ""
Me.txtTel._numbersOnlyTrennzeichen = True
Me.txtTel._Prozent = False
Me.txtTel._ShortDateNew = False
Me.txtTel._ShortDateOnly = False
Me.txtTel._TimeOnly = False
Me.txtTel._TimeOnly_Seconds = False
Me.txtTel._value = Nothing
Me.txtTel._Waehrung = False
Me.txtTel._WaehrungZeichen = True
Me.txtTel.ForeColor = System.Drawing.Color.Black
Me.txtTel.Location = New System.Drawing.Point(254, 117)
Me.txtTel.MaxLineLength = -1
@@ -285,12 +304,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtEori._DateTimeOnly = False
Me.txtEori._numbersOnly = False
Me.txtEori._numbersOnlyKommastellen = ""
Me.txtEori._numbersOnlyTrennzeichen = True
Me.txtEori._Prozent = False
Me.txtEori._ShortDateNew = False
Me.txtEori._ShortDateOnly = False
Me.txtEori._TimeOnly = False
Me.txtEori._TimeOnly_Seconds = False
Me.txtEori._value = Nothing
Me.txtEori._Waehrung = False
Me.txtEori._WaehrungZeichen = True
Me.txtEori.ForeColor = System.Drawing.Color.Black
Me.txtEori.Location = New System.Drawing.Point(653, 98)
Me.txtEori.MaxLineLength = -1
@@ -305,12 +327,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtUid._DateTimeOnly = False
Me.txtUid._numbersOnly = False
Me.txtUid._numbersOnlyKommastellen = ""
Me.txtUid._numbersOnlyTrennzeichen = True
Me.txtUid._Prozent = False
Me.txtUid._ShortDateNew = False
Me.txtUid._ShortDateOnly = False
Me.txtUid._TimeOnly = False
Me.txtUid._TimeOnly_Seconds = False
Me.txtUid._value = Nothing
Me.txtUid._Waehrung = False
Me.txtUid._WaehrungZeichen = True
Me.txtUid.ForeColor = System.Drawing.Color.Black
Me.txtUid.Location = New System.Drawing.Point(254, 98)
Me.txtUid.MaxLineLength = -1
@@ -325,12 +350,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtAdresse2._DateTimeOnly = False
Me.txtAdresse2._numbersOnly = False
Me.txtAdresse2._numbersOnlyKommastellen = ""
Me.txtAdresse2._numbersOnlyTrennzeichen = True
Me.txtAdresse2._Prozent = False
Me.txtAdresse2._ShortDateNew = False
Me.txtAdresse2._ShortDateOnly = False
Me.txtAdresse2._TimeOnly = False
Me.txtAdresse2._TimeOnly_Seconds = False
Me.txtAdresse2._value = Nothing
Me.txtAdresse2._Waehrung = False
Me.txtAdresse2._WaehrungZeichen = True
Me.txtAdresse2.ForeColor = System.Drawing.Color.Black
Me.txtAdresse2.Location = New System.Drawing.Point(254, 72)
Me.txtAdresse2.MaxLineLength = -1
@@ -345,12 +373,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtAdresse1._DateTimeOnly = False
Me.txtAdresse1._numbersOnly = False
Me.txtAdresse1._numbersOnlyKommastellen = ""
Me.txtAdresse1._numbersOnlyTrennzeichen = True
Me.txtAdresse1._Prozent = False
Me.txtAdresse1._ShortDateNew = False
Me.txtAdresse1._ShortDateOnly = False
Me.txtAdresse1._TimeOnly = False
Me.txtAdresse1._TimeOnly_Seconds = False
Me.txtAdresse1._value = Nothing
Me.txtAdresse1._Waehrung = False
Me.txtAdresse1._WaehrungZeichen = True
Me.txtAdresse1.ForeColor = System.Drawing.Color.Black
Me.txtAdresse1.Location = New System.Drawing.Point(254, 53)
Me.txtAdresse1.MaxLineLength = -1
@@ -365,12 +396,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtFirma._DateTimeOnly = False
Me.txtFirma._numbersOnly = False
Me.txtFirma._numbersOnlyKommastellen = ""
Me.txtFirma._numbersOnlyTrennzeichen = True
Me.txtFirma._Prozent = False
Me.txtFirma._ShortDateNew = False
Me.txtFirma._ShortDateOnly = False
Me.txtFirma._TimeOnly = False
Me.txtFirma._TimeOnly_Seconds = False
Me.txtFirma._value = Nothing
Me.txtFirma._Waehrung = False
Me.txtFirma._WaehrungZeichen = True
Me.txtFirma.ForeColor = System.Drawing.Color.Black
Me.txtFirma.Location = New System.Drawing.Point(254, 34)
Me.txtFirma.MaxLineLength = -1
@@ -382,7 +416,7 @@ Partial Class usrcntlVollmacht_DE
'
'pic
'
Me.pic.BackgroundImage = Global.SDL.My.Resources.pdf
Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
Me.pic.Cursor = System.Windows.Forms.Cursors.Hand
Me.pic.Location = New System.Drawing.Point(5, 5)
@@ -404,7 +438,7 @@ Partial Class usrcntlVollmacht_DE
'btnDown
'
Me.btnDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnDown.BackgroundImage = Global.SDL.My.Resources.pfeil_unten
Me.btnDown.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten
Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnDown.Location = New System.Drawing.Point(976, 42)
@@ -416,7 +450,7 @@ Partial Class usrcntlVollmacht_DE
'btnUp
'
Me.btnUp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnUp.BackgroundImage = Global.SDL.My.Resources.pfeil_oben
Me.btnUp.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben
Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnUp.Location = New System.Drawing.Point(976, 22)
@@ -428,7 +462,7 @@ Partial Class usrcntlVollmacht_DE
'btnDel
'
Me.btnDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnDel.BackgroundImage = Global.SDL.My.Resources.del
Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del
Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnDel.Location = New System.Drawing.Point(976, -1)
@@ -472,12 +506,15 @@ Partial Class usrcntlVollmacht_DE
Me.txtEinmalig_CarnetATA._DateTimeOnly = False
Me.txtEinmalig_CarnetATA._numbersOnly = False
Me.txtEinmalig_CarnetATA._numbersOnlyKommastellen = ""
Me.txtEinmalig_CarnetATA._numbersOnlyTrennzeichen = True
Me.txtEinmalig_CarnetATA._Prozent = False
Me.txtEinmalig_CarnetATA._ShortDateNew = False
Me.txtEinmalig_CarnetATA._ShortDateOnly = False
Me.txtEinmalig_CarnetATA._TimeOnly = False
Me.txtEinmalig_CarnetATA._TimeOnly_Seconds = False
Me.txtEinmalig_CarnetATA._value = Nothing
Me.txtEinmalig_CarnetATA._Waehrung = False
Me.txtEinmalig_CarnetATA._WaehrungZeichen = True
Me.txtEinmalig_CarnetATA.Enabled = False
Me.txtEinmalig_CarnetATA.ForeColor = System.Drawing.Color.Black
Me.txtEinmalig_CarnetATA.Location = New System.Drawing.Point(390, 181)
@@ -488,12 +525,23 @@ Partial Class usrcntlVollmacht_DE
Me.txtEinmalig_CarnetATA.Size = New System.Drawing.Size(174, 20)
Me.txtEinmalig_CarnetATA.TabIndex = 34
'
'cbxVollmachtmitBefristung
'
Me.cbxVollmachtmitBefristung.AutoSize = True
Me.cbxVollmachtmitBefristung.Location = New System.Drawing.Point(590, 183)
Me.cbxVollmachtmitBefristung.Name = "cbxVollmachtmitBefristung"
Me.cbxVollmachtmitBefristung.Size = New System.Drawing.Size(141, 17)
Me.cbxVollmachtmitBefristung.TabIndex = 38
Me.cbxVollmachtmitBefristung.Text = "Vollmacht mit Befristung:"
Me.cbxVollmachtmitBefristung.UseVisualStyleBackColor = True
'
'usrcntlVollmacht_DE
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.WhiteSmoke
Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Controls.Add(Me.cbxVollmachtmitBefristung)
Me.Controls.Add(Me.txtEinmalig_CarnetATA)
Me.Controls.Add(Me.cbxEinmaligeVollmachtCarnetATA)
Me.Controls.Add(Me.Label12)
@@ -563,5 +611,5 @@ Partial Class usrcntlVollmacht_DE
Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents cbxEinmaligeVollmachtCarnetATA As System.Windows.Forms.CheckBox
Friend WithEvents txtEinmalig_CarnetATA As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents cbxVollmachtmitBefristung As CheckBox
End Class

View File

@@ -92,4 +92,5 @@
Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxEinmaligeVollmachtCarnetATA.CheckedChanged
txtEinmalig_CarnetATA.Enabled = sender.checked
End Sub
End Class

View File

@@ -210,22 +210,24 @@ Public Class usrcntlVorauskasse
If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("31.12.2020") Then
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "0,0"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0,0"))
'txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("5%", "0,05"))
'txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16%", "0,16"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
txtEustProzent.changeItem("0,19")
' txtEustProzent.changeItem("0,19")
' txtEustProzent.changeItem("0,16")
Else
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "0,0"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("10%", "0,10"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
txtEustProzent.changeItem("0,19")
' txtEustProzent.changeItem("0,19")
End If
cboFirma.Items.Clear()
@@ -425,22 +427,23 @@ Public Class usrcntlVorauskasse
'Select Case FIRMA_TMP.Firma_LandKz
lblWaehrung.Text = "EUR"
Select Case cboFirma._value
Case "11",
txtEustProzent.changeItem("0,20")
Case "11"
'txtEustProzent.changeItem("0,20")
txtEustProzent.changeItem("0,0")
Case "26"
txtEustProzent.changeItem("0,20")
txtEustProzent.changeItem("0,0")
lblWaehrung.Text = "GBP"
Case "24"
cboSprache.Visible = True
Label17.Visible = True
txtEustProzent.changeItem("0,19")
txtEustProzent.changeItem("0,0")
Case Else
'If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("20.12.2020") Then
' txtEustProzent.changeItem("0,16")
'Else
' txtEustProzent.changeItem("0,19")
'End If
txtEustProzent.changeItem("0,19")
txtEustProzent.changeItem("0,0")
End Select
End If
initBerechnung()
@@ -451,27 +454,39 @@ Public Class usrcntlVorauskasse
End Sub
Private Sub btnSaveFD_Click(sender As Object, e As EventArgs) Handles btnSaveFD.Click
If txtVorlage.Text = "" Then MsgBox("Bitte ein Vorlagenbezeichnung eingeben!") : Exit Sub
Dim FV As cFormularVorlagen
If FV_ID > -1 Then
If MsgBox("Möchten Sie die Vorlage überschreiben?", vbYesNoCancel) <> MsgBoxResult.Yes Then Exit Sub
FV = New cFormularVorlagen(FV_ID)
Else
FV = New cFormularVorlagen
FV.tblform_art = Me.GetType.ToString
FV.tblform_begriff = txtVorlage.Text
End If
FV.tblform_KundenNr = If(KdNR > 0, KdNR, Nothing)
FV.tblform_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
FV.tblform_letzeAenderung = Now
If checkEustProzent() Then
If txtVorlage.Text = "" Then MsgBox("Bitte ein Vorlagenbezeichnung eingeben!") : Exit Sub
Dim FV As cFormularVorlagen
If FV_ID > -1 Then
If MsgBox("Möchten Sie die Vorlage überschreiben?", vbYesNoCancel) <> MsgBoxResult.Yes Then Exit Sub
FV = New cFormularVorlagen(FV_ID)
Else
FV = New cFormularVorlagen
FV.tblform_art = Me.GetType.ToString
FV.tblform_begriff = txtVorlage.Text
End If
FV.tblform_KundenNr = If(KdNR > 0, KdNR, Nothing)
FV.tblform_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
FV.tblform_letzeAenderung = Now
If FV.SAVE() Then
getValues(FV)
If FV.SAVE_VALUES() Then initControlsSave(FV)
If FV.SAVE() Then
getValues(FV)
If FV.SAVE_VALUES() Then initControlsSave(FV)
End If
End If
End Sub
Public Function checkEustProzent() As Boolean
If txtEustProzent.Text = "" Then
txtEustProzent.Focus()
txtEustProzent.BackColor = Color.LightCoral
MsgBox("EUST-Wert erforderlich. Erstellen ist nicht möglich.", vbCritical, "Fehler")
Return False
Else
txtEustProzent.BackColor = SystemColors.Window
Return True
End If
End Function
Sub getValues(ByVal FV As cFormularVorlagen)
FV.VALUES.Clear()
@@ -582,10 +597,13 @@ Public Class usrcntlVorauskasse
End Sub
Private Sub btnStandardPreiseLaden_Click(sender As Object, e As EventArgs) Handles btnStandardPreiseLaden.Click
If FormularManagerNEU.saveVorauskasse(Me) Then
lblCRsaved.Text = "(gespeichert)"
lblCRsaved.ForeColor = Color.Green
If checkEustProzent() Then
If FormularManagerNEU.saveVorauskasse(Me) Then
lblCRsaved.Text = "(gespeichert)"
lblCRsaved.ForeColor = Color.Green
End If
End If
End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click

View File

@@ -616,6 +616,10 @@ Public Class frmFormulare
End If
End Sub
MyFlowLayoutPanel1.Controls.Add(c)
Dim sprachen() As String = {"DE", "EN"}
c.MyComboBoxSprache.Items.Clear()
c.MyComboBoxSprache.Items.AddRange(sprachen)
End If
Case FormularManagerArten.Boniteatsauskunft
Dim c As New usrcntlCreditreformBoniAuskunft
@@ -1573,6 +1577,8 @@ Public Class FormularManagerNEU
listTowrite = addEinmaligeVM(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text)
ElseIf usrCntl.cbxEinmaligeVollmachtCarnetATA.Checked Then
listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "")
ElseIf usrCntl.cbxVollmachtmitBefristung.Checked Then
listTowrite = addBebfristung(listTowrite, 0, 235, usrCntl.cboSprache._value, "", "")
End If
@@ -4369,17 +4375,21 @@ Public Class FormularManagerNEU
If usrCntl.checkEustProzent Then
saveVorauskasse(usrCntl)
Else
Exit Function
End If
If usrCntl.cbxLKWWartet.Checked Then
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("!!! LKW wartet !!!", 141, 12, 60, 15, "boldRed", 20, , itextsharp.text.Element.ALIGN_LEFT))
End If
If usrCntl.cbxBeimErstellenSpeichern.Checked Then
' If vbYes = MsgBox("Möchten Sie die Bonitätsauskunft in den Kundendaten speichern?", vbYesNoCancel) Then
saveVorauskasse(usrCntl)
'End If
End If
Dim destPath = ""
Dim destPath = ""
If usrCntl.cboFirma._value = "26" Then 'VERAG-UNISPED LTD
destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG-UNISPED", "", "Importaviso_VK", listTowrite)
Else
@@ -6448,6 +6458,18 @@ Public Class FormularManagerNEU
Return listTowrite
End Function
Shared Function addBebfristung(listTowrite As List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues), left As Integer, top As Integer, language As String, DateAtr As String, XXXX As String, Optional small As Boolean = False) As List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
Select Case language
Case "EN"
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("Power of attorney valid until: ____________", left + 15, top, 180, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
Case Else
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("Vollmacht gültig bis: ____________", left + 15, top, 180, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
End Select
Return listTowrite
End Function
Public Shared Function MergePdfFiles(ByVal fileNames As List(Of String), ByVal targetPdf As String) As Boolean
Dim merged As Boolean = True