Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

This commit is contained in:
2026-02-24 13:54:37 +01:00
28 changed files with 926 additions and 262 deletions

View File

@@ -320,9 +320,9 @@ Public Class cFakturierung
If RECHNUNG_KD.Zahlungsziel IsNot Nothing AndAlso IsNumeric(RECHNUNG_KD.Zahlungsziel) Then
ZZTage = RECHNUNG_KD.Zahlungsziel
If ZZTage > 14 AndAlso RECHNUNG.Firma_ID = 19 AndAlso RECHNUNG.FilialenNr = 8001 Then
ZZTage = 14
End If
'If ZZTage > 14 AndAlso RECHNUNG.Firma_ID = 19 AndAlso RECHNUNG.FilialenNr = 8001 Then
' ZZTage = 14 'Hier aus DEebitor überschreiben!
'End If
End If
Select Case RECHNUNG.[BelegartenNr]

View File

@@ -1,8 +1,4 @@
Imports com.sun.tools.javadoc
Imports GrapeCity.ActiveReports.ReportsCore.Tools
Imports GrapeCity.Viewer.Common.Model
Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
Imports Microsoft.Office.Interop
Public Class frmFaktSammelRgDrucken

View File

@@ -23,27 +23,27 @@ Partial Class usrCntlFaktAbrechnung
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle1 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 DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle12 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 DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlFaktAbrechnung))
Me.Label9 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label()
@@ -924,36 +924,36 @@ Partial Class usrCntlFaktAbrechnung
Me.dgvAnhaenge.AllowUserToResizeColumns = False
Me.dgvAnhaenge.AllowUserToResizeRows = False
Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.optAnhSel, Me.DataGridViewTextBoxColumn2, Me.clmnBezeichnung, Me.clmnDsId, Me.clmnAnhId})
DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle4
DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle25
Me.dgvAnhaenge.Location = New System.Drawing.Point(493, 911)
Me.dgvAnhaenge.MultiSelect = False
Me.dgvAnhaenge.Name = "dgvAnhaenge"
Me.dgvAnhaenge.ReadOnly = True
DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle26
Me.dgvAnhaenge.RowHeadersVisible = False
Me.dgvAnhaenge.RowHeadersWidth = 62
Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -975,10 +975,10 @@ Partial Class usrCntlFaktAbrechnung
'
'DataGridViewTextBoxColumn2
'
DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle2.Format = "N0"
DataGridViewCellStyle2.NullValue = Nothing
Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle2
DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle23.Format = "N0"
DataGridViewCellStyle23.NullValue = Nothing
Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle23
Me.DataGridViewTextBoxColumn2.HeaderText = "Art"
Me.DataGridViewTextBoxColumn2.MinimumWidth = 8
Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
@@ -988,9 +988,9 @@ Partial Class usrCntlFaktAbrechnung
'clmnBezeichnung
'
Me.clmnBezeichnung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle3.Format = "c2"
Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle3
DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle24.Format = "c2"
Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle24
Me.clmnBezeichnung.FillWeight = 121.2598!
Me.clmnBezeichnung.HeaderText = "Bezeichnung"
Me.clmnBezeichnung.MinimumWidth = 8
@@ -2318,7 +2318,7 @@ Partial Class usrCntlFaktAbrechnung
Me.txtKdAuftragsNr.BackColor = System.Drawing.Color.Yellow
Me.txtKdAuftragsNr.ForeColor = System.Drawing.Color.Black
Me.txtKdAuftragsNr.Location = New System.Drawing.Point(101, 123)
Me.txtKdAuftragsNr.MaxLength = 35
Me.txtKdAuftragsNr.MaxLength = 50
Me.txtKdAuftragsNr.MaxLineLength = -1
Me.txtKdAuftragsNr.MaxLines_Warning = ""
Me.txtKdAuftragsNr.MaxLines_Warning_Label = Nothing
@@ -2995,35 +2995,35 @@ Partial Class usrCntlFaktAbrechnung
Me.dgvRechnungenPositionen.AllowUserToResizeColumns = False
Me.dgvRechnungenPositionen.AllowUserToResizeRows = False
Me.dgvRechnungenPositionen.BackgroundColor = System.Drawing.Color.White
DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27
Me.dgvRechnungenPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvRechnungenPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Leistung, Me.Anzahl, Me.Preis, Me.SteuerpflichtigerBetrag, Me.SteuerfreierBetrag, Me.Aufschubkonto})
DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle11
DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle32
Me.dgvRechnungenPositionen.Location = New System.Drawing.Point(10, 258)
Me.dgvRechnungenPositionen.Name = "dgvRechnungenPositionen"
Me.dgvRechnungenPositionen.ReadOnly = True
DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle33
Me.dgvRechnungenPositionen.RowHeadersVisible = False
Me.dgvRechnungenPositionen.RowHeadersWidth = 62
Me.dgvRechnungenPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -3041,10 +3041,10 @@ Partial Class usrCntlFaktAbrechnung
'
'Anzahl
'
DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle7.Format = "N0"
DataGridViewCellStyle7.NullValue = Nothing
Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle7
DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle28.Format = "N0"
DataGridViewCellStyle28.NullValue = Nothing
Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle28
Me.Anzahl.HeaderText = "Anzahl"
Me.Anzahl.MinimumWidth = 8
Me.Anzahl.Name = "Anzahl"
@@ -3053,9 +3053,9 @@ Partial Class usrCntlFaktAbrechnung
'
'Preis
'
DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle8.Format = "c2"
Me.Preis.DefaultCellStyle = DataGridViewCellStyle8
DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle29.Format = "c2"
Me.Preis.DefaultCellStyle = DataGridViewCellStyle29
Me.Preis.HeaderText = "Preis"
Me.Preis.MinimumWidth = 8
Me.Preis.Name = "Preis"
@@ -3064,9 +3064,9 @@ Partial Class usrCntlFaktAbrechnung
'
'SteuerpflichtigerBetrag
'
DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle9.Format = "c2"
Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle9
DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle30.Format = "c2"
Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle30
Me.SteuerpflichtigerBetrag.HeaderText = "Steuerpfl."
Me.SteuerpflichtigerBetrag.MinimumWidth = 8
Me.SteuerpflichtigerBetrag.Name = "SteuerpflichtigerBetrag"
@@ -3075,10 +3075,10 @@ Partial Class usrCntlFaktAbrechnung
'
'SteuerfreierBetrag
'
DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle10.Format = "C2"
DataGridViewCellStyle10.NullValue = Nothing
Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle10
DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
DataGridViewCellStyle31.Format = "C2"
DataGridViewCellStyle31.NullValue = Nothing
Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle31
Me.SteuerfreierBetrag.HeaderText = "Steuerfrei"
Me.SteuerfreierBetrag.MinimumWidth = 8
Me.SteuerfreierBetrag.Name = "SteuerfreierBetrag"
@@ -3101,41 +3101,41 @@ Partial Class usrCntlFaktAbrechnung
Me.dgvOffertenSperrliste.AllowUserToResizeRows = False
Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White
Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34
Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle14
DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle35
Me.dgvOffertenSperrliste.Location = New System.Drawing.Point(11, 29)
Me.dgvOffertenSperrliste.MultiSelect = False
Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste"
Me.dgvOffertenSperrliste.ReadOnly = True
DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle36
Me.dgvOffertenSperrliste.RowHeadersVisible = False
Me.dgvOffertenSperrliste.RowHeadersWidth = 62
DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.PapayaWhip
DataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black
Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle16
DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle37.SelectionBackColor = System.Drawing.Color.PapayaWhip
DataGridViewCellStyle37.SelectionForeColor = System.Drawing.Color.Black
Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle37
Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(204, 201)
Me.dgvOffertenSperrliste.TabIndex = 2
@@ -3148,44 +3148,44 @@ Partial Class usrCntlFaktAbrechnung
Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False
Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True
Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False
DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
DataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle38
Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White
Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18
DataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle39
Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle19
DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle40
Me.dgvOfferteDetailsUebersicht.Location = New System.Drawing.Point(220, 29)
Me.dgvOfferteDetailsUebersicht.MultiSelect = False
Me.dgvOfferteDetailsUebersicht.Name = "dgvOfferteDetailsUebersicht"
DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle20
DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle41
Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False
Me.dgvOfferteDetailsUebersicht.RowHeadersWidth = 62
DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
DataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black
Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle21
DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
DataGridViewCellStyle42.SelectionForeColor = System.Drawing.Color.Black
Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle42
Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(601, 201)
Me.dgvOfferteDetailsUebersicht.TabIndex = 3

View File

@@ -206,7 +206,7 @@ Partial Class frmFormulare
Me.pnlBody.Dock = System.Windows.Forms.DockStyle.Fill
Me.pnlBody.Location = New System.Drawing.Point(0, 166)
Me.pnlBody.Name = "pnlBody"
Me.pnlBody.Size = New System.Drawing.Size(1326, 570)
Me.pnlBody.Size = New System.Drawing.Size(1326, 615)
Me.pnlBody.TabIndex = 1
'
'MyFlowLayoutPanel1
@@ -219,7 +219,7 @@ Partial Class frmFormulare
Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
Me.MyFlowLayoutPanel1.MinimumSize = New System.Drawing.Size(1000, 100)
Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1"
Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(1324, 568)
Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(1324, 613)
Me.MyFlowLayoutPanel1.TabIndex = 0
'
'pnlBottom
@@ -238,7 +238,7 @@ Partial Class frmFormulare
Me.pnlBottom.Controls.Add(Me.Button2)
Me.pnlBottom.Controls.Add(Me.btn)
Me.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
Me.pnlBottom.Location = New System.Drawing.Point(0, 736)
Me.pnlBottom.Location = New System.Drawing.Point(0, 781)
Me.pnlBottom.Name = "pnlBottom"
Me.pnlBottom.Size = New System.Drawing.Size(1326, 61)
Me.pnlBottom.TabIndex = 2
@@ -408,7 +408,7 @@ Partial Class frmFormulare
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1326, 797)
Me.ClientSize = New System.Drawing.Size(1326, 842)
Me.Controls.Add(Me.pnlBody)
Me.Controls.Add(Me.pnlBottom)
Me.Controls.Add(Me.pnl)

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.5.3.0")>
<Assembly: AssemblyFileVersion("1.5.3.0")>
<Assembly: AssemblyVersion("1.5.3.1")>
<Assembly: AssemblyFileVersion("1.5.3.1")>

View File

@@ -24,8 +24,8 @@ Partial Class frmMDM_USTVAntrag
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag))
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()
Me.pnlBottom = New System.Windows.Forms.Panel()
Me.pbXMLExport = New System.Windows.Forms.PictureBox()
Me.btnRMCQuartal = New System.Windows.Forms.Button()
@@ -144,6 +144,7 @@ Partial Class frmMDM_USTVAntrag
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.cbxInterneNr = New System.Windows.Forms.CheckBox()
Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
Me.pnlBottom.SuspendLayout()
@@ -603,6 +604,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.cbxInterneNr)
Me.Panel8.Controls.Add(Me.cbxSicherheit)
Me.Panel8.Controls.Add(Me.Label16)
Me.Panel8.Controls.Add(Me.txtRZam)
@@ -1560,8 +1562,8 @@ Partial Class frmMDM_USTVAntrag
Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500
Me.dgvUSTVPositionen.AllowUserToAddRows = False
Me.dgvUSTVPositionen.AllowUserToDeleteRows = False
DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1714,8 +1716,8 @@ Partial Class frmMDM_USTVAntrag
Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500
Me.dgvErstattungspositionen.AllowUserToAddRows = False
Me.dgvErstattungspositionen.AllowUserToDeleteRows = False
DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1860,6 +1862,19 @@ Partial Class frmMDM_USTVAntrag
Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen"
Me.FakturiertToolStripMenuItem.Visible = False
'
'cbxInterneNr
'
Me.cbxInterneNr.AutoSize = True
Me.cbxInterneNr.BackColor = System.Drawing.Color.Transparent
Me.cbxInterneNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxInterneNr.ForeColor = System.Drawing.Color.Black
Me.cbxInterneNr.Location = New System.Drawing.Point(15, 91)
Me.cbxInterneNr.Name = "cbxInterneNr"
Me.cbxInterneNr.Size = New System.Drawing.Size(141, 20)
Me.cbxInterneNr.TabIndex = 57
Me.cbxInterneNr.Text = "interne Nr anzeigen"
Me.cbxInterneNr.UseVisualStyleBackColor = False
'
'UstCntlUSTV_AntragPosition1
'
Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2046,4 +2061,5 @@ Partial Class frmMDM_USTVAntrag
Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents btnRMCQuartal As Button
Friend WithEvents pbXMLExport As PictureBox
Friend WithEvents cbxInterneNr As CheckBox
End Class

View File

@@ -76,7 +76,7 @@ Public Class frmMDM_USTVAntrag
' left join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
' where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVPo_ID", "FMZOLL")
.SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Nettobetrag],[UStVPo_NettobetragEUR],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter], [UStVPo_daId], [UStVPo_daId_loeschbar] ,[UStVPo_VZ],[UStVPo_VZ_RKID] ,cast(case when isnull([UStVPo_VZ_RKID],0) = 0 then 0 else 1 end as bit) as VZabrechnet
.SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] " & IIf(cbxInterneNr.Checked, ",[UStVPo_interneNr] as intNr", "") & " ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Nettobetrag],[UStVPo_NettobetragEUR],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter], [UStVPo_daId], [UStVPo_daId_loeschbar] ,[UStVPo_VZ],[UStVPo_VZ_RKID] ,cast(case when isnull([UStVPo_VZ_RKID],0) = 0 then 0 else 1 end as bit) as VZabrechnet
FROM [tblUStVPositionen]
LEFT JOIN [tblUStVLeistender] as leist
ON ([tblUStVPositionen].[UStVPo_LeistenderId] > 0
@@ -1009,7 +1009,7 @@ Public Class frmMDM_USTVAntrag
USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
USTV_POS.UStVPo_Zeitstempel = Now()
USTV_POS.UStVPo_daId = 0
USTV_POS.UStVPo_daId = 0 '0 weil immer autom. vom System vergeben (bei SchnittstellenNr 1 wird das Feld daid als Info für die RK_ID verwendet!)
Dim rkID = sql.getValueTxtBySql("SELECT TOP(1) isnull(RK_ID,0) FROM Rechnungsausgang where cast(Rechnungsausgang.RechnungsDatum as Date) ='" & USTV_POS.UStVPo_ReDat & "' and Rechnungsausgang.RechnungsNr='" & USTV_POS.UStVPo_ReNr & "' AND FilialenNr = " & r.Item("FilialenNr") & " AND RK_ID is not null", "FMZOLL")
@@ -1018,7 +1018,7 @@ Public Class frmMDM_USTVAntrag
If USTV_POS.UStVPo_daId > 0 Then
USTV_POS.UStVPo_daId_loeschbar = False
Else
USTV_POS.UStVPo_daId_loeschbar = True
USTV_POS.UStVPo_daId_loeschbar = False 'bei Schnittstelle Nr1 gehe ich immer davon aus, das eine Rechnung im System existiert!!!
End If
@@ -2236,7 +2236,11 @@ Public Class frmMDM_USTVAntrag
Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVA_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & "_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr)
If DS IsNot Nothing AndAlso DS.da_id IsNot Nothing Then
DS.DELETE_COMPLETE()
If DS.DELETE_COMPLETE() Then
'löschen nicht vorhandenen Verweis!
SQL.doSQL("update tblUStVPositionen set UStVPo_daId = NULL where UStVAn_ID = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & " and UStVPo_daId > 0 and isnull(UStVPo_daId, 0) not in (select da_id from tblDatenarchiv) ", "FMZOLL")
End If
End If
ElseIf UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId > 0 Then
@@ -2244,7 +2248,11 @@ Public Class frmMDM_USTVAntrag
Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId)
If DS IsNot Nothing AndAlso DS.da_id IsNot Nothing Then
DS.DELETE_COMPLETE()
If DS.DELETE_COMPLETE() Then
'löschen nicht vorhandenen Verweis!
SQL.doSQL("update tblUStVPositionen set UStVPo_daId = NULL where UStVAn_ID = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & " and UStVPo_daId > 0 and isnull(UStVPo_daId, 0) not in (select da_id from tblDatenarchiv) ", "FMZOLL")
End If
End If
End If
@@ -4134,6 +4142,18 @@ Public Class frmMDM_USTVAntrag
BANK_IBAN = FIRMA.Firma_IBAN1
BANK_BIC = FIRMA.Firma_BIC1
If BANK_BIC.ToString.Contains("BIC:") Then
BANK_BIC = BANK_BIC.ToString.Replace("BIC:", "")
BANK_BIC = BANK_BIC.Trim()
BANK_BIC = BANK_BIC.ToString.Replace(" ", "")
End If
If BANK_IBAN.ToString.Contains("IBAN:") Then
BANK_IBAN = BANK_IBAN.ToString.Replace("IBAN:", "")
BANK_IBAN = BANK_IBAN.Trim()
BANK_IBAN = BANK_IBAN.ToString.Replace(" ", "")
End If
Case Else
'Bank aus Kunden!
Dim dtBank As New DataTable
@@ -4470,6 +4490,10 @@ Public Class frmMDM_USTVAntrag
End If
End Function
Private Sub cbxInterneNr_CheckedChanged(sender As Object, e As EventArgs) Handles cbxInterneNr.CheckedChanged
init()
End Sub
Private Function setXMLExportVisible(ISOLand As String)
Dim valid As Boolean = True

View File

@@ -1,4 +1,7 @@
Imports System.Windows.Documents
Imports com.sun.org.apache.bcel.internal.generic
Imports java.awt.geom
Imports MDM_Worker
Imports VERAG_PROG_ALLGEMEIN
Public Class frmUSTVoffeneAntraege
@@ -1088,31 +1091,90 @@ Public Class frmUSTVoffeneAntraege
End Sub
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
Dim SQLQuery As String = ""
Dim dtfehlendePDF As New DataTable
Dim dtPartInvoicesIDS As New DataTable
Select Case LIEFERANT.ToString.ToLower
Case "plose" : SQLQuery = "select [plInv_SupplierRechnungsNr] as RechnungsNr,plInv_SupplierRechnungsDatum as Rechnungsdatum,Adressen.AdressenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST from [tblPLOSE_Inv_Data] INNER JOIN Adressen on [plInv_PLOSEKundennummer]=Adressen.PLOSEKundenNr INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by plInv_SupplierRechnungsNr, Adressen.AdressenNr, Adressen.[Name 1], plInv_SupplierRechnungsDatum, kde_keineMWSt"
Case "rmc" : SQLQuery = "select rmc_reNr as RechnungsNr,rmc_reDatum AS Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST from [tblRMCImport] INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt "
Case "mse" : SQLQuery = "select invoice_id as RechnungsNr,[invoice_date] as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST from tblMSEInvoices inner join [tblMSECustomers] on [customer_number] = [customer_id] INNER JOIN Adressen on Adressen.MSEKundenNr = [customer_number] INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date, kde_keineMWSt"
Case "uta" : SQLQuery = " SELECT U.Abrechnungsnummer AS Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.AdressenNr AS KundenNr,A.UTAKundenNr AS UTAKundenNr,A.[Name 1] AS Kunde,A.LandKz, kde_keineMWSt as keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert on A.AdressenNr = kde_KundenNr WHERE U.daId IS NULL AND CAST(U.Rechnungsdatum AS date) BETWEEN '" & dat_Sum_Von.Value & "' AND '" & dat_Sum_Bis.Value & "' AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
Case "ids" : SQLQuery = "select Invoicenumber as RechnungsNr,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG INNER JOIN tblKundenErweitert on Adressen.AdressenNr = kde_KundenNr where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay, kde_keineMWSt"
Case Else : SQLQuery = ""
Case "plose"
Dim LIEFERANT As cPLOSE_Inv_Data
dtfehlendePDF = LIEFERANT.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
Case "rmc"
Dim LIEFERANT As cRMC
dtfehlendePDF = LIEFERANT.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
Case "mse"
Dim LIEFERANT As cMSEAPI
dtfehlendePDF = LIEFERANT.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
Case "uta"
Dim LIEFERANT As cUTA
dtfehlendePDF = LIEFERANT.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
Case "ids"
Dim LIEFERANT As cIDS
dtfehlendePDF = LIEFERANT.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
dtPartInvoicesIDS = LIEFERANT.checkPartInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
Case "verag"
MsgBox("PDF wird zur Laufzeit aus RE-Daten generiert")
Exit Sub
Case Else
MsgBox("Funktion nur pro Lieferant möglich!")
Exit Sub
End Select
Dim fehlendePDFs As Integer = 0
If SQLQuery <> "" Then
Dim dtfehlendePDF As DataTable = (New SQL).loadDgvBySql(SQLQuery, "FMZOLL")
MsgBox("Anzahl fehlende PDFs: " & dtfehlendePDF.Rows.Count & IIf(CDate(dat_Sum_Von.Value).Year <= 2024 OrElse CDate(dat_Sum_Bis.Value).Year <= 2024, vbNewLine & "PDF-Rechnungen vor 2025 wurden tlw. nicht importiert!", ""))
If dtfehlendePDF.Rows.Count > 0 Then
If vbYes = MsgBox("Details der fehlenden PDF-Rechnungen anzeigen?", vbYesNo) Then
cProgramFunctions.genExcelFromDT_NEW(dtfehlendePDF,,, "Fehlende PDF-Rechnungen: " & dat_Sum_Von.Value.ToShortDateString & " - " & dat_Sum_Bis.Value.ToShortDateString)
End If
End If
'extra bei IDS ->Prüft ob es zur Gesamtrechnung Teilrechnungen gibt!!
If LIEFERANT.ToString.ToLower = "ids" Then
If dtPartInvoicesIDS.Rows.Count > 0 Then
If vbYes = MsgBox("Es fehlen " & dtPartInvoicesIDS.Rows.Count & " Teilrechnungen" & vbNewLine & "Details der fehlenden Teilrechnungen anzeigen?", vbYesNo) Then
cProgramFunctions.genExcelFromDT_NEW(dtPartInvoicesIDS,,, "Fehlende PDF-Teilrechnungen inkl. Datensatz " & dat_Sum_Von.Value.ToShortDateString & " - " & dat_Sum_Bis.Value.ToShortDateString)
End If
If dtPartInvoicesIDS.Rows.Count <= 10 Then
If vbYes = MsgBox(dtPartInvoicesIDS.Rows.Count & " Gesamtrechnungen der fehlenden PDF-Teilrechnungen anzeigen?", vbYesNo) Then
For Each row In dtPartInvoicesIDS.Rows
If row.item("daId") IsNot Nothing AndAlso IsNumeric(row.item("daId")) AndAlso CInt(row.item("daId")) > 0 Then
Dim DS As New cDATENSERVER(row.item("daId"))
Dim pathPDF = DS.GET_TOP1_PATH
If pathPDF <> "" Then Process.Start(pathPDF)
End If
Next
End If
End If
Else
MsgBox("Funktion nur pro Lieferant möglich!")
End If
End If
End Sub

View File

@@ -401,7 +401,7 @@ Public Class usrCntlUSTV
' AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))<>0
' AND UStVAn_AntragEingereichtAm is not null
' order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc"
Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KundenNr,[UStVAn_Name] as Kundename,Adressen.LandKz as Land_Kunde, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA .LandKz Land_Antrag,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as Währung,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, UStVAn_VZBetrag as Vorauszahlungsbetrag, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr
Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, UStVAn_VZBetrag as VZ, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr
FROM [tblUStVAntrag]
inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr
inner join Adressen on AdressenNr=UStVAn_KuNr
@@ -413,7 +413,7 @@ Public Class usrCntlUSTV
Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
cProgramFunctions.genExcelFromDT_NEW(dt, {"J1:M" & (dt.Rows.Count + 1)},,,,, True)
cProgramFunctions.genExcelFromDT_NEW(dt, ,,,,, True,,,,,, {"L1:Q" & (dt.Rows.Count + 1)})
Else
MsgBox("Keine Daten!")
End If
@@ -678,6 +678,12 @@ Public Class usrCntlUSTV
ContextMenuStrip1.Items.Add(oa)
End If
If Not ContextMenuStrip1.Items.ContainsKey("checkPDF") Then
Dim pdf = New ToolStripMenuItem() With {.Text = "PDF-Verknüpfungen prüfen", .Name = "checkPDF", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
AddHandler pdf.Click, AddressOf mnuItem_Clicked
ContextMenuStrip1.Items.Add(pdf)
End If
ContextMenuStrip1.Show(Cursor.Position)
@@ -724,7 +730,11 @@ Public Class usrCntlUSTV
frm.Show()
End If
ElseIf item.Name = "checkPDF" Then
checkPDF()
Else
MsgBox("Funktion nicht implementiert!")
End If
@@ -756,6 +766,30 @@ Public Class usrCntlUSTV
End Function
Private Function checkPDF(Optional ByRef filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean
'INFO -> Schnittstelle beinhaltet ald DA-ID die RK-ID (Feld wird missbraucht!!!)
Dim sqlStr = "select tblUStVAntrag.UStVAn_ID,[Länderverzeichnis für die Außenhandelsstatistik].LandKz, UStVPo_interneNr, UStVPo_ID, UStVPo_SchnittstellenNr, UStVPo_daId, UStVPo_daId_loeschbar
from tblUStVAntrag
inner join tblUStVPositionen on tblUStVAntrag.UStVAn_ID = tblUStVPositionen.UStVAn_ID
inner join [Länderverzeichnis für die Außenhandelsstatistik] on Landnr = tblUStVAntrag.UStVAn_LandNr
where isnull(UStVPo_daId, 0) <> 0 and isnull(UStVPo_daId, 0) not in (select da_id from tblDatenarchiv) and UStVPo_SchnittstellenNr <> 1
order by UStVAn_ID "
Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
'filepath = ""
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, openExcel,,, True)
Return True
Else
MsgBox("Keine Daten!")
Return False
End If
End Function
Private Sub mailmitExcelauswertung()
Try
@@ -1237,13 +1271,14 @@ Public Class usrCntlUSTV
If f.DialogResult = DialogResult.OK Then
Dim pruefdatum As Date = CDate(f.Datum)
Dim laenderausnahmen = f.exceptedCountries
Dim sqlQery = "Select A.AdressenNr, A.[E-Mail], A.[E-Mail2], A.LandKz as KundeLand, A.Ordnungsbegriff,L.LandKz as SteuerLandKz, S.StNrFürRückerstattungUSt, S.StNrGültigkeitsdatum, CAST('" & pruefdatum & "' AS DATE) AS Prüfdatum,
CASE
WHEN S.StNrGültigkeitsdatum > CAST('" & pruefdatum & "' AS DATE) THEN 1 ELSE 0
END AS Gültig
FROM [Länderverzeichnis für die Außenhandelsstatistik] L INNER JOIN (Adressen A INNER JOIN Währungstabelle W ON A.LandKz = W.LandKz INNER JOIN tblSteuernummern S ON A.AdressenNr = S.AdressenNr) ON L.LandNr = S.LandNr
WHERE S.StNrGültigkeitsdatum IS NOT NULL AND W.MitgliedslandEU = 0 " & IIf(sqlKunde <> "", sqlKunde, "") & IIf(f.cbxKunden.Checked, " AND A.AdressenNr between " & f.cboKundenkreis._value.Replace("-", " AND "), "")
WHERE S.StNrGültigkeitsdatum IS NOT NULL AND W.MitgliedslandEU = 0 " & IIf(sqlKunde <> "", sqlKunde, "") & IIf(f.cbxKunden.Checked, " AND A.AdressenNr between " & f.cboKundenkreis._value.Replace("-", " AND "), "") & IIf(laenderausnahmen <> "", " AND L.LandKz NOT IN (" & laenderausnahmen & ")", "")
Dim dtVorschau As DataTable = SQL.loadDgvBySql(sqlQery, "FMZOLL")

View File

@@ -642,6 +642,9 @@ Public Class ustCntlUSTV_AntragPosition
Private Sub scanSonstiges_FileDeleted() Handles scanSonstiges.FileDeleted
getValues(UStV_POS, True)
UStV_POS.UStVPo_daId = Nothing
sql.doSQL("update tblUStVPositionen set UStVPo_daId = NULL where UStVAn_ID = " & UStV_POS.UStVAn_ID & " and UStVPo_daId > 0 and isnull(UStVPo_daId, 0) not in (select da_id from tblDatenarchiv) ", "FMZOLL")
If UStV_POS.SAVE() Then RaiseEvent CHANGED(UStV_POS.UStVPo_ID)
End Sub

View File

@@ -704,5 +704,5 @@ Partial Class frmBU_Mahnlauf
Friend WithEvents Label9 As Label
Friend WithEvents lblBetreuer As Label
Friend WithEvents cboBetreuer As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents cbxNewDGV As CheckBox
Public Shared WithEvents cbxNewDGV As CheckBox
End Class

View File

@@ -830,7 +830,7 @@ Public Class frmBU_Mahnlauf
'Mail_HTMLBody &= "<br><br>"
Mail_HTMLBody &= "Iyi calismalar diler, saygilarimizi sunariz"
Mail_HTMLBody &= "<br><br><br>"
Mail_HTMLBody &= "<i>If you are not responsible for this matter, please send us an e-mail address to <b>buchhaltung@verag.ag</b>,
Mail_HTMLBody &= "<i>If you are not responsible for this matter, please send us an e-mail address to <b>" & FIRMA.Firma_E_Mail_Mahnungen & "</b>,
to which future reminders should be sent.<br>
In the meantime, we ask you to forward them to the responsible persons in your company.</i>"
Mail_HTMLBody &= "<br><br><br>" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID)
@@ -840,7 +840,7 @@ Public Class frmBU_Mahnlauf
Mail_Subject = MAHNTEXT & IIf(KdNr > 0, " - KdNr.: " & KdNr, "")
Mail_HTMLBody = "Sehr geehrte Damen und Herren,<br><br>im Anhang finden Sie ihre Mahnung, mit der Bitte um Bearbeitung. "
Mail_HTMLBody &= "<br><br><br>"
Mail_HTMLBody &= "<i>Sollten Sie für diesen Sachverhalt nicht zuständig sein, teilen Sie uns bitte per Mail an <b>buchhaltung@verag.ag</b> eine Mailadresse mit,
Mail_HTMLBody &= "<i>Sollten Sie für diesen Sachverhalt nicht zuständig sein, teilen Sie uns bitte per Mail an <b>" & FIRMA.Firma_E_Mail_Mahnungen & "</b> eine Mailadresse mit,
an welche zukünftig die Mahnungen versandt werden sollen.<br>
Derweil bitten wir um Weiterleitung an die zuständigen Personen in ihrem Haus.</i>"
Mail_HTMLBody &= "<br><br><br>Mit freundlichen Grüßen<br><br>" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID)
@@ -850,7 +850,7 @@ Public Class frmBU_Mahnlauf
Mail_Subject = "PAYMENT REMINDER" & IIf(KdNr > 0, " - Cust.: " & KdNr, "")
Mail_HTMLBody = "Dear Sir or Madam,<br><br>attached we send you the invoice reminder."
Mail_HTMLBody &= "<br><br><br>"
Mail_HTMLBody &= "<i>If you are not responsible for this matter, please send us an e-mail address to <b>buchhaltung@verag.ag</b>,
Mail_HTMLBody &= "<i>If you are not responsible for this matter, please send us an e-mail address to <b>" & FIRMA.Firma_E_Mail_Mahnungen & "</b>,
to which future reminders should be sent.<br>
In the meantime, we ask you to forward them to the responsible persons in your company.</i>"
Mail_HTMLBody &= "<br><br><br>Best regards<br><br>" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID)
@@ -858,11 +858,35 @@ Public Class frmBU_Mahnlauf
End If
Mail_HTMLBody = "<div style=""font-family:Calibri, Arial"">" & Mail_HTMLBody & "</div>"
If Firma_ID = 7 AndAlso (cbxNewDGV IsNot Nothing And cbxNewDGV.Checked) Then
Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an (ATILLA)")
Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an (ATILLA)")
Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an (ATILLA)")
Mail_HTMLBody = Mail_HTMLBody.ToString.Replace("rechnungsversand@verag.ag", FIRMA.Firma_E_Mail_Mahnungen)
Mail_BCC &= "buchhaltung@verag.ag;"
If Mail_To = "" AndAlso Mail_CC = "" Then 'fallback -> falls nicht korrekt hinterlegt!!
Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an")
Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an")
Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an")
Mail_BCC &= "buchhaltung@verag.ag;"
End If
Else
Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an")
Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an")
Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an")
End If
Mail_HTMLBody = "<div style=""font-family:Calibri, Arial"">" & Mail_HTMLBody & "</div>"
If Firma_ID = 19 Then
Select Case AD.LandKz
Case "RO" : Mail_BCC &= "alex@verag.ag;maut.ro@verag.ag;ma@verag.ag;" 'immer an alle bei RO!

View File

@@ -1035,7 +1035,7 @@ Public Class usrCntlBH
End Function
Function gen_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, ByRef RK_ID As Integer, ByRef Fusstext As String)
Function gen_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, ByRef RK_ID As Integer, ByRef Fusstext As String, ZahlungszielAusDebitor As Integer)
Try
If KdNr = "" Then Return False
@@ -1105,10 +1105,14 @@ Public Class usrCntlBH
RG.Packstücke_und_Warenbezeichnung = "NACHBERECHNUNG VON VERZUGSZINSEN" & vbNewLine & SPEDBUCH.Vermerk
'RG.EMailRechnungstext = Fusstext
If Not IsDBNull(KD.Zahlungsziel) AndAlso IsNumeric(KD.Zahlungsziel) Then
Dim Zahlungsziel As Integer = CInt(KD.Zahlungsziel)
RG.Nettozahlungsziel = IIf(Zahlungsziel > 14, 14, KD.Zahlungsziel)
End If
'IN DIESEM FALL IMMER AUS DEBITOR NEHMEN!!!
'If Not IsDBNull(KD.Zahlungsziel) AndAlso IsNumeric(KD.Zahlungsziel) Then
' Dim Zahlungsziel As Integer = CInt(KD.Zahlungsziel)
' RG.Nettozahlungsziel = IIf(Zahlungsziel > 14, 14, KD.Zahlungsziel)
'End If
RG.Nettozahlungsziel = ZahlungszielAusDebitor
RG.SteuerpflichtigerGesamtbetrag = 0
RG.SteuerfreierGesamtbetrag = 0
@@ -1245,7 +1249,7 @@ Public Class usrCntlBH
Private Sub btnZNBverrechnen_Click(sender As Object, e As EventArgs) Handles btnZNBverrechnen.Click
If txtZRbis.Text = "" OrElse Not IsDate(txtZRbis.Text) Then
MsgBox("Abrechnungdatum setzen!")
MsgBox("Abrechnungdatum (Zahlungen bis) setzen!")
txtZRbis.Focus()
Exit Sub
End If
@@ -1255,7 +1259,7 @@ Public Class usrCntlBH
LimitBEtrag = CInt(txtAbBetragAbrechnen.Text)
End If
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("Select [kundenNr],SUM([zinsbetrag]) as Zinsbetrag, zahlungsperiode_start,zahlungsperiode_ende FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where [verrechnet] Is null group by [kundenNr], zahlungsperiode_start, zahlungsperiode_ende" & IIf(LimitBEtrag > 0, " having SUM([zinsbetrag]) >= " & LimitBEtrag, ""), "FMZOLL")
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("Select [kundenNr],SUM([zinsbetrag]) as Zinsbetrag,max(belegZahlungsziel) as belegZahlungsziel , zahlungsperiode_start,zahlungsperiode_ende FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where [verrechnet] Is null group by [kundenNr], zahlungsperiode_start, zahlungsperiode_ende" & IIf(LimitBEtrag > 0, " having SUM([zinsbetrag]) >= " & LimitBEtrag, ""), "FMZOLL")
If dt_Main.Rows.Count > 0 Then
Dim kundenNr As String = ""
@@ -1342,7 +1346,7 @@ Public Class usrCntlBH
Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
Dim RK_ID As Integer = -1
If Not gen_SPEDBUCH_ByKdNr(R("kundenNr"), SPEDBUCH, CDate(txtZRbis.Text).ToShortDateString, vermerk) Then verarbOK = False
If Not gen_RECHNUNG_BySPEDBUCH(R("kundenNr"), SPEDBUCH, RK_ID, Fußtext) Then verarbOK = False
If Not gen_RECHNUNG_BySPEDBUCH(R("kundenNr"), SPEDBUCH, RK_ID, Fußtext, R("belegZahlungsziel")) Then verarbOK = False
If verarbOK Then
SQL.doSQL("UPDATE [tblMDM_Zinsberechnung] SET [verrechnet]=GETDATE(), RK_ID = " & RK_ID & " WHERE [verrechnet] Is null And kundenNr='" & R("kundenNr") & "' ", "FMZOLL")

View File

@@ -1131,7 +1131,7 @@ Public Class cProgramFunctions
Return ""
End Function
Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "", Optional Landscape As Boolean = False, Optional fitToOnePage As Boolean = False, Optional openFile As Boolean = True, Optional fitWideToOnePage As Boolean = False) As String
Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "", Optional Landscape As Boolean = False, Optional fitToOnePage As Boolean = False, Optional openFile As Boolean = True, Optional fitWideToOnePage As Boolean = False, Optional rangeAsBuchhaltung() As String = Nothing) As String
Try
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName
@@ -1156,6 +1156,16 @@ Public Class cProgramFunctions
Next
End If
If rangeAsBuchhaltung IsNot Nothing Then
For Each r In rangeAsBuchhaltung
Try
wb.Worksheets(0).Range(r).Style.NumberFormat.SetFormat("_-* #,##0.00_-;-* #,##0.00_-;_-* ""-""??_-;_-@_-")
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
Next
End If
If HeaderTxt <> "" Then
wb.Worksheets(0).FirstRow.InsertRowsAbove(2)
wb.Worksheets(0).Range("A1").Value = HeaderTxt

View File

@@ -76,9 +76,6 @@ Partial Class frmdynMailvorlagen
'
'mainPanel
'
Me.mainPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.mainPanel.Controls.Add(Me.TextBox2)
Me.mainPanel.Controls.Add(Me.cbxTyp)
Me.mainPanel.Controls.Add(Me.Label13)
@@ -109,9 +106,10 @@ Partial Class frmdynMailvorlagen
Me.mainPanel.Controls.Add(Me.btnSave)
Me.mainPanel.Controls.Add(Me.cbxAktiv)
Me.mainPanel.Controls.Add(Me.Label1)
Me.mainPanel.Location = New System.Drawing.Point(0, 425)
Me.mainPanel.Dock = System.Windows.Forms.DockStyle.Bottom
Me.mainPanel.Location = New System.Drawing.Point(0, 429)
Me.mainPanel.Name = "mainPanel"
Me.mainPanel.Size = New System.Drawing.Size(1283, 457)
Me.mainPanel.Size = New System.Drawing.Size(1295, 457)
Me.mainPanel.TabIndex = 101
'
'TextBox2
@@ -262,7 +260,7 @@ Partial Class frmdynMailvorlagen
Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.email_big
Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn.Location = New System.Drawing.Point(1100, 405)
Me.btn.Location = New System.Drawing.Point(1112, 405)
Me.btn.Margin = New System.Windows.Forms.Padding(5)
Me.btn.Name = "btn"
Me.btn.Padding = New System.Windows.Forms.Padding(5)
@@ -413,6 +411,7 @@ Partial Class frmdynMailvorlagen
'
'btnAdd
'
Me.btnAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnAdd.BackgroundImage = Global.SDL.My.Resources.Resources.plus
Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -424,6 +423,7 @@ Partial Class frmdynMailvorlagen
'
'btnDelete
'
Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnDelete.BackgroundImage = Global.SDL.My.Resources.Resources.del
Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -558,6 +558,9 @@ Partial Class frmdynMailvorlagen
Me.dgvMailvorlagen.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvMailvorlagen.AllowUserToAddRows = False
Me.dgvMailvorlagen.AllowUserToDeleteRows = False
Me.dgvMailvorlagen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.dgvMailvorlagen.BackgroundColor = System.Drawing.Color.White
Me.dgvMailvorlagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvMailvorlagen.Location = New System.Drawing.Point(0, 54)
@@ -569,12 +572,12 @@ Partial Class frmdynMailvorlagen
'
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 48)
Me.ContextMenuStrip1.Size = New System.Drawing.Size(122, 26)
'
'KopierenToolStripMenuItem
'
Me.KopierenToolStripMenuItem.Name = "KopierenToolStripMenuItem"
Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(121, 22)
Me.KopierenToolStripMenuItem.Text = "Kopieren"
'
'frmdynMailvorlagen

View File

@@ -4143,7 +4143,7 @@ Partial Class usrcntlKundeBearbeitenFull
Me.Kunden.Location = New System.Drawing.Point(4, 22)
Me.Kunden.Name = "Kunden"
Me.Kunden.Padding = New System.Windows.Forms.Padding(3)
Me.Kunden.Size = New System.Drawing.Size(651, 175)
Me.Kunden.Size = New System.Drawing.Size(651, 164)
Me.Kunden.TabIndex = 1
Me.Kunden.Text = "Kundenpreise"
Me.Kunden.UseVisualStyleBackColor = True
@@ -4176,7 +4176,7 @@ Partial Class usrcntlKundeBearbeitenFull
Me.dgvIDS_Rabatte.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(3, 3)
Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte"
Me.dgvIDS_Rabatte.Size = New System.Drawing.Size(645, 169)
Me.dgvIDS_Rabatte.Size = New System.Drawing.Size(645, 158)
Me.dgvIDS_Rabatte.TabIndex = 34
'
'TabPage2
@@ -4188,7 +4188,7 @@ Partial Class usrcntlKundeBearbeitenFull
Me.TabPage2.Location = New System.Drawing.Point(4, 22)
Me.TabPage2.Name = "TabPage2"
Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage2.Size = New System.Drawing.Size(651, 175)
Me.TabPage2.Size = New System.Drawing.Size(651, 164)
Me.TabPage2.TabIndex = 2
Me.TabPage2.Text = "ATEZ KundenNr"
Me.TabPage2.UseVisualStyleBackColor = True
@@ -5497,7 +5497,7 @@ Partial Class usrcntlKundeBearbeitenFull
'
Me.txtEmail2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtEmail2.Location = New System.Drawing.Point(107, 120)
Me.txtEmail2.MaxLength = 40
Me.txtEmail2.MaxLength = 100
Me.txtEmail2.Name = "txtEmail2"
Me.txtEmail2.Size = New System.Drawing.Size(333, 20)
Me.txtEmail2.TabIndex = 9
@@ -5506,7 +5506,7 @@ Partial Class usrcntlKundeBearbeitenFull
'
Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtEmail.Location = New System.Drawing.Point(107, 94)
Me.txtEmail.MaxLength = 40
Me.txtEmail.MaxLength = 100
Me.txtEmail.Name = "txtEmail"
Me.txtEmail.Size = New System.Drawing.Size(333, 20)
Me.txtEmail.TabIndex = 7

View File

@@ -885,6 +885,17 @@ Public Class usrcntlKundeBearbeitenFull
txtERROR.Text = err : Exit Sub
End If
Dim Email1 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(txtEmail.Text)
If Email1 <> "" Then
txtERROR.Text = Email1 & " ist keine gültige Email!" : Exit Sub
End If
Dim Email2 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(txtEmail2.Text)
If Email2 <> "" Then
txtERROR.Text = Email2 & " ist keine gültige Email!" : Exit Sub
End If
Dim allowdelete = Not (KUNDE.hasEntry And ADRESSE.hasEntry) ' wenn der Eintrag bereits existiert
If Not checkAbfertigungsverbot() Then

View File

@@ -9,10 +9,36 @@ Public Class usrcntlVertraege
Public Shared Event clickOK(ByVal sender As System.Object, ByVal e As System.EventArgs)
Private Sub dgvVertraege_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVertraegeNew.CellContentDoubleClick
If dgvVertraegeNew.SelectedRows.Count = 1 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraegeNew.SelectedRows(0).Cells("kv_datenarchivId").Value)
DS.OPEN_SINGLE()
'If dgvVertraegeNew.SelectedRows.Count = 1 Then
' Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraegeNew.SelectedRows(0).Cells("kv_datenarchivId").Value)
' DS.OPEN_SINGLE()
'End If
Dim tmprowindex As Integer = e.RowIndex
If dgvVertraegeNew.Columns(e.ColumnIndex).Name = "clmnPDF" Then
If dgvVertraegeNew.Rows(e.RowIndex).Cells("kv_datenarchivId").Value IsNot DBNull.Value AndAlso CInt(dgvVertraegeNew.Rows(e.RowIndex).Cells("kv_datenarchivId").Value) > 0 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraegeNew.Rows(tmprowindex).Cells("kv_datenarchivId").Value)
If DS.hasITEMS Then
For Each i In DS.DATA_LIST.LIST
Process.Start(i.coll_pfad)
Next
End If
End If
ElseIf dgvVertraegeNew.Columns(e.ColumnIndex).Name = "clmnMail" Then
If dgvVertraegeNew.Rows(e.RowIndex).Cells("kv_datenarchivId_mail").Value IsNot DBNull.Value AndAlso CInt(dgvVertraegeNew.Rows(e.RowIndex).Cells("kv_datenarchivId_mail").Value) > 0 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraegeNew.Rows(tmprowindex).Cells("kv_datenarchivId_mail").Value)
If DS.hasITEMS Then
For Each i In DS.DATA_LIST.LIST
Process.Start(i.coll_pfad)
Next
End If
End If
End If
End Sub
Private Sub dgvVertraege_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvVertraegeNew.CellMouseClick

View File

@@ -157,6 +157,7 @@ Partial Class usrcntlGestellungsgarantien
Me.dgvGestGarantieNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvGestGarantieNew.Location = New System.Drawing.Point(0, 0)
Me.dgvGestGarantieNew.Name = "dgvGestGarantieNew"
Me.dgvGestGarantieNew.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvGestGarantieNew.Size = New System.Drawing.Size(506, 105)
Me.dgvGestGarantieNew.TabIndex = 15
'

View File

@@ -62,6 +62,8 @@ Public Class cUSTVAntrag
Property UStVAn_Sicherheit As Object = Nothing
Property POSITIONEN As New List(Of cUStVPositionen) '= Nothing
Public hasEntry = False
Dim SQL As New SQL
Sub New()
@@ -136,6 +138,9 @@ Public Class cUSTVAntrag
Public Sub LOAD(UStVAn_ID, Optional loadPos = True)
Try
hasEntry = False
POSITIONEN.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblUStVAntrag WHERE UStVAn_ID=@UStVAn_ID ", conn)
@@ -151,6 +156,7 @@ Public Class cUSTVAntrag
propInfo.SetValue(Me, dr.Item(i.Text))
End If
Next
hasEntry = True
If loadPos Then LOAD_POSITIONEN()
End If
dr.Close()
@@ -351,14 +357,24 @@ Public Class cUStVPositionen
Property UStVPo_Nettobetrag As Object = Nothing
Property UStVPo_NettobetragEUR As Object = Nothing
Public hasEntry = False
Dim SQL As New SQL
Sub New(UStVAn_ID, UStVPo_ID, UStVPo_interneNr)
Me.UStVAn_ID = UStVAn_ID
Me.UStVPo_interneNr = UStVPo_interneNr
LOAD(UStVAn_ID, UStVPo_interneNr)
End Sub
Sub New(UStVAn_ID, UStVPo_ID)
Me.UStVAn_ID = UStVAn_ID
Me.UStVPo_ID = UStVPo_ID
LOAD(UStVAn_ID, UStVPo_ID)
End Sub
Sub New()
End Sub
@@ -372,6 +388,8 @@ Public Class cUStVPositionen
Public Sub LOAD(UStVAn_ID, UStVPo_ID)
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM [tblUStVPositionen] WHERE UStVAn_ID=@UStVAn_ID AND UStVPo_ID=@UStVPo_ID ", conn)
cmd.Parameters.AddWithValue("@UStVAn_ID", UStVAn_ID)
@@ -387,7 +405,37 @@ Public Class cUStVPositionen
propInfo.SetValue(Me, dr.Item(i.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using
End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
End Sub
Public Sub LOADInterneNr(UStVAn_ID, UStVPo_interneNr)
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM [tblUStVPositionen] WHERE UStVAn_ID=@UStVAn_ID AND UStVPo_interneNr=@UStVPo_interneNr ", conn)
cmd.Parameters.AddWithValue("@UStVAn_ID", UStVAn_ID)
cmd.Parameters.AddWithValue("@UStVPo_interneNr", UStVPo_interneNr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
'Dim l As New cOfferte
For Each i In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(i.Scalarvariable)
If dr.Item(i.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(i.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using

View File

@@ -3,7 +3,6 @@ Imports System.Data.SqlClient
Imports System.IO
Imports System.Net
Imports System.Reflection
Imports DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing
Public Class cIDS
@@ -664,12 +663,43 @@ Public Class cIDS
Return ""
End Function
Public Shared Function checkInvoices() As DataTable
Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing) As DataTable
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim sqlTime As String = ""
Dim SQLstr = "select * from tblIDSInvoicesNew where invoice_id not in (select TotalInvoiceId from tblIDSInvoicesNewSplittedByCountry) and Year(YearMonthDay) >= 2025"
If IsDate(reDatVon) AndAlso CDate(reDatVon) > "01.01.2020" AndAlso IsDate(reDatBis) AndAlso CDate(reDatBis) > "01.01.2020" Then
sqlTime = " And cast(YearMonthDay as Date) between '" & reDatVon.ToShortDateString & "' and '" & reDatBis.ToShortDateString & "'"
End If
Dim SQLstr = "select Invoicenumber as RechnungsNr,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG INNER JOIN tblKundenErweitert on Adressen.AdressenNr = kde_KundenNr where DocumentName is null " & sqlTime & " group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay, kde_keineMWSt"
Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
Return dt
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return Nothing
End Function
Public Shared Function checkPartInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing) As DataTable
Try
'Prüft, ob es zu Gesamtrechnungen Teilrechnungen gibt!
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim SQLstr = " "
If IsDate(reDatVon) AndAlso CDate(reDatVon) > "01.01.2020" AndAlso IsDate(reDatBis) AndAlso CDate(reDatBis) > "01.01.2020" Then
SQLstr &= "select Invoicenumber as RechnungsNr ,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt,daId from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG INNER JOIN tblKundenErweitert on Adressen.AdressenNr = kde_KundenNr where invoice_id not in (select TotalInvoiceId from tblIDSInvoicesNewSplittedByCountry) AND YearMonthDay >= '" & reDatVon.ToShortDateString & "' and YearMonthDay < '" & reDatBis.ToShortDateString & "'"
Else
SQLstr &= "select * from tblIDSInvoicesNew where invoice_id not in (select TotalInvoiceId from tblIDSInvoicesNewSplittedByCountry) AND Year(YearMonthDay) >= 2025"
End If
Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")

View File

@@ -308,7 +308,7 @@ Public Class cMessenger
Next
Me.LOAD_MEMBERS()
If dateTmp Is Nothing Then
Me.LOAD_MESSAGES(topMax)
Me.LOAD_MESSAGES_NEW(topMax)
Else
Me.LOAD_MESSAGES_DATE(dateTmp)
End If
@@ -346,7 +346,7 @@ Public Class cMessenger
Me.LOAD_MEMBERS()
If dateTmp Is Nothing Then
Me.LOAD_MESSAGES()
Me.LOAD_MESSAGES_NEW()
Else
Me.LOAD_MESSAGES_DATE(dateTmp)
End If
@@ -415,9 +415,9 @@ Public Class cMessenger
cmd.Parameters.AddWithValue("@top", top)
Dim dr = cmd.ExecuteReader()
While dr.Read
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) ' ----> 100 messages = 101 SQL calls
'Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) ' ----> 100 messages = 101 SQL calls
'Hier werden die einzelnen MSg-Obj nicht mehr per SQL geladen, sondern direkt als Objekt übergeben -> schneller!
'Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_chatId"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
Me.CHAT_MESSAGES.Add(MSG)
End While
dr.Close()
@@ -431,6 +431,64 @@ Public Class cMessenger
End Try
End Sub
Public Sub LOAD_MESSAGES_NEW(Optional top As Integer = 100)
Try
Me.CHAT_MESSAGES.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
Using cmd As New SqlCommand(
"SELECT TOP (@top) chatMg_id, chatMg_chatId, chatMg_maId, chatMg_maName, chatMg_maFirma, chatMg_datetime, chatMg_type, chatMg_text, chatMg_anhang_docId, chatMg_referenz_AvisoId, chatMg_referenz_SendungsId, chatMg_referenz_KundenNr
FROM tblMessenger_ChatMessages
WHERE chatMg_chatId = @chat_id
ORDER BY chatMg_datetime DESC", conn)
cmd.Parameters.AddWithValue("@chat_id", chat_id)
cmd.Parameters.AddWithValue("@top", top)
Using dr As SqlDataReader = cmd.ExecuteReader()
While dr.Read()
Dim chatMg_id As Integer? = SafeInt(dr("chatMg_id"))
Dim chatMg_chatId As Integer? = SafeInt(dr("chatMg_chatId"))
Dim chatMg_maId As Integer? = SafeInt(dr("chatMg_maId"))
Dim chatMg_type As String = If(IsDBNull(dr("chatMg_type")), "", dr("chatMg_type").ToString())
Dim chatMg_anhang_docId As Integer? = SafeInt(dr("chatMg_anhang_docId"))
Dim chatMg_referenz_AvisoId As Integer? = SafeInt(dr("chatMg_referenz_AvisoId"))
Dim chatMg_referenz_SendungsId As Integer? = SafeInt(dr("chatMg_referenz_SendungsId"))
Dim chatMg_datetime As DateTime = If(IsDBNull(dr("chatMg_datetime")), DateTime.MinValue, Convert.ToDateTime(dr("chatMg_datetime")))
Dim chatMg_maName As String = If(IsDBNull(dr("chatMg_maName")), "", dr("chatMg_maName").ToString())
Dim chatMg_maFirma As String = If(IsDBNull(dr("chatMg_maFirma")), "", dr("chatMg_maFirma").ToString())
Dim chatMg_text As String = If(IsDBNull(dr("chatMg_text")), "", dr("chatMg_text").ToString())
Dim chatMg_referenz_KundenNr As String = If(IsDBNull(dr("chatMg_referenz_KundenNr")), "", dr("chatMg_referenz_KundenNr").ToString())
' Message-Objekt direkt erstellen
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_chatId"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr"))
Me.CHAT_MESSAGES.Add(MSG)
End While
End Using
End Using
End Using
' Nachrichten umdrehen, damit älteste zuerst angezeigt werden
Me.CHAT_MESSAGES.Reverse()
Catch ex As Exception
MsgBox("Fehler in LOAD_MESSAGES: " & vbNewLine & ex.Message & vbNewLine & ex.StackTrace)
End Try
End Sub
Private Function SafeInt(value As Object) As Integer?
If IsDBNull(value) Then Return Nothing
Dim s As String = value.ToString().Trim()
Dim result As Integer
If Integer.TryParse(s, result) Then
Return result
Else
Return Nothing
End If
End Function
Public Sub LOAD_MESSAGES_DATE(dateTmp As Date)
Try
Me.CHAT_MESSAGES.Clear()
@@ -442,9 +500,9 @@ Public Class cMessenger
While dr.Read
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) '----> 100 messages = 101 SQL calls
'Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) '----> 100 messages = 101 SQL calls
'Hier werden die einzelnen MSg-Obj nicht mehr per SQL geladen, sondern direkt als Objekt übergeben -> schneller!
'Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_chatId"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
Me.CHAT_MESSAGES.Add(MSG)
End While
@@ -780,7 +838,8 @@ Public Class cMessenger
Me.chatMg_maId = chatMg_maId
End Sub
Sub New(chatMg_chatId, chatMg_maId, chatMg_datetime, chatMg_maName, chatMg_maFirma, chatMg_type, chatMg_text, chatMg_anhang_docId, chatMg_referenz_AvisoId, chatMg_referenz_SendungsId, chatMg_referenz_KundenNr)
Sub New(chatMg_id, chatMg_chatId, chatMg_maId, chatMg_datetime, chatMg_maName, chatMg_maFirma, chatMg_type, chatMg_text, chatMg_anhang_docId, chatMg_referenz_AvisoId, chatMg_referenz_SendungsId, chatMg_referenz_KundenNr)
Me.chatMg_id = chatMg_id
Me.chatMg_chatId = chatMg_chatId
Me.chatMg_maId = chatMg_maId
Me.chatMg_datetime = chatMg_datetime

View File

@@ -363,6 +363,31 @@ Public Class cRMC
End Function
Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing) As DataTable
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim sqlTime As String = ""
If IsDate(reDatVon) AndAlso CDate(reDatVon) > "01.01.2020" AndAlso IsDate(reDatBis) AndAlso CDate(reDatBis) > "01.01.2020" Then
sqlTime = " And cast([rmc_reDatum] As Date) between '" & reDatVon.ToShortDateString & "' and '" & reDatBis.ToShortDateString & "'"
End If
Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & " group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt"
Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
Return dt
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return Nothing
End Function
Public Class Paramter

View File

@@ -45,6 +45,31 @@ Public Class cUTA
Return SQL.getValueTxtBySql("SELECT count(InvToCustomer) FROM [tblUTAImportNew] where InvToCustomer Is null ", "FMZOLL",,, -1)
End Function
Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing) As DataTable
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim sqlTime As String = ""
If IsDate(reDatVon) AndAlso CDate(reDatVon) > "01.01.2020" AndAlso IsDate(reDatBis) AndAlso CDate(reDatBis) > "01.01.2020" Then
sqlTime = " And CAST(U.Rechnungsdatum As Date) BETWEEN '" & reDatVon.ToShortDateString & "' and '" & reDatBis.ToShortDateString & "'"
End If
Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
Return dt
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return Nothing
End Function
Public Class UTAHeader
Property Übertragungsnummer As Integer

View File

@@ -64,7 +64,7 @@ Public Class frmMessenger
End Sub
Private Sub MyDatagridview1_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChats.CellClick '.CellContentClick
If dgvChats.Rows(e.RowIndex).Cells("ungelesen").Value <> "" Then
If dgvChats.Rows(e.RowIndex).Cells("ungelesen").Value <> 0 Then 'If dgvChats.Rows(e.RowIndex).Cells("ungelesen").Value <> "" Then
Dim dgv_ChatID = If(dgvChats.SelectedRows.Count > 0, dgvChats.SelectedRows(0).Cells("chat_id").Value, -1)
intiDGVChats(dgv_ChatID, False) ' Splate ungelesen sol sich ändern
End If
@@ -216,7 +216,54 @@ Public Class frmMessenger
" & where & "
) as T " & whereName & " ORDER BY chat_lastMsg DESC"
.DataSource = SQL.loadDgvBySql(sqlQery, "ADMIN")
Dim sqlQery_optimiced As String = "SELECT TOP 200
c.chat_id,
CASE
WHEN ISNULL(c.chat_name, '') <> '' THEN c.chat_name
ELSE names.chat_name
END AS chat_name,
ISNULL(unread.ungelesen, 0) AS ungelesen,
c.chat_lastMsg
FROM tblMessenger_Chat c
-- ensure current user is member
INNER JOIN tblMessenger_ChatMembers m
ON m.chatMb_chatId = c.chat_id
AND m.chatMb_maId = " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "
-- 🔹 get participant names (distinct!)
OUTER APPLY (
SELECT STRING_AGG(name, ', ') AS chat_name
FROM (
SELECT DISTINCT
mit.mit_vname + ' ' + mit.mit_nname AS name
FROM tblMessenger_ChatMembers m2
INNER JOIN tblMitarbeiter mit
ON mit.mit_id = m2.chatMb_maId
WHERE m2.chatMb_chatId = c.chat_id
AND m2.chatMb_maId <> " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "
) x
) names
-- 🔹 unread count separated (no duplication!)
OUTER APPLY (
SELECT COUNT(*) AS ungelesen
FROM tblMessenger_ChatMessages msg
INNER JOIN tblMessenger_ChatMessageStatus s
ON s.chatMgSt_chatMsgId = msg.chatMg_id
WHERE msg.chatMg_chatId = c.chat_id
AND s.chatMgSt_MaId = " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "
AND s.chatMgSt_gelesen = 0
) unread WHERE c.chat_aktiv = " & IIf(Not cbxInaktiveChats.Checked, 1, 0) & "" & where & "ORDER BY c.chat_lastMsg DESC"
.DataSource = SQL.loadDgvBySql(sqlQery_optimiced, "ADMIN")
If .Columns.Count = 0 Then Exit Sub
@@ -547,10 +594,19 @@ Public Class frmMessenger
If CHAT IsNot Nothing Then
CHAT.LOAD_MESSAGES(topMessages)
CHAT.LOAD_MESSAGES_NEW(topMessages)
' CHAT = New VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat(dgvChats.SelectedRows(0).Cells("chat_id").Value)
Dim newMsg As Boolean = False
Dim existingIds As New HashSet(Of Integer)
For Each ctrl In MyFlowLayoutPanel1.Controls
existingIds.Add(ctrl.CHAT_MSG.chatMg_id)
Next
For Each MSG In CHAT.CHAT_MESSAGES
Dim found As Boolean = False
For Each I In MyFlowLayoutPanel1.Controls
@@ -602,6 +658,61 @@ Public Class frmMessenger
End Try
End Sub
Private Sub REFRESH_CHAT_NEW()
Try
If CHAT Is Nothing Then Exit Sub
' Load latest messages
CHAT.LOAD_MESSAGES_NEW(topMessages)
' Build fast lookup for existing message IDs
Dim existingIds As New HashSet(Of Integer)
For Each ctrl As Control In MyFlowLayoutPanel1.Controls
Select Case ctrl.GetType()
Case GetType(usrCntlMessenger_ChatElement)
existingIds.Add(DirectCast(ctrl, usrCntlMessenger_ChatElement).CHAT_MSG.chatMg_id)
Case GetType(usrCntlMessenger_ChatAnhang)
existingIds.Add(DirectCast(ctrl, usrCntlMessenger_ChatAnhang).CHAT_MSG.chatMg_id)
Case GetType(usrCntlMessenger_ChatEmoji)
existingIds.Add(DirectCast(ctrl, usrCntlMessenger_ChatEmoji).CHAT_MSG.chatMg_id)
Case GetType(usrCntlMessenger_ChatElementDEL)
existingIds.Add(DirectCast(ctrl, usrCntlMessenger_ChatElementDEL).CHAT_MSG.chatMg_id)
End Select
Next
Dim newMessageAdded As Boolean = False
MyFlowLayoutPanel1.SuspendLayout()
For Each MSG In CHAT.CHAT_MESSAGES
If Not existingIds.Contains(MSG.chatMg_id) Then
Dim ctrl = getControlFromMSG(MSG)
If ctrl IsNot Nothing Then
MyFlowLayoutPanel1.Controls.Add(ctrl)
newMessageAdded = True
End If
End If
Next
MyFlowLayoutPanel1.ResumeLayout()
If newMessageAdded Then
MyFlowLayoutPanel1.VerticalScroll.Value = MyFlowLayoutPanel1.VerticalScroll.Maximum
End If
checkOnlineOffline()
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace,
System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
'Sub ORDER_CHAT_MSG()
' If Not CHECK_CHATMSG_ORDER() Then
@@ -689,10 +800,11 @@ Public Class frmMessenger
MSG.chatMg_maFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
If MSG.SAVE(True, CHAT.CHAT_MEMBERS) Then
SEND_TOKEN_NEW_MESSAGE()
' CHAT.CHAT_MESSAGES.Add(MSG)
CHAT.CHAT_MESSAGES.Add(MSG)
SET_ALL_READ()
REFRESH_CHAT()
REFRESH_CHAT_NEW()
rtbChatMessage.Text = ""
rtbChatMessage.Focus()
End If
@@ -753,13 +865,13 @@ Public Class frmMessenger
If CHAT IsNot Nothing And VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = True Then
VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = False
' MsgBox("asd")
REFRESH_CHAT()
REFRESH_CHAT_NEW()
End If
End Sub
Private Sub Timer_REFRESH_Tick(sender As Object, e As EventArgs) Handles Timer_REFRESH.Tick
loaded = False
REFRESH_CHAT()
REFRESH_CHAT_NEW()
Dim dgv_ChatID = If(dgvChats.SelectedRows.Count > 0, dgvChats.SelectedRows(0).Cells("chat_id").Value, -1)
If checkNewestShit() Then ' prüft, ob neue Nachrichten gekommen sind, sont kein Refresh (stört das scrollen)
intiDGVChats(dgv_ChatID, False)
@@ -871,7 +983,7 @@ Public Class frmMessenger
If dgvChats.Columns.Count > 0 Then
If e.ColumnIndex = dgvChats.Columns("ungelesen").Index Then
If dgvChats.Rows(e.RowIndex).Cells("ungelesen").Value <> "" Then
If dgvChats.Rows(e.RowIndex).Cells("ungelesen").Value <> 0 Then ' If dgvChats.Rows(e.RowIndex).Cells("ungelesen").Value <> "" Then
dgvChats.Rows(e.RowIndex).Cells("ungelesen").Style.BackColor = Color.Red
End If
'For Each r As DataGridViewRow In .Rows
@@ -946,10 +1058,10 @@ Public Class frmMessenger
If MSG.SAVE(True, CHAT.CHAT_MEMBERS) Then
If reloadChat Then
CHAT.CHAT_MESSAGES.Add(MSG)
SEND_TOKEN_NEW_MESSAGE()
' CHAT.CHAT_MESSAGES.Add(MSG)
SET_ALL_READ()
REFRESH_CHAT()
REFRESH_CHAT_NEW()
rtbChatMessage.Text = ""
rtbChatMessage.Focus()
End If
@@ -972,7 +1084,7 @@ Public Class frmMessenger
SEND_TOKEN_NEW_MESSAGE()
' CHAT.CHAT_MESSAGES.Add(MSG)
SET_ALL_READ()
REFRESH_CHAT()
REFRESH_CHAT_NEW()
'rtbChatMessage.Text = filePath
'rtbChatMessage.Focus()
End If
@@ -1155,7 +1267,7 @@ Public Class frmMessenger
'CHAT neu laden!
SEND_TOKEN_NEW_MESSAGE()
SET_ALL_READ()
REFRESH_CHAT()
REFRESH_CHAT_NEW()
rtbChatMessage.Text = ""
rtbChatMessage.Focus()
End If

View File

@@ -71,6 +71,31 @@ Public Class cMSEAPI
Return SQL.getValueTxtBySql("SELECT count(InvToCustomer) FROM [tblMSEInvoices] where InvToCustomer Is null ", "FMZOLL",,, -1)
End Function
Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing) As DataTable
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim sqlTime As String = ""
If IsDate(reDatVon) AndAlso CDate(reDatVon) > "01.01.2020" AndAlso IsDate(reDatBis) AndAlso CDate(reDatBis) > "01.01.2020" Then
sqlTime = " And cast(invoice_date As Date) between '" & reDatVon.ToShortDateString & "' and '" & reDatBis.ToShortDateString & "'"
End If
Dim SQLstr = "Select invoice_id As RechnungsNr,[invoice_date] As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST from tblMSEInvoices inner join [tblMSECustomers] On [customer_number] = [customer_id] INNER JOIN Adressen On Adressen.MSEKundenNr = [customer_number] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where daId Is null " & sqlTime & " group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date, kde_keineMWSt"
Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
Return dt
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return Nothing
End Function

View File

@@ -26,6 +26,11 @@ Partial Class frmDatumsabfrage
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
Me.Label2 = New System.Windows.Forms.Label()
Me.lbLaender = New VERAG_PROG_ALLGEMEIN.MyListBox()
Me.btnKeine = New System.Windows.Forms.Button()
Me.btnAlle = New System.Windows.Forms.Button()
Me.pnlKunde = New System.Windows.Forms.Panel()
Me.cbxKunden = New System.Windows.Forms.CheckBox()
Me.cboKundenkreis = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -35,13 +40,17 @@ Partial Class frmDatumsabfrage
Me.lbl = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.MyPanel1.SuspendLayout()
Me.MyPanel2.SuspendLayout()
Me.pnlKunde.SuspendLayout()
Me.SuspendLayout()
'
'MyPanel1
'
Me.MyPanel1.AutoSize = True
Me.MyPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.MyPanel1.BackColor = System.Drawing.Color.White
Me.MyPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.MyPanel1.Controls.Add(Me.MyPanel2)
Me.MyPanel1.Controls.Add(Me.pnlKunde)
Me.MyPanel1.Controls.Add(Me.dtp_date)
Me.MyPanel1.Controls.Add(Me.btnClose)
@@ -54,6 +63,60 @@ Partial Class frmDatumsabfrage
Me.MyPanel1.Size = New System.Drawing.Size(286, 84)
Me.MyPanel1.TabIndex = 3
'
'MyPanel2
'
Me.MyPanel2.AutoSize = True
Me.MyPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.MyPanel2.Controls.Add(Me.Label2)
Me.MyPanel2.Controls.Add(Me.lbLaender)
Me.MyPanel2.Controls.Add(Me.btnKeine)
Me.MyPanel2.Controls.Add(Me.btnAlle)
Me.MyPanel2.Location = New System.Drawing.Point(3, 82)
Me.MyPanel2.Name = "MyPanel2"
Me.MyPanel2.Size = New System.Drawing.Size(253, 364)
Me.MyPanel2.TabIndex = 49
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(22, 3)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(40, 13)
Me.Label2.TabIndex = 50
Me.Label2.Text = "Länder"
'
'lbLaender
'
Me.lbLaender._value = ""
Me.lbLaender.FormattingEnabled = True
Me.lbLaender.Location = New System.Drawing.Point(25, 16)
Me.lbLaender.Name = "lbLaender"
Me.lbLaender.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
Me.lbLaender.Size = New System.Drawing.Size(225, 316)
Me.lbLaender.TabIndex = 46
'
'btnKeine
'
Me.btnKeine.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnKeine.Location = New System.Drawing.Point(150, 338)
Me.btnKeine.Margin = New System.Windows.Forms.Padding(0)
Me.btnKeine.Name = "btnKeine"
Me.btnKeine.Size = New System.Drawing.Size(100, 26)
Me.btnKeine.TabIndex = 47
Me.btnKeine.Text = "Keine"
Me.btnKeine.UseVisualStyleBackColor = True
'
'btnAlle
'
Me.btnAlle.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAlle.Location = New System.Drawing.Point(25, 338)
Me.btnAlle.Margin = New System.Windows.Forms.Padding(0)
Me.btnAlle.Name = "btnAlle"
Me.btnAlle.Size = New System.Drawing.Size(100, 26)
Me.btnAlle.TabIndex = 48
Me.btnAlle.Text = "Alle"
Me.btnAlle.UseVisualStyleBackColor = True
'
'pnlKunde
'
Me.pnlKunde.Controls.Add(Me.cbxKunden)
@@ -149,6 +212,7 @@ Partial Class frmDatumsabfrage
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.AutoSize = True
Me.ClientSize = New System.Drawing.Size(286, 84)
Me.Controls.Add(Me.MyPanel1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
@@ -157,9 +221,12 @@ Partial Class frmDatumsabfrage
Me.Text = "frmDatumsabfrage"
Me.MyPanel1.ResumeLayout(False)
Me.MyPanel1.PerformLayout()
Me.MyPanel2.ResumeLayout(False)
Me.MyPanel2.PerformLayout()
Me.pnlKunde.ResumeLayout(False)
Me.pnlKunde.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
End Sub
@@ -172,4 +239,9 @@ Partial Class frmDatumsabfrage
Friend WithEvents pnlKunde As Panel
Public WithEvents cboKundenkreis As VERAG_PROG_ALLGEMEIN.MyComboBox
Public WithEvents cbxKunden As CheckBox
Friend WithEvents btnAlle As Button
Friend WithEvents lbLaender As MyListBox
Friend WithEvents btnKeine As Button
Friend WithEvents MyPanel2 As MyPanel
Friend WithEvents Label2 As Label
End Class

View File

@@ -1,10 +1,10 @@
Imports System.Windows.Forms
Imports GrapeCity.Viewer.Common.Model
Imports VERAG_PROG_ALLGEMEIN
Public Class frmDatumsabfrage
Dim onlypastDate As Boolean = True
Dim panelKunde As Boolean = False
Dim panelLaender As Boolean = False
Sub New()
@@ -31,9 +31,13 @@ Public Class frmDatumsabfrage
onlypastDate = _onlypastDate
lbl.Text = title
panelKunde = _mitKundengruppe
panelLaender = _mitKundengruppe
End Sub
Public Datum As Date = CDate(Now.ToShortDateString)
Public exceptedCountries As String
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
Label1.Text = ""
@@ -43,6 +47,9 @@ Public Class frmDatumsabfrage
Exit Sub
End If
Datum = CDate(dtp_date.Value)
If panelLaender Then
exceptedCountries = getValues()
End If
Me.DialogResult = DialogResult.OK
End Sub
@@ -54,12 +61,26 @@ Public Class frmDatumsabfrage
Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
Datum = CDate(Now.ToShortDateString)
If panelLaender Then
exceptedCountries = getValues()
End If
Me.Close()
End Sub
Private Sub frmDatumsabfrage(sender As Object, e As EventArgs) Handles Me.Load
dtp_date.Value = Now.ToShortDateString
pnlKunde.Visible = panelKunde
MyPanel2.Visible = panelLaender
If panelLaender Then
Me.Height = 462
Else
Me.Height = 84
End If
If panelKunde Then
cboKundenkreis.Items.Clear()
@@ -74,10 +95,42 @@ Public Class frmDatumsabfrage
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 400000-499999: YU - KUNDEN", "400000-499999"))
End If
If panelLaender Then
lbLaender.fillWithSQL(" select L.LandKz, L.LandBez FROM [Länderverzeichnis für die Außenhandelsstatistik] L
INNER JOIN (Adressen A INNER JOIN Währungstabelle W ON A.LandKz = W.LandKz INNER JOIN tblSteuernummern S ON A.AdressenNr = S.AdressenNr) ON L.LandNr = S.LandNr
WHERE S.StNrGültigkeitsdatum IS NOT NULL AND W.MitgliedslandEU = 0 GROUP BY L.LandBez, L.LandKz
order by L.LandBez ", , "FMZOLL")
End If
End Sub
Private Sub cbxKunden_CheckedChanged(sender As Object, e As EventArgs) Handles cbxKunden.CheckedChanged
cboKundenkreis.Enabled = cbxKunden.Checked
End Sub
Private Sub btnAlle_Click(sender As Object, e As EventArgs) Handles btnAlle.Click
For i = 0 To lbLaender.Items.Count - 1
lbLaender.SetSelected(i, True)
Next
End Sub
Private Sub btnKeine_Click(sender As Object, e As EventArgs) Handles btnKeine.Click
For i = 0 To lbLaender.Items.Count - 1
lbLaender.SetSelected(i, False)
Next
End Sub
Function getValues() As String
Dim s As String = ""
For Each i As VERAG_PROG_ALLGEMEIN.MyListItem In lbLaender.Items
If Not lbLaender.GetSelected(lbLaender.Items.IndexOf(i)) Then
s += "'" & i.Value & "', "
End If
Next
If s.EndsWith(", ") Then
s = s.Substring(0, s.Length - 2)
End If
Return s
End Function
End Class