MDMAusewrtung, faktEmail, etc.
This commit is contained in:
@@ -102,7 +102,7 @@ Public Class frmAbrechnungsMaske
|
||||
Case "ATILLA"
|
||||
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID=7", False, "FMZOLL")
|
||||
cboFirma.changeItem("7")
|
||||
cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where isnull(mit_firmaFMZoll,0)=7 and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
|
||||
cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where isnull(mit_firmaFMZoll,0)=7 and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=199 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
|
||||
FilialNrRestriction = 4813
|
||||
|
||||
Case "VERAGIMEX"
|
||||
|
||||
39
SDL/Fakturierung/frmFaktEmail.Designer.vb
generated
39
SDL/Fakturierung/frmFaktEmail.Designer.vb
generated
@@ -22,7 +22,6 @@ Partial Class frmFaktEmail
|
||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||
<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()
|
||||
@@ -51,7 +50,7 @@ Partial Class frmFaktEmail
|
||||
Me.lkl = New System.Windows.Forms.LinkLabel()
|
||||
Me.Label3 = New System.Windows.Forms.Label()
|
||||
Me.cbxOriginalPrint = New System.Windows.Forms.CheckBox()
|
||||
Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
|
||||
Me.clmnLKW = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.clmnStb_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.clmnMitt_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
@@ -74,7 +73,7 @@ Partial Class frmFaktEmail
|
||||
Me.cbxTransFerry = New System.Windows.Forms.CheckBox()
|
||||
Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.cbxRgKopieDrucken = New System.Windows.Forms.CheckBox()
|
||||
Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
|
||||
Me.optAnhSel = New System.Windows.Forms.DataGridViewCheckBoxColumn()
|
||||
Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.clmnBezeichnung = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
@@ -87,11 +86,15 @@ Partial Class frmFaktEmail
|
||||
Me.cbxMDMAnh = New System.Windows.Forms.CheckBox()
|
||||
Me.Button6 = New System.Windows.Forms.Button()
|
||||
Me.cbxVZ = New System.Windows.Forms.CheckBox()
|
||||
Me.btn_FM = New System.Windows.Forms.Button()
|
||||
Me.CM_FM = New System.Windows.Forms.ContextMenuStrip()
|
||||
Me.OriginalschreibenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
CType(Me.dgvEmailBCC, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.dgvEmailCC, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.CM_FM.SuspendLayout()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'lbl
|
||||
@@ -744,12 +747,38 @@ Partial Class frmFaktEmail
|
||||
Me.cbxVZ.Text = "VZ"
|
||||
Me.cbxVZ.UseVisualStyleBackColor = True
|
||||
'
|
||||
'btn_FM
|
||||
'
|
||||
Me.btn_FM.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btn_FM.Image = Global.SDL.My.Resources.Resources.android_note12
|
||||
Me.btn_FM.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btn_FM.Location = New System.Drawing.Point(610, 605)
|
||||
Me.btn_FM.Name = "btn_FM"
|
||||
Me.btn_FM.Size = New System.Drawing.Size(131, 39)
|
||||
Me.btn_FM.TabIndex = 99
|
||||
Me.btn_FM.Text = "Formular-Manager"
|
||||
Me.btn_FM.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.btn_FM.UseVisualStyleBackColor = True
|
||||
'
|
||||
'CM_FM
|
||||
'
|
||||
Me.CM_FM.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OriginalschreibenToolStripMenuItem})
|
||||
Me.CM_FM.Name = "ContextMenuStrip1"
|
||||
Me.CM_FM.Size = New System.Drawing.Size(192, 26)
|
||||
'
|
||||
'OriginalschreibenToolStripMenuItem
|
||||
'
|
||||
Me.OriginalschreibenToolStripMenuItem.Name = "OriginalschreibenToolStripMenuItem"
|
||||
Me.OriginalschreibenToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
|
||||
Me.OriginalschreibenToolStripMenuItem.Text = "Verzollungsunterlagen"
|
||||
'
|
||||
'frmFaktEmail
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.BackColor = System.Drawing.Color.WhiteSmoke
|
||||
Me.ClientSize = New System.Drawing.Size(750, 850)
|
||||
Me.Controls.Add(Me.btn_FM)
|
||||
Me.Controls.Add(Me.cbxVZ)
|
||||
Me.Controls.Add(Me.Button6)
|
||||
Me.Controls.Add(Me.cbxMDMAnh)
|
||||
@@ -802,6 +831,7 @@ Partial Class frmFaktEmail
|
||||
CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.CM_FM.ResumeLayout(False)
|
||||
Me.ResumeLayout(False)
|
||||
Me.PerformLayout()
|
||||
|
||||
@@ -865,4 +895,7 @@ Partial Class frmFaktEmail
|
||||
Friend WithEvents cbxMDMAnh As CheckBox
|
||||
Friend WithEvents Button6 As Button
|
||||
Friend WithEvents cbxVZ As CheckBox
|
||||
Friend WithEvents btn_FM As Button
|
||||
Friend WithEvents CM_FM As ContextMenuStrip
|
||||
Friend WithEvents OriginalschreibenToolStripMenuItem As ToolStripMenuItem
|
||||
End Class
|
||||
|
||||
@@ -162,6 +162,9 @@
|
||||
<metadata name="clmnAnhId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="CM_FM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
|
||||
@@ -1401,6 +1401,14 @@ Public Class frmFaktEmail
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button7_Click(sender As Object, e As EventArgs) Handles btn_FM.Click
|
||||
CM_FM.Show(Cursor.Position)
|
||||
End Sub
|
||||
|
||||
Private Sub OriginalschreibenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OriginalschreibenToolStripMenuItem.Click
|
||||
SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, KdNr)
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
|
||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.5.1.7")>
|
||||
<Assembly: AssemblyFileVersion("1.5.1.7")>
|
||||
<Assembly: AssemblyVersion("1.5.1.8")>
|
||||
<Assembly: AssemblyFileVersion("1.5.1.8")>
|
||||
|
||||
@@ -2859,7 +2859,7 @@ Public Class usrCntlSpeditionsBuchSuche
|
||||
,BelegNr
|
||||
,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung,Speditionsbuch.Zollsystem_Land, Speditionsbuch.[LKW Kennzeichen]
|
||||
FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart
|
||||
where EmpfängerKundenNr IN (" & kdnrsrch & ") and VermittlerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,29,38)", "FMZOLL")
|
||||
where EmpfängerKundenNr IN (" & kdnrsrch & ") and VermittlerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,26,29,38)", "FMZOLL")
|
||||
|
||||
Try
|
||||
|
||||
|
||||
48
SDL/USTV/frmMDM_USTVAntrag.Designer.vb
generated
48
SDL/USTV/frmMDM_USTVAntrag.Designer.vb
generated
@@ -116,6 +116,7 @@ Partial Class frmMDM_USTVAntrag
|
||||
Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel()
|
||||
Me.Panel2 = New System.Windows.Forms.Panel()
|
||||
Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
|
||||
Me.Panel4 = New System.Windows.Forms.Panel()
|
||||
Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox()
|
||||
Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
|
||||
@@ -126,6 +127,7 @@ Partial Class frmMDM_USTVAntrag
|
||||
Me.Panel3 = New System.Windows.Forms.Panel()
|
||||
Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.pnlErstattungsdetails = New System.Windows.Forms.Panel()
|
||||
Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
|
||||
Me.Panel1 = New System.Windows.Forms.Panel()
|
||||
Me.Button2 = New System.Windows.Forms.Button()
|
||||
Me.Button3 = New System.Windows.Forms.Button()
|
||||
@@ -142,8 +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.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
|
||||
Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
|
||||
Me.btnRMCQuartal = New System.Windows.Forms.Button()
|
||||
Me.pnlBottom.SuspendLayout()
|
||||
CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -175,6 +176,7 @@ Partial Class frmMDM_USTVAntrag
|
||||
'
|
||||
Me.pnlBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
|
||||
Me.pnlBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
|
||||
Me.pnlBottom.Controls.Add(Me.btnRMCQuartal)
|
||||
Me.pnlBottom.Controls.Add(Me.Label18)
|
||||
Me.pnlBottom.Controls.Add(Me.txtSumme)
|
||||
Me.pnlBottom.Controls.Add(Me.pbMail)
|
||||
@@ -1569,6 +1571,14 @@ Partial Class frmMDM_USTVAntrag
|
||||
Me.Panel2.Size = New System.Drawing.Size(1428, 263)
|
||||
Me.Panel2.TabIndex = 1
|
||||
'
|
||||
'UstCntlUSTV_AntragPosition1
|
||||
'
|
||||
Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
|
||||
Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
|
||||
Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
|
||||
Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
|
||||
'
|
||||
'Panel4
|
||||
'
|
||||
Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
|
||||
@@ -1714,6 +1724,14 @@ Partial Class frmMDM_USTVAntrag
|
||||
Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 261)
|
||||
Me.pnlErstattungsdetails.TabIndex = 0
|
||||
'
|
||||
'UstCntlUSTV_AntragErstattungen1
|
||||
'
|
||||
Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
|
||||
Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
|
||||
Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259)
|
||||
Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
|
||||
'
|
||||
'Panel1
|
||||
'
|
||||
Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
|
||||
@@ -1832,21 +1850,18 @@ Partial Class frmMDM_USTVAntrag
|
||||
Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen"
|
||||
Me.FakturiertToolStripMenuItem.Visible = False
|
||||
'
|
||||
'UstCntlUSTV_AntragPosition1
|
||||
'btnRMCQuartal
|
||||
'
|
||||
Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
|
||||
Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
|
||||
Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
|
||||
Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
|
||||
'
|
||||
'UstCntlUSTV_AntragErstattungen1
|
||||
'
|
||||
Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
|
||||
Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
|
||||
Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259)
|
||||
Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
|
||||
Me.btnRMCQuartal.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnRMCQuartal.ForeColor = System.Drawing.Color.Black
|
||||
Me.btnRMCQuartal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnRMCQuartal.Location = New System.Drawing.Point(752, 17)
|
||||
Me.btnRMCQuartal.Name = "btnRMCQuartal"
|
||||
Me.btnRMCQuartal.Size = New System.Drawing.Size(103, 39)
|
||||
Me.btnRMCQuartal.TabIndex = 55
|
||||
Me.btnRMCQuartal.Text = "RMC Quartal"
|
||||
Me.btnRMCQuartal.UseVisualStyleBackColor = True
|
||||
Me.btnRMCQuartal.Visible = False
|
||||
'
|
||||
'frmMDM_USTVAntrag
|
||||
'
|
||||
@@ -2015,4 +2030,5 @@ Partial Class frmMDM_USTVAntrag
|
||||
Friend WithEvents pbMail As PictureBox
|
||||
Friend WithEvents Label18 As Label
|
||||
Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Friend WithEvents btnRMCQuartal As Button
|
||||
End Class
|
||||
|
||||
@@ -535,12 +535,18 @@ Public Class frmMDM_USTVAntrag
|
||||
Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & USTV_ANTRAG.UStVAn_LandNr & "'", "FMZOLL")
|
||||
setValue(USTV_ANTRAG)
|
||||
|
||||
If CInt(USTV_ANTRAG.UStVAn_KuNr) >= 150000 AndAlso CInt(USTV_ANTRAG.UStVAn_KuNr) < 160000 Then
|
||||
btnRMCQuartal.Visible = True
|
||||
Else
|
||||
btnRMCQuartal.Visible = False
|
||||
End If
|
||||
|
||||
Else
|
||||
Dim sqlWhere As String = ""
|
||||
Dim sqlWhere As String = ""
|
||||
'neuer USTVA-Antrag
|
||||
KdSearchBox1.Visible = True
|
||||
cbxWahrung.Enabled = True
|
||||
btnRMCQuartal.Visible = False
|
||||
|
||||
|
||||
For i As Integer = 0 To cbxFiliale.Items.Count - 1
|
||||
@@ -3917,6 +3923,29 @@ Return ""
|
||||
|
||||
End Function
|
||||
|
||||
Private Sub btnRMCQuartal_Click(sender As Object, e As EventArgs) Handles btnRMCQuartal.Click
|
||||
|
||||
Dim rmc As cRMC
|
||||
|
||||
Dim nurUnter50EurAnzeigen As Boolean = True
|
||||
|
||||
Select Case MsgBox("Sollen nur Anträge angezeigt werden, deren Bearbeitung pro Quartal unter 50EUR liegt?", vbYesNo)
|
||||
Case vbYes : nurUnter50EurAnzeigen = True
|
||||
Case vbNo : nurUnter50EurAnzeigen = False
|
||||
End Select
|
||||
|
||||
Dim dt = rmc.getRMCQuartalsAbrechnungen(SQL, 1, Now.Year, "327", USTV_ANTRAG, Antrag_LandKz, nurUnter50EurAnzeigen)
|
||||
If dt.Rows.Count > 0 Then
|
||||
cProgramFunctions.genExcelFromDT_NEW(dt)
|
||||
Else
|
||||
MsgBox("keine Daten für ausgewählten Zeitraum")
|
||||
End If
|
||||
|
||||
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Function PDFInvoicesPath(ByRef posId As String) As String
|
||||
|
||||
|
||||
|
||||
@@ -591,7 +591,7 @@ Public Class frmNacherfassungLeihgeld
|
||||
Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True)
|
||||
RG.LOAD_OFFERT_POSITIONEN() ' --> OFFERTE MIT ANZAHL >0 und Preis >0
|
||||
|
||||
allPos(RG, OFFERTE, 110, summeBRUTTO, summeNETTO, (summeBRUTTO - summeNETTO), "Leihgeldauszahlung (" & BARBELEG.LKW_Kennzeichen & " " & BARBELEG.Fahrer & ")")
|
||||
allPos(RG, OFFERTE, 110, summeBRUTTO, summeNETTO, (summeBRUTTO - summeNETTO), "LG-Auszahlung (" & BARBELEG.LKW_Kennzeichen & " " & BARBELEG.Fahrer & ")")
|
||||
|
||||
Dim dtSt As DataTable = SQL.loadDgvBySql("SELECT TOP 1 isnull([Steuersatz %],0),isnull([Steuerbezeichnung],'') FROM [Steuertabelle] WHERE [Steuerschlüssel]='" & RG.Steuerschlüssel & "'", "FMZOLL")
|
||||
If dtSt IsNot Nothing AndAlso dtSt.Rows.Count > 0 Then
|
||||
@@ -627,6 +627,10 @@ Public Class frmNacherfassungLeihgeld
|
||||
POS.LeistungsNr = o.LeistungsNr
|
||||
POS.LeistungsBez = IIf(leistungsBez <> "", leistungsBez, o.LeistungsBez)
|
||||
|
||||
If POS.LeistungsBez IsNot Nothing AndAlso POS.LeistungsBez.Length > 30 Then
|
||||
POS.LeistungsBez = POS.LeistungsBez.Substring(0, Math.Min(30, POS.LeistungsBez.Length))
|
||||
End If
|
||||
|
||||
POS.BerechnungsartNr = o.BerechnungsartNr
|
||||
POS.Anzahl = 1
|
||||
POS.Steuerpflichtig = LEISTUNG.Steuerpflichtig
|
||||
|
||||
153
SDL/mdm/usrCntlMDMAuswertungen.Designer.vb
generated
153
SDL/mdm/usrCntlMDMAuswertungen.Designer.vb
generated
@@ -129,6 +129,10 @@ Partial Class usrCntlMDMAuswertungen
|
||||
Me.TabPage3 = New System.Windows.Forms.TabPage()
|
||||
Me.Label66 = New System.Windows.Forms.Label()
|
||||
Me.GroupBox20 = New System.Windows.Forms.GroupBox()
|
||||
Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.txtLeistungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
|
||||
Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
|
||||
Me.Label67 = New System.Windows.Forms.Label()
|
||||
Me.PictureBox7 = New System.Windows.Forms.PictureBox()
|
||||
Me.Label45 = New System.Windows.Forms.Label()
|
||||
Me.Label64 = New System.Windows.Forms.Label()
|
||||
@@ -197,10 +201,7 @@ Partial Class usrCntlMDMAuswertungen
|
||||
Me.btnContractdaten = New System.Windows.Forms.Button()
|
||||
Me.Button15 = New System.Windows.Forms.Button()
|
||||
Me.pnl = New System.Windows.Forms.Panel()
|
||||
Me.Label67 = New System.Windows.Forms.Label()
|
||||
Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
|
||||
Me.txtLeistungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
|
||||
Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.cbxNurUnter50EUR = New System.Windows.Forms.CheckBox()
|
||||
Me.GroupBox1.SuspendLayout()
|
||||
Me.GroupBox2.SuspendLayout()
|
||||
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -1444,6 +1445,7 @@ Partial Class usrCntlMDMAuswertungen
|
||||
'
|
||||
'GroupBox20
|
||||
'
|
||||
Me.GroupBox20.Controls.Add(Me.cbxNurUnter50EUR)
|
||||
Me.GroupBox20.Controls.Add(Me.cboQuartal)
|
||||
Me.GroupBox20.Controls.Add(Me.txtLeistungsNr)
|
||||
Me.GroupBox20.Controls.Add(Me.txtJahr)
|
||||
@@ -1459,6 +1461,73 @@ Partial Class usrCntlMDMAuswertungen
|
||||
Me.GroupBox20.TabIndex = 14
|
||||
Me.GroupBox20.TabStop = False
|
||||
'
|
||||
'cboQuartal
|
||||
'
|
||||
Me.cboQuartal._allowedValuesFreiText = Nothing
|
||||
Me.cboQuartal._allowFreiText = False
|
||||
Me.cboQuartal._value = ""
|
||||
Me.cboQuartal.FormattingEnabled = True
|
||||
Me.cboQuartal.Location = New System.Drawing.Point(306, 46)
|
||||
Me.cboQuartal.Name = "cboQuartal"
|
||||
Me.cboQuartal.Size = New System.Drawing.Size(59, 21)
|
||||
Me.cboQuartal.TabIndex = 16
|
||||
'
|
||||
'txtLeistungsNr
|
||||
'
|
||||
Me.txtLeistungsNr._DateTimeOnly = False
|
||||
Me.txtLeistungsNr._numbersOnly = False
|
||||
Me.txtLeistungsNr._numbersOnlyKommastellen = ""
|
||||
Me.txtLeistungsNr._numbersOnlyTrennzeichen = True
|
||||
Me.txtLeistungsNr._Prozent = False
|
||||
Me.txtLeistungsNr._ShortDateNew = False
|
||||
Me.txtLeistungsNr._ShortDateOnly = False
|
||||
Me.txtLeistungsNr._TimeOnly = False
|
||||
Me.txtLeistungsNr._TimeOnly_Seconds = False
|
||||
Me.txtLeistungsNr._value = "327"
|
||||
Me.txtLeistungsNr._Waehrung = False
|
||||
Me.txtLeistungsNr._WaehrungZeichen = True
|
||||
Me.txtLeistungsNr.ForeColor = System.Drawing.Color.Black
|
||||
Me.txtLeistungsNr.Location = New System.Drawing.Point(306, 73)
|
||||
Me.txtLeistungsNr.MaxLineLength = -1
|
||||
Me.txtLeistungsNr.MaxLines_Warning = ""
|
||||
Me.txtLeistungsNr.MaxLines_Warning_Label = Nothing
|
||||
Me.txtLeistungsNr.Name = "txtLeistungsNr"
|
||||
Me.txtLeistungsNr.Size = New System.Drawing.Size(93, 20)
|
||||
Me.txtLeistungsNr.TabIndex = 15
|
||||
Me.txtLeistungsNr.Text = "327"
|
||||
'
|
||||
'txtJahr
|
||||
'
|
||||
Me.txtJahr._DateTimeOnly = False
|
||||
Me.txtJahr._numbersOnly = False
|
||||
Me.txtJahr._numbersOnlyKommastellen = ""
|
||||
Me.txtJahr._numbersOnlyTrennzeichen = True
|
||||
Me.txtJahr._Prozent = False
|
||||
Me.txtJahr._ShortDateNew = False
|
||||
Me.txtJahr._ShortDateOnly = False
|
||||
Me.txtJahr._TimeOnly = False
|
||||
Me.txtJahr._TimeOnly_Seconds = False
|
||||
Me.txtJahr._value = ""
|
||||
Me.txtJahr._Waehrung = False
|
||||
Me.txtJahr._WaehrungZeichen = True
|
||||
Me.txtJahr.ForeColor = System.Drawing.Color.Black
|
||||
Me.txtJahr.Location = New System.Drawing.Point(185, 47)
|
||||
Me.txtJahr.MaxLineLength = -1
|
||||
Me.txtJahr.MaxLines_Warning = ""
|
||||
Me.txtJahr.MaxLines_Warning_Label = Nothing
|
||||
Me.txtJahr.Name = "txtJahr"
|
||||
Me.txtJahr.Size = New System.Drawing.Size(53, 20)
|
||||
Me.txtJahr.TabIndex = 13
|
||||
'
|
||||
'Label67
|
||||
'
|
||||
Me.Label67.AutoSize = True
|
||||
Me.Label67.Location = New System.Drawing.Point(145, 80)
|
||||
Me.Label67.Name = "Label67"
|
||||
Me.Label67.Size = New System.Drawing.Size(155, 13)
|
||||
Me.Label67.TabIndex = 12
|
||||
Me.Label67.Text = "LeistungsNr (Komma-getrennt).:"
|
||||
'
|
||||
'PictureBox7
|
||||
'
|
||||
Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.woelfl
|
||||
@@ -2173,72 +2242,17 @@ Partial Class usrCntlMDMAuswertungen
|
||||
Me.pnl.Size = New System.Drawing.Size(1057, 54)
|
||||
Me.pnl.TabIndex = 26
|
||||
'
|
||||
'Label67
|
||||
'cbxNurUnter50EUR
|
||||
'
|
||||
Me.Label67.AutoSize = True
|
||||
Me.Label67.Location = New System.Drawing.Point(145, 80)
|
||||
Me.Label67.Name = "Label67"
|
||||
Me.Label67.Size = New System.Drawing.Size(155, 13)
|
||||
Me.Label67.TabIndex = 12
|
||||
Me.Label67.Text = "LeistungsNr (Komma-getrennt).:"
|
||||
'
|
||||
'txtJahr
|
||||
'
|
||||
Me.txtJahr._DateTimeOnly = False
|
||||
Me.txtJahr._numbersOnly = False
|
||||
Me.txtJahr._numbersOnlyKommastellen = ""
|
||||
Me.txtJahr._numbersOnlyTrennzeichen = True
|
||||
Me.txtJahr._Prozent = False
|
||||
Me.txtJahr._ShortDateNew = False
|
||||
Me.txtJahr._ShortDateOnly = False
|
||||
Me.txtJahr._TimeOnly = False
|
||||
Me.txtJahr._TimeOnly_Seconds = False
|
||||
Me.txtJahr._value = ""
|
||||
Me.txtJahr._Waehrung = False
|
||||
Me.txtJahr._WaehrungZeichen = True
|
||||
Me.txtJahr.ForeColor = System.Drawing.Color.Black
|
||||
Me.txtJahr.Location = New System.Drawing.Point(185, 47)
|
||||
Me.txtJahr.MaxLineLength = -1
|
||||
Me.txtJahr.MaxLines_Warning = ""
|
||||
Me.txtJahr.MaxLines_Warning_Label = Nothing
|
||||
Me.txtJahr.Name = "txtJahr"
|
||||
Me.txtJahr.Size = New System.Drawing.Size(53, 20)
|
||||
Me.txtJahr.TabIndex = 13
|
||||
'
|
||||
'txtLeistungsNr
|
||||
'
|
||||
Me.txtLeistungsNr._DateTimeOnly = False
|
||||
Me.txtLeistungsNr._numbersOnly = False
|
||||
Me.txtLeistungsNr._numbersOnlyKommastellen = ""
|
||||
Me.txtLeistungsNr._numbersOnlyTrennzeichen = True
|
||||
Me.txtLeistungsNr._Prozent = False
|
||||
Me.txtLeistungsNr._ShortDateNew = False
|
||||
Me.txtLeistungsNr._ShortDateOnly = False
|
||||
Me.txtLeistungsNr._TimeOnly = False
|
||||
Me.txtLeistungsNr._TimeOnly_Seconds = False
|
||||
Me.txtLeistungsNr._value = "327"
|
||||
Me.txtLeistungsNr._Waehrung = False
|
||||
Me.txtLeistungsNr._WaehrungZeichen = True
|
||||
Me.txtLeistungsNr.ForeColor = System.Drawing.Color.Black
|
||||
Me.txtLeistungsNr.Location = New System.Drawing.Point(306, 73)
|
||||
Me.txtLeistungsNr.MaxLineLength = -1
|
||||
Me.txtLeistungsNr.MaxLines_Warning = ""
|
||||
Me.txtLeistungsNr.MaxLines_Warning_Label = Nothing
|
||||
Me.txtLeistungsNr.Name = "txtLeistungsNr"
|
||||
Me.txtLeistungsNr.Size = New System.Drawing.Size(93, 20)
|
||||
Me.txtLeistungsNr.TabIndex = 15
|
||||
Me.txtLeistungsNr.Text = "327"
|
||||
'
|
||||
'cboQuartal
|
||||
'
|
||||
Me.cboQuartal._allowedValuesFreiText = Nothing
|
||||
Me.cboQuartal._allowFreiText = False
|
||||
Me.cboQuartal._value = ""
|
||||
Me.cboQuartal.FormattingEnabled = True
|
||||
Me.cboQuartal.Location = New System.Drawing.Point(306, 46)
|
||||
Me.cboQuartal.Name = "cboQuartal"
|
||||
Me.cboQuartal.Size = New System.Drawing.Size(59, 21)
|
||||
Me.cboQuartal.TabIndex = 16
|
||||
Me.cbxNurUnter50EUR.AutoSize = True
|
||||
Me.cbxNurUnter50EUR.Checked = True
|
||||
Me.cbxNurUnter50EUR.CheckState = System.Windows.Forms.CheckState.Checked
|
||||
Me.cbxNurUnter50EUR.Location = New System.Drawing.Point(414, 73)
|
||||
Me.cbxNurUnter50EUR.Name = "cbxNurUnter50EUR"
|
||||
Me.cbxNurUnter50EUR.Size = New System.Drawing.Size(111, 17)
|
||||
Me.cbxNurUnter50EUR.TabIndex = 17
|
||||
Me.cbxNurUnter50EUR.Text = "Nur unter 50 EUR"
|
||||
Me.cbxNurUnter50EUR.UseVisualStyleBackColor = True
|
||||
'
|
||||
'usrCntlMDMAuswertungen
|
||||
'
|
||||
@@ -2493,4 +2507,5 @@ Partial Class usrCntlMDMAuswertungen
|
||||
Friend WithEvents Label67 As Label
|
||||
Friend WithEvents txtLeistungsNr As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Friend WithEvents cboQuartal As VERAG_PROG_ALLGEMEIN.MyComboBox
|
||||
Friend WithEvents cbxNurUnter50EUR As CheckBox
|
||||
End Class
|
||||
|
||||
@@ -1531,35 +1531,8 @@ Public Class usrCntlMDMAuswertungen
|
||||
Jahr = txtJahr.Text
|
||||
End If
|
||||
|
||||
Dim SQLstr = "select Temp.KundenNr, Temp.Kundenname, Temp.Jahr, Temp.Quartal, sum(Temp.Betrag) as 'verrechneter Betrag', 50 - sum(Temp.Betrag) as Differenzbetrag from (SELECT
|
||||
USTVA.UStVAn_KuNr as KundenNr,
|
||||
USTVA.UStVAn_Name as Kundenname,
|
||||
YEAR(R.Abfertigungsdatum) AS Jahr,
|
||||
DATEPART(QUARTER, R.Abfertigungsdatum) AS Quartal,
|
||||
POS.LeistungsNr,
|
||||
SUM(POS.SteuerfreierBetrag + POS.SteuerpflichtigerBetrag) AS Betrag
|
||||
FROM tblUStVAntrag AS USTVA
|
||||
INNER JOIN Rechnungsausgang AS R
|
||||
ON R.FilialenNr = USTVA.FilialenNr
|
||||
AND R.AbfertigungsNr = USTVA.AbfertigungsNr
|
||||
INNER JOIN RechnungsausgangPositionen AS POS
|
||||
ON R.RK_ID = POS.RK_ID
|
||||
WHERE USTVA.UStVAn_KuNr LIKE '15%'
|
||||
|
||||
AND YEAR(R.Abfertigungsdatum) = " & Jahr &
|
||||
" AND POS.LeistungsNr IN (" & IIf(txtLeistungsNr.Text <> "", txtLeistungsNr.Text, "") & ")
|
||||
GROUP BY
|
||||
USTVA.UStVAn_KuNr,
|
||||
USTVA.UStVAn_Name,
|
||||
YEAR(R.Abfertigungsdatum),
|
||||
DATEPART(QUARTER, R.Abfertigungsdatum),
|
||||
POS.LeistungsNr
|
||||
) as Temp
|
||||
WHERE 1 = 1 " & IIf(cboQuartal._value.Trim() <> "", " AND temp.Quartal = " & cboQuartal._value, "") & "
|
||||
Group by Temp.KundenNr, Temp.Kundenname, Temp.Jahr, Temp.Quartal
|
||||
Having sum(Temp.Betrag) < 50"
|
||||
|
||||
Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
|
||||
Dim rmc As cRMC
|
||||
Dim dt = rmc.getRMCQuartalsAbrechnungen(New VERAG_PROG_ALLGEMEIN.SQL, cboQuartal._value.Trim(), Jahr, txtLeistungsNr.Text,,, cbxNurUnter50EUR.Checked)
|
||||
|
||||
If dt.Rows.Count > 0 Then
|
||||
cProgramFunctions.genExcelFromDT_NEW(dt)
|
||||
@@ -1568,8 +1541,6 @@ Public Class usrCntlMDMAuswertungen
|
||||
End If
|
||||
|
||||
|
||||
|
||||
|
||||
Catch ex As System.Exception
|
||||
MsgBox(ex.Message & ex.StackTrace)
|
||||
End Try
|
||||
|
||||
@@ -663,6 +663,26 @@ Public Class cIDS
|
||||
Return ""
|
||||
End Function
|
||||
|
||||
Public Shared Function checkInvoices() As DataTable
|
||||
Try
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
|
||||
Dim SQLstr = "select * from tblIDSInvoicesNew where invoice_id not in (select TotalInvoiceId from tblIDSInvoicesNewSplittedByCountry) and Year(YearMonthDay) >= 2025"
|
||||
|
||||
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
|
||||
|
||||
|
||||
@@ -264,6 +264,9 @@ Public Class cRMC
|
||||
|
||||
End Function
|
||||
|
||||
|
||||
|
||||
|
||||
Public Shared Function setBackToCustomerCustomerID(SQL As SQL, backToCustomer As Boolean, customerNo As String) As Boolean
|
||||
|
||||
Return SQL.doSQL("update tblRMCImport set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where InvToCustomer Is null AND rmc_kdNr = '" & customerNo & "'", "FMZOLL")
|
||||
@@ -282,6 +285,55 @@ Public Class cRMC
|
||||
Return SQL.getValueTxtBySql("SELECT count(InvToCustomer) FROM [tblRMCImport] where InvToCustomer Is null ", "FMZOLL",,, -1)
|
||||
End Function
|
||||
|
||||
|
||||
Public Shared Function getRMCQuartalsAbrechnungen(SQL As SQL, quartal As Integer, jahr As Integer, LeistungsNr As String, Optional USTV_ANTRAG As cUSTVAntrag = Nothing, Optional LANDKZ As String = "", Optional nurUnter50anzeigen As Boolean = True) As DataTable
|
||||
|
||||
Dim SQLWhere As String = "WHERE POS.LeistungsNr IN (" & IIf(LeistungsNr <> "", LeistungsNr, "") & ")"
|
||||
|
||||
If USTV_ANTRAG Is Nothing Then
|
||||
|
||||
SQLWhere &= " AND USTVA.UStVAn_KuNr LIKE '15%' AND YEAR(R.Abfertigungsdatum) = " & jahr & ""
|
||||
Else
|
||||
|
||||
SQLWhere &= " AND USTVA.UStVAn_KuNr = " & USTV_ANTRAG.UStVAn_KuNr & IIf(LANDKZ <> "", " AND [Länderverzeichnis für die Außenhandelsstatistik].LandKz = '" & LANDKZ & "'", "") & " AND R.Abfertigungsdatum between '" & CDate(USTV_ANTRAG.UStVAn_ReDatVon).ToShortDateString & "' AND '" & CDate(USTV_ANTRAG.UStVAn_ReDatBis).ToShortDateString & "'"
|
||||
|
||||
End If
|
||||
|
||||
|
||||
Dim SQLstr = "select Temp.KundenNr, Temp.Kundenname,Temp.LandKZ, Temp.Jahr, Temp.Quartal, sum(Temp.Betrag) as 'verrechneter Betrag', 50 - sum(Temp.Betrag) as Differenzbetrag from (SELECT
|
||||
USTVA.UStVAn_KuNr as KundenNr,
|
||||
USTVA.UStVAn_Name as Kundenname,
|
||||
[Länderverzeichnis für die Außenhandelsstatistik].LandKz as LandKZ,
|
||||
YEAR(R.Abfertigungsdatum) AS Jahr,
|
||||
DATEPART(QUARTER, R.Abfertigungsdatum) AS Quartal,
|
||||
POS.LeistungsNr,
|
||||
SUM(POS.SteuerfreierBetrag + POS.SteuerpflichtigerBetrag) AS Betrag
|
||||
FROM tblUStVAntrag AS USTVA
|
||||
INNER JOIN Rechnungsausgang AS R ON R.FilialenNr = USTVA.FilialenNr AND R.AbfertigungsNr = USTVA.AbfertigungsNr
|
||||
INNER JOIN RechnungsausgangPositionen AS POS ON R.RK_ID = POS.RK_ID
|
||||
INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr
|
||||
" & SQLWhere & "
|
||||
|
||||
GROUP BY
|
||||
USTVA.UStVAn_KuNr,
|
||||
USTVA.UStVAn_Name,
|
||||
[Länderverzeichnis für die Außenhandelsstatistik].LandKz,
|
||||
YEAR(R.Abfertigungsdatum),
|
||||
DATEPART(QUARTER, R.Abfertigungsdatum),
|
||||
POS.LeistungsNr
|
||||
) as Temp
|
||||
WHERE 1 = 1 " & IIf(quartal > 0, " AND temp.Quartal = " & quartal, "") & "
|
||||
Group by Temp.KundenNr, Temp.Kundenname,Temp.LandKZ, Temp.Jahr, Temp.Quartal
|
||||
" & IIf(nurUnter50anzeigen, "Having sum(Temp.Betrag) < 50", "")
|
||||
|
||||
Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
|
||||
|
||||
Return dt
|
||||
|
||||
|
||||
|
||||
End Function
|
||||
|
||||
Public Class Paramter
|
||||
|
||||
Shared apiSettingsloaded As Boolean = False
|
||||
|
||||
Reference in New Issue
Block a user