diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb
index 802ac8e8..117d749e 100644
--- a/SDL/Fakturierung/frmFaktEmail.vb
+++ b/SDL/Fakturierung/frmFaktEmail.vb
@@ -461,7 +461,7 @@ Public Class frmFaktEmail
If SR Then
Try
- If RechnungsNr > 1 OrElse vbYes = MsgBox("Möchten Sie das PDF als Mail-Anhang erstellen?" & vbNewLine & "Es wird eine Rechnungsnummer vergeben, die Rechnung gilt somit als gedruckt und kann nicht mehr bearbeitet werden.", vbYesNoCancel) Then
+ If RechnungsNr > 1 OrElse vbYes = MsgBox("Möchten Sie das PDF als Mail-Anhang erstellen?" & vbNewLine & "Es wird eine Belegsnummer vergeben, der Beleg gilt somit als gedruckt und kann nicht mehr bearbeitet werden.", vbYesNoCancel) Then
If FakturierungsGruppe <> "" Then
additionalLine = "Abrechnungsstelle: " & FakturierungsGruppe.Replace("WAI", "Waidhaus")
@@ -1049,12 +1049,14 @@ Public Class frmFaktEmail
If MergePDF And ATTACHMENTS.Count > 1 Then
+
+
Dim extension = ".pdf"
- Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(IIf(SammelrechungArt <> 6, "Rechnungs_Anhänge_", "Rechnung_") & RgNr & extension, extension,, False, "Zusammenfassung")
+ Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(IIf(SammelrechungArt <> 6, RECHNUNG.BelegartenBez & "sanhänge_", RECHNUNG.BelegartenBez & "_") & RgNr & extension, extension,, False, "Zusammenfassung")
If RECHNUNG IsNot Nothing AndAlso RECHNUNG.Firma_ID = 19 Then
- Dim zielPfadZusammenfassung_Lieferantenrechnungen = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(IIf(SammelrechungArt <> 6, "LF-Rechnungs_Anhänge_", "LF-Rechnung_") & RgNr & extension, extension,, False, "Zusammenfassung")
+ Dim zielPfadZusammenfassung_Lieferantenrechnungen = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(IIf(SammelrechungArt <> 6, "LF-Rechnungsanhänge_", "LF-Rechnung_") & RgNr & extension, extension,, False, "Zusammenfassung")
Dim zielPfadZusammenfassung_POSListe = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("POS_Anhang" & RgNr & extension, extension,, False, "Zusammenfassung")
Dim myList As New List(Of String)
diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
index 4f3054e4..f0d3a53f 100644
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -1758,7 +1758,7 @@ Public Class usrCntlFaktAbrechnung
End If
RECHNUNG.LOAD_ANHAENGE()
- If RECHNUNG IsNot Nothing AndAlso RECHNUNG.ANHAENGE IsNot Nothing And Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+ If RECHNUNG IsNot Nothing AndAlso RECHNUNG.ANHAENGE IsNot Nothing Then
'-----------------------------
'ANHÄNGE OHNE AVISO-BEZUG LADEN:
'-----------------------------
@@ -1847,13 +1847,30 @@ Public Class usrCntlFaktAbrechnung
If .Rows.Count > 0 Then
For Each r As DataGridViewRow In .Rows
- If r.Cells("Art").Value = "POS-LIST" Then .Rows.Remove(r)
+ If .Columns.Contains("clmnBezeichnung") AndAlso r.Cells("clmnBezeichnung").Value = DS.da_name Then
+ .Rows.Remove(r)
+ For Each ATT As cRechnungsausgangAnhaenge In RECHNUNG.ANHAENGE
+ If ATT.Bezeichnung = DS.da_name AndAlso RECHNUNG.DruckDatumZeit Is Nothing Then
+ Dim ANH_DEL As New VERAG_PROG_ALLGEMEIN.cRechnungsausgangAnhaenge()
+ ANH_DEL.DELETE(ATT.RK_ID, ATT.dsId)
+ End If
+ Next
+
+ End If
+
Next
End If
-
- .Rows.Add(-1, "POS-LIST", DS.da_name, DS.da_id, -1)
+ If RECHNUNG.ANHAENGE.Count > 0 Then
+ If RECHNUNG.DruckDatumZeit Is Nothing OrElse Not RECHNUNG.ANHAENGE.Exists(Function(c) c.Bezeichnung = DS.da_name) Then
+ .Rows.Add(-1, "POS-LIST", DS.da_name, DS.da_id, -1)
+ End If
+ Else
+ .Rows.Add(-1, "POS-LIST", DS.da_name, DS.da_id, -1)
+ End If
End If
+
+
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
@@ -1863,29 +1880,37 @@ Public Class usrCntlFaktAbrechnung
If dt IsNot Nothing Then
For Each r In dt.Rows
- Dim DAID As String = ""
- DAID = func.getPDF(r("UStVPo_SchnittstellenNr"), r("UStVPo_ReNr"), r("UStVPo_ReDat"), r("UStVPo_daId"), False, True, USTV.UStVAn_LandKz, USTV, New cFakturierung, True)
+ If Not IsDBNull(r("UStVPo_daId")) Then
- Dim nameLief As String = ""
+ If RECHNUNG.ANHAENGE IsNot Nothing AndAlso Not RECHNUNG.ANHAENGE.Exists(Function(c) c.dsId = r("UStVPo_daId")) Then 'wenn der Anhang schon existiert!
- Select Case r("UStVPo_SchnittstellenNr")
- Case 1 : nameLief = "VERAG-" 'Verag360
- Case 2, 8, 12 : nameLief = "IDS-"
- Case 3 : nameLief = "IT-"
- Case 4, 9 : nameLief = "MSE-"
- Case 5, 10 : nameLief = "UTA-"
- Case 6, 11 : nameLief = "PLOSE-"
- Case 7 : nameLief = "RMC-"
- End Select
+ Dim DAID As String = ""
+ DAID = func.getPDF(r("UStVPo_SchnittstellenNr"), r("UStVPo_ReNr"), r("UStVPo_ReDat"), r("UStVPo_daId"), False, True, USTV.UStVAn_LandKz, USTV, New cFakturierung, True)
- nameLief &= "RE"
+ Dim nameLief As String = ""
- If DAID <> "" AndAlso IsNumeric(DAID) Then
- Dim daidno As Integer = CInt(DAID)
- Dim ds As New cDATENSERVER(daidno)
- .Rows.Add(-1, nameLief, ds.da_name, ds.da_id, -1)
+ Select Case r("UStVPo_SchnittstellenNr")
+ Case 1 : nameLief = "VERAG-" 'Verag360
+ Case 2, 8, 12 : nameLief = "IDS-"
+ Case 3 : nameLief = "IT-"
+ Case 4, 9 : nameLief = "MSE-"
+ Case 5, 10 : nameLief = "UTA-"
+ Case 6, 11 : nameLief = "PLOSE-"
+ Case 7 : nameLief = "RMC-"
+ End Select
+
+ nameLief &= "RE"
+
+ If DAID <> "" AndAlso IsNumeric(DAID) Then
+ Dim daidno As Integer = CInt(DAID)
+ Dim ds As New cDATENSERVER(daidno)
+ .Rows.Add(-1, nameLief, ds.da_name, ds.da_id, -1)
+ End If
+
+ End If
End If
+
Next
End If
End If
@@ -3037,17 +3062,17 @@ Public Class usrCntlFaktAbrechnung
If fixeTaxe <= 0 Then Exit Sub
'Sucht, ob Fixetaxe schon vorhanden ist,...
- Dim FixeTaxePOS = RECHNUNG.POSITIONEN.Find(Function(x) x.LeistungsNr = 440 And x.BerechnungsartNr = 9)
+ Dim FixeTaxePOS = RECHNUNG.POSITIONEN.Find(Function(x) x.LeistungsNr = 440 And x.LeistungsBez = "Fixe Taxe" And x.BerechnungsartNr = 9)
'... sonst wird eine neue Pos eingefügt...
- If FixeTaxePOS IsNot Nothing Then
- ' FixeTaxePOS = New VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen
+ If FixeTaxePOS Is Nothing Then
+ FixeTaxePOS = New VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen
FixeTaxePOS.LeistungsNr = 440
- FixeTaxePOS.LeistungsBez = "P.P./Fixe Taxe"
+ FixeTaxePOS.LeistungsBez = "Fixe Taxe"
FixeTaxePOS.BerechnungsartNr = 9
- ' RECHNUNG.POSITIONEN.Add(FixeTaxePOS)
+ RECHNUNG.POSITIONEN.Add(FixeTaxePOS)
'...und der Wert gesetzt.
FixeTaxePOS.Anzahl = 1
- FixeTaxePOS.Preis = getVorzeichen(RECHNUNG) * FixeTaxe
+ FixeTaxePOS.Preis = getVorzeichen(RECHNUNG) * fixeTaxe
initSteuerbetraege(RECHNUNG, FixeTaxePOS)
End If
diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb
index 307c1d37..84e250bd 100644
--- a/SDL/buchhaltung/frmBU_Mahnlauf.vb
+++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb
@@ -45,7 +45,7 @@ Public Class frmBU_Mahnlauf
ORDER BY KTO.c_name"
Dim sqlStringVerag360 = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,Kunden.Abfertigungsverbot as AV,max(KTO.dec_aktuellersaldo) as Saldo,/*KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, */ " &
- "sum(eur_bruttobetrag+eur_zahlung) as Ausstand,cast(min (OWNFIELD_Belegdatum)as date) as 'ältesteRg',/*min(op.d_netto) Faelligkeit,*/max(si_mahnstufe) as MS,max(Kunden.UStV_Summe3470BetragEUR) as '3470',max(Kunden.Versicherungssumme) as V,
+ "sum(eur_bruttobetrag+eur_zahlung) as Ausstand,cast(max(d_rechnung)as date) as 'ältesteRg',/*min(op.d_netto) Faelligkeit,*/max(si_mahnstufe) as MS,max(Kunden.UStV_Summe3470BetragEUR) as '3470',max(Kunden.Versicherungssumme) as V,
max(KTO.dec_aktuellersaldo) - isnull(CASE WHEN Max(Kunden.UStV_SummeUmsatzsteuerbetragEUR) > max(Kunden.UStV_SummeErstattungsbetragEUR) THEN max(Kunden.UStV_SummeUmsatzsteuerbetragEUR) - max(Kunden.UStV_SummeErstattungsbetragEUR) ELSE 0 END ,0) - isnull(max(Kunden.UStV_Summe3470BetragEUR),0) + isnull(max(Kunden.UStV_SummeVZBetragEUR),0) - isnull(max(Kunden.UStV_SummeVorschaubetragEUR),0) - isnull(CASE WHEN ISNULL(max(Kunden.BankgarantieGültigBis), GETDATE()) < GETDATE() THEN 0 ELSE ISNULL(max(Kunden.BankgarantieBetrag), 0) END,0) as Risiko,
@@ -374,7 +374,7 @@ Public Class frmBU_Mahnlauf
dict("FREITAG") = Today.AddDays(3).ToShortDateString()
dict("HEUTE") = Today.ToShortDateString()
- Dim rpt As New rptMahnung(Sprache, MAHNSTUFE, Firma_ID, IIf(Firma_ID = 19, dict, Nothing))
+ Dim rpt As New rptMahnung(Sprache, IIf(MAHNSTUFE > 10, 10, MAHNSTUFE), Firma_ID, IIf(Firma_ID = 19, dict, Nothing)) '10. Mahnstufe MAX
rpt.Document.Printer.PrinterName = ""
rpt.PageSettings.PaperKind = GrapeCity.ActiveReports.Printing.PaperKind.A4
diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb
index e34e30f5..3c09ecbc 100644
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -31,6 +31,10 @@ Partial Class frmKundenblatt
Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -44,10 +48,6 @@ Partial Class frmKundenblatt
Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenblatt))
Me.pnlInfo = New System.Windows.Forms.Panel()
Me.txtInfotext = New System.Windows.Forms.Label()
@@ -55,6 +55,10 @@ Partial Class frmKundenblatt
Me.Panel4 = New System.Windows.Forms.Panel()
Me.tbcntrMain = New System.Windows.Forms.TabControl()
Me.tbAllgemein = New System.Windows.Forms.TabPage()
+ Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton()
+ Me.lblBonitaet = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label39 = New System.Windows.Forms.Label()
+ Me.btnBonitaetBearbeiten = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.btnReloadOP = New System.Windows.Forms.Button()
@@ -65,6 +69,9 @@ Partial Class frmKundenblatt
Me.dgvUmsaetze = New System.Windows.Forms.DataGridView()
Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label13 = New System.Windows.Forms.Label()
+ Me.TabPage3 = New System.Windows.Forms.TabPage()
+ Me.PictureBox7 = New System.Windows.Forms.PictureBox()
+ Me.dgvUmsatzNachLeistngsNr = New System.Windows.Forms.DataGridView()
Me.lblAdressenzusatz = New System.Windows.Forms.TextBox()
Me.Label11 = New System.Windows.Forms.Label()
Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -209,12 +216,6 @@ Partial Class frmKundenblatt
Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem()
Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
- Me.TabPage3 = New System.Windows.Forms.TabPage()
- Me.dgvUmsatzNachLeistngsNr = New System.Windows.Forms.DataGridView()
- Me.btnBonitaetBearbeiten = New VERAG_PROG_ALLGEMEIN.FlatButton()
- Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton()
- Me.lblBonitaet = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.Label39 = New System.Windows.Forms.Label()
Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull()
Me.usrcntlKarten = New SDL.usrCntlKartenDaten()
Me.UsrCntlLKW1 = New SDL.usrCntlLKW()
@@ -230,6 +231,9 @@ Partial Class frmKundenblatt
CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage2.SuspendLayout()
CType(Me.dgvUmsaetze, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.TabPage3.SuspendLayout()
+ CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.dgvUmsatzNachLeistngsNr, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -270,8 +274,6 @@ Partial Class frmKundenblatt
Me.ContextMenuStrip3.SuspendLayout()
Me.mne.SuspendLayout()
Me.pnl.SuspendLayout()
- Me.TabPage3.SuspendLayout()
- CType(Me.dgvUmsatzNachLeistngsNr, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'pnlInfo
@@ -375,6 +377,73 @@ Partial Class frmKundenblatt
Me.tbAllgemein.TabIndex = 0
Me.tbAllgemein.Text = "Allgemein"
'
+ 'FlatButton6
+ '
+ Me.FlatButton6.allowBorder = False
+ Me.FlatButton6.BackgroundImage = Global.SDL.My.Resources.Resources.list
+ Me.FlatButton6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.FlatButton6.FlatAppearance.BorderSize = 0
+ Me.FlatButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.FlatButton6.ForeColor = System.Drawing.Color.Black
+ Me.FlatButton6.Location = New System.Drawing.Point(708, 547)
+ Me.FlatButton6.Name = "FlatButton6"
+ Me.FlatButton6.Size = New System.Drawing.Size(15, 12)
+ Me.FlatButton6.TabIndex = 191
+ Me.FlatButton6.UseVisualStyleBackColor = True
+ '
+ 'lblBonitaet
+ '
+ Me.lblBonitaet._DateTimeOnly = False
+ Me.lblBonitaet._numbersOnly = False
+ Me.lblBonitaet._numbersOnlyKommastellen = ""
+ Me.lblBonitaet._numbersOnlyTrennzeichen = True
+ Me.lblBonitaet._Prozent = False
+ Me.lblBonitaet._ShortDateNew = False
+ Me.lblBonitaet._ShortDateOnly = False
+ Me.lblBonitaet._TimeOnly = False
+ Me.lblBonitaet._TimeOnly_Seconds = False
+ Me.lblBonitaet._value = Nothing
+ Me.lblBonitaet._Waehrung = False
+ Me.lblBonitaet._WaehrungZeichen = True
+ Me.lblBonitaet.BackColor = System.Drawing.Color.WhiteSmoke
+ Me.lblBonitaet.BorderStyle = System.Windows.Forms.BorderStyle.None
+ Me.lblBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.lblBonitaet.ForeColor = System.Drawing.Color.Black
+ Me.lblBonitaet.Location = New System.Drawing.Point(648, 546)
+ Me.lblBonitaet.MaxLineLength = -1
+ Me.lblBonitaet.MaxLines_Warning = ""
+ Me.lblBonitaet.MaxLines_Warning_Label = Nothing
+ Me.lblBonitaet.Name = "lblBonitaet"
+ Me.lblBonitaet.ReadOnly = True
+ Me.lblBonitaet.Size = New System.Drawing.Size(54, 13)
+ Me.lblBonitaet.TabIndex = 189
+ Me.lblBonitaet.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'Label39
+ '
+ Me.Label39.AutoSize = True
+ Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label39.Location = New System.Drawing.Point(591, 546)
+ Me.Label39.Name = "Label39"
+ Me.Label39.Size = New System.Drawing.Size(43, 13)
+ Me.Label39.TabIndex = 188
+ Me.Label39.Text = "Bonität:"
+ '
+ 'btnBonitaetBearbeiten
+ '
+ Me.btnBonitaetBearbeiten.allowBorder = False
+ Me.btnBonitaetBearbeiten.BackgroundImage = Global.SDL.My.Resources.Resources.plus
+ Me.btnBonitaetBearbeiten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnBonitaetBearbeiten.FlatAppearance.BorderSize = 0
+ Me.btnBonitaetBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnBonitaetBearbeiten.ForeColor = System.Drawing.Color.Black
+ Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(568, 546)
+ Me.btnBonitaetBearbeiten.Name = "btnBonitaetBearbeiten"
+ Me.btnBonitaetBearbeiten.Size = New System.Drawing.Size(15, 12)
+ Me.btnBonitaetBearbeiten.TabIndex = 187
+ Me.btnBonitaetBearbeiten.UseVisualStyleBackColor = True
+ Me.btnBonitaetBearbeiten.Visible = False
+ '
'TabControl1
'
Me.TabControl1.Controls.Add(Me.TabPage1)
@@ -573,6 +642,71 @@ Partial Class frmKundenblatt
Me.Label13.TabIndex = 184
Me.Label13.Text = "Umsatz Jahr:"
'
+ 'TabPage3
+ '
+ Me.TabPage3.Controls.Add(Me.PictureBox7)
+ Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr)
+ Me.TabPage3.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage3.Name = "TabPage3"
+ Me.TabPage3.Size = New System.Drawing.Size(710, 524)
+ Me.TabPage3.TabIndex = 2
+ Me.TabPage3.Text = "Umsatz nach LeistungsNr"
+ Me.TabPage3.UseVisualStyleBackColor = True
+ '
+ 'PictureBox7
+ '
+ Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+ Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.PictureBox7.Location = New System.Drawing.Point(687, 0)
+ Me.PictureBox7.Name = "PictureBox7"
+ Me.PictureBox7.Size = New System.Drawing.Size(20, 20)
+ Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+ Me.PictureBox7.TabIndex = 145
+ Me.PictureBox7.TabStop = False
+ '
+ 'dgvUmsatzNachLeistngsNr
+ '
+ Me.dgvUmsatzNachLeistngsNr.AllowUserToAddRows = False
+ Me.dgvUmsatzNachLeistngsNr.AllowUserToDeleteRows = False
+ Me.dgvUmsatzNachLeistngsNr.AllowUserToResizeRows = False
+ DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvUmsatzNachLeistngsNr.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+ Me.dgvUmsatzNachLeistngsNr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.dgvUmsatzNachLeistngsNr.BackgroundColor = System.Drawing.Color.White
+ DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvUmsatzNachLeistngsNr.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
+ Me.dgvUmsatzNachLeistngsNr.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+ DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.dgvUmsatzNachLeistngsNr.DefaultCellStyle = DataGridViewCellStyle11
+ Me.dgvUmsatzNachLeistngsNr.Location = New System.Drawing.Point(2, 20)
+ Me.dgvUmsatzNachLeistngsNr.Name = "dgvUmsatzNachLeistngsNr"
+ Me.dgvUmsatzNachLeistngsNr.ReadOnly = True
+ DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
+ Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False
+ Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+ Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(707, 484)
+ Me.dgvUmsatzNachLeistngsNr.TabIndex = 183
+ '
'lblAdressenzusatz
'
Me.lblAdressenzusatz.BackColor = System.Drawing.Color.White
@@ -2476,126 +2610,6 @@ Partial Class frmKundenblatt
Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
Me.tbiVERAGCard.Text = "VERAG Card"
'
- 'TabPage3
- '
- Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr)
- Me.TabPage3.Location = New System.Drawing.Point(4, 22)
- Me.TabPage3.Name = "TabPage3"
- Me.TabPage3.Size = New System.Drawing.Size(710, 524)
- Me.TabPage3.TabIndex = 2
- Me.TabPage3.Text = "Umsatz nach LeistungsNr"
- Me.TabPage3.UseVisualStyleBackColor = True
- '
- 'dgvUmsatzNachLeistngsNr
- '
- Me.dgvUmsatzNachLeistngsNr.AllowUserToAddRows = False
- Me.dgvUmsatzNachLeistngsNr.AllowUserToDeleteRows = False
- Me.dgvUmsatzNachLeistngsNr.AllowUserToResizeRows = False
- DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvUmsatzNachLeistngsNr.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
- Me.dgvUmsatzNachLeistngsNr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.dgvUmsatzNachLeistngsNr.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvUmsatzNachLeistngsNr.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
- Me.dgvUmsatzNachLeistngsNr.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.dgvUmsatzNachLeistngsNr.DefaultCellStyle = DataGridViewCellStyle11
- Me.dgvUmsatzNachLeistngsNr.Location = New System.Drawing.Point(2, 20)
- Me.dgvUmsatzNachLeistngsNr.Name = "dgvUmsatzNachLeistngsNr"
- Me.dgvUmsatzNachLeistngsNr.ReadOnly = True
- DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
- Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False
- Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
- Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(707, 484)
- Me.dgvUmsatzNachLeistngsNr.TabIndex = 183
- '
- 'btnBonitaetBearbeiten
- '
- Me.btnBonitaetBearbeiten.allowBorder = False
- Me.btnBonitaetBearbeiten.BackgroundImage = Global.SDL.My.Resources.Resources.plus
- Me.btnBonitaetBearbeiten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.btnBonitaetBearbeiten.FlatAppearance.BorderSize = 0
- Me.btnBonitaetBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnBonitaetBearbeiten.ForeColor = System.Drawing.Color.Black
- Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(568, 546)
- Me.btnBonitaetBearbeiten.Name = "btnBonitaetBearbeiten"
- Me.btnBonitaetBearbeiten.Size = New System.Drawing.Size(15, 12)
- Me.btnBonitaetBearbeiten.TabIndex = 187
- Me.btnBonitaetBearbeiten.UseVisualStyleBackColor = True
- Me.btnBonitaetBearbeiten.Visible = False
- '
- 'FlatButton6
- '
- Me.FlatButton6.allowBorder = False
- Me.FlatButton6.BackgroundImage = Global.SDL.My.Resources.Resources.list
- Me.FlatButton6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.FlatButton6.FlatAppearance.BorderSize = 0
- Me.FlatButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.FlatButton6.ForeColor = System.Drawing.Color.Black
- Me.FlatButton6.Location = New System.Drawing.Point(708, 547)
- Me.FlatButton6.Name = "FlatButton6"
- Me.FlatButton6.Size = New System.Drawing.Size(15, 12)
- Me.FlatButton6.TabIndex = 191
- Me.FlatButton6.UseVisualStyleBackColor = True
- '
- 'lblBonitaet
- '
- Me.lblBonitaet._DateTimeOnly = False
- Me.lblBonitaet._numbersOnly = False
- Me.lblBonitaet._numbersOnlyKommastellen = ""
- Me.lblBonitaet._numbersOnlyTrennzeichen = True
- Me.lblBonitaet._Prozent = False
- Me.lblBonitaet._ShortDateNew = False
- Me.lblBonitaet._ShortDateOnly = False
- Me.lblBonitaet._TimeOnly = False
- Me.lblBonitaet._TimeOnly_Seconds = False
- Me.lblBonitaet._value = Nothing
- Me.lblBonitaet._Waehrung = False
- Me.lblBonitaet._WaehrungZeichen = True
- Me.lblBonitaet.BackColor = System.Drawing.Color.WhiteSmoke
- Me.lblBonitaet.BorderStyle = System.Windows.Forms.BorderStyle.None
- Me.lblBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblBonitaet.ForeColor = System.Drawing.Color.Black
- Me.lblBonitaet.Location = New System.Drawing.Point(648, 546)
- Me.lblBonitaet.MaxLineLength = -1
- Me.lblBonitaet.MaxLines_Warning = ""
- Me.lblBonitaet.MaxLines_Warning_Label = Nothing
- Me.lblBonitaet.Name = "lblBonitaet"
- Me.lblBonitaet.ReadOnly = True
- Me.lblBonitaet.Size = New System.Drawing.Size(54, 13)
- Me.lblBonitaet.TabIndex = 189
- Me.lblBonitaet.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'Label39
- '
- Me.Label39.AutoSize = True
- Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label39.Location = New System.Drawing.Point(591, 546)
- Me.Label39.Name = "Label39"
- Me.Label39.Size = New System.Drawing.Size(43, 13)
- Me.Label39.TabIndex = 188
- Me.Label39.Text = "Bonität:"
- '
'UsrcntlKundeBearbeitenFull1
'
Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White
@@ -2680,6 +2694,9 @@ Partial Class frmKundenblatt
Me.TabPage2.ResumeLayout(False)
Me.TabPage2.PerformLayout()
CType(Me.dgvUmsaetze, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.TabPage3.ResumeLayout(False)
+ CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.dgvUmsatzNachLeistngsNr, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2732,8 +2749,6 @@ Partial Class frmKundenblatt
Me.mne.PerformLayout()
Me.pnl.ResumeLayout(False)
Me.pnl.PerformLayout()
- Me.TabPage3.ResumeLayout(False)
- CType(Me.dgvUmsatzNachLeistngsNr, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -2909,4 +2924,5 @@ Partial Class frmKundenblatt
Friend WithEvents FlatButton6 As VERAG_PROG_ALLGEMEIN.FlatButton
Friend WithEvents lblBonitaet As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label39 As Label
+ Friend WithEvents PictureBox7 As PictureBox
End Class
diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb
index 5ab5a865..513ca287 100644
--- a/SDL/kunden/frmKundenblatt.vb
+++ b/SDL/kunden/frmKundenblatt.vb
@@ -2175,5 +2175,15 @@ Public Class frmKundenblatt
End Sub
End Sub
+
+ Private Sub PictureBox7_Click(sender As Object, e As EventArgs) Handles PictureBox7.Click
+ If dgvUmsatzNachLeistngsNr.Rows.Count > 0 Then
+ Me.Cursor = Cursors.WaitCursor
+ cProgramFunctions.genExcelFromDGV_NEW(dgvUmsatzNachLeistngsNr, True)
+ Me.Cursor = Cursors.Default
+ End If
+
+
+ End Sub
End Class
diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb
index 0ae6d90e..f862739b 100644
--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -1243,10 +1243,10 @@ Public Class frmMDMDatenverarbetiung
'Alle Alangen im foglenden VZ löschen und die aktuellen kopieren
Dim dirAnhang = IIf(test, utaParam.ANLAGEN & "TEST\", utaParam.ANLAGEN)
If Directory.Exists(dirAnhang) Then 'Directory.Delete(dirAnhang, True)
- For Each f In Directory.GetFiles(dirAnhang)
- File.Delete(f)
- Next
- End If
+ For Each f In Directory.GetFiles(dirAnhang)
+ File.Delete(f)
+ Next
+ End If
If Not Directory.Exists(dirAnhang) Then Directory.CreateDirectory(dirAnhang)
For Each f In Directory.GetFiles(dir)
File.Copy(f, dirAnhang & (New FileInfo(f)).Name, True)
@@ -3621,6 +3621,7 @@ Public Class frmMDMDatenverarbetiung
Call usrCntlFaktAbrechnung.przFixeTaxe(RG) ' Fixe Taxe errechnen
Call usrCntlFaktAbrechnung.przPP(RG) ' Porto/Papiere errechnen
Call usrCntlFaktAbrechnung.przBS415(RG) ' Bankspesen errechnen
+ Call usrCntlFaktAbrechnung.setFixeTaxeMin(RG, 500, 20) ' Fixe Taxe errechnen
RE = RG
diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb
index 8741a767..3a0d79a5 100644
--- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb
+++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb
@@ -50,21 +50,21 @@ Partial Class usrcntlFakturierung
Me.Label10 = New System.Windows.Forms.Label()
Me.Label9 = New System.Windows.Forms.Label()
Me.Label8 = New System.Windows.Forms.Label()
- Me.PictureBox9 = New System.Windows.Forms.PictureBox()
+ Me.PictureBox10 = New System.Windows.Forms.PictureBox()
Me.cbxStatusAUTOMAIL = New System.Windows.Forms.CheckBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.Label6 = New System.Windows.Forms.Label()
Me.btnAbfdruck = New System.Windows.Forms.Button()
Me.btnREJdruck = New System.Windows.Forms.Button()
- Me.PictureBox8 = New System.Windows.Forms.PictureBox()
+ Me.PictureBox9 = New System.Windows.Forms.PictureBox()
Me.Label2 = New System.Windows.Forms.Label()
- Me.PictureBox7 = New System.Windows.Forms.PictureBox()
+ Me.PictureBox8 = New System.Windows.Forms.PictureBox()
Me.Label1 = New System.Windows.Forms.Label()
Me.Button3 = New System.Windows.Forms.Button()
Me.Button2 = New System.Windows.Forms.Button()
Me.cbxMautanh = New System.Windows.Forms.CheckBox()
Me.btnMautanh_pruefen = New System.Windows.Forms.Button()
- Me.PictureBox6 = New System.Windows.Forms.PictureBox()
+ Me.PictureBox7 = New System.Windows.Forms.PictureBox()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
Me.PictureBox4 = New System.Windows.Forms.PictureBox()
Me.PictureBox3 = New System.Windows.Forms.PictureBox()
@@ -96,19 +96,22 @@ Partial Class usrcntlFakturierung
Me.btnRePos = New System.Windows.Forms.Button()
Me.Validation1 = New SDL.EORI.validation()
Me.btnWikiStatusmails = New System.Windows.Forms.Button()
+ Me.PictureBox6 = New System.Windows.Forms.PictureBox()
+ Me.Label11 = New System.Windows.Forms.Label()
Me.GroupBox1.SuspendLayout()
Me.GBMautberichte.SuspendLayout()
CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GBSammelrechnung.SuspendLayout()
+ CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'GroupBox1
@@ -339,25 +342,27 @@ Partial Class usrcntlFakturierung
'
'GBSammelrechnung
'
+ Me.GBSammelrechnung.Controls.Add(Me.Label11)
+ Me.GBSammelrechnung.Controls.Add(Me.PictureBox6)
Me.GBSammelrechnung.Controls.Add(Me.lblAnzRE)
Me.GBSammelrechnung.Controls.Add(Me.Label10)
Me.GBSammelrechnung.Controls.Add(Me.Label9)
Me.GBSammelrechnung.Controls.Add(Me.Label8)
- Me.GBSammelrechnung.Controls.Add(Me.PictureBox9)
+ Me.GBSammelrechnung.Controls.Add(Me.PictureBox10)
Me.GBSammelrechnung.Controls.Add(Me.cbxStatusAUTOMAIL)
Me.GBSammelrechnung.Controls.Add(Me.Label7)
Me.GBSammelrechnung.Controls.Add(Me.Label6)
Me.GBSammelrechnung.Controls.Add(Me.btnAbfdruck)
Me.GBSammelrechnung.Controls.Add(Me.btnREJdruck)
- Me.GBSammelrechnung.Controls.Add(Me.PictureBox8)
+ Me.GBSammelrechnung.Controls.Add(Me.PictureBox9)
Me.GBSammelrechnung.Controls.Add(Me.Label2)
- Me.GBSammelrechnung.Controls.Add(Me.PictureBox7)
+ Me.GBSammelrechnung.Controls.Add(Me.PictureBox8)
Me.GBSammelrechnung.Controls.Add(Me.Label1)
Me.GBSammelrechnung.Controls.Add(Me.Button3)
Me.GBSammelrechnung.Controls.Add(Me.Button2)
Me.GBSammelrechnung.Controls.Add(Me.cbxMautanh)
Me.GBSammelrechnung.Controls.Add(Me.btnMautanh_pruefen)
- Me.GBSammelrechnung.Controls.Add(Me.PictureBox6)
+ Me.GBSammelrechnung.Controls.Add(Me.PictureBox7)
Me.GBSammelrechnung.Controls.Add(Me.PictureBox5)
Me.GBSammelrechnung.Controls.Add(Me.PictureBox4)
Me.GBSammelrechnung.Controls.Add(Me.PictureBox3)
@@ -422,22 +427,22 @@ Partial Class usrcntlFakturierung
'
'Label8
'
- Me.Label8.Location = New System.Drawing.Point(168, 230)
+ Me.Label8.Location = New System.Drawing.Point(168, 239)
Me.Label8.Name = "Label8"
Me.Label8.Size = New System.Drawing.Size(151, 16)
Me.Label8.TabIndex = 120
Me.Label8.Text = "3. Status Autoversand setzen"
'
- 'PictureBox9
+ 'PictureBox10
'
- Me.PictureBox9.BackgroundImage = Global.SDL.My.Resources.Resources.ok
- Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox9.Location = New System.Drawing.Point(148, 230)
- Me.PictureBox9.Name = "PictureBox9"
- Me.PictureBox9.Size = New System.Drawing.Size(14, 14)
- Me.PictureBox9.TabIndex = 119
- Me.PictureBox9.TabStop = False
- Me.PictureBox9.Visible = False
+ Me.PictureBox10.BackgroundImage = Global.SDL.My.Resources.Resources.ok
+ Me.PictureBox10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.PictureBox10.Location = New System.Drawing.Point(148, 239)
+ Me.PictureBox10.Name = "PictureBox10"
+ Me.PictureBox10.Size = New System.Drawing.Size(14, 14)
+ Me.PictureBox10.TabIndex = 119
+ Me.PictureBox10.TabStop = False
+ Me.PictureBox10.Visible = False
'
'cbxStatusAUTOMAIL
'
@@ -487,39 +492,39 @@ Partial Class usrcntlFakturierung
Me.btnREJdruck.Text = "RE Journal öffnen"
Me.btnREJdruck.UseVisualStyleBackColor = True
'
- 'PictureBox8
+ 'PictureBox9
'
- Me.PictureBox8.BackgroundImage = Global.SDL.My.Resources.Resources.ok
- Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox8.Location = New System.Drawing.Point(148, 212)
- Me.PictureBox8.Name = "PictureBox8"
- Me.PictureBox8.Size = New System.Drawing.Size(14, 14)
- Me.PictureBox8.TabIndex = 113
- Me.PictureBox8.TabStop = False
- Me.PictureBox8.Visible = False
+ Me.PictureBox9.BackgroundImage = Global.SDL.My.Resources.Resources.ok
+ Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.PictureBox9.Location = New System.Drawing.Point(148, 221)
+ Me.PictureBox9.Name = "PictureBox9"
+ Me.PictureBox9.Size = New System.Drawing.Size(14, 14)
+ Me.PictureBox9.TabIndex = 113
+ Me.PictureBox9.TabStop = False
+ Me.PictureBox9.Visible = False
'
'Label2
'
- Me.Label2.Location = New System.Drawing.Point(168, 212)
+ Me.Label2.Location = New System.Drawing.Point(168, 221)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(224, 17)
Me.Label2.TabIndex = 112
Me.Label2.Text = "2. PDFs erzeugt"
'
- 'PictureBox7
+ 'PictureBox8
'
- Me.PictureBox7.BackgroundImage = Global.SDL.My.Resources.Resources.ok
- Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox7.Location = New System.Drawing.Point(148, 195)
- Me.PictureBox7.Name = "PictureBox7"
- Me.PictureBox7.Size = New System.Drawing.Size(14, 14)
- Me.PictureBox7.TabIndex = 111
- Me.PictureBox7.TabStop = False
- Me.PictureBox7.Visible = False
+ Me.PictureBox8.BackgroundImage = Global.SDL.My.Resources.Resources.ok
+ Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.PictureBox8.Location = New System.Drawing.Point(148, 204)
+ Me.PictureBox8.Name = "PictureBox8"
+ Me.PictureBox8.Size = New System.Drawing.Size(14, 14)
+ Me.PictureBox8.TabIndex = 111
+ Me.PictureBox8.TabStop = False
+ Me.PictureBox8.Visible = False
'
'Label1
'
- Me.Label1.Location = New System.Drawing.Point(168, 195)
+ Me.Label1.Location = New System.Drawing.Point(168, 204)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(224, 17)
Me.Label1.TabIndex = 110
@@ -572,22 +577,22 @@ Partial Class usrcntlFakturierung
Me.btnMautanh_pruefen.Text = "Mautanh. prüfen"
Me.btnMautanh_pruefen.UseVisualStyleBackColor = True
'
- 'PictureBox6
+ 'PictureBox7
'
- Me.PictureBox6.BackgroundImage = CType(resources.GetObject("PictureBox6.BackgroundImage"), System.Drawing.Image)
- Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox6.Location = New System.Drawing.Point(148, 163)
- Me.PictureBox6.Name = "PictureBox6"
- Me.PictureBox6.Size = New System.Drawing.Size(14, 14)
- Me.PictureBox6.TabIndex = 105
- Me.PictureBox6.TabStop = False
- Me.PictureBox6.Visible = False
+ Me.PictureBox7.BackgroundImage = CType(resources.GetObject("PictureBox7.BackgroundImage"), System.Drawing.Image)
+ Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.PictureBox7.Location = New System.Drawing.Point(148, 173)
+ Me.PictureBox7.Name = "PictureBox7"
+ Me.PictureBox7.Size = New System.Drawing.Size(14, 14)
+ Me.PictureBox7.TabIndex = 105
+ Me.PictureBox7.TabStop = False
+ Me.PictureBox7.Visible = False
'
'PictureBox5
'
Me.PictureBox5.BackgroundImage = CType(resources.GetObject("PictureBox5.BackgroundImage"), System.Drawing.Image)
Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox5.Location = New System.Drawing.Point(148, 146)
+ Me.PictureBox5.Location = New System.Drawing.Point(148, 141)
Me.PictureBox5.Name = "PictureBox5"
Me.PictureBox5.Size = New System.Drawing.Size(14, 14)
Me.PictureBox5.TabIndex = 104
@@ -598,7 +603,7 @@ Partial Class usrcntlFakturierung
'
Me.PictureBox4.BackgroundImage = CType(resources.GetObject("PictureBox4.BackgroundImage"), System.Drawing.Image)
Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox4.Location = New System.Drawing.Point(148, 129)
+ Me.PictureBox4.Location = New System.Drawing.Point(148, 124)
Me.PictureBox4.Name = "PictureBox4"
Me.PictureBox4.Size = New System.Drawing.Size(14, 14)
Me.PictureBox4.TabIndex = 103
@@ -609,7 +614,7 @@ Partial Class usrcntlFakturierung
'
Me.PictureBox3.BackgroundImage = CType(resources.GetObject("PictureBox3.BackgroundImage"), System.Drawing.Image)
Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox3.Location = New System.Drawing.Point(148, 112)
+ Me.PictureBox3.Location = New System.Drawing.Point(148, 107)
Me.PictureBox3.Name = "PictureBox3"
Me.PictureBox3.Size = New System.Drawing.Size(14, 14)
Me.PictureBox3.TabIndex = 102
@@ -620,7 +625,7 @@ Partial Class usrcntlFakturierung
'
Me.PictureBox2.BackgroundImage = CType(resources.GetObject("PictureBox2.BackgroundImage"), System.Drawing.Image)
Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox2.Location = New System.Drawing.Point(148, 95)
+ Me.PictureBox2.Location = New System.Drawing.Point(148, 90)
Me.PictureBox2.Name = "PictureBox2"
Me.PictureBox2.Size = New System.Drawing.Size(14, 14)
Me.PictureBox2.TabIndex = 101
@@ -631,7 +636,7 @@ Partial Class usrcntlFakturierung
'
Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.ok
Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox1.Location = New System.Drawing.Point(148, 76)
+ Me.PictureBox1.Location = New System.Drawing.Point(148, 71)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(14, 14)
Me.PictureBox1.TabIndex = 95
@@ -640,7 +645,7 @@ Partial Class usrcntlFakturierung
'
'Label4
'
- Me.Label4.Location = New System.Drawing.Point(168, 146)
+ Me.Label4.Location = New System.Drawing.Point(168, 141)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(440, 17)
Me.Label4.TabIndex = 100
@@ -756,7 +761,7 @@ Partial Class usrcntlFakturierung
'
Me.txtPloseAnh_Einarbeitung.BackColor = System.Drawing.Color.White
Me.txtPloseAnh_Einarbeitung.BorderStyle = System.Windows.Forms.BorderStyle.None
- Me.txtPloseAnh_Einarbeitung.Location = New System.Drawing.Point(510, 218)
+ Me.txtPloseAnh_Einarbeitung.Location = New System.Drawing.Point(510, 241)
Me.txtPloseAnh_Einarbeitung.Name = "txtPloseAnh_Einarbeitung"
Me.txtPloseAnh_Einarbeitung.Size = New System.Drawing.Size(106, 13)
Me.txtPloseAnh_Einarbeitung.TabIndex = 38
@@ -764,7 +769,7 @@ Partial Class usrcntlFakturierung
'Label71
'
Me.Label71.AutoSize = True
- Me.Label71.Location = New System.Drawing.Point(443, 218)
+ Me.Label71.Location = New System.Drawing.Point(443, 241)
Me.Label71.Name = "Label71"
Me.Label71.Size = New System.Drawing.Size(56, 13)
Me.Label71.TabIndex = 35
@@ -772,14 +777,14 @@ Partial Class usrcntlFakturierung
'
'pbPloseAnh_Proz
'
- Me.pbPloseAnh_Proz.Location = New System.Drawing.Point(446, 189)
+ Me.pbPloseAnh_Proz.Location = New System.Drawing.Point(446, 212)
Me.pbPloseAnh_Proz.Name = "pbPloseAnh_Proz"
Me.pbPloseAnh_Proz.Size = New System.Drawing.Size(245, 23)
Me.pbPloseAnh_Proz.TabIndex = 36
'
'lblPloseAnh_Proz
'
- Me.lblPloseAnh_Proz.Location = New System.Drawing.Point(622, 218)
+ Me.lblPloseAnh_Proz.Location = New System.Drawing.Point(622, 241)
Me.lblPloseAnh_Proz.Name = "lblPloseAnh_Proz"
Me.lblPloseAnh_Proz.Size = New System.Drawing.Size(69, 13)
Me.lblPloseAnh_Proz.TabIndex = 37
@@ -790,7 +795,7 @@ Partial Class usrcntlFakturierung
'
Me.btn_setRENr.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_setRENr.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.btn_setRENr.Location = New System.Drawing.Point(10, 182)
+ Me.btn_setRENr.Location = New System.Drawing.Point(10, 191)
Me.btn_setRENr.Name = "btn_setRENr"
Me.btn_setRENr.Size = New System.Drawing.Size(121, 49)
Me.btn_setRENr.TabIndex = 32
@@ -799,11 +804,11 @@ Partial Class usrcntlFakturierung
'
'Label70
'
- Me.Label70.Location = New System.Drawing.Point(168, 163)
+ Me.Label70.Location = New System.Drawing.Point(168, 173)
Me.Label70.Name = "Label70"
Me.Label70.Size = New System.Drawing.Size(429, 14)
Me.Label70.TabIndex = 30
- Me.Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an."
+ Me.Label70.Text = "7. Hängt Mautgesamtbericht an Sammenrechnungen an."
'
'cboSachbearbeiter
'
@@ -844,7 +849,7 @@ Partial Class usrcntlFakturierung
'
'Label65
'
- Me.Label65.Location = New System.Drawing.Point(168, 129)
+ Me.Label65.Location = New System.Drawing.Point(168, 124)
Me.Label65.Name = "Label65"
Me.Label65.Size = New System.Drawing.Size(440, 17)
Me.Label65.TabIndex = 8
@@ -852,7 +857,7 @@ Partial Class usrcntlFakturierung
'
'Label64
'
- Me.Label64.Location = New System.Drawing.Point(168, 112)
+ Me.Label64.Location = New System.Drawing.Point(168, 107)
Me.Label64.Name = "Label64"
Me.Label64.Size = New System.Drawing.Size(440, 17)
Me.Label64.TabIndex = 7
@@ -860,7 +865,7 @@ Partial Class usrcntlFakturierung
'
'Label63
'
- Me.Label63.Location = New System.Drawing.Point(168, 95)
+ Me.Label63.Location = New System.Drawing.Point(168, 90)
Me.Label63.Name = "Label63"
Me.Label63.Size = New System.Drawing.Size(440, 17)
Me.Label63.TabIndex = 6
@@ -869,7 +874,7 @@ Partial Class usrcntlFakturierung
'
'Label45
'
- Me.Label45.Location = New System.Drawing.Point(168, 78)
+ Me.Label45.Location = New System.Drawing.Point(168, 73)
Me.Label45.Name = "Label45"
Me.Label45.Size = New System.Drawing.Size(224, 17)
Me.Label45.TabIndex = 5
@@ -904,6 +909,25 @@ Partial Class usrcntlFakturierung
Me.btnWikiStatusmails.TabIndex = 72
Me.btnWikiStatusmails.UseVisualStyleBackColor = True
'
+ 'PictureBox6
+ '
+ Me.PictureBox6.BackgroundImage = CType(resources.GetObject("PictureBox6.BackgroundImage"), System.Drawing.Image)
+ Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.PictureBox6.Location = New System.Drawing.Point(148, 157)
+ Me.PictureBox6.Name = "PictureBox6"
+ Me.PictureBox6.Size = New System.Drawing.Size(14, 14)
+ Me.PictureBox6.TabIndex = 124
+ Me.PictureBox6.TabStop = False
+ Me.PictureBox6.Visible = False
+ '
+ 'Label11
+ '
+ Me.Label11.Location = New System.Drawing.Point(168, 156)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(440, 17)
+ Me.Label11.TabIndex = 125
+ Me.Label11.Text = "6. Fixe Taxe"
+ '
'usrcntlFakturierung
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -924,15 +948,16 @@ Partial Class usrcntlFakturierung
CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
Me.GBSammelrechnung.ResumeLayout(False)
Me.GBSammelrechnung.PerformLayout()
+ CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -983,7 +1008,7 @@ Partial Class usrcntlFakturierung
Friend WithEvents Label5 As Label
Friend WithEvents pbMautAnh_Proz As ProgressBar
Friend WithEvents lblMautAnh_Proz As Label
- Friend WithEvents PictureBox6 As PictureBox
+ Friend WithEvents PictureBox7 As PictureBox
Friend WithEvents PictureBox5 As PictureBox
Friend WithEvents PictureBox4 As PictureBox
Friend WithEvents PictureBox3 As PictureBox
@@ -992,16 +1017,16 @@ Partial Class usrcntlFakturierung
Friend WithEvents cbxMautanh As CheckBox
Friend WithEvents Button3 As Button
Friend WithEvents Button2 As Button
- Friend WithEvents PictureBox7 As PictureBox
- Friend WithEvents Label1 As Label
Friend WithEvents PictureBox8 As PictureBox
+ Friend WithEvents Label1 As Label
+ Friend WithEvents PictureBox9 As PictureBox
Friend WithEvents Label2 As Label
Friend WithEvents btnREJdruck As Button
Friend WithEvents btnAbfdruck As Button
Friend WithEvents btnLieferantenrechnungen As Button
Friend WithEvents Validation1 As EORI.validation
Friend WithEvents Label8 As Label
- Friend WithEvents PictureBox9 As PictureBox
+ Friend WithEvents PictureBox10 As PictureBox
Friend WithEvents cbxStatusAUTOMAIL As CheckBox
Friend WithEvents Label7 As Label
Friend WithEvents Label6 As Label
@@ -1009,4 +1034,6 @@ Partial Class usrcntlFakturierung
Friend WithEvents btnWikiStatusmails As Button
Friend WithEvents lblAnzRE As Label
Friend WithEvents Label10 As Label
+ Friend WithEvents Label11 As Label
+ Friend WithEvents PictureBox6 As PictureBox
End Class
diff --git a/SDL/seriendruck/usrCntlFakturierung.resx b/SDL/seriendruck/usrCntlFakturierung.resx
index 343a6bf9..32e578b1 100644
--- a/SDL/seriendruck/usrCntlFakturierung.resx
+++ b/SDL/seriendruck/usrCntlFakturierung.resx
@@ -140,6 +140,30 @@
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
+ YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
+ BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
+ FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
+ Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
+ 6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
+ Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
+ 2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
+ j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
+ 1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
+ WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
+ qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
+ LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
+ GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
+ g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
+ BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
+ cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+ +z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
+ RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
+ SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb
index ec4a434c..df796bb7 100644
--- a/SDL/seriendruck/usrCntlFakturierung.vb
+++ b/SDL/seriendruck/usrCntlFakturierung.vb
@@ -135,7 +135,7 @@ Public Class usrcntlFakturierung
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles btnRePos.Click
- Label70.Text = "6. Hängt Mautgesamtbericht an Sammelrechnungen an."
+ Label70.Text = "7. Hängt Mautgesamtbericht an Sammelrechnungen an."
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -148,7 +148,7 @@ Public Class usrcntlFakturierung
PictureBox3.Visible = False
PictureBox4.Visible = False
PictureBox5.Visible = False
- PictureBox6.Visible = False
+ PictureBox7.Visible = False
If rechnungsdatum > Today() Then
@@ -291,11 +291,15 @@ Public Class usrcntlFakturierung
'Berechnet Banküberweisung/Bankspesen.
showPic(Bankspesen(Sachbearbeiter, rechnungsdatum), PictureBox5)
+ 'Berechnet FixeTaxe.
+ showPic(FixeTaxe(Sachbearbeiter, rechnungsdatum), PictureBox6)
+
+
'Gesamtmautberichte an Sammelrechnung anhängen
Dim okMaut As Boolean = False
okMaut = setMautgesamtberichtInRechnung(Sachbearbeiter, rechnungsdatum, dtSammelrechnungen)
- showPic(okMaut, PictureBox6)
+ showPic(okMaut, PictureBox7)
If Not okMaut Then
MsgBox("Fehler beim Setzen der Gesamtmautberichte")
@@ -321,8 +325,8 @@ Public Class usrcntlFakturierung
Rechnungsausgang.Währungscode,
isnull(Rechnungsausgang.[Steuersatz %],0) as [Steuersatz %],
cast(Rechnungsausgang.Lastschrift as bit) as Lastschrift,
- SUM(CASE WHEN LeistungsNr = 440 THEN Anzahl ELSE 0 END) AS AnzahlPP,
- SUM(CASE WHEN LeistungsNr = 440 THEN 0 ELSE SteuerpflichtigerBetrag + SteuerfreierBetrag END) AS BetragExclusivPP
+ SUM(CASE WHEN LeistungsNr = 440 and LeistungsBez <> 'Fixe Taxe' THEN Anzahl ELSE 0 END) AS AnzahlPP,
+ SUM(CASE WHEN LeistungsNr = 440 and LeistungsBez = 'Fixe Taxe' THEN 0 ELSE SteuerpflichtigerBetrag + SteuerfreierBetrag END) AS BetragExclusivPP
FROM
Rechnungsausgang
INNER JOIN
@@ -344,7 +348,7 @@ Public Class usrcntlFakturierung
Rechnungsausgang.[Steuersatz %],
Rechnungsausgang.Lastschrift
HAVING
- SUM(CASE WHEN LeistungsNr = 440 THEN Anzahl ELSE 0 END) > 0
+ SUM(CASE WHEN LeistungsNr = 440 and LeistungsBez <> 'Fixe Taxe' THEN Anzahl ELSE 0 END) > 0
ORDER BY
Rechnungsausgang.Firma_ID,
Rechnungsausgang.Status,
@@ -401,7 +405,7 @@ Public Class usrcntlFakturierung
Rechnungsausgang.Firma_ID = " & r("Firma_ID") & "
And Rechnungsausgang.Status = " & r("Status") & "
And Rechnungsausgang.Sammelrechnung = " & r("Sammelrechnung") & "
- And Rechnungsausgang.UPPER(Sachbearbeiter) = '" & Sachbearbeiter & "'
+ And UPPER(Rechnungsausgang.Sachbearbeiter) = '" & Sachbearbeiter & "'
And Rechnungsausgang.RechnungsKundenNr = " & r("RechnungsKundenNr") & "
And Rechnungsausgang.BelegartenNr = " & r("BelegartenNr") & "
And Rechnungsausgang.Währungscode = '" & r("Währungscode") & "'
@@ -422,7 +426,7 @@ Public Class usrcntlFakturierung
- Dim dtREPOSANZ As DataTable = (New SQL).loadDgvBySql("Select [RK_ID], [LeistungsNr], cast([Steuerpflichtig] as bit) as Steuerpflichtig, [LeistungsBez],[IndexZkteing], Anzahl, SteuerpflichtigerBetrag, SteuerfreierBetrag,upsize_ts From RechnungsausgangPositionen Where RechnungsausgangPositionen.RK_ID = " & re("RK_ID") & " And RechnungsausgangPositionen.LeistungsNr = 440", "FMZOLL")
+ Dim dtREPOSANZ As DataTable = (New SQL).loadDgvBySql("Select [RK_ID], [LeistungsNr], cast([Steuerpflichtig] as bit) as Steuerpflichtig, [LeistungsBez],[IndexZkteing], Anzahl, SteuerpflichtigerBetrag, SteuerfreierBetrag,upsize_ts From RechnungsausgangPositionen Where RechnungsausgangPositionen.RK_ID = " & re("RK_ID") & " And RechnungsausgangPositionen.LeistungsNr = 440 and And RechnungsausgangPositionen.LeistungsBez <> 'Fixe Taxe'", "FMZOLL")
If dtREPOSANZ.Rows.Count > 0 Then
@@ -493,8 +497,8 @@ Public Class usrcntlFakturierung
Rechnungsausgang.Währungscode,
isnull(Rechnungsausgang.[Steuersatz %],0) as [Steuersatz %],
cast(Rechnungsausgang.Lastschrift as bit) as Lastschrift,
- SUM(CASE WHEN LeistungsNr = 440 THEN Anzahl ELSE 0 END) AS AnzahlPP,
- SUM(CASE WHEN LeistungsNr = 440 THEN 0 ELSE SteuerpflichtigerBetrag + SteuerfreierBetrag END) AS BetragExclusivPP
+ SUM(CASE WHEN LeistungsNr = 440 THEN Anzahl ELSE 0 END) AS AnzahlFT,
+ SUM(CASE WHEN LeistungsNr = 440 THEN 0 ELSE SteuerpflichtigerBetrag + SteuerfreierBetrag END) AS BetragExclusivFT
FROM
Rechnungsausgang
INNER JOIN
@@ -528,29 +532,29 @@ Public Class usrcntlFakturierung
Rechnungsausgang.[Steuersatz %],
Rechnungsausgang.Lastschrift"
- Dim dtPP As DataTable = (New SQL).loadDgvBySql(sqlString, "FMZOLL")
+ Dim dtFT As DataTable = (New SQL).loadDgvBySql(sqlString, "FMZOLL")
- If dtPP.Rows.Count > 0 Then
+ If dtFT.Rows.Count > 0 Then
- For Each r In dtPP.Rows
+ For Each r In dtFT.Rows
Dim intZlr As Integer = 0
- ' Bei BetragExclusivPP kleiner als 150€ wird 1x P.P. verrechnet, bei grösser/gleich 150€ wird kein P.P. verrechnet.
- ' Zähler auf die Anzahl der P.P. Löschungen einstellen.
+ ' Bei BetragExclusivFT kleiner als 500€ wird 1x fixe Taxe verrechnet, bei grösser/gleich 500€ wird kein fixe Taxe verrechnet.
+ ' Zähler auf die Anzahl der fixe Taxe Löschungen einstellen.
- If Not IsDBNull(r("BetragExclusivPP")) AndAlso r("BetragExclusivPP") > 0 Then
+ If Not IsDBNull(r("BetragExclusivFT")) AndAlso r("BetragExclusivFT") > 0 Then
- If r("BetragExclusivPP") < 150 Then
- intZlr = r("AnzahlPP") - 1
+ If r("BetragExclusivFT") < 500 Then
+ intZlr = r("AnzahlFT") - 1
Else
- intZlr = r("AnzahlPP")
+ intZlr = r("AnzahlFT")
End If
Else
- If (0 - r("BetragExclusivPP")) < 150 Then
- intZlr = r("AnzahlPP") - 1
+ If (0 - r("BetragExclusivFT")) < 500 Then
+ intZlr = r("AnzahlFT") - 1
Else
- intZlr = r("AnzahlPP") - 1
+ intZlr = r("AnzahlFT") - 1
End If
End If
If intZlr > 0 Then
@@ -573,7 +577,7 @@ Public Class usrcntlFakturierung
Rechnungsausgang.Firma_ID = " & r("Firma_ID") & "
And Rechnungsausgang.Status = " & r("Status") & "
And Rechnungsausgang.Sammelrechnung = " & r("Sammelrechnung") & "
- And Rechnungsausgang.UPPER(Sachbearbeiter) = '" & Sachbearbeiter & "'
+ And UPPER(Rechnungsausgang.Sachbearbeiter) = '" & Sachbearbeiter & "'
And Rechnungsausgang.RechnungsKundenNr = " & r("RechnungsKundenNr") & "
And Rechnungsausgang.BelegartenNr = " & r("BelegartenNr") & "
And Rechnungsausgang.Währungscode = '" & r("Währungscode") & "'
@@ -594,7 +598,7 @@ Public Class usrcntlFakturierung
- Dim dtREPOSANZ As DataTable = (New SQL).loadDgvBySql("Select [RK_ID], [LeistungsNr], cast([Steuerpflichtig] as bit) as Steuerpflichtig, [LeistungsBez],[IndexZkteing], Anzahl, SteuerpflichtigerBetrag, SteuerfreierBetrag,upsize_ts From RechnungsausgangPositionen Where RechnungsausgangPositionen.RK_ID = " & re("RK_ID") & " And RechnungsausgangPositionen.LeistungsNr = 440", "FMZOLL")
+ Dim dtREPOSANZ As DataTable = (New SQL).loadDgvBySql("Select [RK_ID], [LeistungsNr], cast([Steuerpflichtig] as bit) as Steuerpflichtig, [LeistungsBez],[IndexZkteing], Anzahl, SteuerpflichtigerBetrag, SteuerfreierBetrag,upsize_ts From RechnungsausgangPositionen Where RechnungsausgangPositionen.RK_ID = " & re("RK_ID") & " And RechnungsausgangPositionen.LeistungsNr = 440 and RechnungsausgangPositionen.LeistungsBez= 'Fixe Taxe'", "FMZOLL")
If dtREPOSANZ.Rows.Count > 0 Then
@@ -1006,14 +1010,14 @@ Public Class usrcntlFakturierung
End If
- Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an." & " CSV: " & counterCSV & " PDF: " & counterPDF
+ Label70.Text = "7. Hängt Mautgesamtbericht an Sammenrechnungen an." & " CSV: " & counterCSV & " PDF: " & counterPDF
Return attachmentIsSet
Catch ex As SystemException
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
- Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an."
+ Label70.Text = "7. Hängt Mautgesamtbericht an Sammenrechnungen an."
Return False
End Function
@@ -1143,7 +1147,7 @@ Public Class usrcntlFakturierung
Dim reNrisSet = setStatus2(Sachbearbeiter, rechnungsdatum, dtSammelrechnungenGruppiert, cbxStatusAUTOMAIL.Checked)
- showPic(reNrisSet, PictureBox7)
+ showPic(reNrisSet, PictureBox8)
If Not reNrisSet Then
MsgBox("Fehler beim Setzen der Rechnungsnummer" & vbNewLine & "Vorgang wird abgebrochen!")
@@ -1238,14 +1242,14 @@ Public Class usrcntlFakturierung
If Not FormularManagerNEU.MergePdfFiles(listPDFs, pathPDFMerge) Then
Exit Sub
MsgBox("Fehler beim Zusammenführen der PDFs.")
- showPic(False, PictureBox8)
+ showPic(False, PictureBox9)
Else
- showPic(True, PictureBox8)
+ showPic(True, PictureBox9)
Process.Start(pathPDFMerge)
End If
Else
- showPic(True, PictureBox8)
+ showPic(True, PictureBox9)
Process.Start(pathPDF)
End If
@@ -1277,7 +1281,7 @@ Public Class usrcntlFakturierung
Else
- showPic(False, PictureBox8)
+ showPic(False, PictureBox9)
If kdnr > 0 Then
MsgBox("Keine Sammelrechnung zum " & rechnungsdatum.ToShortDateString & " von " & Sachbearbeiter & " für Kundennummer " & kdnr & " vorhanden!")
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
index e24568b5..b934dcf5 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
@@ -1007,6 +1007,10 @@ Public Class cRechnungsausgangAnhaenge
Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", showError, list)
End Function
+ Public Function DELETE(RK_ID As Integer, DSIS As Integer) As Boolean
+ Return SQL.doSQLVarList("DELETE FROM RechnungsausgangAnhaenge where RK_ID = " & RK_ID & " and dsId = " & DSIS, "FMZOLL")
+ End Function
+
Public Function getInsertCmd() As String