edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fakt, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-05-13 13:44:31 +02:00
parent afdc1c3822
commit dcf20568ad
12 changed files with 182 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/Fakturierung/frmAbrechnungsMaske.vb
View File

@@ -983,9 +983,9 @@ Public Class frmAbrechnungsMaske
Dim ListOfRK_ID As New List(Of Integer)
Dim noRE_DATE = dgvRechnungen.SelectedRows.Cast(Of DataGridViewRow)().Any(Function(r) r.Cells("RENR").Value Is Nothing OrElse IsDBNull(r.Cells("RENR").Value) OrElse (r.Cells("RENR").Value) <> "-")
Dim noRE_NR = dgvRechnungen.SelectedRows.Cast(Of DataGridViewRow)().Any(Function(r) r.Cells("RENR").Value Is Nothing OrElse IsDBNull(r.Cells("RENR").Value) OrElse Not IsNumeric(r.Cells("RENR").Value))
If noRE_DATE Then MsgBox("ACHTUNG, Rechnungsdatum wurde nicht gesetzt." & vbNewLine & "Vorgang wird abgebrochen!") : Exit Sub
If noRE_NR Then MsgBox("ACHTUNG, RechnungsNr wurde nicht gesetzt." & vbNewLine & "Vorgang wird abgebrochen!") : Exit Sub
For Each row As DataGridViewRow In dgvRechnungen.SelectedRows

2
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -1062,9 +1062,9 @@ Public Class usrCntlFaktAbrechnung
End Select
initRgArt()
initKdAtrNr()
initPkSt()
End Sub
Sub setBGbColotTxt(p_cntl As Control)

142
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb generated
View File

@@ -85,15 +85,17 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Button21 = New System.Windows.Forms.Button()
Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button()
Me.pnlBerichte = New System.Windows.Forms.Panel()
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.btnHandling = New System.Windows.Forms.Button()
Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.btnHandling_AMBAR = New System.Windows.Forms.Button()
Me.cboHandlingssatz_AMBAR = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.cbxHandlingAbrechnen = New System.Windows.Forms.CheckBox()
Me.CheckBox4 = New System.Windows.Forms.CheckBox()
Me.cbxDetailbericht = New System.Windows.Forms.CheckBox()
Me.cboHandlingssatz_AMBAR = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.btnHandling_AMBAR = New System.Windows.Forms.Button()
Me.Button24 = New System.Windows.Forms.Button()
Me.Button23 = New System.Windows.Forms.Button()
Me.lblKdAusFortschritt = New System.Windows.Forms.Label()
Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
@@ -101,7 +103,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.btnHandling = New System.Windows.Forms.Button()
Me.Button19 = New System.Windows.Forms.Button()
Me.Button18 = New System.Windows.Forms.Button()
Me.Button16 = New System.Windows.Forms.Button()
@@ -214,7 +215,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Label45 = New System.Windows.Forms.Label()
Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
Me.pnlRechts.SuspendLayout()
CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -224,6 +224,7 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Panel3.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.pnlBerichte.SuspendLayout()
Me.FlowLayoutPanel1.SuspendLayout()
Me.MenuStrip1.SuspendLayout()
Me.pnl.SuspendLayout()
Me.MenuStrip2.SuspendLayout()
@@ -239,7 +240,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.Panel2.SuspendLayout()
Me.SplitContainer.SuspendLayout()
Me.FlowLayoutPanel1.SuspendLayout()
Me.SuspendLayout()
'
'TabPage1
@@ -1098,6 +1098,70 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.pnlBerichte.TabIndex = 6
Me.pnlBerichte.Visible = False
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.btnHandling)
Me.FlowLayoutPanel1.Controls.Add(Me.cboHandlingssatz)
Me.FlowLayoutPanel1.Controls.Add(Me.btnHandling_AMBAR)
Me.FlowLayoutPanel1.Controls.Add(Me.cboHandlingssatz_AMBAR)
Me.FlowLayoutPanel1.Location = New System.Drawing.Point(3, 123)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
Me.FlowLayoutPanel1.Size = New System.Drawing.Size(319, 60)
Me.FlowLayoutPanel1.TabIndex = 97
'
'btnHandling
'
Me.btnHandling.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnHandling.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.btnHandling.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnHandling.Location = New System.Drawing.Point(0, 0)
Me.btnHandling.Margin = New System.Windows.Forms.Padding(0)
Me.btnHandling.Name = "btnHandling"
Me.btnHandling.Size = New System.Drawing.Size(159, 28)
Me.btnHandling.TabIndex = 59
Me.btnHandling.Text = "Handling an Außenstellen"
Me.btnHandling.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnHandling.UseVisualStyleBackColor = True
'
'cboHandlingssatz
'
Me.cboHandlingssatz._allowedValuesFreiText = Nothing
Me.cboHandlingssatz._allowFreiText = False
Me.cboHandlingssatz._value = ""
Me.cboHandlingssatz.DropDownWidth = 300
Me.cboHandlingssatz.FormattingEnabled = True
Me.cboHandlingssatz.Location = New System.Drawing.Point(3, 31)
Me.cboHandlingssatz.Name = "cboHandlingssatz"
Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21)
Me.cboHandlingssatz.TabIndex = 60
'
'btnHandling_AMBAR
'
Me.btnHandling_AMBAR.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnHandling_AMBAR.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.btnHandling_AMBAR.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnHandling_AMBAR.Location = New System.Drawing.Point(165, 28)
Me.btnHandling_AMBAR.Margin = New System.Windows.Forms.Padding(0)
Me.btnHandling_AMBAR.Name = "btnHandling_AMBAR"
Me.btnHandling_AMBAR.Size = New System.Drawing.Size(128, 28)
Me.btnHandling_AMBAR.TabIndex = 94
Me.btnHandling_AMBAR.Text = "Handling (AMBAR)"
Me.btnHandling_AMBAR.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnHandling_AMBAR.UseVisualStyleBackColor = True
'
'cboHandlingssatz_AMBAR
'
Me.cboHandlingssatz_AMBAR._allowedValuesFreiText = Nothing
Me.cboHandlingssatz_AMBAR._allowFreiText = False
Me.cboHandlingssatz_AMBAR._value = ""
Me.cboHandlingssatz_AMBAR.DropDownWidth = 250
Me.cboHandlingssatz_AMBAR.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboHandlingssatz_AMBAR.FormattingEnabled = True
Me.cboHandlingssatz_AMBAR.Location = New System.Drawing.Point(3, 59)
Me.cboHandlingssatz_AMBAR.Name = "cboHandlingssatz_AMBAR"
Me.cboHandlingssatz_AMBAR.Size = New System.Drawing.Size(128, 22)
Me.cboHandlingssatz_AMBAR.TabIndex = 53
'
'cbxHandlingAbrechnen
'
Me.cbxHandlingAbrechnen.AutoSize = True
@@ -1132,33 +1196,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.cbxDetailbericht.Text = "Detailbericht"
Me.cbxDetailbericht.UseVisualStyleBackColor = False
'
'cboHandlingssatz_AMBAR
'
Me.cboHandlingssatz_AMBAR._allowedValuesFreiText = Nothing
Me.cboHandlingssatz_AMBAR._allowFreiText = False
Me.cboHandlingssatz_AMBAR._value = ""
Me.cboHandlingssatz_AMBAR.DropDownWidth = 250
Me.cboHandlingssatz_AMBAR.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboHandlingssatz_AMBAR.FormattingEnabled = True
Me.cboHandlingssatz_AMBAR.Location = New System.Drawing.Point(3, 59)
Me.cboHandlingssatz_AMBAR.Name = "cboHandlingssatz_AMBAR"
Me.cboHandlingssatz_AMBAR.Size = New System.Drawing.Size(128, 22)
Me.cboHandlingssatz_AMBAR.TabIndex = 53
'
'btnHandling_AMBAR
'
Me.btnHandling_AMBAR.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnHandling_AMBAR.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.btnHandling_AMBAR.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnHandling_AMBAR.Location = New System.Drawing.Point(165, 28)
Me.btnHandling_AMBAR.Margin = New System.Windows.Forms.Padding(0)
Me.btnHandling_AMBAR.Name = "btnHandling_AMBAR"
Me.btnHandling_AMBAR.Size = New System.Drawing.Size(128, 28)
Me.btnHandling_AMBAR.TabIndex = 94
Me.btnHandling_AMBAR.Text = "Handling (AMBAR)"
Me.btnHandling_AMBAR.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnHandling_AMBAR.UseVisualStyleBackColor = True
'
'Button24
'
Me.Button24.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -1193,18 +1230,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.lblKdAusFortschritt.TabIndex = 43
Me.lblKdAusFortschritt.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'cboHandlingssatz
'
Me.cboHandlingssatz._allowedValuesFreiText = Nothing
Me.cboHandlingssatz._allowFreiText = False
Me.cboHandlingssatz._value = ""
Me.cboHandlingssatz.DropDownWidth = 300
Me.cboHandlingssatz.FormattingEnabled = True
Me.cboHandlingssatz.Location = New System.Drawing.Point(3, 31)
Me.cboHandlingssatz.Name = "cboHandlingssatz"
Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21)
Me.cboHandlingssatz.TabIndex = 60
'
'MenuStrip1
'
Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.None
@@ -1264,20 +1289,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)"
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Visible = False
'
'btnHandling
'
Me.btnHandling.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnHandling.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.btnHandling.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnHandling.Location = New System.Drawing.Point(0, 0)
Me.btnHandling.Margin = New System.Windows.Forms.Padding(0)
Me.btnHandling.Name = "btnHandling"
Me.btnHandling.Size = New System.Drawing.Size(159, 28)
Me.btnHandling.TabIndex = 59
Me.btnHandling.Text = "Handling an Außenstellen"
Me.btnHandling.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnHandling.UseVisualStyleBackColor = True
'
'Button19
'
Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2968,17 +2979,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.SplitContainer.SplitterWidth = 2
Me.SplitContainer.TabIndex = 3
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.btnHandling)
Me.FlowLayoutPanel1.Controls.Add(Me.cboHandlingssatz)
Me.FlowLayoutPanel1.Controls.Add(Me.btnHandling_AMBAR)
Me.FlowLayoutPanel1.Controls.Add(Me.cboHandlingssatz_AMBAR)
Me.FlowLayoutPanel1.Location = New System.Drawing.Point(3, 123)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
Me.FlowLayoutPanel1.Size = New System.Drawing.Size(319, 59)
Me.FlowLayoutPanel1.TabIndex = 97
'
'usrCntlSpeditionsBuchSuche
'
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -3002,6 +3002,7 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Panel1.PerformLayout()
Me.pnlBerichte.ResumeLayout(False)
Me.pnlBerichte.PerformLayout()
Me.FlowLayoutPanel1.ResumeLayout(False)
Me.MenuStrip1.ResumeLayout(False)
Me.MenuStrip1.PerformLayout()
Me.pnl.ResumeLayout(False)
@@ -3024,7 +3025,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.SplitContainer.Panel2.ResumeLayout(False)
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer.ResumeLayout(False)
Me.FlowLayoutPanel1.ResumeLayout(False)
Me.ResumeLayout(False)
End Sub

6
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx
View File

@@ -126,9 +126,6 @@
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>431, 17</value>
</metadata>
<metadata name="MenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>546, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ToolStripMenuItem2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -296,4 +293,7 @@
AElFTkSuQmCC
</value>
</data>
<metadata name="MenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>546, 17</value>
</metadata>
</root>

2
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

@@ -3090,7 +3090,7 @@ Public Class usrCntlSpeditionsBuchSuche
SPEDBUCH.Umrechnungskurs = Nothing
SPEDBUCH.veoerz_basbtg = Nothing
SPEDBUCH.Sicherheitsbetrag = Nothing
SPEDBUCH.AnzahlZA = anzahl
SPEDBUCH.Abfertigungsanzahl = anzahl
SPEDBUCH.Bemerkungen = "Sammelrechnung " & von.ToShortDateString & " - " & bis.ToShortDateString & " / Abfertigungen: " & anzahl

64
SDL/buchhaltung/usrCntlBH.Designer.vb generated
View File

@@ -174,6 +174,9 @@ Partial Class usrCntlBH
Me.txtZRvon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtZRbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label51 = New System.Windows.Forms.Label()
Me.Button15 = New System.Windows.Forms.Button()
Me.Label61 = New System.Windows.Forms.Label()
Me.txtMonateSyskavergleich = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.pnl.SuspendLayout()
Me.TabPage1.SuspendLayout()
Me.GroupBox13.SuspendLayout()
@@ -871,6 +874,9 @@ Partial Class usrCntlBH
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.txtMonateSyskavergleich)
Me.GroupBox2.Controls.Add(Me.Label61)
Me.GroupBox2.Controls.Add(Me.Button15)
Me.GroupBox2.Controls.Add(Me.Label2)
Me.GroupBox2.Controls.Add(Me.Label5)
Me.GroupBox2.Controls.Add(Me.Button1)
@@ -883,7 +889,7 @@ Partial Class usrCntlBH
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(145, 30)
Me.Label2.Location = New System.Drawing.Point(145, 23)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(291, 26)
Me.Label2.TabIndex = 2
@@ -904,9 +910,9 @@ Partial Class usrCntlBH
'
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button1.Location = New System.Drawing.Point(6, 19)
Me.Button1.Location = New System.Drawing.Point(6, 10)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(121, 49)
Me.Button1.Size = New System.Drawing.Size(121, 37)
Me.Button1.TabIndex = 1
Me.Button1.Text = "Abgleich starten"
Me.Button1.UseVisualStyleBackColor = True
@@ -2252,6 +2258,55 @@ Partial Class usrCntlBH
Me.Label51.TabIndex = 36
Me.Label51.Text = "Zinsnachberechnung"
'
'Button15
'
Me.Button15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button15.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button15.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button15.Location = New System.Drawing.Point(6, 49)
Me.Button15.Name = "Button15"
Me.Button15.Size = New System.Drawing.Size(121, 31)
Me.Button15.TabIndex = 29
Me.Button15.Text = " Excel"
Me.Button15.UseVisualStyleBackColor = True
'
'Label61
'
Me.Label61.AutoSize = True
Me.Label61.Location = New System.Drawing.Point(145, 61)
Me.Label61.Name = "Label61"
Me.Label61.Size = New System.Drawing.Size(226, 13)
Me.Label61.TabIndex = 30
Me.Label61.Text = "Kunden ohne FIBU-Filiale der letzten x Monate"
'
'txtMonateSyskavergleich
'
Me.txtMonateSyskavergleich._DateTimeOnly = False
Me.txtMonateSyskavergleich._numbersOnly = True
Me.txtMonateSyskavergleich._numbersOnlyKommastellen = ""
Me.txtMonateSyskavergleich._numbersOnlyTrennzeichen = False
Me.txtMonateSyskavergleich._Prozent = False
Me.txtMonateSyskavergleich._ShortDateNew = False
Me.txtMonateSyskavergleich._ShortDateOnly = False
Me.txtMonateSyskavergleich._TimeOnly = False
Me.txtMonateSyskavergleich._TimeOnly_Seconds = False
Me.txtMonateSyskavergleich._value = ""
Me.txtMonateSyskavergleich._Waehrung = False
Me.txtMonateSyskavergleich._WaehrungZeichen = False
Me.txtMonateSyskavergleich.ForeColor = System.Drawing.Color.Black
Me.txtMonateSyskavergleich.Location = New System.Drawing.Point(383, 58)
Me.txtMonateSyskavergleich.MaxLength = 2
Me.txtMonateSyskavergleich.MaxLineLength = -1
Me.txtMonateSyskavergleich.MaxLines_Warning = ""
Me.txtMonateSyskavergleich.MaxLines_Warning_Label = Nothing
Me.txtMonateSyskavergleich.Name = "txtMonateSyskavergleich"
Me.txtMonateSyskavergleich.Size = New System.Drawing.Size(24, 20)
Me.txtMonateSyskavergleich.TabIndex = 43
Me.txtMonateSyskavergleich.Text = "3"
Me.txtMonateSyskavergleich.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'usrCntlBH
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2456,4 +2511,7 @@ Partial Class usrCntlBH
Friend WithEvents Label60 As Label
Friend WithEvents Label58 As Label
Friend WithEvents btnfortlRENr As Button
Friend WithEvents txtMonateSyskavergleich As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label61 As Label
Friend WithEvents Button15 As Button
End Class

27
SDL/buchhaltung/usrCntlBH.vb
View File

@@ -1593,5 +1593,32 @@ Public Class usrCntlBH
End Sub
Private Sub Button15_Click_1(sender As Object, e As EventArgs) Handles Button15.Click
If txtMonateSyskavergleich.Text <> "" AndAlso IsNumeric(txtMonateSyskavergleich.Text) Then
Dim SQLString = "select RechnungsKundenNr, Adressen.[Name 1], Kunden.FilialenNr, MAX(cast(RechnungsDatum as Date)) as aktuellsteRE from Rechnungsausgang
inner join Kunden on Kunden.KundenNr = Rechnungsausgang.KundenNrZentrale
inner join Adressen on Adressen.AdressenNr = Kunden.KundenNr
where cast(RechnungsDatum as date) >= DATEADD(MONTH,-" & txtMonateSyskavergleich.Text & ", GETDATE()) and Kunden.FiBuSchnittstelle = 0 and Kunden.FiBuSchnittstelleNr is null
group by RechnungsKundenNr, Adressen.[Name 1], Kunden.FilialenNr
order by MAX(cast(RechnungsDatum as Date)) "
Me.Cursor = Cursors.WaitCursor
Dim dt_RE As DataTable = SQL.loadDgvBySql(SQLString, "FMZOLL")
If dt_RE.Rows.Count > 0 Then
cProgramFunctions.genExcelFromDT_NEW(dt_RE,,, "Kunden ohne FIBU-Filiale mit Belegen der letzten " & txtMonateSyskavergleich.Text & " Monate",,, True)
Me.Cursor = Cursors.Default
Else
MsgBox("keine Daten für den ausgewählten Zeitraum!")
Me.Cursor = Cursors.Default
End If
End If
End Sub
End Class

3
SDL/kunden/frmKundenUebersichtZOLL.vb
View File

@@ -212,13 +212,10 @@ Public Class frmKundenUebersichtZOLL
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("KUNDEN_Fiskaldaten", Me) Then
mnueFiskal.Visible = True
mnueFiskaluebersicht.Visible = True
mnueFiskaluebersicht.Visible = True
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CBAM", Me) Then
mnueCBAM.Visible = True
mnueCBAM.Visible = True
mnueCBAM.Visible = True
End If

14
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -2452,18 +2452,12 @@ Public Class frmMDMDatenverarbetiung
FROM [VERAG].[dbo].[tblIDSTransactionsNew_Details] as det
inner join [tblIDSTransactionsNew] as trans on det.[YearMonthDay] = trans.[YearMonthDay] and det.[CustomerCode] = trans.[CustomerCode] and det.[OutletCountryCode] = trans.[OutletCountryCode] and det.[OutletCode] = trans.[OutletCode] and det.[ProductTypeCode] = trans.[ProductTypeCode]
inner join [VERAG].[dbo].[tbl_IDS_Länder] as land on det.OutletCountryCode = land.OutletCountryCode
where cast(det.[YearMonthDay] as date) = '" & DateTimePicker2.Text & "' and trans.charged = 0
where cast(det.[YearMonthDay] as date) = '" & DateTimePicker2.Text & "' and trans.charged = 1
group by trans.KdNrVERAG,det.CustomerCode, det.[YearMonthDay], det.CardNumber, land.Lieferland_ISO2, det.LicencePlateNumber,det.Transactiondate "
Dim dt As DataTable = SQL.loadDgvBySql_Param(SQL_IDS, "FMZOLL")
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim sqlstrBULKIMPORT As String = "SELECT *, cast( '" & datPloseAnhang.Text & "' as date) as Billingdate FROM ( " & SQL_IDS & " ) AS TEMP ORDER BY TEMP.[Customer No];"
Dim updated As Boolean = False
@@ -2491,9 +2485,9 @@ Public Class frmMDMDatenverarbetiung
End If
End If
pic.Visible = True
Return True
pic.Visible = updated
Return updated
Catch ex As System.Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)

14
SDL/seriendruck/usrCntlFakturierung.vb
View File

@@ -29,9 +29,9 @@ Public Class usrcntlFakturierung
KdSearchBox3.initKdBox(Me.FindForm)
cbxMautbericht.Items.Clear()
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht", "Gesamtbericht_EXCEL"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautbericht AT DE MSE UTA", "Lieferantenbericht_PDF"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht als CSV-Datei", "Gesamtbericht_CSV"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht (öffnen)", "Gesamtbericht_EXCEL"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautbericht PDF (erzeugen)", "Lieferantenbericht_PDF"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht CSV (erzeugen)", "Gesamtbericht_CSV"))
cbxDateMautbericht.Items.Clear()
cbxDateMautbericht.fillWithSQL("select distinct(cast(BillingDate as Date)) From tblMautbericht order by cast(BillingDate as Date) desc", False, "FMZOLL")
@@ -1372,7 +1372,7 @@ Public Class usrcntlFakturierung
Dim dtBerichtkunden_CSV As DataTable = (New SQL).loadDgvBySql("SELECT [Customer No], [Licence Plate Number], [Transaction Country], [Transaction date], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal], tblMautbericht.[Net Amount], tblMautbericht.[VAT Amount], tblMautbericht.[Total Amount]
FROM Adressen
INNER JOIN tblMautbericht ON Adressen.AdressenNr = tblMautbericht.[Customer No]
WHERE Adressen.ExportMautberichtCSV=1 AND cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "'
WHERE Adressen.ExportMautberichtCSV=1 AND cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' and Datenquelle <> 'IDS'
ORDER BY tblMautbericht.[Customer No], tblMautbericht.[Licence Plate Number], tblMautbericht.[Transaction Country], tblMautbericht.[Transaction date], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal]", "FMZOLL")
If dtBerichtkunden_CSV.Rows.Count > 0 Then
@@ -1436,11 +1436,11 @@ Public Class usrcntlFakturierung
'für Kunde an RE anhängen (Tool Report to Verag Invoice aus FMZOLL)
Case "Lieferantenbericht_PDF"
Dim AnzahlPDF_Berichte As Integer = CInt((New SQL).getValueTxtBySql("SELECT count(distinct(tblMautbericht.[Customer No])) FROM tblMautbericht WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "'", "FMZOLL"))
Dim AnzahlPDF_Berichte As Integer = CInt((New SQL).getValueTxtBySql("SELECT count(distinct(tblMautbericht.[Customer No])) FROM tblMautbericht WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' and Datenquelle <> 'IDS' ", "FMZOLL"))
Dim dtBerichtkunden_PDF As DataTable = (New SQL).loadDgvBySql("SELECT tblMautbericht.[Customer No], Adressen.Ordnungsbegriff AS [Customer name], tblMautbericht.[Licence Plate Number], tblMautbericht.[Transaction date], tblMautbericht.[Transaction Country], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal], Sum(tblMautbericht.[Net Amount]) AS [Net Amount], Sum(tblMautbericht.[VAT Amount]) AS [VAT Amount], Sum(tblMautbericht.[Total Amount]) AS [Total Amount]
FROM tblMautbericht INNER JOIN Adressen ON tblMautbericht.[Customer No] = Adressen.AdressenNr
WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "'
WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' and Datenquelle <> 'IDS'
GROUP BY tblMautbericht.[Customer No], Adressen.Ordnungsbegriff, tblMautbericht.[Licence Plate Number], tblMautbericht.[Transaction date], tblMautbericht.[Transaction Country], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal]
ORDER BY tblMautbericht.[Licence Plate Number] , tblMautbericht.[Transaction Country], tblMautbericht.[Transaction date] ", "FMZOLL")
@@ -1471,7 +1471,7 @@ Public Class usrcntlFakturierung
Dim dt_PDF_selected = dtBerichtkunden_PDF.Select("[Customer No] ='" & pdf.Item(0) & "'").CopyToDataTable
Dim dtLaender As DataTable = (New SQL).loadDgvBySql("SELECT tblMautbericht.[Customer No], tblMautbericht.[Transaction Country], sum(tblMautbericht.[Net Amount]) as Netto, sum(tblMautbericht.[VAT Amount]) as MWST, sum(tblMautbericht.[Total Amount]) as Brutto
FROM tblMautbericht WHERE [Customer No] ='" & pdf.Item(0) & "' AND cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "'
FROM tblMautbericht WHERE [Customer No] ='" & pdf.Item(0) & "' AND cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' and Datenquelle <> 'IDS'
GROUP BY [Customer No], [Transaction Country]
ORDER BY tblMautbericht.[Customer No], tblMautbericht.[Transaction Country]", "FMZOLL")

2
VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
View File

@@ -490,7 +490,7 @@ Public Class cIDS
SQL.doSQL("UPDATE det SET det.LicencePlateNumber = s.KfzKennzeichen FROM tblIDSTransactionsNew_Details det INNER JOIN SDL.dbo.SDL s
ON s.KartenNr =
CAST(det.CustomerCode AS varchar(50)) + CAST(det.CardNumber AS varchar(50))
WHERE s.SDLNr = 100 AND ISNULL(s.Gesperrt,0) = 0")
WHERE s.SDLNr = 100 AND ISNULL(s.Gesperrt,0) = 0 AND det.LicencePlateNumber is null", "FMZOLL")
MDMEinarb.supplier = "IDS_Details"
cnt = CInt(lngRecordCount)

2
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
View File

@@ -51,7 +51,7 @@ Public Class frmMitarbeitersuche
End If
sbMitarbeiter.initSearchBox(Me.FindForm, " [mit_id] ,[mit_username] ,(mit_vname + ' ' + mit_nname ) AS Name , CASE WHEN mit_firma='ALL' THEN mit_firmaHaupt ELSE mit_firma END as Firma, mit_niederlassung as Niederlassung FROM tblMitarbeiter", {"mit_vname", "mit_nname"}, " 1=1 AND mit_gekuendigt=0 AND [mit_TESTonly]=0 AND [mit_pseudoUser]=0 ", "mit_id", "mit_id", "Name", "ADMIN", , 400, 200, {"mit_id", "mit_username"})
sbMitarbeiter.initSearchBox(Me.FindForm, " [mit_id] ,[mit_username] ,(mit_vname + ' ' + mit_nname ) AS Name , CASE WHEN mit_firma='ALL' THEN mit_firmaHaupt ELSE mit_firma END as Firma, mit_niederlassung as Niederlassung FROM tblMitarbeiter", {"mit_vname", "mit_nname"}, " 1=1 AND mit_gekuendigt=0 AND [mit_TESTonly]=0 AND [mit_pseudoUser]=0 AND isnull([mit_kundenportal], 0) <> 1 ", "mit_id", "mit_id", "Name", "ADMIN", , 400, 200, {"mit_id", "mit_username"})
initMA()
End Sub