diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index a00b2e98..3964dbed 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 179a0f26..74c01dd2 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -41,7 +41,7 @@ Partial Class frmMDM_USTVAntrag Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblLand = New System.Windows.Forms.Label() Me.Panel8 = New System.Windows.Forms.Panel() - Me.lblMWSTAbrechnung = New System.Windows.Forms.Label() + Me.lblMWSTAntrag = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label11 = New System.Windows.Forms.Label() @@ -341,7 +341,7 @@ Partial Class frmMDM_USTVAntrag ' Me.Panel8.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel8.Controls.Add(Me.lblMWSTAbrechnung) + Me.Panel8.Controls.Add(Me.lblMWSTAntrag) Me.Panel8.Controls.Add(Me.Label13) Me.Panel8.Controls.Add(Me.txtGueltig) Me.Panel8.Controls.Add(Me.Label11) @@ -368,17 +368,17 @@ Partial Class frmMDM_USTVAntrag Me.Panel8.Size = New System.Drawing.Size(973, 87) Me.Panel8.TabIndex = 19 ' - 'lblMWSTAbrechnung + 'lblMWSTAntrag ' - Me.lblMWSTAbrechnung.AutoSize = True - Me.lblMWSTAbrechnung.BackColor = System.Drawing.Color.Transparent - Me.lblMWSTAbrechnung.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblMWSTAbrechnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMWSTAbrechnung.ForeColor = System.Drawing.Color.Black - Me.lblMWSTAbrechnung.Location = New System.Drawing.Point(224, 41) - Me.lblMWSTAbrechnung.Name = "lblMWSTAbrechnung" - Me.lblMWSTAbrechnung.Size = New System.Drawing.Size(0, 17) - Me.lblMWSTAbrechnung.TabIndex = 25 + Me.lblMWSTAntrag.AutoSize = True + Me.lblMWSTAntrag.BackColor = System.Drawing.Color.Transparent + Me.lblMWSTAntrag.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblMWSTAntrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblMWSTAntrag.ForeColor = System.Drawing.Color.Black + Me.lblMWSTAntrag.Location = New System.Drawing.Point(224, 41) + Me.lblMWSTAntrag.Name = "lblMWSTAntrag" + Me.lblMWSTAntrag.Size = New System.Drawing.Size(0, 17) + Me.lblMWSTAntrag.TabIndex = 25 ' 'Label13 ' @@ -1315,7 +1315,7 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents picPDF As PictureBox Friend WithEvents txtGueltig As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label13 As Label - Friend WithEvents lblMWSTAbrechnung As Label + Friend WithEvents lblMWSTAntrag As Label Friend WithEvents lblGesamtUSteuer As Label Friend WithEvents lblDiffernezbetrag As Label Friend WithEvents lblGesamtErstattung As Label diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index dd29928c..52e8683e 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -245,10 +245,11 @@ Public Class frmMDM_USTVAntrag If KUNDE_ERW IsNot Nothing Then If KUNDE_ERW.kde_MWStAbrechnung IsNot Nothing Then - lblMWSTAbrechnung.Text = KUNDE_ERW.kde_MWStAbrechnung + lblMWSTAntrag.Text = KUNDE_ERW.kde_MWStAbrechnung Else - lblMWSTAbrechnung.Text = "" + lblMWSTAntrag.Text = "" End If + If KUNDE_ERW.kde_AnmerkungAntrag IsNot Nothing AndAlso KUNDE_ERW.kde_AnmerkungAntrag <> "" Then lblMWSTAntrag.Text &= " - " & KUNDE_ERW.kde_AnmerkungAntrag End If End If @@ -1687,7 +1688,8 @@ Public Class frmMDM_USTVAntrag Dim list As New List(Of String) If dgvUSTVPositionen.SelectedRows.Count > 0 Then - For Each row As DataGridViewRow In dgvUSTVPositionen.SelectedRows + + For Each row As DataGridViewRow In dgvUSTVPositionen.SelectedRows.Cast(Of DataGridViewRow)().OrderBy(Function(dgvr) dgvr.Index) Dim pdf As String = "" pdf = getPDF(row.Cells("UStVPo_SchnittstellenNr").Value, row.Cells("UStVPo_ReNr").Value, row.Cells("UStVPo_ReDat").Value, row.Cells("UStVPo_daId").Value) @@ -1858,6 +1860,44 @@ Public Class frmMDM_USTVAntrag Next + End Sub + + Private Sub dgvUSTVPositionen_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles dgvUSTVPositionen.PreviewKeyDown + + If dgvUSTVPositionen.SelectedRows.Count <> 1 Then Exit Sub + + If (e.KeyCode) = Keys.Add AndAlso e.Control Then + + Dim id As Integer = dgvUSTVPositionen.SelectedRows(0).Cells("UStVPo_ID").Value + + initPosition(id) + + dgvUSTVPositionen.GetOrder() + + Dim USTV_POS_temp As New cUStVPositionen(UStVAn_ID, id) + + Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen + USTV_POS.UStVAn_ID = USTV_POS_temp.UStVAn_ID + USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_ReDat = USTV_POS_temp.UStVPo_ReDat + USTV_POS.UStVPo_ReNr = USTV_POS_temp.UStVPo_ReNr + USTV_POS.UStVPo_SchnittstellenNr = -1 + USTV_POS.UStVPo_Schnittstelle = False + USTV_POS.UStVPo_Leistungsbezeichnung = USTV_POS_temp.UStVPo_Leistungsbezeichnung + USTV_POS.UStVPo_Leistender = USTV_POS_temp.UStVPo_Leistender + USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + USTV_POS.UStVPo_USteuerbetragEUR = 0 + USTV_POS.UStVPo_USteuerbetrag = 0 + USTV_POS.UStVPo_Umrechnungskurs = 1 + USTV_POS.UStVPo_Zeitstempel = Now() + If USTV_POS.SAVE() Then init() + + dgvUSTVPositionen.SetOrder() + + End If + + + End Sub Private Sub setinfofields() diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index daab3510..a7ca107f 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -98,6 +98,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() Me.pnlverag360 = New System.Windows.Forms.Panel() + Me.txtAnmerkungAntraege = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.gbMWSTAntraege = New System.Windows.Forms.GroupBox() Me.rbJ = New System.Windows.Forms.RadioButton() Me.rbHJ = New System.Windows.Forms.RadioButton() @@ -1174,14 +1175,39 @@ Partial Class usrcntlKundeBearbeitenFull ' 'pnlverag360 ' + Me.pnlverag360.Controls.Add(Me.txtAnmerkungAntraege) Me.pnlverag360.Controls.Add(Me.gbMWSTAntraege) Me.pnlverag360.Controls.Add(Me.txtVorauszahlung) Me.pnlverag360.Controls.Add(Me.cbxVorauszahlung) Me.pnlverag360.Location = New System.Drawing.Point(417, 247) Me.pnlverag360.Name = "pnlverag360" - Me.pnlverag360.Size = New System.Drawing.Size(252, 117) + Me.pnlverag360.Size = New System.Drawing.Size(252, 143) Me.pnlverag360.TabIndex = 49 ' + 'txtAnmerkungAntraege + ' + Me.txtAnmerkungAntraege._DateTimeOnly = False + Me.txtAnmerkungAntraege._numbersOnly = False + Me.txtAnmerkungAntraege._numbersOnlyKommastellen = "" + Me.txtAnmerkungAntraege._numbersOnlyTrennzeichen = False + Me.txtAnmerkungAntraege._Prozent = False + Me.txtAnmerkungAntraege._ShortDateNew = False + Me.txtAnmerkungAntraege._ShortDateOnly = False + Me.txtAnmerkungAntraege._TimeOnly = False + Me.txtAnmerkungAntraege._TimeOnly_Seconds = False + Me.txtAnmerkungAntraege._value = "" + Me.txtAnmerkungAntraege._Waehrung = False + Me.txtAnmerkungAntraege._WaehrungZeichen = False + Me.txtAnmerkungAntraege.ForeColor = System.Drawing.Color.Red + Me.txtAnmerkungAntraege.Location = New System.Drawing.Point(8, 89) + Me.txtAnmerkungAntraege.MaxLength = 10 + Me.txtAnmerkungAntraege.MaxLineLength = -1 + Me.txtAnmerkungAntraege.MaxLines_Warning = "" + Me.txtAnmerkungAntraege.MaxLines_Warning_Label = Nothing + Me.txtAnmerkungAntraege.Name = "txtAnmerkungAntraege" + Me.txtAnmerkungAntraege.Size = New System.Drawing.Size(195, 20) + Me.txtAnmerkungAntraege.TabIndex = 49 + ' 'gbMWSTAntraege ' Me.gbMWSTAntraege.Controls.Add(Me.rbJ) @@ -1245,7 +1271,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVorauszahlung._Waehrung = False Me.txtVorauszahlung._WaehrungZeichen = False Me.txtVorauszahlung.ForeColor = System.Drawing.Color.Red - Me.txtVorauszahlung.Location = New System.Drawing.Point(106, 92) + Me.txtVorauszahlung.Location = New System.Drawing.Point(110, 120) Me.txtVorauszahlung.MaxLength = 10 Me.txtVorauszahlung.MaxLineLength = -1 Me.txtVorauszahlung.MaxLines_Warning = "" @@ -1253,13 +1279,12 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVorauszahlung.Name = "txtVorauszahlung" Me.txtVorauszahlung.Size = New System.Drawing.Size(123, 20) Me.txtVorauszahlung.TabIndex = 48 - Me.txtVorauszahlung.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'cbxVorauszahlung ' Me.cbxVorauszahlung.AutoSize = True Me.cbxVorauszahlung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxVorauszahlung.Location = New System.Drawing.Point(4, 92) + Me.cbxVorauszahlung.Location = New System.Drawing.Point(8, 120) Me.cbxVorauszahlung.Name = "cbxVorauszahlung" Me.cbxVorauszahlung.Size = New System.Drawing.Size(96, 17) Me.cbxVorauszahlung.TabIndex = 47 @@ -5732,4 +5757,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents pnlverag360 As Panel Friend WithEvents txtVorauszahlung As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents cbxVorauszahlung As CheckBox + Friend WithEvents txtAnmerkungAntraege As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index a9f2bff5..83c7b0d1 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -203,6 +203,7 @@ txtHandelsregisterNr.Text = loadValue(KUNDE_ERW.kde_HRNr, "") cbxVorauszahlung.Checked = loadValue(KUNDE_ERW.kde_VZ, False) txtVorauszahlung.Text = loadValue(KUNDE_ERW.kde_AnmerkungVZ, "") + txtAnmerkungAntraege.Text = loadValue(KUNDE_ERW.kde_AnmerkungAntrag, "") txtEORI.Text = If(KUNDE.EORITIN, "") txtEORINL.Text = If(KUNDE.EORITIN_NL, "") @@ -619,6 +620,7 @@ KUNDE_ERW.kde_HRNr = isLeerNothing(txtHandelsregisterNr.Text) KUNDE_ERW.kde_VZ = cbxVorauszahlung.Checked KUNDE_ERW.kde_AnmerkungVZ = txtVorauszahlung.Text + KUNDE_ERW.kde_AnmerkungAntrag = txtAnmerkungAntraege.Text If isLeerNothing(txtGruendungsDatum.Text) IsNot Nothing AndAlso IsDate(txtGruendungsDatum.Text) Then KUNDE_ERW.kde_GruendungsDatum = CDate(txtGruendungsDatum.Text) @@ -2234,4 +2236,9 @@ End If End Sub + + Private Sub cbxVorauszahlung_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVorauszahlung.CheckedChanged + txtVorauszahlung.Enabled = cbxVorauszahlung.Checked + If Not cbxVorauszahlung.Checked Then txtVorauszahlung.Text = "" + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 7165fd79..a566dd39 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -91,6 +91,7 @@ Public Class cKundenErweitert Property kde_MWStAbrechnung As Object = Nothing Property kde_AnmerkungVZ As Object = Nothing Property kde_VZ As Boolean = False + Property kde_AnmerkungAntrag As Object = Nothing Dim SQL As New SQL @@ -184,6 +185,7 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_MWStAbrechnung", kde_MWStAbrechnung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungVZ", kde_AnmerkungVZ)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_VZ", kde_VZ)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungAntrag", kde_AnmerkungAntrag)) Return list End Function