diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_IE.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_IE.Designer.vb index cdcb89f0..49b8d3a7 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_IE.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_IE.Designer.vb @@ -145,6 +145,7 @@ Partial Class usrcntlVollmacht_GB_IE Me.Label7.Size = New System.Drawing.Size(239, 13) Me.Label7.TabIndex = 26 Me.Label7.Text = "aufgeschobene VAT Meldung und Zahlung (UK):" + Me.Label7.Visible = False ' 'btn ' @@ -467,13 +468,14 @@ Partial Class usrcntlVollmacht_GB_IE 'cbxPostponed ' Me.cbxPostponed._allowedValuesFreiText = Nothing - Me.cbxPostponed._allowFreiText = False + Me.cbxPostponed._allowFreiText = True Me.cbxPostponed._value = "" Me.cbxPostponed.FormattingEnabled = True Me.cbxPostponed.Location = New System.Drawing.Point(915, 160) Me.cbxPostponed.Name = "cbxPostponed" Me.cbxPostponed.Size = New System.Drawing.Size(48, 21) Me.cbxPostponed.TabIndex = 31 + Me.cbxPostponed.Visible = False ' 'usrcntlVollmacht_GB_IE ' diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_IE.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_IE.vb index cca82f74..b37586dc 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_IE.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_IE.vb @@ -90,6 +90,9 @@ cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) cbxPostponed.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", "JA")) cbxPostponed.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", "NEIN")) + cbxPostponed.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cbxPostponed.changeItem("") + If KdNR > 0 Then initKdNR(KdNR) End Sub diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_indirekt.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_indirekt.Designer.vb index e3ec427c..98ee03e6 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_indirekt.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_indirekt.Designer.vb @@ -415,13 +415,14 @@ Partial Class usrcntlVollmacht_GB_indirekt 'cbxPostponed ' Me.cbxPostponed._allowedValuesFreiText = Nothing - Me.cbxPostponed._allowFreiText = False + Me.cbxPostponed._allowFreiText = True Me.cbxPostponed._value = "" Me.cbxPostponed.FormattingEnabled = True Me.cbxPostponed.Location = New System.Drawing.Point(915, 158) Me.cbxPostponed.Name = "cbxPostponed" Me.cbxPostponed.Size = New System.Drawing.Size(48, 21) Me.cbxPostponed.TabIndex = 36 + Me.cbxPostponed.Visible = False ' 'Label7 ' @@ -431,6 +432,7 @@ Partial Class usrcntlVollmacht_GB_indirekt Me.Label7.Size = New System.Drawing.Size(239, 13) Me.Label7.TabIndex = 35 Me.Label7.Text = "aufgeschobene VAT Meldung und Zahlung (UK):" + Me.Label7.Visible = False ' 'txtZahlungsaufschung ' diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_indirekt.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_indirekt.vb index 124aeede..5971af6c 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_indirekt.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_GB_indirekt.vb @@ -90,6 +90,8 @@ cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) cbxPostponed.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", "JA")) cbxPostponed.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", "NEIN")) + cbxPostponed.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cbxPostponed.changeItem("") If KdNR > 0 Then initKdNR(KdNR) End Sub diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 924a7304..222913e9 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -3412,7 +3412,7 @@ Public Class FormularManagerNEU If usrCntl.cbxPostponed._value = "JA" Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("x", 70, 118.5 + add, 3, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - Else + ElseIf usrCntl.cbxPostponed._value = "NEIN" Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("x", 86, 118.5 + add, 3, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) End If @@ -3467,7 +3467,7 @@ Public Class FormularManagerNEU If usrCntl.cbxPostponed._value = "JA" Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("x", 70, 118.5 + add, 3, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - Else + ElseIf usrCntl.cbxPostponed._value = "NEIN" Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("x", 86, 118.5 + add, 3, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) End If