diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index b33066b3..a7041885 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -38,7 +38,7 @@ Public Class frmFaktEmail InitializeComponent() Me.RECHNUNG = RECHNUNG - Me.Firma_ID = RECHNUNG.Firma_ID + Me.Firma_ID = Firma_ID Me.SPEDBUCH = SPEDBUCH Me.printOriginalRg = printOriginalRg Me.KdNr = RECHNUNG.RechnungsKundenNr diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb index f25a1b53..59e012c1 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb @@ -22,11 +22,15 @@ Partial Class usrCntlQualitaetskontrolle 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Label46 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.Label40 = New System.Windows.Forms.Label() @@ -58,11 +62,6 @@ Partial Class usrCntlQualitaetskontrolle Me.txtFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label30 = New System.Windows.Forms.Label() Me.dgvPositionen = New System.Windows.Forms.DataGridView() - Me.pos = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.anZ_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.art_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.erzeugnis = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.txtPackAdresse2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtPackAdresse1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtPackFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -94,11 +93,25 @@ Partial Class usrCntlQualitaetskontrolle Me.cboZollstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label15 = New System.Windows.Forms.Label() Me.Label17 = New System.Windows.Forms.Label() - Me.DataGridView1 = New System.Windows.Forms.DataGridView() + Me.dgvGebuehren = New System.Windows.Forms.DataGridView() + Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.gew = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Preis = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Faktor = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Betrag = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Button5 = New System.Windows.Forms.Button() + Me.cbxVerzicht = New System.Windows.Forms.CheckBox() + Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label18 = New System.Windows.Forms.Label() + Me.pos = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.anZ_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.art_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.erzeugnis = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.KNCode = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvPositionen, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvGebuehren, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Label46 @@ -542,51 +555,12 @@ Partial Class usrCntlQualitaetskontrolle Me.dgvPositionen.BackgroundColor = System.Drawing.Color.White Me.dgvPositionen.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable Me.dgvPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.pos, Me.anZ_pkgstk, Me.art_pkgstk, Me.erzeugnis, Me.gewicht}) + Me.dgvPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.pos, Me.anZ_pkgstk, Me.art_pkgstk, Me.erzeugnis, Me.gewicht, Me.KNCode}) Me.dgvPositionen.Location = New System.Drawing.Point(180, 291) Me.dgvPositionen.Name = "dgvPositionen" Me.dgvPositionen.Size = New System.Drawing.Size(791, 345) Me.dgvPositionen.TabIndex = 156 ' - 'pos - ' - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle1.Format = "N0" - DataGridViewCellStyle1.NullValue = Nothing - Me.pos.DefaultCellStyle = DataGridViewCellStyle1 - Me.pos.Frozen = True - Me.pos.HeaderText = "Position" - Me.pos.MaxInputLength = 3 - Me.pos.Name = "pos" - Me.pos.ReadOnly = True - Me.pos.Width = 50 - ' - 'anZ_pkgstk - ' - Me.anZ_pkgstk.HeaderText = "Anz-Packs." - Me.anZ_pkgstk.Name = "anZ_pkgstk" - ' - 'art_pkgstk - ' - Me.art_pkgstk.HeaderText = "Art-Packs" - Me.art_pkgstk.Name = "art_pkgstk" - ' - 'erzeugnis - ' - Me.erzeugnis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.erzeugnis.HeaderText = "Art des Erzeugnisses" - Me.erzeugnis.Name = "erzeugnis" - ' - 'gewicht - ' - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle2.Format = "N2" - DataGridViewCellStyle2.NullValue = Nothing - Me.gewicht.DefaultCellStyle = DataGridViewCellStyle2 - Me.gewicht.HeaderText = "Gewicht" - Me.gewicht.MaxInputLength = 100 - Me.gewicht.Name = "gewicht" - ' 'txtPackAdresse2 ' Me.txtPackAdresse2._DateTimeOnly = False @@ -965,22 +939,67 @@ Partial Class usrCntlQualitaetskontrolle Me.Label17.TabIndex = 188 Me.Label17.Text = "Qualitätskontrolle Gebühren" ' - 'DataGridView1 + 'dgvGebuehren ' - Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - Me.DataGridView1.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.DataGridView1.Location = New System.Drawing.Point(179, 690) - Me.DataGridView1.Name = "DataGridView1" - Me.DataGridView1.Size = New System.Drawing.Size(506, 119) - Me.DataGridView1.TabIndex = 189 + Me.dgvGebuehren.BackgroundColor = System.Drawing.Color.White + Me.dgvGebuehren.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable + Me.dgvGebuehren.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvGebuehren.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Art, Me.gew, Me.Preis, Me.Faktor, Me.Betrag}) + Me.dgvGebuehren.Location = New System.Drawing.Point(179, 690) + Me.dgvGebuehren.Name = "dgvGebuehren" + Me.dgvGebuehren.ReadOnly = True + Me.dgvGebuehren.Size = New System.Drawing.Size(545, 158) + Me.dgvGebuehren.TabIndex = 189 + ' + 'Art + ' + Me.Art.HeaderText = "Art" + Me.Art.Name = "Art" + Me.Art.ReadOnly = True + ' + 'gew + ' + DataGridViewCellStyle6.Format = "N2" + DataGridViewCellStyle6.NullValue = Nothing + Me.gew.DefaultCellStyle = DataGridViewCellStyle6 + Me.gew.HeaderText = "Gewicht" + Me.gew.Name = "gew" + Me.gew.ReadOnly = True + ' + 'Preis + ' + DataGridViewCellStyle7.Format = "C2" + DataGridViewCellStyle7.NullValue = Nothing + Me.Preis.DefaultCellStyle = DataGridViewCellStyle7 + Me.Preis.HeaderText = "Preis" + Me.Preis.Name = "Preis" + Me.Preis.ReadOnly = True + ' + 'Faktor + ' + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter + DataGridViewCellStyle8.Format = "N0" + DataGridViewCellStyle8.NullValue = Nothing + Me.Faktor.DefaultCellStyle = DataGridViewCellStyle8 + Me.Faktor.HeaderText = "Faktor" + Me.Faktor.Name = "Faktor" + Me.Faktor.ReadOnly = True + ' + 'Betrag + ' + DataGridViewCellStyle9.Format = "C2" + DataGridViewCellStyle9.NullValue = Nothing + Me.Betrag.DefaultCellStyle = DataGridViewCellStyle9 + Me.Betrag.HeaderText = "Betrag" + Me.Betrag.Name = "Betrag" + Me.Betrag.ReadOnly = True ' 'Button5 ' Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button5.Image = Global.SDL.My.Resources.Resources.belegEUR1 Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(695, 690) + Me.Button5.Location = New System.Drawing.Point(744, 690) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(111, 51) Me.Button5.TabIndex = 190 @@ -988,14 +1007,105 @@ Partial Class usrCntlQualitaetskontrolle Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button5.UseVisualStyleBackColor = True ' + 'cbxVerzicht + ' + Me.cbxVerzicht.AutoSize = True + Me.cbxVerzicht.Location = New System.Drawing.Point(24, 699) + Me.cbxVerzicht.Name = "cbxVerzicht" + Me.cbxVerzicht.Size = New System.Drawing.Size(149, 17) + Me.cbxVerzicht.TabIndex = 191 + Me.cbxVerzicht.Text = "Verzicht Qualitätsbeschau" + Me.cbxVerzicht.UseVisualStyleBackColor = True + ' + 'txtSumme + ' + Me.txtSumme._DateTimeOnly = False + Me.txtSumme._numbersOnly = True + Me.txtSumme._numbersOnlyKommastellen = "" + Me.txtSumme._numbersOnlyTrennzeichen = True + Me.txtSumme._Prozent = False + Me.txtSumme._ShortDateNew = False + Me.txtSumme._ShortDateOnly = False + Me.txtSumme._TimeOnly = False + Me.txtSumme._TimeOnly_Seconds = False + Me.txtSumme._value = "" + Me.txtSumme._Waehrung = True + Me.txtSumme._WaehrungZeichen = True + Me.txtSumme.ForeColor = System.Drawing.Color.Black + Me.txtSumme.Location = New System.Drawing.Point(646, 854) + Me.txtSumme.MaxLineLength = -1 + Me.txtSumme.MaxLines_Warning = "" + Me.txtSumme.MaxLines_Warning_Label = Nothing + Me.txtSumme.Name = "txtSumme" + Me.txtSumme.Size = New System.Drawing.Size(78, 20) + Me.txtSumme.TabIndex = 193 + Me.txtSumme.Text = "0" + Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Location = New System.Drawing.Point(599, 861) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(41, 13) + Me.Label18.TabIndex = 192 + Me.Label18.Text = "Betrag:" + ' + 'pos + ' + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle1.Format = "N0" + DataGridViewCellStyle1.NullValue = Nothing + Me.pos.DefaultCellStyle = DataGridViewCellStyle1 + Me.pos.Frozen = True + Me.pos.HeaderText = "Position" + Me.pos.MaxInputLength = 3 + Me.pos.Name = "pos" + Me.pos.ReadOnly = True + Me.pos.Width = 50 + ' + 'anZ_pkgstk + ' + Me.anZ_pkgstk.HeaderText = "Anz-Packs." + Me.anZ_pkgstk.Name = "anZ_pkgstk" + ' + 'art_pkgstk + ' + Me.art_pkgstk.HeaderText = "Art-Packs" + Me.art_pkgstk.Name = "art_pkgstk" + ' + 'erzeugnis + ' + Me.erzeugnis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.erzeugnis.HeaderText = "Art des Erzeugnisses" + Me.erzeugnis.Name = "erzeugnis" + ' + 'gewicht + ' + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle2.Format = "N2" + DataGridViewCellStyle2.NullValue = Nothing + Me.gewicht.DefaultCellStyle = DataGridViewCellStyle2 + Me.gewicht.HeaderText = "Gewicht" + Me.gewicht.MaxInputLength = 100 + Me.gewicht.Name = "gewicht" + ' + 'KNCode + ' + Me.KNCode.HeaderText = "KNCode" + Me.KNCode.Name = "KNCode" + ' 'usrCntlQualitaetskontrolle ' 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.txtSumme) + Me.Controls.Add(Me.Label18) + Me.Controls.Add(Me.cbxVerzicht) Me.Controls.Add(Me.Button5) - Me.Controls.Add(Me.DataGridView1) + Me.Controls.Add(Me.dgvGebuehren) Me.Controls.Add(Me.Label17) Me.Controls.Add(Me.cboZollstelle) Me.Controls.Add(Me.Label15) @@ -1057,7 +1167,7 @@ Partial Class usrCntlQualitaetskontrolle Me.Size = New System.Drawing.Size(1018, 896) CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvPositionen, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvGebuehren, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1111,11 +1221,6 @@ Partial Class usrCntlQualitaetskontrolle Friend WithEvents cbxEinf As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxTyp As ComboBox Friend WithEvents Label12 As Label - Friend WithEvents pos As DataGridViewTextBoxColumn - Friend WithEvents anZ_pkgstk As DataGridViewTextBoxColumn - Friend WithEvents art_pkgstk As DataGridViewTextBoxColumn - Friend WithEvents erzeugnis As DataGridViewTextBoxColumn - Friend WithEvents gewicht As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn3 As DataGridViewTextBoxColumn @@ -1129,6 +1234,20 @@ Partial Class usrCntlQualitaetskontrolle Friend WithEvents cboZollstelle As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label15 As Label Friend WithEvents Label17 As Label - Friend WithEvents DataGridView1 As DataGridView + Friend WithEvents dgvGebuehren As DataGridView Friend WithEvents Button5 As Button + Friend WithEvents cbxVerzicht As CheckBox + Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label18 As Label + Friend WithEvents Art As DataGridViewTextBoxColumn + Friend WithEvents gew As DataGridViewTextBoxColumn + Friend WithEvents Preis As DataGridViewTextBoxColumn + Friend WithEvents Faktor As DataGridViewTextBoxColumn + Friend WithEvents Betrag As DataGridViewTextBoxColumn + Friend WithEvents pos As DataGridViewTextBoxColumn + Friend WithEvents anZ_pkgstk As DataGridViewTextBoxColumn + Friend WithEvents art_pkgstk As DataGridViewTextBoxColumn + Friend WithEvents erzeugnis As DataGridViewTextBoxColumn + Friend WithEvents gewicht As DataGridViewTextBoxColumn + Friend WithEvents KNCode As DataGridViewTextBoxColumn End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.resx b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.resx index 82b0df3d..19f0523e 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.resx +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.resx @@ -132,4 +132,22 @@ True + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb index f92c018e..db092efc 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb @@ -18,6 +18,9 @@ Public Class usrCntlQualitaetskontrolle Public EZA_Nr As String Public CRN As String Dim packstueckeZOLL_TMP As String = "" + Dim Normen, normenSpeziell, normenAllg As New DataTable + Dim NormenpreisAllg As Double + Dim NormenpreisSpez As Double Dim EZOLL_SQL = "EZOLL" Sub New() @@ -161,6 +164,20 @@ Public Class usrCntlQualitaetskontrolle cbxUrsprungslang.fillWithSQL("SELECT [Länderverzeichnis für die Außenhandelsstatistik].LandKz, [Länderverzeichnis für die Außenhandelsstatistik].LandBez FROM [Länderverzeichnis für die Außenhandelsstatistik] ORDER BY [Länderverzeichnis für die Außenhandelsstatistik].LandKz; ", True, "VERAG", True) cbxBestimmungsland.Items.AddRange(cbxUrsprungslang.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + + Normen = sql.loadDgvBySql("select * from tblVermarktungsnormen", "FMZOLL") + + Dim dvAllgNormen = New DataView(Normen) + Dim dvSpezNormen = New DataView(Normen) + dvSpezNormen.RowFilter = "speziell = true" + dvAllgNormen.RowFilter = "speziell = false" + + normenSpeziell = dvSpezNormen.ToTable + normenAllg = dvAllgNormen.ToTable + + NormenpreisAllg = CDbl(sql.getValueTxtBySql("select top(1) betrag FROM tblVermarktungsnormenGebuehren where gueltigAb <= GETDATE() and [speziell] = 0 order by gueltigAb desc", "FMZOLL")) + NormenpreisSpez = CDbl(sql.getValueTxtBySql("select top(1) betrag FROM tblVermarktungsnormenGebuehren where gueltigAb <= GETDATE() and [speziell] = 1 order by gueltigAb desc", "FMZOLL")) If SENDUNG IsNot Nothing Then If SENDUNG.tblSnd_DakosyRef <> "" Then @@ -174,6 +191,7 @@ Public Class usrCntlQualitaetskontrolle initKdNR(KdNR) initSND() + End Sub Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click @@ -198,13 +216,17 @@ Public Class usrCntlQualitaetskontrolle Private Sub loadDGV(dt As DataTable) Dim couter As Integer = 1 + Dim checkKNCode As Boolean = False For Each row As DataRow In dt.Rows - dgvPositionen.Rows.Add(row("ItNr"), row("Nr"), row("Kind"), row("GdsDes"), row("Net")) + dgvPositionen.Rows.Add(row("ItNr"), row("Nr"), row("Kind"), row("GdsDes"), row("Net"), row("ComCd")) + If row("ComCd") <> "" Then checkKNCode = True couter = +1 Next + If checkKNCode Then initdgvGebuehren() + End Sub Private Sub dgvPositionen_DefaultValuesNeeded(sender As Object, e As DataGridViewRowEventArgs) Handles dgvPositionen.DefaultValuesNeeded @@ -304,7 +326,7 @@ Public Class usrCntlQualitaetskontrolle berechneDGVSum() ' Tabelle zsAnmGdsitem lesen. - Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT item.ItNr ,item.GdsDes , item.Net, pack.Kind, pack.Nr, item.Orig" & + Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT item.ItNr ,item.GdsDes , item.Net, pack.Kind, pack.Nr, item.Orig, item.ComCd" & " FROM zsAnmGdsitem as item" & " INNER JOIN zsAnmGdsItemPack as pack ON item.LizenzNr = pack.LizenzNr And item.OperatorID = pack.OperatorID and item.VorgangID = pack.VorgangID and pack.AnmID = item.AnmID" & " WHERE (item.LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (item.OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (item.VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (item.AnmID = " & DR_zsAnmRefs.Item("AnmID") & " and item.GdsItemID = pack.GdsItemID)" & @@ -314,6 +336,7 @@ Public Class usrCntlQualitaetskontrolle If DTzsAnmGdsitem IsNot Nothing AndAlso DTzsAnmGdsitem.Rows().Count > 0 Then loadDGV(DTzsAnmGdsitem) + End If Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler EZOLL Personal: " & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -350,6 +373,7 @@ Public Class usrCntlQualitaetskontrolle Private Sub dgvPositionen_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvPositionen.CellValueChanged Dim gewicht As Double = 0 Dim colli As Double = 0 + Dim checkKNCode As Boolean = False For Each r As DataGridViewRow In dgvPositionen.Rows @@ -363,10 +387,17 @@ Public Class usrCntlQualitaetskontrolle End If + If r IsNot Nothing And r.Cells(5).Value <> "" Then + checkKNCode = True + End If + Next txtGewicht.Text = gewicht & " kg" txtAnzVerp.Text = colli + + If checkKNCode Then initdgvGebuehren() + End Sub Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click @@ -379,9 +410,130 @@ Public Class usrCntlQualitaetskontrolle Private Sub dgvPositionen_RowsAdded(sender As Object, e As DataGridViewRowsAddedEventArgs) Handles dgvPositionen.RowsAdded berechneDGVSum() + initdgvGebuehren() End Sub Private Sub dgvPositionen_RowsRemoved(sender As Object, e As DataGridViewRowsRemovedEventArgs) Handles dgvPositionen.RowsRemoved berechneDGVSum() + initdgvGebuehren() + End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + + If dgvGebuehren.Rows.Count = 0 Then Exit Sub + + Dim PERSONAL As SDL.cPersonal = Nothing + Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then + PERSONAL = frmSecureLoginKassenbuch.PERSONAL + Dim f As New frmBelegNeu(PERSONAL, Nothing, "E") + + AddHandler f.LOADED, Sub() + f.AddPositions(dgvGebuehren, False) + End Sub + f.ShowDialog(Me) + + End If + + End Sub + + Private Sub initdgvGebuehren() + + If dgvGebuehren.Rows.Count > 0 Then dgvGebuehren.Rows.Clear() + Dim posVorhanden As Boolean = False + + If dgvPositionen.Rows.Count < 1 Then Exit Sub + + If normenSpeziell.Rows.Count < 1 Or normenSpeziell.Rows.Count < 1 Then Exit Sub + + + Dim sumNormenAllg As Double = 0 + Dim sumNormenSpez As Double = 0 + + Dim antrag, verzicht, idk As Double + antrag = 40.7 + verzicht = 9.3 + idk = 39.4 + + + For Each r As DataGridViewRow In dgvPositionen.Rows + + Dim found As Boolean = False + + If r IsNot Nothing And IsNumeric(r.Cells(4).Value) AndAlso r.Cells(4).Value >= 1000 Then + posVorhanden = True + + If r.Cells(5).Value <> "" Then + For Each row As DataRow In normenSpeziell.Rows + Dim code = row("kncode").trim() + Dim searchedCode = r.Cells(5).Value + searchedCode = searchedCode.ToString.Substring(0, code.Length) + If row("kncode") = searchedCode Then + sumNormenSpez += r.Cells(4).Value + found = True + Exit For + End If + + Next + If Not found Then + + For Each row As DataRow In normenAllg.Rows + Dim code = row("kncode").trim() + Dim searchedCode = r.Cells(5).Value + If searchedCode = searchedCode.ToString.Substring(0, code.Length) Then + sumNormenAllg += r.Cells(4).Value + found = True + Exit For + End If + + Next + + End If + End If + + End If + + Next + + If Not posVorhanden Then Exit Sub + + If sumNormenAllg > 0 Then + Dim anzAllg As Integer + anzAllg = Math.Ceiling(sumNormenAllg / 1000) + dgvGebuehren.Rows.Add("Allgemein", sumNormenAllg, NormenpreisAllg, anzAllg, anzAllg * NormenpreisAllg) + End If + If sumNormenSpez > 0 Then + Dim anzSpez As Integer + anzSpez = Math.Ceiling(sumNormenSpez / 1000) + dgvGebuehren.Rows.Add("Speziell", sumNormenSpez, NormenpreisSpez, anzSpez, anzSpez * NormenpreisSpez) + End If + + + + + If cbxVerzicht.Checked Then + dgvGebuehren.Rows.Clear() + dgvGebuehren.Rows.Add("Antrag", "", antrag, "", antrag) + dgvGebuehren.Rows.Add("Verzicht", "", verzicht, "", verzicht) + Else + dgvGebuehren.Rows.Add("Antrag", "", antrag, "", antrag) + dgvGebuehren.Rows.Add("Identitätskontrolle", "", idk, "", idk) + End If + + + + Dim sumBetrag As Double = 0 + For Each r As DataGridViewRow In dgvGebuehren.Rows + If IsNumeric(r.Cells(4).Value) Then sumBetrag += r.Cells(4).Value + Next + + txtSumme.Text = CDbl(sumBetrag) + + End Sub + + Private Sub cbxVerzicht_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVerzicht.CheckedChanged + + initdgvGebuehren() + End Sub End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb index 4b8e5dd5..4c87beaa 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb @@ -199,7 +199,6 @@ End If End If - End Sub Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click @@ -436,5 +435,27 @@ Case Else : txtFirma._UseFIRMA = "VERAG" : KdInAuftrag._UseFIRMA = "VERAG" End Select + setAnlagenText() + + End Sub + + Private Sub setAnlagenText() + + Select Case cboFirma._value + Case "AMBAR" + txtAnlage1.Text = "Original Präferenz" + txtAnlage2.Text = "Lieferanten-Rechnung" + txtAnlage3.Text = "Zollbeleg" + + Case Else + + txtAnlage1.Text = "Zollbeleg" + txtAnlage2.Text = "Lieferanten-Rechnung" + txtAnlage3.Text = "Original Präferenz" + + End Select + + + End Sub End Class diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 6fdad7e4..ad0a4ab6 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -261,7 +261,7 @@ Public Class frmFormulare cboVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Neukunde DE", FormularVorlagenGruppe.NeukundeDE)) Case Else - If VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID = "16" Then 'SDL + If VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID = "7" Then 'SDL MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", FormularManagerArten.MDM_Vollmacht_PDF)) MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht EU", FormularManagerArten.MDM_Vollmacht_Word)) 'MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EU Vollmacht", FormularManagerArten.MDM_Vollmacht)) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index a3759511..d48ef696 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -290,6 +290,8 @@ Public Class frmBU_Mahnlauf rpt.lblSachbearbeiter.Text = cFakturierung.getSBRgName(FIRMA.Firma_ID, VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) 'If(RECHNUNG.Sachbearbeiter, "") + rpt.lblEmail.Text = IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "buchhaltung@verag.ag") + Dim waehrungCode As String = KD.Währungscode diff --git a/SDL/buchhaltung/rptMahnung.Designer.vb b/SDL/buchhaltung/rptMahnung.Designer.vb index 82dfe60b..52b9cd28 100644 --- a/SDL/buchhaltung/rptMahnung.Designer.vb +++ b/SDL/buchhaltung/rptMahnung.Designer.vb @@ -761,8 +761,9 @@ Partial Public Class rptMahnung Me.lblEmail.HyperLink = Nothing Me.lblEmail.Left = 5.197479! Me.lblEmail.Name = "lblEmail" + Me.lblEmail.ShrinkToFit = True Me.lblEmail.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: right; vertical-al" & - "ign: middle; ddo-char-set: 1" + "ign: middle; ddo-char-set: 1; ddo-shrink-to-fit: true" Me.lblEmail.Text = "buchhaltung@verag.ag" Me.lblEmail.Top = 2.35! Me.lblEmail.Width = 1.895268! diff --git a/SDL/buchhaltung/usrCntlBH.Designer.vb b/SDL/buchhaltung/usrCntlBH.Designer.vb index 583296bd..13d11c59 100644 --- a/SDL/buchhaltung/usrCntlBH.Designer.vb +++ b/SDL/buchhaltung/usrCntlBH.Designer.vb @@ -31,12 +31,14 @@ Partial Class usrCntlBH Me.Button11 = New System.Windows.Forms.Button() Me.Label40 = New System.Windows.Forms.Label() Me.Button10 = New System.Windows.Forms.Button() + Me.txtStichtag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label39 = New System.Windows.Forms.Label() Me.Label38 = New System.Windows.Forms.Label() Me.Button9 = New System.Windows.Forms.Button() Me.Label34 = New System.Windows.Forms.Label() Me.GroupBox8 = New System.Windows.Forms.GroupBox() Me.Label36 = New System.Windows.Forms.Label() + Me.cboAbfVerbFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button8 = New System.Windows.Forms.Button() Me.Label35 = New System.Windows.Forms.Label() Me.Label32 = New System.Windows.Forms.Label() @@ -76,26 +78,39 @@ Partial Class usrCntlBH Me.cbx2JahreUmsatz = New System.Windows.Forms.CheckBox() Me.cbxSDLLeistungenSperre = New System.Windows.Forms.CheckBox() Me.Label23 = New System.Windows.Forms.Label() + Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() + Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label22 = New System.Windows.Forms.Label() Me.cbxHideZeroValues = New System.Windows.Forms.CheckBox() Me.cbxFormatNumbers = New System.Windows.Forms.CheckBox() Me.Panel3 = New System.Windows.Forms.Panel() + Me.txtBagatellgrenzeBei = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label19 = New System.Windows.Forms.Label() Me.cbxBagatellgrenze = New System.Windows.Forms.CheckBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label21 = New System.Windows.Forms.Label() Me.Label20 = New System.Windows.Forms.Label() Me.Label18 = New System.Windows.Forms.Label() + Me.txtOPUmsatzBetragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPUmsatzBetragVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label16 = New System.Windows.Forms.Label() + Me.txtOPUmsatzBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPUmsatzVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label15 = New System.Windows.Forms.Label() Me.cbxOPUmsatz = New System.Windows.Forms.CheckBox() Me.Label10 = New System.Windows.Forms.Label() Me.Label14 = New System.Windows.Forms.Label() + Me.txtOPRisikoBetragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button3 = New System.Windows.Forms.Button() + Me.txtOPRisikoBetragVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label13 = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() + Me.txtOPKdNrBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPKdNrVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label11 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() + Me.txtOPKdName = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label8 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.tbcntr = New System.Windows.Forms.TabControl() @@ -106,21 +121,7 @@ Partial Class usrCntlBH Me.Label30 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() - Me.txtStichtag = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cboAbfVerbFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() - Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtBagatellgrenzeBei = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtOPUmsatzBetragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPUmsatzBetragVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPUmsatzBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPUmsatzVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPRisikoBetragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPRisikoBetragVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPKdNrBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPKdNrVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPKdName = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxBankgarantieInfo = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() Me.TabPage1.SuspendLayout() Me.GroupBox9.SuspendLayout() @@ -262,6 +263,30 @@ Partial Class usrCntlBH Me.Button10.Text = " Excel" Me.Button10.UseVisualStyleBackColor = True ' + 'txtStichtag + ' + Me.txtStichtag._DateTimeOnly = False + Me.txtStichtag._numbersOnly = False + Me.txtStichtag._numbersOnlyKommastellen = "" + Me.txtStichtag._numbersOnlyTrennzeichen = True + Me.txtStichtag._Prozent = False + Me.txtStichtag._ShortDateNew = True + Me.txtStichtag._ShortDateOnly = False + Me.txtStichtag._TimeOnly = False + Me.txtStichtag._TimeOnly_Seconds = False + Me.txtStichtag._value = "" + Me.txtStichtag._Waehrung = False + Me.txtStichtag._WaehrungZeichen = True + Me.txtStichtag.ForeColor = System.Drawing.Color.Black + Me.txtStichtag.Location = New System.Drawing.Point(67, 10) + Me.txtStichtag.MaxLength = 10 + Me.txtStichtag.MaxLineLength = -1 + Me.txtStichtag.MaxLines_Warning = "" + Me.txtStichtag.MaxLines_Warning_Label = Nothing + Me.txtStichtag.Name = "txtStichtag" + Me.txtStichtag.Size = New System.Drawing.Size(60, 20) + Me.txtStichtag.TabIndex = 21 + ' 'Label39 ' Me.Label39.AutoSize = True @@ -327,6 +352,17 @@ Partial Class usrCntlBH Me.Label36.TabIndex = 30 Me.Label36.Text = "Firma:" ' + 'cboAbfVerbFirma + ' + Me.cboAbfVerbFirma._allowedValuesFreiText = Nothing + Me.cboAbfVerbFirma._allowFreiText = False + Me.cboAbfVerbFirma._value = "" + Me.cboAbfVerbFirma.FormattingEnabled = True + Me.cboAbfVerbFirma.Location = New System.Drawing.Point(503, 27) + Me.cboAbfVerbFirma.Name = "cboAbfVerbFirma" + Me.cboAbfVerbFirma.Size = New System.Drawing.Size(132, 21) + Me.cboAbfVerbFirma.TabIndex = 29 + ' 'Button8 ' Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center @@ -637,6 +673,7 @@ Partial Class usrCntlBH ' 'GroupBox3 ' + Me.GroupBox3.Controls.Add(Me.cbxBankgarantieInfo) Me.GroupBox3.Controls.Add(Me.cbxNichtVersicherbarAusblenden) Me.GroupBox3.Controls.Add(Me.Panel1) Me.GroupBox3.Controls.Add(Me.cbxNurVersicherteLänder) @@ -790,6 +827,27 @@ Partial Class usrCntlBH Me.Label23.TabIndex = 23 Me.Label23.Text = "Firmen (Debitoren):" ' + 'MyListBox1 + ' + Me.MyListBox1._value = "" + Me.MyListBox1.FormattingEnabled = True + Me.MyListBox1.Location = New System.Drawing.Point(699, 55) + Me.MyListBox1.Name = "MyListBox1" + Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple + Me.MyListBox1.Size = New System.Drawing.Size(142, 212) + Me.MyListBox1.TabIndex = 7 + ' + 'cboSort + ' + Me.cboSort._allowedValuesFreiText = Nothing + Me.cboSort._allowFreiText = False + Me.cboSort._value = "" + Me.cboSort.FormattingEnabled = True + Me.cboSort.Location = New System.Drawing.Point(207, 205) + Me.cboSort.Name = "cboSort" + Me.cboSort.Size = New System.Drawing.Size(132, 21) + Me.cboSort.TabIndex = 22 + ' 'Label22 ' Me.Label22.AutoSize = True @@ -834,6 +892,32 @@ Partial Class usrCntlBH Me.Panel3.Size = New System.Drawing.Size(133, 50) Me.Panel3.TabIndex = 17 ' + 'txtBagatellgrenzeBei + ' + Me.txtBagatellgrenzeBei._DateTimeOnly = False + Me.txtBagatellgrenzeBei._numbersOnly = False + Me.txtBagatellgrenzeBei._numbersOnlyKommastellen = "" + Me.txtBagatellgrenzeBei._numbersOnlyTrennzeichen = True + Me.txtBagatellgrenzeBei._Prozent = False + Me.txtBagatellgrenzeBei._ShortDateNew = True + Me.txtBagatellgrenzeBei._ShortDateOnly = False + Me.txtBagatellgrenzeBei._TimeOnly = False + Me.txtBagatellgrenzeBei._TimeOnly_Seconds = False + Me.txtBagatellgrenzeBei._value = "" + Me.txtBagatellgrenzeBei._Waehrung = True + Me.txtBagatellgrenzeBei._WaehrungZeichen = True + Me.txtBagatellgrenzeBei.Enabled = False + Me.txtBagatellgrenzeBei.ForeColor = System.Drawing.Color.Black + Me.txtBagatellgrenzeBei.Location = New System.Drawing.Point(38, 25) + Me.txtBagatellgrenzeBei.MaxLength = 10 + Me.txtBagatellgrenzeBei.MaxLineLength = -1 + Me.txtBagatellgrenzeBei.MaxLines_Warning = "" + Me.txtBagatellgrenzeBei.MaxLines_Warning_Label = Nothing + Me.txtBagatellgrenzeBei.Name = "txtBagatellgrenzeBei" + Me.txtBagatellgrenzeBei.Size = New System.Drawing.Size(79, 20) + Me.txtBagatellgrenzeBei.TabIndex = 1 + Me.txtBagatellgrenzeBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label19 ' Me.Label19.AutoSize = True @@ -854,6 +938,17 @@ Partial Class usrCntlBH Me.cbxBagatellgrenze.Text = "Bagatellgrenze" Me.cbxBagatellgrenze.UseVisualStyleBackColor = True ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(532, 55) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(132, 21) + Me.MyComboBox1.TabIndex = 7 + ' 'Panel2 ' Me.Panel2.BackColor = System.Drawing.Color.WhiteSmoke @@ -899,6 +994,54 @@ Partial Class usrCntlBH Me.Label18.TabIndex = 17 Me.Label18.Text = "bis:" ' + 'txtOPUmsatzBetragBis + ' + Me.txtOPUmsatzBetragBis._DateTimeOnly = False + Me.txtOPUmsatzBetragBis._numbersOnly = False + Me.txtOPUmsatzBetragBis._numbersOnlyKommastellen = "" + Me.txtOPUmsatzBetragBis._numbersOnlyTrennzeichen = True + Me.txtOPUmsatzBetragBis._Prozent = False + Me.txtOPUmsatzBetragBis._ShortDateNew = False + Me.txtOPUmsatzBetragBis._ShortDateOnly = False + Me.txtOPUmsatzBetragBis._TimeOnly = False + Me.txtOPUmsatzBetragBis._TimeOnly_Seconds = False + Me.txtOPUmsatzBetragBis._value = "" + Me.txtOPUmsatzBetragBis._Waehrung = True + Me.txtOPUmsatzBetragBis._WaehrungZeichen = True + Me.txtOPUmsatzBetragBis.ForeColor = System.Drawing.Color.Black + Me.txtOPUmsatzBetragBis.Location = New System.Drawing.Point(131, 48) + Me.txtOPUmsatzBetragBis.MaxLineLength = -1 + Me.txtOPUmsatzBetragBis.MaxLines_Warning = "" + Me.txtOPUmsatzBetragBis.MaxLines_Warning_Label = Nothing + Me.txtOPUmsatzBetragBis.Name = "txtOPUmsatzBetragBis" + Me.txtOPUmsatzBetragBis.Size = New System.Drawing.Size(60, 20) + Me.txtOPUmsatzBetragBis.TabIndex = 18 + Me.txtOPUmsatzBetragBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtOPUmsatzBetragVon + ' + Me.txtOPUmsatzBetragVon._DateTimeOnly = False + Me.txtOPUmsatzBetragVon._numbersOnly = False + Me.txtOPUmsatzBetragVon._numbersOnlyKommastellen = "" + Me.txtOPUmsatzBetragVon._numbersOnlyTrennzeichen = True + Me.txtOPUmsatzBetragVon._Prozent = False + Me.txtOPUmsatzBetragVon._ShortDateNew = False + Me.txtOPUmsatzBetragVon._ShortDateOnly = False + Me.txtOPUmsatzBetragVon._TimeOnly = False + Me.txtOPUmsatzBetragVon._TimeOnly_Seconds = False + Me.txtOPUmsatzBetragVon._value = "" + Me.txtOPUmsatzBetragVon._Waehrung = True + Me.txtOPUmsatzBetragVon._WaehrungZeichen = True + Me.txtOPUmsatzBetragVon.ForeColor = System.Drawing.Color.Black + Me.txtOPUmsatzBetragVon.Location = New System.Drawing.Point(38, 48) + Me.txtOPUmsatzBetragVon.MaxLineLength = -1 + Me.txtOPUmsatzBetragVon.MaxLines_Warning = "" + Me.txtOPUmsatzBetragVon.MaxLines_Warning_Label = Nothing + Me.txtOPUmsatzBetragVon.Name = "txtOPUmsatzBetragVon" + Me.txtOPUmsatzBetragVon.Size = New System.Drawing.Size(60, 20) + Me.txtOPUmsatzBetragVon.TabIndex = 16 + Me.txtOPUmsatzBetragVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label16 ' Me.Label16.AutoSize = True @@ -908,6 +1051,54 @@ Partial Class usrCntlBH Me.Label16.TabIndex = 2 Me.Label16.Text = "bis:" ' + 'txtOPUmsatzBis + ' + Me.txtOPUmsatzBis._DateTimeOnly = False + Me.txtOPUmsatzBis._numbersOnly = False + Me.txtOPUmsatzBis._numbersOnlyKommastellen = "" + Me.txtOPUmsatzBis._numbersOnlyTrennzeichen = True + Me.txtOPUmsatzBis._Prozent = False + Me.txtOPUmsatzBis._ShortDateNew = True + Me.txtOPUmsatzBis._ShortDateOnly = False + Me.txtOPUmsatzBis._TimeOnly = False + Me.txtOPUmsatzBis._TimeOnly_Seconds = False + Me.txtOPUmsatzBis._value = "" + Me.txtOPUmsatzBis._Waehrung = False + Me.txtOPUmsatzBis._WaehrungZeichen = True + Me.txtOPUmsatzBis.ForeColor = System.Drawing.Color.Black + Me.txtOPUmsatzBis.Location = New System.Drawing.Point(131, 25) + Me.txtOPUmsatzBis.MaxLength = 10 + Me.txtOPUmsatzBis.MaxLineLength = -1 + Me.txtOPUmsatzBis.MaxLines_Warning = "" + Me.txtOPUmsatzBis.MaxLines_Warning_Label = Nothing + Me.txtOPUmsatzBis.Name = "txtOPUmsatzBis" + Me.txtOPUmsatzBis.Size = New System.Drawing.Size(60, 20) + Me.txtOPUmsatzBis.TabIndex = 4 + ' + 'txtOPUmsatzVon + ' + Me.txtOPUmsatzVon._DateTimeOnly = False + Me.txtOPUmsatzVon._numbersOnly = False + Me.txtOPUmsatzVon._numbersOnlyKommastellen = "" + Me.txtOPUmsatzVon._numbersOnlyTrennzeichen = True + Me.txtOPUmsatzVon._Prozent = False + Me.txtOPUmsatzVon._ShortDateNew = True + Me.txtOPUmsatzVon._ShortDateOnly = False + Me.txtOPUmsatzVon._TimeOnly = False + Me.txtOPUmsatzVon._TimeOnly_Seconds = False + Me.txtOPUmsatzVon._value = "" + Me.txtOPUmsatzVon._Waehrung = False + Me.txtOPUmsatzVon._WaehrungZeichen = True + Me.txtOPUmsatzVon.ForeColor = System.Drawing.Color.Black + Me.txtOPUmsatzVon.Location = New System.Drawing.Point(38, 25) + Me.txtOPUmsatzVon.MaxLength = 10 + Me.txtOPUmsatzVon.MaxLineLength = -1 + Me.txtOPUmsatzVon.MaxLines_Warning = "" + Me.txtOPUmsatzVon.MaxLines_Warning_Label = Nothing + Me.txtOPUmsatzVon.Name = "txtOPUmsatzVon" + Me.txtOPUmsatzVon.Size = New System.Drawing.Size(60, 20) + Me.txtOPUmsatzVon.TabIndex = 1 + ' 'Label15 ' Me.Label15.AutoSize = True @@ -946,6 +1137,30 @@ Partial Class usrCntlBH Me.Label14.TabIndex = 14 Me.Label14.Text = "bis:" ' + 'txtOPRisikoBetragBis + ' + Me.txtOPRisikoBetragBis._DateTimeOnly = False + Me.txtOPRisikoBetragBis._numbersOnly = False + Me.txtOPRisikoBetragBis._numbersOnlyKommastellen = "" + Me.txtOPRisikoBetragBis._numbersOnlyTrennzeichen = True + Me.txtOPRisikoBetragBis._Prozent = False + Me.txtOPRisikoBetragBis._ShortDateNew = False + Me.txtOPRisikoBetragBis._ShortDateOnly = False + Me.txtOPRisikoBetragBis._TimeOnly = False + Me.txtOPRisikoBetragBis._TimeOnly_Seconds = False + Me.txtOPRisikoBetragBis._value = "" + Me.txtOPRisikoBetragBis._Waehrung = True + Me.txtOPRisikoBetragBis._WaehrungZeichen = True + Me.txtOPRisikoBetragBis.ForeColor = System.Drawing.Color.Black + Me.txtOPRisikoBetragBis.Location = New System.Drawing.Point(416, 110) + Me.txtOPRisikoBetragBis.MaxLineLength = -1 + Me.txtOPRisikoBetragBis.MaxLines_Warning = "" + Me.txtOPRisikoBetragBis.MaxLines_Warning_Label = Nothing + Me.txtOPRisikoBetragBis.Name = "txtOPRisikoBetragBis" + Me.txtOPRisikoBetragBis.Size = New System.Drawing.Size(70, 20) + Me.txtOPRisikoBetragBis.TabIndex = 15 + Me.txtOPRisikoBetragBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Button3 ' Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center @@ -960,6 +1175,30 @@ Partial Class usrCntlBH Me.Button3.Text = " Excel" Me.Button3.UseVisualStyleBackColor = True ' + 'txtOPRisikoBetragVon + ' + Me.txtOPRisikoBetragVon._DateTimeOnly = False + Me.txtOPRisikoBetragVon._numbersOnly = False + Me.txtOPRisikoBetragVon._numbersOnlyKommastellen = "" + Me.txtOPRisikoBetragVon._numbersOnlyTrennzeichen = True + Me.txtOPRisikoBetragVon._Prozent = False + Me.txtOPRisikoBetragVon._ShortDateNew = False + Me.txtOPRisikoBetragVon._ShortDateOnly = False + Me.txtOPRisikoBetragVon._TimeOnly = False + Me.txtOPRisikoBetragVon._TimeOnly_Seconds = False + Me.txtOPRisikoBetragVon._value = "" + Me.txtOPRisikoBetragVon._Waehrung = True + Me.txtOPRisikoBetragVon._WaehrungZeichen = True + Me.txtOPRisikoBetragVon.ForeColor = System.Drawing.Color.Black + Me.txtOPRisikoBetragVon.Location = New System.Drawing.Point(308, 110) + Me.txtOPRisikoBetragVon.MaxLineLength = -1 + Me.txtOPRisikoBetragVon.MaxLines_Warning = "" + Me.txtOPRisikoBetragVon.MaxLines_Warning_Label = Nothing + Me.txtOPRisikoBetragVon.Name = "txtOPRisikoBetragVon" + Me.txtOPRisikoBetragVon.Size = New System.Drawing.Size(70, 20) + Me.txtOPRisikoBetragVon.TabIndex = 13 + Me.txtOPRisikoBetragVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label13 ' Me.Label13.AutoSize = True @@ -978,6 +1217,52 @@ Partial Class usrCntlBH Me.Label12.TabIndex = 10 Me.Label12.Text = "bis:" ' + 'txtOPKdNrBis + ' + Me.txtOPKdNrBis._DateTimeOnly = False + Me.txtOPKdNrBis._numbersOnly = False + Me.txtOPKdNrBis._numbersOnlyKommastellen = "" + Me.txtOPKdNrBis._numbersOnlyTrennzeichen = True + Me.txtOPKdNrBis._Prozent = False + Me.txtOPKdNrBis._ShortDateNew = False + Me.txtOPKdNrBis._ShortDateOnly = False + Me.txtOPKdNrBis._TimeOnly = False + Me.txtOPKdNrBis._TimeOnly_Seconds = False + Me.txtOPKdNrBis._value = Nothing + Me.txtOPKdNrBis._Waehrung = False + Me.txtOPKdNrBis._WaehrungZeichen = True + Me.txtOPKdNrBis.ForeColor = System.Drawing.Color.Black + Me.txtOPKdNrBis.Location = New System.Drawing.Point(416, 84) + Me.txtOPKdNrBis.MaxLineLength = -1 + Me.txtOPKdNrBis.MaxLines_Warning = "" + Me.txtOPKdNrBis.MaxLines_Warning_Label = Nothing + Me.txtOPKdNrBis.Name = "txtOPKdNrBis" + Me.txtOPKdNrBis.Size = New System.Drawing.Size(70, 20) + Me.txtOPKdNrBis.TabIndex = 11 + ' + 'txtOPKdNrVon + ' + Me.txtOPKdNrVon._DateTimeOnly = False + Me.txtOPKdNrVon._numbersOnly = False + Me.txtOPKdNrVon._numbersOnlyKommastellen = "" + Me.txtOPKdNrVon._numbersOnlyTrennzeichen = True + Me.txtOPKdNrVon._Prozent = False + Me.txtOPKdNrVon._ShortDateNew = False + Me.txtOPKdNrVon._ShortDateOnly = False + Me.txtOPKdNrVon._TimeOnly = False + Me.txtOPKdNrVon._TimeOnly_Seconds = False + Me.txtOPKdNrVon._value = Nothing + Me.txtOPKdNrVon._Waehrung = False + Me.txtOPKdNrVon._WaehrungZeichen = True + Me.txtOPKdNrVon.ForeColor = System.Drawing.Color.Black + Me.txtOPKdNrVon.Location = New System.Drawing.Point(308, 84) + Me.txtOPKdNrVon.MaxLineLength = -1 + Me.txtOPKdNrVon.MaxLines_Warning = "" + Me.txtOPKdNrVon.MaxLines_Warning_Label = Nothing + Me.txtOPKdNrVon.Name = "txtOPKdNrVon" + Me.txtOPKdNrVon.Size = New System.Drawing.Size(70, 20) + Me.txtOPKdNrVon.TabIndex = 9 + ' 'Label11 ' Me.Label11.AutoSize = True @@ -996,6 +1281,29 @@ Partial Class usrCntlBH Me.Label9.TabIndex = 4 Me.Label9.Text = "Kunde (Namenseinschränkung):" ' + 'txtOPKdName + ' + Me.txtOPKdName._DateTimeOnly = False + Me.txtOPKdName._numbersOnly = False + Me.txtOPKdName._numbersOnlyKommastellen = "" + Me.txtOPKdName._numbersOnlyTrennzeichen = True + Me.txtOPKdName._Prozent = False + Me.txtOPKdName._ShortDateNew = False + Me.txtOPKdName._ShortDateOnly = False + Me.txtOPKdName._TimeOnly = False + Me.txtOPKdName._TimeOnly_Seconds = False + Me.txtOPKdName._value = Nothing + Me.txtOPKdName._Waehrung = False + Me.txtOPKdName._WaehrungZeichen = True + Me.txtOPKdName.ForeColor = System.Drawing.Color.Black + Me.txtOPKdName.Location = New System.Drawing.Point(308, 55) + Me.txtOPKdName.MaxLineLength = -1 + Me.txtOPKdName.MaxLines_Warning = "" + Me.txtOPKdName.MaxLines_Warning_Label = Nothing + Me.txtOPKdName.Name = "txtOPKdName" + Me.txtOPKdName.Size = New System.Drawing.Size(178, 20) + Me.txtOPKdName.TabIndex = 5 + ' 'Label8 ' Me.Label8.AutoSize = True @@ -1103,311 +1411,16 @@ Partial Class usrCntlBH Me.Button7.Text = "Importieren" Me.Button7.UseVisualStyleBackColor = True ' - 'txtStichtag + 'cbxBankgarantieInfo ' - Me.txtStichtag._DateTimeOnly = False - Me.txtStichtag._numbersOnly = False - Me.txtStichtag._numbersOnlyKommastellen = "" - Me.txtStichtag._numbersOnlyTrennzeichen = True - Me.txtStichtag._Prozent = False - Me.txtStichtag._ShortDateNew = True - Me.txtStichtag._ShortDateOnly = False - Me.txtStichtag._TimeOnly = False - Me.txtStichtag._TimeOnly_Seconds = False - Me.txtStichtag._value = "" - Me.txtStichtag._Waehrung = False - Me.txtStichtag._WaehrungZeichen = True - Me.txtStichtag.ForeColor = System.Drawing.Color.Black - Me.txtStichtag.Location = New System.Drawing.Point(67, 10) - Me.txtStichtag.MaxLength = 10 - Me.txtStichtag.MaxLineLength = -1 - Me.txtStichtag.MaxLines_Warning = "" - Me.txtStichtag.MaxLines_Warning_Label = Nothing - Me.txtStichtag.Name = "txtStichtag" - Me.txtStichtag.Size = New System.Drawing.Size(60, 20) - Me.txtStichtag.TabIndex = 21 - ' - 'cboAbfVerbFirma - ' - Me.cboAbfVerbFirma._allowedValuesFreiText = Nothing - Me.cboAbfVerbFirma._allowFreiText = False - Me.cboAbfVerbFirma._value = "" - Me.cboAbfVerbFirma.FormattingEnabled = True - Me.cboAbfVerbFirma.Location = New System.Drawing.Point(503, 27) - Me.cboAbfVerbFirma.Name = "cboAbfVerbFirma" - Me.cboAbfVerbFirma.Size = New System.Drawing.Size(132, 21) - Me.cboAbfVerbFirma.TabIndex = 29 - ' - 'MyListBox1 - ' - Me.MyListBox1._value = "" - Me.MyListBox1.FormattingEnabled = True - Me.MyListBox1.Location = New System.Drawing.Point(699, 55) - Me.MyListBox1.Name = "MyListBox1" - Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple - Me.MyListBox1.Size = New System.Drawing.Size(142, 212) - Me.MyListBox1.TabIndex = 7 - ' - 'cboSort - ' - Me.cboSort._allowedValuesFreiText = Nothing - Me.cboSort._allowFreiText = False - Me.cboSort._value = "" - Me.cboSort.FormattingEnabled = True - Me.cboSort.Location = New System.Drawing.Point(207, 205) - Me.cboSort.Name = "cboSort" - Me.cboSort.Size = New System.Drawing.Size(132, 21) - Me.cboSort.TabIndex = 22 - ' - 'txtBagatellgrenzeBei - ' - Me.txtBagatellgrenzeBei._DateTimeOnly = False - Me.txtBagatellgrenzeBei._numbersOnly = False - Me.txtBagatellgrenzeBei._numbersOnlyKommastellen = "" - Me.txtBagatellgrenzeBei._numbersOnlyTrennzeichen = True - Me.txtBagatellgrenzeBei._Prozent = False - Me.txtBagatellgrenzeBei._ShortDateNew = True - Me.txtBagatellgrenzeBei._ShortDateOnly = False - Me.txtBagatellgrenzeBei._TimeOnly = False - Me.txtBagatellgrenzeBei._TimeOnly_Seconds = False - Me.txtBagatellgrenzeBei._value = "" - Me.txtBagatellgrenzeBei._Waehrung = True - Me.txtBagatellgrenzeBei._WaehrungZeichen = True - Me.txtBagatellgrenzeBei.Enabled = False - Me.txtBagatellgrenzeBei.ForeColor = System.Drawing.Color.Black - Me.txtBagatellgrenzeBei.Location = New System.Drawing.Point(38, 25) - Me.txtBagatellgrenzeBei.MaxLength = 10 - Me.txtBagatellgrenzeBei.MaxLineLength = -1 - Me.txtBagatellgrenzeBei.MaxLines_Warning = "" - Me.txtBagatellgrenzeBei.MaxLines_Warning_Label = Nothing - Me.txtBagatellgrenzeBei.Name = "txtBagatellgrenzeBei" - Me.txtBagatellgrenzeBei.Size = New System.Drawing.Size(79, 20) - Me.txtBagatellgrenzeBei.TabIndex = 1 - Me.txtBagatellgrenzeBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(532, 55) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(132, 21) - Me.MyComboBox1.TabIndex = 7 - ' - 'txtOPUmsatzBetragBis - ' - Me.txtOPUmsatzBetragBis._DateTimeOnly = False - Me.txtOPUmsatzBetragBis._numbersOnly = False - Me.txtOPUmsatzBetragBis._numbersOnlyKommastellen = "" - Me.txtOPUmsatzBetragBis._numbersOnlyTrennzeichen = True - Me.txtOPUmsatzBetragBis._Prozent = False - Me.txtOPUmsatzBetragBis._ShortDateNew = False - Me.txtOPUmsatzBetragBis._ShortDateOnly = False - Me.txtOPUmsatzBetragBis._TimeOnly = False - Me.txtOPUmsatzBetragBis._TimeOnly_Seconds = False - Me.txtOPUmsatzBetragBis._value = "" - Me.txtOPUmsatzBetragBis._Waehrung = True - Me.txtOPUmsatzBetragBis._WaehrungZeichen = True - Me.txtOPUmsatzBetragBis.ForeColor = System.Drawing.Color.Black - Me.txtOPUmsatzBetragBis.Location = New System.Drawing.Point(131, 48) - Me.txtOPUmsatzBetragBis.MaxLineLength = -1 - Me.txtOPUmsatzBetragBis.MaxLines_Warning = "" - Me.txtOPUmsatzBetragBis.MaxLines_Warning_Label = Nothing - Me.txtOPUmsatzBetragBis.Name = "txtOPUmsatzBetragBis" - Me.txtOPUmsatzBetragBis.Size = New System.Drawing.Size(60, 20) - Me.txtOPUmsatzBetragBis.TabIndex = 18 - Me.txtOPUmsatzBetragBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOPUmsatzBetragVon - ' - Me.txtOPUmsatzBetragVon._DateTimeOnly = False - Me.txtOPUmsatzBetragVon._numbersOnly = False - Me.txtOPUmsatzBetragVon._numbersOnlyKommastellen = "" - Me.txtOPUmsatzBetragVon._numbersOnlyTrennzeichen = True - Me.txtOPUmsatzBetragVon._Prozent = False - Me.txtOPUmsatzBetragVon._ShortDateNew = False - Me.txtOPUmsatzBetragVon._ShortDateOnly = False - Me.txtOPUmsatzBetragVon._TimeOnly = False - Me.txtOPUmsatzBetragVon._TimeOnly_Seconds = False - Me.txtOPUmsatzBetragVon._value = "" - Me.txtOPUmsatzBetragVon._Waehrung = True - Me.txtOPUmsatzBetragVon._WaehrungZeichen = True - Me.txtOPUmsatzBetragVon.ForeColor = System.Drawing.Color.Black - Me.txtOPUmsatzBetragVon.Location = New System.Drawing.Point(38, 48) - Me.txtOPUmsatzBetragVon.MaxLineLength = -1 - Me.txtOPUmsatzBetragVon.MaxLines_Warning = "" - Me.txtOPUmsatzBetragVon.MaxLines_Warning_Label = Nothing - Me.txtOPUmsatzBetragVon.Name = "txtOPUmsatzBetragVon" - Me.txtOPUmsatzBetragVon.Size = New System.Drawing.Size(60, 20) - Me.txtOPUmsatzBetragVon.TabIndex = 16 - Me.txtOPUmsatzBetragVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOPUmsatzBis - ' - Me.txtOPUmsatzBis._DateTimeOnly = False - Me.txtOPUmsatzBis._numbersOnly = False - Me.txtOPUmsatzBis._numbersOnlyKommastellen = "" - Me.txtOPUmsatzBis._numbersOnlyTrennzeichen = True - Me.txtOPUmsatzBis._Prozent = False - Me.txtOPUmsatzBis._ShortDateNew = True - Me.txtOPUmsatzBis._ShortDateOnly = False - Me.txtOPUmsatzBis._TimeOnly = False - Me.txtOPUmsatzBis._TimeOnly_Seconds = False - Me.txtOPUmsatzBis._value = "" - Me.txtOPUmsatzBis._Waehrung = False - Me.txtOPUmsatzBis._WaehrungZeichen = True - Me.txtOPUmsatzBis.ForeColor = System.Drawing.Color.Black - Me.txtOPUmsatzBis.Location = New System.Drawing.Point(131, 25) - Me.txtOPUmsatzBis.MaxLength = 10 - Me.txtOPUmsatzBis.MaxLineLength = -1 - Me.txtOPUmsatzBis.MaxLines_Warning = "" - Me.txtOPUmsatzBis.MaxLines_Warning_Label = Nothing - Me.txtOPUmsatzBis.Name = "txtOPUmsatzBis" - Me.txtOPUmsatzBis.Size = New System.Drawing.Size(60, 20) - Me.txtOPUmsatzBis.TabIndex = 4 - ' - 'txtOPUmsatzVon - ' - Me.txtOPUmsatzVon._DateTimeOnly = False - Me.txtOPUmsatzVon._numbersOnly = False - Me.txtOPUmsatzVon._numbersOnlyKommastellen = "" - Me.txtOPUmsatzVon._numbersOnlyTrennzeichen = True - Me.txtOPUmsatzVon._Prozent = False - Me.txtOPUmsatzVon._ShortDateNew = True - Me.txtOPUmsatzVon._ShortDateOnly = False - Me.txtOPUmsatzVon._TimeOnly = False - Me.txtOPUmsatzVon._TimeOnly_Seconds = False - Me.txtOPUmsatzVon._value = "" - Me.txtOPUmsatzVon._Waehrung = False - Me.txtOPUmsatzVon._WaehrungZeichen = True - Me.txtOPUmsatzVon.ForeColor = System.Drawing.Color.Black - Me.txtOPUmsatzVon.Location = New System.Drawing.Point(38, 25) - Me.txtOPUmsatzVon.MaxLength = 10 - Me.txtOPUmsatzVon.MaxLineLength = -1 - Me.txtOPUmsatzVon.MaxLines_Warning = "" - Me.txtOPUmsatzVon.MaxLines_Warning_Label = Nothing - Me.txtOPUmsatzVon.Name = "txtOPUmsatzVon" - Me.txtOPUmsatzVon.Size = New System.Drawing.Size(60, 20) - Me.txtOPUmsatzVon.TabIndex = 1 - ' - 'txtOPRisikoBetragBis - ' - Me.txtOPRisikoBetragBis._DateTimeOnly = False - Me.txtOPRisikoBetragBis._numbersOnly = False - Me.txtOPRisikoBetragBis._numbersOnlyKommastellen = "" - Me.txtOPRisikoBetragBis._numbersOnlyTrennzeichen = True - Me.txtOPRisikoBetragBis._Prozent = False - Me.txtOPRisikoBetragBis._ShortDateNew = False - Me.txtOPRisikoBetragBis._ShortDateOnly = False - Me.txtOPRisikoBetragBis._TimeOnly = False - Me.txtOPRisikoBetragBis._TimeOnly_Seconds = False - Me.txtOPRisikoBetragBis._value = "" - Me.txtOPRisikoBetragBis._Waehrung = True - Me.txtOPRisikoBetragBis._WaehrungZeichen = True - Me.txtOPRisikoBetragBis.ForeColor = System.Drawing.Color.Black - Me.txtOPRisikoBetragBis.Location = New System.Drawing.Point(416, 110) - Me.txtOPRisikoBetragBis.MaxLineLength = -1 - Me.txtOPRisikoBetragBis.MaxLines_Warning = "" - Me.txtOPRisikoBetragBis.MaxLines_Warning_Label = Nothing - Me.txtOPRisikoBetragBis.Name = "txtOPRisikoBetragBis" - Me.txtOPRisikoBetragBis.Size = New System.Drawing.Size(70, 20) - Me.txtOPRisikoBetragBis.TabIndex = 15 - Me.txtOPRisikoBetragBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOPRisikoBetragVon - ' - Me.txtOPRisikoBetragVon._DateTimeOnly = False - Me.txtOPRisikoBetragVon._numbersOnly = False - Me.txtOPRisikoBetragVon._numbersOnlyKommastellen = "" - Me.txtOPRisikoBetragVon._numbersOnlyTrennzeichen = True - Me.txtOPRisikoBetragVon._Prozent = False - Me.txtOPRisikoBetragVon._ShortDateNew = False - Me.txtOPRisikoBetragVon._ShortDateOnly = False - Me.txtOPRisikoBetragVon._TimeOnly = False - Me.txtOPRisikoBetragVon._TimeOnly_Seconds = False - Me.txtOPRisikoBetragVon._value = "" - Me.txtOPRisikoBetragVon._Waehrung = True - Me.txtOPRisikoBetragVon._WaehrungZeichen = True - Me.txtOPRisikoBetragVon.ForeColor = System.Drawing.Color.Black - Me.txtOPRisikoBetragVon.Location = New System.Drawing.Point(308, 110) - Me.txtOPRisikoBetragVon.MaxLineLength = -1 - Me.txtOPRisikoBetragVon.MaxLines_Warning = "" - Me.txtOPRisikoBetragVon.MaxLines_Warning_Label = Nothing - Me.txtOPRisikoBetragVon.Name = "txtOPRisikoBetragVon" - Me.txtOPRisikoBetragVon.Size = New System.Drawing.Size(70, 20) - Me.txtOPRisikoBetragVon.TabIndex = 13 - Me.txtOPRisikoBetragVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOPKdNrBis - ' - Me.txtOPKdNrBis._DateTimeOnly = False - Me.txtOPKdNrBis._numbersOnly = False - Me.txtOPKdNrBis._numbersOnlyKommastellen = "" - Me.txtOPKdNrBis._numbersOnlyTrennzeichen = True - Me.txtOPKdNrBis._Prozent = False - Me.txtOPKdNrBis._ShortDateNew = False - Me.txtOPKdNrBis._ShortDateOnly = False - Me.txtOPKdNrBis._TimeOnly = False - Me.txtOPKdNrBis._TimeOnly_Seconds = False - Me.txtOPKdNrBis._value = Nothing - Me.txtOPKdNrBis._Waehrung = False - Me.txtOPKdNrBis._WaehrungZeichen = True - Me.txtOPKdNrBis.ForeColor = System.Drawing.Color.Black - Me.txtOPKdNrBis.Location = New System.Drawing.Point(416, 84) - Me.txtOPKdNrBis.MaxLineLength = -1 - Me.txtOPKdNrBis.MaxLines_Warning = "" - Me.txtOPKdNrBis.MaxLines_Warning_Label = Nothing - Me.txtOPKdNrBis.Name = "txtOPKdNrBis" - Me.txtOPKdNrBis.Size = New System.Drawing.Size(70, 20) - Me.txtOPKdNrBis.TabIndex = 11 - ' - 'txtOPKdNrVon - ' - Me.txtOPKdNrVon._DateTimeOnly = False - Me.txtOPKdNrVon._numbersOnly = False - Me.txtOPKdNrVon._numbersOnlyKommastellen = "" - Me.txtOPKdNrVon._numbersOnlyTrennzeichen = True - Me.txtOPKdNrVon._Prozent = False - Me.txtOPKdNrVon._ShortDateNew = False - Me.txtOPKdNrVon._ShortDateOnly = False - Me.txtOPKdNrVon._TimeOnly = False - Me.txtOPKdNrVon._TimeOnly_Seconds = False - Me.txtOPKdNrVon._value = Nothing - Me.txtOPKdNrVon._Waehrung = False - Me.txtOPKdNrVon._WaehrungZeichen = True - Me.txtOPKdNrVon.ForeColor = System.Drawing.Color.Black - Me.txtOPKdNrVon.Location = New System.Drawing.Point(308, 84) - Me.txtOPKdNrVon.MaxLineLength = -1 - Me.txtOPKdNrVon.MaxLines_Warning = "" - Me.txtOPKdNrVon.MaxLines_Warning_Label = Nothing - Me.txtOPKdNrVon.Name = "txtOPKdNrVon" - Me.txtOPKdNrVon.Size = New System.Drawing.Size(70, 20) - Me.txtOPKdNrVon.TabIndex = 9 - ' - 'txtOPKdName - ' - Me.txtOPKdName._DateTimeOnly = False - Me.txtOPKdName._numbersOnly = False - Me.txtOPKdName._numbersOnlyKommastellen = "" - Me.txtOPKdName._numbersOnlyTrennzeichen = True - Me.txtOPKdName._Prozent = False - Me.txtOPKdName._ShortDateNew = False - Me.txtOPKdName._ShortDateOnly = False - Me.txtOPKdName._TimeOnly = False - Me.txtOPKdName._TimeOnly_Seconds = False - Me.txtOPKdName._value = Nothing - Me.txtOPKdName._Waehrung = False - Me.txtOPKdName._WaehrungZeichen = True - Me.txtOPKdName.ForeColor = System.Drawing.Color.Black - Me.txtOPKdName.Location = New System.Drawing.Point(308, 55) - Me.txtOPKdName.MaxLineLength = -1 - Me.txtOPKdName.MaxLines_Warning = "" - Me.txtOPKdName.MaxLines_Warning_Label = Nothing - Me.txtOPKdName.Name = "txtOPKdName" - Me.txtOPKdName.Size = New System.Drawing.Size(178, 20) - Me.txtOPKdName.TabIndex = 5 + Me.cbxBankgarantieInfo.AutoSize = True + Me.cbxBankgarantieInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxBankgarantieInfo.Location = New System.Drawing.Point(416, 178) + Me.cbxBankgarantieInfo.Name = "cbxBankgarantieInfo" + Me.cbxBankgarantieInfo.Size = New System.Drawing.Size(187, 17) + Me.cbxBankgarantieInfo.TabIndex = 28 + Me.cbxBankgarantieInfo.Text = "Zusatzinfo Bankgarantie anzeigen" + Me.cbxBankgarantieInfo.UseVisualStyleBackColor = True ' 'usrCntlBH ' @@ -1550,4 +1563,5 @@ Partial Class usrCntlBH Friend WithEvents Button10 As Button Friend WithEvents txtStichtag As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label39 As Label + Friend WithEvents cbxBankgarantieInfo As CheckBox End Class diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index d42114c7..9b2aca42 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -124,7 +124,8 @@ Public Class usrCntlBH sqlStr &= " UStV_Summe3470BetragEUR AS Kto3470, UStV_SummeVZBetragEUR AS Vorauszahlung, UStV_SummeVorschaubetragEUR AS Vorschau, " sqlStr &= " isnull((SELECT SUM(Gesamtausstand) FROM dbo.[Offene Posten] WHERE (Kontonummer = AdressenNr " & Firmen_ID & ")),0) - isnull(CASE WHEN UStV_SummeUmsatzsteuerbetragEUR > UStV_SummeErstattungsbetragEUR THEN UStV_SummeUmsatzsteuerbetragEUR - UStV_SummeErstattungsbetragEUR " sqlStr &= " ELSE 0 END ,0) - isnull(UStV_Summe3470BetragEUR,0) + isnull(UStV_SummeVZBetragEUR,0) - isnull(UStV_SummeVorschaubetragEUR,0) - isnull(CASE WHEN ISNULL(BankgarantieGültigBis, " - sqlStr &= " GETDATE()) < GETDATE() THEN 0 ELSE ISNULL(BankgarantieBetrag, 0) END,0) AS Risiko , /*BankgarantieBetrag, BankgarantieGültigBis, */" + sqlStr &= " GETDATE()) < GETDATE() THEN 0 ELSE ISNULL(BankgarantieBetrag, 0) END,0) AS Risiko , " + sqlStr &= IIf(cbxBankgarantieInfo.Checked, "BankgarantieBetrag, BankgarantieGültigBis,", "") sqlStr &= " Versicherungssumme " @@ -388,12 +389,12 @@ Public Class usrCntlBH ' Dim sumBar As Double = 0 Dim dummycount As Integer = 0 AddHandler rpt.Detail.Format, Sub() - rpt.lblKdNr.Text = If(rpt.Fields.Item("AdressenNr").Value, "") - rpt.lblKunde.Text = If(rpt.Fields.Item("Ordnungsbegriff").Value, "") - rpt.lblAV.Text = If(rpt.Fields.Item("Abfertigungsverbot").Value, "Ja", "") + rpt.lblKdNr.Text = If(rpt.Fields.Item("KdNr").Value IsNot DBNull.Value, rpt.Fields.Item("KdNr").Value, "") + rpt.lblKunde.Text = If(rpt.Fields.Item("Ordnungsbegriff").Value IsNot DBNull.Value, rpt.Fields.Item("Ordnungsbegriff").Value, "") + rpt.lblAV.Text = If(rpt.Fields.Contains("Abfertigungsverbot") AndAlso rpt.Fields.Item("Abfertigungsverbot").Value IsNot Nothing, "Ja", "") rpt.lblLand.Text = If(rpt.Fields.Item("LandKz").Value IsNot DBNull.Value, rpt.Fields.Item("LandKz").Value, "") - rpt.lblBankgarantie.Text = If(rpt.Fields.Item("BankgarantieBetrag").Value IsNot DBNull.Value, CDbl(rpt.Fields.Item("BankgarantieBetrag").Value).ToString("C"), "") + rpt.lblBankgarantie.Text = If(rpt.Fields.Contains("BankgarantieBetrag") AndAlso rpt.Fields.Item("BankgarantieBetrag").Value IsNot DBNull.Value, CDbl(rpt.Fields.Item("BankgarantieBetrag").Value).ToString("C"), "") rpt.lblOPSaldo.Text = If(rpt.Fields.Item("LfdSaldo").Value IsNot DBNull.Value, CDbl(rpt.Fields.Item("LfdSaldo").Value).ToString("C"), "") rpt.lblUStDiff.Text = If(rpt.Fields.Item("UStDiff").Value IsNot DBNull.Value, CDbl(rpt.Fields.Item("UStDiff").Value).ToString("C"), "") rpt.lblKto3470.Text = If(rpt.Fields.Item("Kto3470").Value IsNot DBNull.Value, CDbl(rpt.Fields.Item("Kto3470").Value).ToString("C"), "") @@ -432,8 +433,8 @@ Public Class usrCntlBH ' rpt.lblVorschau.Text = If(rpt.Fields.Item("Vorschau").Value IsNot DBNull.Value, CDbl(rpt.Fields.Item("Vorschau").Value).ToString("C"), "") - rpt.lblBankgarantieGueltigBis.Text = If(rpt.Fields.Item("BankgarantieGültigBis").Value IsNot DBNull.Value, CDate(rpt.Fields.Item("BankgarantieGültigBis").Value).ToShortDateString, "") - rpt.lblOPDat.Text = If(rpt.Fields.Item("OPDatumMin").Value IsNot DBNull.Value, CDate(rpt.Fields.Item("OPDatumMin").Value).ToShortDateString, "") + rpt.lblBankgarantieGueltigBis.Text = If(rpt.Fields.Contains("BankgarantieBetrag") AndAlso rpt.Fields.Item("BankgarantieGültigBis").Value IsNot DBNull.Value, CDate(rpt.Fields.Item("BankgarantieGültigBis").Value).ToShortDateString, "") + rpt.lblOPDat.Text = If(rpt.Fields.Contains("OPDatumMin") AndAlso rpt.Fields.Item("OPDatumMin").Value IsNot DBNull.Value, CDate(rpt.Fields.Item("OPDatumMin").Value).ToShortDateString, "") 'Abwechselnd grauen und weißen Hintergrund dummycount += 1 If (dummycount Mod 2) = 0 Then diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index d7b3e550..0f6b39f6 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -96,6 +96,43 @@ Public Class frmBelegNeu If print Then allowPrint = True : btnPrint.PerformClick() End Sub + Public Sub AddPositions(dgv As DataGridView, print As Boolean) + + ' Dim anz = IIf(IsNumeric(txtAnzahl.Text), txtAnzahl.Text, 1) + Dim p As EABelegPositionen + + cboSteuerschlüssel.changeItem(2512) + + For Each r As DataGridViewRow In dgv.Rows + If r.Cells("Betrag").Value <> 0 Then + + p = New EABelegPositionen + p.Mandant = PERSONAL.Mandant + p.Niederlassung = PERSONAL.Niederlassung + p.Benutzer = PERSONAL.ID + 'p.Benutzer = BenutzerNr + p.BelegDat = Now + p.BelegNr = BELEG.BelegNr + p.PreislistenNr = 4 + p.PreislistenPos = 19 + p.LeistungsNr = 800 + + p.LeistungsBez = "QK-Gebühren " & r.Cells("Art").Value + p.Leistungsbeschreibung = "QK-Gebühren " & r.Cells("Art").Value + + p.Preis = r.Cells("Betrag").Value + p.Abfertigungsart = 0 + p.Anzahl = IIf(IsNumeric(txtAnzahl.Text), txtAnzahl.Text, 1) + p.Betrag = p.Anzahl * p.Preis + BELEG.POS.Add(p) + End If + + Next + + initDGVBelegPos() + If print Then allowPrint = True : btnPrint.PerformClick() + End Sub + Public Function AddLeihgeld(print As Boolean, BELEG_TMP As EABeleg, POS_ADD As List(Of EABelegPositionen)) As Boolean BELEG = BELEG_TMP diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index a8e66eeb..736ac5f1 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -2284,6 +2284,7 @@ Public Class usrCntlKundenuebersicht End If GG.gg_Info = txtT1VerzollungsadresseBestimmungszollstelle.GET_VALUE_OnlyReturn(txtT1VerzollungsadresseBestimmungszollstelle._value, False) + GG.gg_Info &= " - " & txtT1VerzollungsadresseBestimmungszollstelle._value If GG.SAVE Then txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE("") setKD(kdNr) diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 38516312..ba3a0e08 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -280,6 +280,7 @@ Public Class cDATENSERVER s = s.Replace("І", "I") 'cyrillic I s = s.Replace("Ј", "J") 'cyrillic J s = s.Replace("Е", "E") 'cyrillic E + s = s.Replace("?", "") Dim temp = s s = Regex.Replace(s, "[бБвгГдДёЁжЖзЗиИйЙкКлЛмнпПртфФхХцЦчЧшШщЩъЪыЫьЬэЭюЮяЯ]", "").Replace("""", "") 'REMOVE cyrillic letters @@ -287,6 +288,7 @@ Public Class cDATENSERVER Dim tempBytes = System.Text.Encoding.GetEncoding("ISO-8859-8").GetBytes(s) s = System.Text.Encoding.UTF8.GetString(tempBytes) + s = s.Replace("�", "") Return s End Function diff --git a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb index 6d0ab43d..553a7689 100644 --- a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb @@ -127,7 +127,7 @@ Public Class cAllgemein End If - + LOAD_PROGRAMM() LOAD_PARAM() LOAD_TRANSLATE() LOAD_TRANSLATE_AUTO() @@ -154,6 +154,21 @@ Public Class cAllgemein End Sub + Public Shared Sub LOAD_PROGRAMM() + Dim prog_Name = My.Application.Info.ProductName + + + Select Case prog_Name.ToUpper + Case "AVISO" + PROGID = 16 + Case "SDL" + PROGID = 7 + Case Else + PROGID = SQL.getValueTxtBySql("SELECT isnull([prog_id],0) FROM [tblProgramme] WHERe [prog_codename]='" & prog_Name & "'", "ADMIN") + End Select + PROGNAME = SQL.getValueTxtBySql("SELECT prog_name FROM [tblProgramme] WHERe [prog_id]='" & PROGID & "'", "ADMIN") + End Sub + Public Shared Sub LOAD_PARAM() PARAMS = New cParameterList(PROGID, FIRMA) End Sub