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

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-03-10 07:32:32 +01:00
parent c6d4512779 9b4144ff77
commit 33c72e18e2
8 changed files with 439 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
SDL/Fakturierung/frmRechnungenSuche.Designer.vb generated
View File

@@ -113,7 +113,6 @@ Partial Class frmRechnungenSuche
Me.Label10 = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label()
Me.cboBerichtRgAbfArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboBerichtRgAbfArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label31 = New System.Windows.Forms.Label() Me.Label31 = New System.Windows.Forms.Label()
Me.Button8 = New System.Windows.Forms.Button()
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
@@ -132,8 +131,12 @@ Partial Class frmRechnungenSuche
Me.Label22 = New System.Windows.Forms.Label() Me.Label22 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label()
Me.pnlTop = New System.Windows.Forms.Panel() Me.pnlTop = New System.Windows.Forms.Panel()
Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.PictureBox5 = New System.Windows.Forms.PictureBox()
Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MenuStrip2 = New System.Windows.Forms.MenuStrip()
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
Me.NachZollabfertigungspreisenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.Panel2.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout()
@@ -154,6 +157,7 @@ Partial Class frmRechnungenSuche
Me.ctxtRg.SuspendLayout() Me.ctxtRg.SuspendLayout()
Me.pnlTop.SuspendLayout() Me.pnlTop.SuspendLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
Me.MenuStrip2.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'SplitContainer 'SplitContainer
@@ -1535,12 +1539,12 @@ Partial Class frmRechnungenSuche
' '
'pnlBerichte 'pnlBerichte
' '
Me.pnlBerichte.Controls.Add(Me.MenuStrip2)
Me.pnlBerichte.Controls.Add(Me.Button3) Me.pnlBerichte.Controls.Add(Me.Button3)
Me.pnlBerichte.Controls.Add(Me.Button1) Me.pnlBerichte.Controls.Add(Me.Button1)
Me.pnlBerichte.Controls.Add(Me.Label10) Me.pnlBerichte.Controls.Add(Me.Label10)
Me.pnlBerichte.Controls.Add(Me.cboBerichtRgAbfArt) Me.pnlBerichte.Controls.Add(Me.cboBerichtRgAbfArt)
Me.pnlBerichte.Controls.Add(Me.Label31) Me.pnlBerichte.Controls.Add(Me.Label31)
Me.pnlBerichte.Controls.Add(Me.Button8)
Me.pnlBerichte.Controls.Add(Me.MenuStrip1) Me.pnlBerichte.Controls.Add(Me.MenuStrip1)
Me.pnlBerichte.Dock = System.Windows.Forms.DockStyle.Left Me.pnlBerichte.Dock = System.Windows.Forms.DockStyle.Left
Me.pnlBerichte.Location = New System.Drawing.Point(233, 0) Me.pnlBerichte.Location = New System.Drawing.Point(233, 0)
@@ -1583,7 +1587,7 @@ Partial Class frmRechnungenSuche
Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label10.AutoSize = True Me.Label10.AutoSize = True
Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label10.Location = New System.Drawing.Point(149, 23) Me.Label10.Location = New System.Drawing.Point(162, 9)
Me.Label10.Name = "Label10" Me.Label10.Name = "Label10"
Me.Label10.Size = New System.Drawing.Size(50, 13) Me.Label10.Size = New System.Drawing.Size(50, 13)
Me.Label10.TabIndex = 40 Me.Label10.TabIndex = 40
@@ -1597,7 +1601,7 @@ Partial Class frmRechnungenSuche
Me.cboBerichtRgAbfArt.DropDownWidth = 250 Me.cboBerichtRgAbfArt.DropDownWidth = 250
Me.cboBerichtRgAbfArt.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboBerichtRgAbfArt.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboBerichtRgAbfArt.FormattingEnabled = True Me.cboBerichtRgAbfArt.FormattingEnabled = True
Me.cboBerichtRgAbfArt.Location = New System.Drawing.Point(149, 39) Me.cboBerichtRgAbfArt.Location = New System.Drawing.Point(162, 25)
Me.cboBerichtRgAbfArt.Name = "cboBerichtRgAbfArt" Me.cboBerichtRgAbfArt.Name = "cboBerichtRgAbfArt"
Me.cboBerichtRgAbfArt.Size = New System.Drawing.Size(50, 22) Me.cboBerichtRgAbfArt.Size = New System.Drawing.Size(50, 22)
Me.cboBerichtRgAbfArt.TabIndex = 39 Me.cboBerichtRgAbfArt.TabIndex = 39
@@ -1613,21 +1617,6 @@ Partial Class frmRechnungenSuche
Me.Label31.TabIndex = 32 Me.Label31.TabIndex = 32
Me.Label31.Text = "Auswertungen:" Me.Label31.Text = "Auswertungen:"
' '
'Button8
'
Me.Button8.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button8.Location = New System.Drawing.Point(9, 22)
Me.Button8.Margin = New System.Windows.Forms.Padding(0)
Me.Button8.Name = "Button8"
Me.Button8.Size = New System.Drawing.Size(137, 39)
Me.Button8.TabIndex = 5
Me.Button8.Text = "Bericht nach Rechnungsanschrift"
Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button8.UseVisualStyleBackColor = True
'
'MenuStrip1 'MenuStrip1
' '
Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.None Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.None
@@ -1655,21 +1644,21 @@ Partial Class frmRechnungenSuche
' '
Me.ToolStripMenuItem1.Image = CType(resources.GetObject("ToolStripMenuItem1.Image"), System.Drawing.Image) Me.ToolStripMenuItem1.Image = CType(resources.GetObject("ToolStripMenuItem1.Image"), System.Drawing.Image)
Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
Me.ToolStripMenuItem1.Size = New System.Drawing.Size(372, 24) Me.ToolStripMenuItem1.Size = New System.Drawing.Size(376, 26)
Me.ToolStripMenuItem1.Text = "TRANSFERRY/360 (Sammelrechnung auswählen)" Me.ToolStripMenuItem1.Text = "TRANSFERRY/360 (Sammelrechnung auswählen)"
' '
'EVOLOGSammelrechnungAuswählenToolStripMenuItem 'EVOLOGSammelrechnungAuswählenToolStripMenuItem
' '
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Image = CType(resources.GetObject("EVOLOGSammelrechnungAuswählenToolStripMenuItem.Image"), System.Drawing.Image) Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Image = CType(resources.GetObject("EVOLOGSammelrechnungAuswählenToolStripMenuItem.Image"), System.Drawing.Image)
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Name = "EVOLOGSammelrechnungAuswählenToolStripMenuItem" Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Name = "EVOLOGSammelrechnungAuswählenToolStripMenuItem"
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Size = New System.Drawing.Size(372, 24) Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Size = New System.Drawing.Size(376, 26)
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Text = "EVOLOG (Sammelrechnung auswählen)" Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Text = "EVOLOG (Sammelrechnung auswählen)"
' '
'ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem 'ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem
' '
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image)
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem" Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem"
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(372, 24) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(376, 26)
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Friedrichshafen AG (Zeitraum auswählen)" Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Friedrichshafen AG (Zeitraum auswählen)"
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False
' '
@@ -1805,12 +1794,6 @@ Partial Class frmRechnungenSuche
Me.pnlTop.Size = New System.Drawing.Size(1327, 48) Me.pnlTop.Size = New System.Drawing.Size(1327, 48)
Me.pnlTop.TabIndex = 0 Me.pnlTop.TabIndex = 0
' '
'TestToolStripMenuItem
'
Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19)
Me.TestToolStripMenuItem.Text = "test"
'
'PictureBox5 'PictureBox5
' '
Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
@@ -1821,6 +1804,49 @@ Partial Class frmRechnungenSuche
Me.PictureBox5.TabIndex = 133 Me.PictureBox5.TabIndex = 133
Me.PictureBox5.TabStop = False Me.PictureBox5.TabStop = False
' '
'TestToolStripMenuItem
'
Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19)
Me.TestToolStripMenuItem.Text = "test"
'
'MenuStrip2
'
Me.MenuStrip2.Dock = System.Windows.Forms.DockStyle.None
Me.MenuStrip2.ImageScalingSize = New System.Drawing.Size(20, 20)
Me.MenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2})
Me.MenuStrip2.Location = New System.Drawing.Point(3, 27)
Me.MenuStrip2.Name = "MenuStrip2"
Me.MenuStrip2.Padding = New System.Windows.Forms.Padding(5, 2, 0, 2)
Me.MenuStrip2.Size = New System.Drawing.Size(143, 28)
Me.MenuStrip2.TabIndex = 45
Me.MenuStrip2.Text = "Kundenauswertungen"
'
'ToolStripMenuItem2
'
Me.ToolStripMenuItem2.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.NachZollabfertigungspreisenToolStripMenuItem})
Me.ToolStripMenuItem2.Font = New System.Drawing.Font("Segoe UI", 10.0!)
Me.ToolStripMenuItem2.ForeColor = System.Drawing.Color.White
Me.ToolStripMenuItem2.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
Me.ToolStripMenuItem2.Size = New System.Drawing.Size(136, 24)
Me.ToolStripMenuItem2.Text = "RE-Auswertung"
'
'ToolStripMenuItem3
'
Me.ToolStripMenuItem3.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
Me.ToolStripMenuItem3.Size = New System.Drawing.Size(260, 26)
Me.ToolStripMenuItem3.Text = "Nach Rechnungsanschrift"
'
'NachZollabfertigungspreisenToolStripMenuItem
'
Me.NachZollabfertigungspreisenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.NachZollabfertigungspreisenToolStripMenuItem.Name = "NachZollabfertigungspreisenToolStripMenuItem"
Me.NachZollabfertigungspreisenToolStripMenuItem.Size = New System.Drawing.Size(276, 26)
Me.NachZollabfertigungspreisenToolStripMenuItem.Text = "Nach Zollabf.-preisen (LNr: 340)"
'
'frmRechnungenSuche 'frmRechnungenSuche
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -1860,6 +1886,8 @@ Partial Class frmRechnungenSuche
Me.pnlTop.ResumeLayout(False) Me.pnlTop.ResumeLayout(False)
Me.pnlTop.PerformLayout() Me.pnlTop.PerformLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
Me.MenuStrip2.ResumeLayout(False)
Me.MenuStrip2.PerformLayout()
Me.ResumeLayout(False) Me.ResumeLayout(False)
End Sub End Sub
@@ -1927,7 +1955,6 @@ Partial Class frmRechnungenSuche
Friend WithEvents Button5 As System.Windows.Forms.Button Friend WithEvents Button5 As System.Windows.Forms.Button
Friend WithEvents btnExcel As System.Windows.Forms.Button Friend WithEvents btnExcel As System.Windows.Forms.Button
Friend WithEvents pnlBerichte As System.Windows.Forms.Panel Friend WithEvents pnlBerichte As System.Windows.Forms.Panel
Friend WithEvents Button8 As System.Windows.Forms.Button
Friend WithEvents Label31 As System.Windows.Forms.Label Friend WithEvents Label31 As System.Windows.Forms.Label
Friend WithEvents pnl As System.Windows.Forms.Panel Friend WithEvents pnl As System.Windows.Forms.Panel
Friend WithEvents Label33 As System.Windows.Forms.Label Friend WithEvents Label33 As System.Windows.Forms.Label
@@ -1973,4 +2000,8 @@ Partial Class frmRechnungenSuche
Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents lblunterschRe As Label Friend WithEvents lblunterschRe As Label
Friend WithEvents PictureBox5 As PictureBox Friend WithEvents PictureBox5 As PictureBox
Friend WithEvents MenuStrip2 As MenuStrip
Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem
Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
Friend WithEvents NachZollabfertigungspreisenToolStripMenuItem As ToolStripMenuItem
End Class End Class

205
SDL/Fakturierung/frmRechnungenSuche.resx
View File

@@ -123,8 +123,8 @@
<metadata name="cntxtCntxtSpeditionsbuch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="cntxtCntxtSpeditionsbuch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="MenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>316, 17</value> <value>518, 17</value>
</metadata> </metadata>
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>316, 17</value> <value>316, 17</value>
@@ -177,39 +177,40 @@
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
AElFTkSuQmCC
</value> </value>
</data> </data>
<data name="EVOLOGSammelrechnungAuswählenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="EVOLOGSammelrechnungAuswählenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -259,39 +260,40 @@
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
AElFTkSuQmCC
</value> </value>
</data> </data>
<data name="ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -341,39 +343,40 @@
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
AElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="ctxtRg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ctxtRg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

165
SDL/Fakturierung/frmRechnungenSuche.vb
View File

@@ -567,69 +567,8 @@ Public Class frmRechnungenSuche
''Me.Cursor = Cursors.Default ''Me.Cursor = Cursors.Default
End Sub End Sub
Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click Private Sub Button8_Click(sender As Object, e As EventArgs)
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", Me) Then
Dim sqlstr As String = ""
sqlstr &= " SELECT COUNT(*) as Anzahl,RechnungsKundenNr,[RechnungsName 1] as RechnungAn,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,isnull(max(RechnungsOrt),'') as RechnungsOrt,isnull(max(RechnungsStraße),'') as RechnungsStraße"
sqlstr &= " FROM [Rechnungsausgang] INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr"
sqlstr &= " WHERE 1=1"
sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer")
If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value
sqlstr &= " group by RechnungsKundenNr, [RechnungsName 1]"
sqlstr &= " order by COUNT(*) desc,[RechnungsName 1]"
If cboBerichtRgAbfArt._value <> "" Then
End If
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList())
'DataGridView.DataSource = dt
Dim print As New frmPrintLayout
print.Text = "Rechnungsempfänger Bericht"
Dim rpt As New rptFaktRechnungAn
rpt.DataSource = dt
'cProgramFunctions.genExcelFromDT_NEW(DataGridView.DataSource)
If rpt.DataSource.rows.count = 0 Then
rpt.Dispose() : print.Dispose()
MsgBox("Keine Daten vorhanden!")
Exit Sub
End If
Dim sum = 0
rpt.lblUeberschrift.Text = "Rechnungsanschrift Bericht " & txtAbfertDat.Text & " bis " & txtAbfertDatBis.Text
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
'Dim cnt As Integer = 0
rpt.lblDat.Text = Now.ToLongDateString
Dim sumAnz As Double = 0
For Each r In dt.Rows
If r("Anzahl") Then sumAnz += r("Anzahl")
Next
rpt.lblGesAnzahl.Text = sumAnz
AddHandler rpt.Detail.Format, Sub()
rpt.lblAnzahl.Text = rpt.Fields.Item("Anzahl").Value
rpt.lblKdNr.Text = rpt.Fields.Item("RechnungsKundenNr").Value
rpt.lblRechnungsAn.Text = rpt.Fields.Item("RechnungAn").Value
rpt.lblRechnungsadresse.Text = rpt.Fields.Item("RechnungsOrt").Value
If IsNumeric(rpt.Fields.Item("Anzahl").Value) Then
rpt.lblPercent.Text = CDbl(CDbl(rpt.Fields.Item("Anzahl").Value) / sumAnz).ToString("P1")
Else
rpt.lblPercent.Text = ""
End If
End Sub
print.Viewer.LoadDocument(rpt)
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
print.Show()
End If
End Sub End Sub
Private Sub Button9_Click(sender As Object, e As EventArgs) Private Sub Button9_Click(sender As Object, e As EventArgs)
@@ -885,4 +824,106 @@ Public Class frmRechnungenSuche
Dim webAddress As String = "https://wiki.verag.ag/de/abteilungen/verrechnung/xxxx" Dim webAddress As String = "https://wiki.verag.ag/de/abteilungen/verrechnung/xxxx"
Process.Start(webAddress) Process.Start(webAddress)
End Sub End Sub
Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem3.Click
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", Me) Then
Dim sqlstr As String = ""
sqlstr &= " SELECT COUNT(*) as Anzahl,RechnungsKundenNr,[RechnungsName 1] as RechnungAn,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,isnull(max(RechnungsOrt),'') as RechnungsOrt,isnull(max(RechnungsStraße),'') as RechnungsStraße"
sqlstr &= " FROM [Rechnungsausgang] INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr"
sqlstr &= " WHERE 1=1"
sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer")
If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value
sqlstr &= " group by RechnungsKundenNr, [RechnungsName 1]"
sqlstr &= " order by COUNT(*) desc,[RechnungsName 1]"
If cboBerichtRgAbfArt._value <> "" Then
End If
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList())
'DataGridView.DataSource = dt
Dim print As New frmPrintLayout
print.Text = "Rechnungsempfänger Bericht"
Dim rpt As New rptFaktRechnungAn
rpt.DataSource = dt
'cProgramFunctions.genExcelFromDT_NEW(DataGridView.DataSource)
If rpt.DataSource.rows.count = 0 Then
rpt.Dispose() : print.Dispose()
MsgBox("Keine Daten vorhanden!")
Exit Sub
End If
Dim sum = 0
rpt.lblUeberschrift.Text = "Rechnungsanschrift Bericht " & txtAbfertDat.Text & " bis " & txtAbfertDatBis.Text
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
'Dim cnt As Integer = 0
rpt.lblDat.Text = Now.ToLongDateString
Dim sumAnz As Double = 0
For Each r In dt.Rows
If r("Anzahl") Then sumAnz += r("Anzahl")
Next
rpt.lblGesAnzahl.Text = sumAnz
AddHandler rpt.Detail.Format, Sub()
rpt.lblAnzahl.Text = rpt.Fields.Item("Anzahl").Value
rpt.lblKdNr.Text = rpt.Fields.Item("RechnungsKundenNr").Value
rpt.lblRechnungsAn.Text = rpt.Fields.Item("RechnungAn").Value
rpt.lblRechnungsadresse.Text = rpt.Fields.Item("RechnungsOrt").Value
If IsNumeric(rpt.Fields.Item("Anzahl").Value) Then
rpt.lblPercent.Text = CDbl(CDbl(rpt.Fields.Item("Anzahl").Value) / sumAnz).ToString("P1")
Else
rpt.lblPercent.Text = ""
End If
End Sub
print.Viewer.LoadDocument(rpt)
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
print.Show()
End If
End Sub
Private Sub NachZollabfertigungspreisenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NachZollabfertigungspreisenToolStripMenuItem.Click
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", Me) Then
Dim sqlstr As String = ""
sqlstr &= " SELECT COUNT(distinct(RechnungsNr)) as Anzahl,isnull(max(Offertenpositionen.Preis),0) as AbfKosten, MAX(Offertenpositionen.OffertenNr) as OffertenNr, RechnungsKundenNr,[RechnungsName 1] as RechnungAn,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,isnull(max(RechnungsOrt),'') as RechnungsOrt,isnull(max(RechnungsStraße),'')as RechnungsStraße "
sqlstr &= " FROM [Rechnungsausgang] INNER JOIN RechnungsausgangPositionen on [Rechnungsausgang].RK_ID = RechnungsausgangPositionen.RK_ID INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr LEFT JOIN Offertenpositionen on Offertenpositionen.KundenNr = RechnungsKundenNr and (Offertenpositionen.OffertenNr = 1 or Offertenpositionen.OffertenNr = 38)"
sqlstr &= " WHERE 1=1"
sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer")
If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value & " And RechnungsausgangPositionen.LeistungsNr = 340"
sqlstr &= " group by RechnungsKundenNr, [RechnungsName 1] "
sqlstr &= " order by isnull(max(Offertenpositionen.Preis),0) desc,[RechnungsName 1]"
If cboBerichtRgAbfArt._value <> "" Then
End If
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList())
Dim print As New frmPrintLayout
print.Text = "Zollabfertigungspreise Bericht"
Dim rpt As New rptFaktRechnungAn
If dt.Rows.Count = 0 Then
MsgBox("Keine Daten vorhanden!")
Exit Sub
End If
cProgramFunctions.genExcelFromDT_NEW(dt,,,,,, False)
End If
End Sub
End Class End Class

67
SDL/Fakturierung/frmSendEmail.vb
View File

@@ -40,6 +40,7 @@ Public Class frmSendEmail
ByVal SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, ByVal SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch,
ByVal printOriginalRg As Object, ByVal printOriginalRg As Object,
ByVal Rechnungsdruck As Integer, ByVal Rechnungsdruck As Integer,
ByVal Kdnr As Integer,
Optional ByVal Rechnungsdatum As Object = Nothing) Optional ByVal Rechnungsdatum As Object = Nothing)
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
@@ -50,64 +51,14 @@ Public Class frmSendEmail
Me.Firma_ID = Firma_ID Me.Firma_ID = Firma_ID
Me.SPEDBUCH = SPEDBUCH Me.SPEDBUCH = SPEDBUCH
Me.printOriginalRg = printOriginalRg Me.printOriginalRg = printOriginalRg
Me.KdNr = RECHNUNG.RechnungsKundenNr Me.KdNr = Kdnr
Me.Rechnungsdruck = Rechnungsdruck Me.Rechnungsdruck = Rechnungsdruck
If Rechnungsdatum IsNot Nothing Then If Rechnungsdatum IsNot Nothing Then
Me.Rechnungsdatum = CDate(Rechnungsdatum) Me.Rechnungsdatum = CDate(Rechnungsdatum)
End If End If
End Sub End Sub
' Konstruktor 2
Public Sub New(ByVal Firma_ID As Integer,
ByVal SammelrechungArt As Integer,
ByVal DatumBis As Date,
ByVal Rechnungsdatum As Date,
ByVal PrinterName As String,
ByVal Rechnungsdruck As Integer,
Optional ByVal EinzelAnlagen As Boolean = True,
Optional ByVal Sammelbericht As Boolean = True,
Optional ByVal KdNr As Integer = -1,
Optional ByVal RechnungsdruckArt As Integer = -1,
Optional ByRef listPDFs As List(Of String) = Nothing,
Optional ByVal SB As String = "",
ByRef Optional lastAktuelle_RgNr As Integer = -1,
Optional ByVal AvisoIds As List(Of Integer) = Nothing,
Optional ByVal xlsEvolog As Boolean = False,
Optional ByVal xlsTransFerry As Boolean = False,
Optional ByVal FakturierungsGruppe As String = "",
Optional ByVal Abfertigungsart As String = "",
Optional ByVal printRgCopy As Boolean = False)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
Me.SR_DT = cFakturierung.GET_SR_SQLDT(Firma_ID,
SammelrechungArt,
DatumBis,
KdNr,
SB,
AvisoIds,
FakturierungsGruppe,
Abfertigungsart)
Me.Firma_ID = Firma_ID
Me.SammelrechungArt = SammelrechungArt
Me.DatumBis = DatumBis
Me.SB = SB
Me.EinzelAnlagen = EinzelAnlagen
Me.Sammelbericht = Sammelbericht
Me.xlsEvolog = xlsEvolog
Me.xlsTransFerry = xlsTransFerry
Me.KdNr = KdNr
Me.Rechnungsdatum = Rechnungsdatum
Me.RechnungsNr = lastAktuelle_RgNr
Me.FakturierungsGruppe = FakturierungsGruppe
Me.Abfertigungsart = Abfertigungsart
Me.AvisoIds = AvisoIds
Me.Rechnungsdruck = Rechnungsdruck
Me.printRgCopy = printRgCopy
SR = True
End Sub
' Ereignishandler: Form-Load ' Ereignishandler: Form-Load
Private Sub frmFaktEmail_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmFaktEmail_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -137,26 +88,26 @@ Public Class frmSendEmail
End If End If
Next Next
End If End If
email_receipt = If(allAtilla, VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an (ATILLA)"), "") email_receipt = If(allAtilla, VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(KdNr, "Rechnung an (ATILLA)"), "")
Else Else
If RECHNUNG.FilialenNr = "4801" OrElse RECHNUNG.FilialenNr = "4802" Then If RECHNUNG.FilialenNr = "4801" OrElse RECHNUNG.FilialenNr = "4802" Then
email_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an (ATILLA)") email_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(KdNr, "Rechnung an (ATILLA)")
End If End If
End If End If
Dim EMAILTMP As String = If(email_receipt = "", Dim EMAILTMP As String = If(email_receipt = "",
VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an"), VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(KdNr, "Rechnung an"),
email_receipt) email_receipt)
If EMAILTMP <> "" Then dgvEmail.Rows.Add(EMAILTMP) If EMAILTMP <> "" Then dgvEmail.Rows.Add(EMAILTMP)
Dim EMAILTMPCC As String = If(email_receipt = "", Dim EMAILTMPCC As String = If(email_receipt = "",
VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an"), VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(KdNr, "Rechnung an"),
VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an (ATILLA)")) VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(KdNr, "Rechnung an (ATILLA)"))
If EMAILTMPCC <> "" Then dgvEmailCC.Rows.Add(EMAILTMPCC) If EMAILTMPCC <> "" Then dgvEmailCC.Rows.Add(EMAILTMPCC)
Dim EMAILTMPBCC As String = If(email_receipt = "", Dim EMAILTMPBCC As String = If(email_receipt = "",
VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an"), VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(KdNr, "Rechnung an"),
VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an (ATILLA)")) VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(KdNr, "Rechnung an (ATILLA)"))
If EMAILTMPBCC <> "" Then dgvEmailBCC.Rows.Add(EMAILTMPBCC) If EMAILTMPBCC <> "" Then dgvEmailBCC.Rows.Add(EMAILTMPBCC)
initDGVAnhaenge() initDGVAnhaenge()

75
SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb generated
View File

@@ -82,6 +82,7 @@ Partial Class usrCntlFaktAbrechnung
Me.lblRechnungsDatum = New System.Windows.Forms.Label() Me.lblRechnungsDatum = New System.Windows.Forms.Label()
Me.lblRechnungsNummer = New System.Windows.Forms.Label() Me.lblRechnungsNummer = New System.Windows.Forms.Label()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.Button17 = New System.Windows.Forms.Button()
Me.txtTextZZ = New VERAG_PROG_ALLGEMEIN.MyRichTextBox() Me.txtTextZZ = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.optAnhSel = New System.Windows.Forms.DataGridViewCheckBoxColumn() Me.optAnhSel = New System.Windows.Forms.DataGridViewCheckBoxColumn()
@@ -273,13 +274,17 @@ Partial Class usrCntlFaktAbrechnung
Me.EmpfängerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EmpfängerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AuftraggeberToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AuftraggeberToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AvisiererToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AvisiererToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.AbsenderToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.EmpfängerToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.AuftraggeberToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.AvisiererToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.GutschriftAusRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GutschriftAusRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.SeperateRechnungFürEUSTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SeperateRechnungFürEUSTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GutschriftAnVeragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GutschriftAnVeragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.VeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.VeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Button17 = New System.Windows.Forms.Button()
Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten() Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten()
Me.pnlTop.SuspendLayout() Me.pnlTop.SuspendLayout()
Me.Panel3.SuspendLayout() Me.Panel3.SuspendLayout()
@@ -305,6 +310,7 @@ Partial Class usrCntlFaktAbrechnung
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.CntxtAbfArt.SuspendLayout() Me.CntxtAbfArt.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout()
Me.ContextMenuStrip3.SuspendLayout()
Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
@@ -851,6 +857,20 @@ Partial Class usrCntlFaktAbrechnung
Me.Panel1.Size = New System.Drawing.Size(830, 1142) Me.Panel1.Size = New System.Drawing.Size(830, 1142)
Me.Panel1.TabIndex = 1 Me.Panel1.TabIndex = 1
' '
'Button17
'
Me.Button17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
Me.Button17.ContextMenuStrip = Me.ContextMenuStrip3
Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button17.Location = New System.Drawing.Point(656, 887)
Me.Button17.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
Me.Button17.Name = "Button17"
Me.Button17.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
Me.Button17.Size = New System.Drawing.Size(166, 24)
Me.Button17.TabIndex = 92
Me.Button17.Text = "E-Mail Erstellen"
Me.Button17.UseVisualStyleBackColor = True
'
'txtTextZZ 'txtTextZZ
' '
Me.txtTextZZ.Location = New System.Drawing.Point(64, 1061) Me.txtTextZZ.Location = New System.Drawing.Point(64, 1061)
@@ -3932,6 +3952,37 @@ Partial Class usrCntlFaktAbrechnung
Me.AvisiererToolStripMenuItem.Size = New System.Drawing.Size(153, 22) Me.AvisiererToolStripMenuItem.Size = New System.Drawing.Size(153, 22)
Me.AvisiererToolStripMenuItem.Text = "4 Avisierer" Me.AvisiererToolStripMenuItem.Text = "4 Avisierer"
' '
'ContextMenuStrip3
'
Me.ContextMenuStrip3.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.ContextMenuStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AbsenderToolStripMenuItem2, Me.EmpfängerToolStripMenuItem2, Me.AuftraggeberToolStripMenuItem2, Me.AvisiererToolStripMenuItem2})
Me.ContextMenuStrip3.Name = "ContextMenuStrip3"
Me.ContextMenuStrip3.Size = New System.Drawing.Size(154, 92)
'
'AbsenderToolStripMenuItem2
'
Me.AbsenderToolStripMenuItem2.Name = "AbsenderToolStripMenuItem2"
Me.AbsenderToolStripMenuItem2.Size = New System.Drawing.Size(153, 22)
Me.AbsenderToolStripMenuItem2.Text = "1 Absender"
'
'EmpfängerToolStripMenuItem2
'
Me.EmpfängerToolStripMenuItem2.Name = "EmpfängerToolStripMenuItem2"
Me.EmpfängerToolStripMenuItem2.Size = New System.Drawing.Size(153, 22)
Me.EmpfängerToolStripMenuItem2.Text = "2 Empfänger"
'
'AuftraggeberToolStripMenuItem2
'
Me.AuftraggeberToolStripMenuItem2.Name = "AuftraggeberToolStripMenuItem2"
Me.AuftraggeberToolStripMenuItem2.Size = New System.Drawing.Size(153, 22)
Me.AuftraggeberToolStripMenuItem2.Text = "3 Auftraggeber"
'
'AvisiererToolStripMenuItem2
'
Me.AvisiererToolStripMenuItem2.Name = "AvisiererToolStripMenuItem2"
Me.AvisiererToolStripMenuItem2.Size = New System.Drawing.Size(153, 22)
Me.AvisiererToolStripMenuItem2.Text = "4 Avisierer"
'
'ContextMenuStrip2 'ContextMenuStrip2
' '
Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GutschriftAusRechnungToolStripMenuItem, Me.SeperateRechnungFürEUSTToolStripMenuItem, Me.GutschriftAnVeragToolStripMenuItem}) Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GutschriftAusRechnungToolStripMenuItem, Me.SeperateRechnungFürEUSTToolStripMenuItem, Me.GutschriftAnVeragToolStripMenuItem})
@@ -3969,19 +4020,6 @@ Partial Class usrCntlFaktAbrechnung
Me.VeragCSToolStripMenuItem.Size = New System.Drawing.Size(122, 22) Me.VeragCSToolStripMenuItem.Size = New System.Drawing.Size(122, 22)
Me.VeragCSToolStripMenuItem.Text = "Verag CS" Me.VeragCSToolStripMenuItem.Text = "Verag CS"
' '
'Button17
'
Me.Button17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button17.Location = New System.Drawing.Point(656, 887)
Me.Button17.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
Me.Button17.Name = "Button17"
Me.Button17.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
Me.Button17.Size = New System.Drawing.Size(166, 24)
Me.Button17.TabIndex = 92
Me.Button17.Text = "E-Mail Erstellen"
Me.Button17.UseVisualStyleBackColor = True
'
'rtbAbf_Besonderheiten 'rtbAbf_Besonderheiten
' '
Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White
@@ -4039,6 +4077,7 @@ Partial Class usrCntlFaktAbrechnung
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
Me.CntxtAbfArt.ResumeLayout(False) Me.CntxtAbfArt.ResumeLayout(False)
Me.ContextMenuStrip1.ResumeLayout(False) Me.ContextMenuStrip1.ResumeLayout(False)
Me.ContextMenuStrip3.ResumeLayout(False)
Me.ContextMenuStrip2.ResumeLayout(False) Me.ContextMenuStrip2.ResumeLayout(False)
Me.ResumeLayout(False) Me.ResumeLayout(False)
@@ -4262,10 +4301,16 @@ Partial Class usrCntlFaktAbrechnung
Friend WithEvents SdfToolStripMenuItem As ToolStripMenuItem Friend WithEvents SdfToolStripMenuItem As ToolStripMenuItem
Friend WithEvents Button15 As Button Friend WithEvents Button15 As Button
Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
Friend WithEvents Button17 As Button
Friend WithEvents AbsenderToolStripMenuItem As ToolStripMenuItem Friend WithEvents AbsenderToolStripMenuItem As ToolStripMenuItem
Friend WithEvents EmpfängerToolStripMenuItem As ToolStripMenuItem Friend WithEvents EmpfängerToolStripMenuItem As ToolStripMenuItem
Friend WithEvents AuftraggeberToolStripMenuItem As ToolStripMenuItem Friend WithEvents AuftraggeberToolStripMenuItem As ToolStripMenuItem
Friend WithEvents AvisiererToolStripMenuItem As ToolStripMenuItem Friend WithEvents AvisiererToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ContextMenuStrip3 As ContextMenuStrip
Friend WithEvents AbsenderToolStripMenuItem2 As ToolStripMenuItem
Friend WithEvents EmpfängerToolStripMenuItem2 As ToolStripMenuItem
Friend WithEvents AuftraggeberToolStripMenuItem2 As ToolStripMenuItem
Friend WithEvents AvisiererToolStripMenuItem2 As ToolStripMenuItem
Friend WithEvents txtTextZZ As VERAG_PROG_ALLGEMEIN.MyRichTextBox Friend WithEvents txtTextZZ As VERAG_PROG_ALLGEMEIN.MyRichTextBox
Friend WithEvents Button16 As Button Friend WithEvents Button16 As Button
Friend WithEvents ContextMenuStrip2 As ContextMenuStrip Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
@@ -4278,5 +4323,5 @@ Partial Class usrCntlFaktAbrechnung
Friend WithEvents VeragCSToolStripMenuItem As ToolStripMenuItem Friend WithEvents VeragCSToolStripMenuItem As ToolStripMenuItem
Friend WithEvents lblOFgesperrt As Label Friend WithEvents lblOFgesperrt As Label
Friend WithEvents cboVorauskasse As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cboVorauskasse As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Button17 As Button
End Class End Class

13
SDL/Fakturierung/usrCntlFaktAbrechnung.resx
View File

@@ -117,6 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="optAnhSel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="optAnhSel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@@ -176,19 +179,19 @@
</value> </value>
</data> </data>
<metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>290, 17</value>
</metadata> </metadata>
<metadata name="Timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="Timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>109, 17</value> <value>384, 17</value>
</metadata> </metadata>
<metadata name="CntxtAbfArt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="CntxtAbfArt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 6</value> <value>173, 17</value>
</metadata> </metadata>
<metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>343, 15</value> <value>469, 17</value>
</metadata> </metadata>
<metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>500, 15</value> <value>625, 17</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>45</value> <value>45</value>

41
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -4224,6 +4224,38 @@ Nächste_Textzeile_lesen:
End Sub End Sub
Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click
ContextMenuStrip3.Show(Cursor.Position)
End Sub
Private Sub AbsenderToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles AbsenderToolStripMenuItem2.Click, EmpfängerToolStripMenuItem2.Click, AuftraggeberToolStripMenuItem2.Click, AvisiererToolStripMenuItem2.Click
Try
If cboRechnungAn._value = "" Then Exit Sub
getValues()
Dim ROLLE = "AUFTRAGGEBER"
Dim FirmaFrm = (RECHNUNG.RechnungsName_1 & " " & If(RECHNUNG.RechnungsName_2, "")).trim
Dim kdnrFrm As Integer = RECHNUNG.RechnungsKundenNr
Select Case sender.text.ToString.Substring(0, 1) 'cboRechnungAn._value
Case "1"
ROLLE = "ABSENDER"
FirmaFrm = (RECHNUNG.AbsenderName_1 & " " & If(RECHNUNG.AbsenderName_2, "")).trim
kdnrFrm = RECHNUNG.AbsenderKundenNr
Case "2"
ROLLE = "EMPFAENGER"
FirmaFrm = (RECHNUNG.EmpfängerName_1 & " " & If(RECHNUNG.EmpfängerName_2, "")).trim
kdnrFrm = RECHNUNG.EmpfängerKundenNr
Case "3"
ROLLE = "AUFTRAGGEBER"
FirmaFrm = (RECHNUNG.VermittlerName_1 & " " & If(RECHNUNG.VermittlerName_2, "")).trim
kdnrFrm = RECHNUNG.VermittlerKundenNr
Case "4"
ROLLE = "AVISIERER"
FirmaFrm = (RECHNUNG.Avisierer)
kdnrFrm = RECHNUNG.AvisiererKundenNr
End Select
If Not checkUIDNR() Then Exit Sub If Not checkUIDNR() Then Exit Sub
If RECHNUNG.Status <> 0 OrElse saveMe() Then If RECHNUNG.Status <> 0 OrElse saveMe() Then
@@ -4239,7 +4271,7 @@ Nächste_Textzeile_lesen:
RG_DRUCK = 5 RG_DRUCK = 5
End If End If
Dim f As New frmSendEmail(RECHNUNG, SPEDBUCH, If(cbxOriginalPrint.Visible, cbxOriginalPrint.Checked, Nothing), RG_DRUCK) Dim f As New frmSendEmail(RECHNUNG, SPEDBUCH, If(cbxOriginalPrint.Visible, cbxOriginalPrint.Checked, Nothing), RG_DRUCK, kdnrFrm)
f.ShowDialog(Me) f.ShowDialog(Me)
initRECHNUNG() initRECHNUNG()
RaiseEvent SOMETHING_CHANGED(-1) RaiseEvent SOMETHING_CHANGED(-1)
@@ -4247,5 +4279,12 @@ Nächste_Textzeile_lesen:
End If End If
cbxOriginalPrint.Checked = False cbxOriginalPrint.Checked = False
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub End Sub
End Class End Class

41
SDL/mdm/usrcntlFremdrechnungen.vb
View File

@@ -51,10 +51,7 @@ Public Class usrcntlFremdrechnungen
kdNr_WHERE = "" kdNr_WHERE = ""
End If End If
If kdNr_filter Then If kdNr_filter Then
'Dim dt As DataTable = SQL.loadDgvBySql("SELECT KundenSDL.SDLNr FROM KundenSDL INNER JOIN [Speditionsdienstleistungen] as S ON s.SDLNr=KundenSDL.sdlnr WHERE s.SDLTypNr IN (1,2) AND KundenSDL.KundenNr = '" & kdNr & "' group by KundenSDL.SDLNr ")
'If dt Is Nothing Then
' MsgBox("Es wurden noch keine Leistungen freigeschaltet.")
'Else
btnSDL_IDS.Visible = True ' dt.Select("SDLNr=100").Count > 0 btnSDL_IDS.Visible = True ' dt.Select("SDLNr=100").Count > 0
btnSDL_UTA.Visible = True 'dt.Select("SDLNr=212").Count > 0 btnSDL_UTA.Visible = True 'dt.Select("SDLNr=212").Count > 0
btnSDL_Hugo.Visible = False ' dt.Select("SDLNr=213").Count > 0 btnSDL_Hugo.Visible = False ' dt.Select("SDLNr=213").Count > 0
@@ -263,7 +260,7 @@ Public Class usrcntlFremdrechnungen
--RMC --RMC
SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant, [rmc_reDatum] as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & " order by rmc_reDatum, rmc_reNr SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant, [rmc_reDatum] as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & " order by rmc_reDatum, rmc_reNr
) as temp order by Rechnungsdatum desc" ) as temp where 1=1 and temp.Rechnungsdatum" & setSQLWhere(SDLNrTmp, "temp.Land", True) & " order by Rechnungsdatum desc"
@@ -314,16 +311,42 @@ Public Class usrcntlFremdrechnungen
setPDFImages() setPDFImages()
End Sub End Sub
Private Function setSQLWhere(SDLNrTmp As Integer, land As String) As String Private Function setSQLWhere(SDLNrTmp As Integer, land As String, Optional alle As Boolean = False) As String
Dim SQLWhere = " between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "'" Dim SQLWhere = " between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "'"
If cbx.Checked AndAlso SDLNrTmp <> 100 AndAlso KUNDE IsNot Nothing Then If cbx.Checked AndAlso SDLNrTmp <> 100 AndAlso KUNDE IsNot Nothing Then
Select Case KUNDE.LandKz
Case "SRB", "BIH", "MK", "MNE", "TR" 'ORIGINAL-RECHNUNG senden wenn:
If land <> "" Then SQLWhere &= " AND " & land & " not in('AT','CH', 'CZ', 'DE', 'EE', 'ES', 'IE', 'LT', 'LV', 'NRW', 'NO', 'OT', 'RS', 'UA', " & IIf(KUNDE.LandKz = "SRB", "'BG', 'HU', 'RO', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "BIH", "'SK'", "") & IIf(KUNDE.LandKz = "TR", "'HU', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "MNE", "'PL', 'SI'", "") & IIf(KUNDE.LandKz = "MK", "'BG', 'PL','SI'", "") & ")" '1. wenn die Rechnung in dem Land in dem er ansässig ist ausgestellt wurde (rumän. Kunde – Rechnung ausgestellt in Rumänien = z.B. IDS in RO getankt…)
If land <> "" Then SQLWhere &= " AND " & land & " not in ('" & KUNDE.LandKz & "')"
'2. wenn die Rechnung die Summe NULL aufweist
Select Case SDLNrTmp
Case 212 And Not alle : SQLWhere &= " AND Gesamtbetrag_Brutto_in_Darstellwährung <> 0" 'UTA
Case 214 And Not alle : SQLWhere &= " AND plInv_Bruttobetrag <> 0" 'PLOSE
Case 502 And Not alle : SQLWhere &= " AND (tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal) <> 0" 'VERAG
Case 208 And Not alle : SQLWhere &= " AND total_amount_euro <> 0" 'MSE
Case 999 And Not alle : SQLWhere &= " AND rmc_betragBrutto <> 0" 'RMC
Case -1 And alle : SQLWhere &= " AND temp.Nettobetrag <> 0" 'ALLE
End Select End Select
'3. Rechnungen der Länder in denen der Kunde keine MWST erstattet bekommt
'4. Rechnungen der Länder, in denen der Kunde selber MWST beantragt
'nicht NOTWENDIG!
'Select Case KUNDE.LandKz
' Case "SRB", "BIH", "MK", "MNE", "TR"
' If land <> "" Then SQLWhere &= " AND " & land & " not in('AT','CH', 'CZ', 'DE', 'EE', 'ES', 'IE', 'LT', 'LV', 'NRW', 'NO', 'OT', 'RS', 'UA', " & IIf(KUNDE.LandKz = "SRB", "'BG', 'HU', 'RO', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "BIH", "'SK'", "") & IIf(KUNDE.LandKz = "TR", "'HU', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "MNE", "'PL', 'SI'", "") & IIf(KUNDE.LandKz = "MK", "'BG', 'PL','SI'", "") & ")"
'End Select
End If End If
Return SQLWhere Return SQLWhere