diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb index ba73b0f0..5e70f478 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb @@ -3929,7 +3929,7 @@ Partial Class usrCntlFaktAbrechnung ' Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GutschriftAusRechnungToolStripMenuItem, Me.SeperateRechnungFürEUSTToolStripMenuItem, Me.GutschriftAnVeragToolStripMenuItem}) Me.ContextMenuStrip2.Name = "ContextMenuStrip2" - Me.ContextMenuStrip2.Size = New System.Drawing.Size(224, 92) + Me.ContextMenuStrip2.Size = New System.Drawing.Size(224, 70) ' 'GutschriftAusRechnungToolStripMenuItem ' diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index e4f6fdd2..e74656f4 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1732,7 +1732,7 @@ Public Class usrCntlFaktAbrechnung If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = "Zollbelege" If If(RECHNUNG.Anlage_2, String.Empty) = String.Empty Then RECHNUNG.Anlage_2 = "Lief.-Rechn." If If(RECHNUNG.Anlage_3, String.Empty) = String.Empty Then RECHNUNG.Anlage_3 = "Präferenzz./Original" - If If(RECHNUNG.Anlage_4, String.Empty) = String.Empty Then RECHNUNG.Anlage_4 = "" '"CMR" + If If(RECHNUNG.Anlage_4, String.Empty) = String.Empty Then RECHNUNG.Anlage_4 = "Dublikat folgt nachträglich" If If(RECHNUNG.Anlage_5, String.Empty) = String.Empty Then RECHNUNG.Anlage_5 = "" End Select End If @@ -4048,5 +4048,4 @@ Nächste_Textzeile_lesen: End Sub - End Class \ No newline at end of file diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index 693b4956..b5988a5a 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -63,6 +63,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlOpt = New System.Windows.Forms.Panel() Me.pnlBerichte = New System.Windows.Forms.Panel() + Me.Button24 = New System.Windows.Forms.Button() Me.Button23 = New System.Windows.Forms.Button() Me.Button22 = New System.Windows.Forms.Button() Me.Button21 = New System.Windows.Forms.Button() @@ -236,13 +237,13 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cntxtCntxtSpeditionsbuch.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EintragLöschenToolStripMenuItem}) Me.cntxtCntxtSpeditionsbuch.Name = "cntxtCntxtSpeditionsbuch" - Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(181, 48) + Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(156, 26) Me.cntxtCntxtSpeditionsbuch.Text = "cntxtSpeditionsbuch" ' 'EintragLöschenToolStripMenuItem ' Me.EintragLöschenToolStripMenuItem.Name = "EintragLöschenToolStripMenuItem" - Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(155, 22) Me.EintragLöschenToolStripMenuItem.Text = "Eintrag löschen" ' 'txtAvisoId @@ -762,6 +763,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' 'pnlBerichte ' + Me.pnlBerichte.Controls.Add(Me.Button24) Me.pnlBerichte.Controls.Add(Me.Button23) Me.pnlBerichte.Controls.Add(Me.Button22) Me.pnlBerichte.Controls.Add(Me.Button21) @@ -798,6 +800,18 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlBerichte.TabIndex = 6 Me.pnlBerichte.Visible = False ' + 'Button24 + ' + Me.Button24.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button24.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button24.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button24.Location = New System.Drawing.Point(715, 14) + Me.Button24.Name = "Button24" + Me.Button24.Size = New System.Drawing.Size(41, 34) + Me.Button24.TabIndex = 43 + Me.Button24.UseVisualStyleBackColor = True + ' 'Button23 ' Me.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -1105,7 +1119,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtMax._WaehrungZeichen = True Me.txtMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtMax.ForeColor = System.Drawing.Color.Black - Me.txtMax.Location = New System.Drawing.Point(743, 8) + Me.txtMax.Location = New System.Drawing.Point(793, 11) Me.txtMax.MaxLineLength = -1 Me.txtMax.MaxLines_Warning = "" Me.txtMax.MaxLines_Warning_Label = Nothing @@ -1120,7 +1134,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cboRolle._value = "" Me.cboRolle.DropDownWidth = 300 Me.cboRolle.FormattingEnabled = True - Me.cboRolle.Location = New System.Drawing.Point(743, 27) + Me.cboRolle.Location = New System.Drawing.Point(793, 30) Me.cboRolle.Name = "cboRolle" Me.cboRolle.Size = New System.Drawing.Size(76, 21) Me.cboRolle.TabIndex = 39 @@ -1128,7 +1142,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label35 ' Me.Label35.AutoSize = True - Me.Label35.Location = New System.Drawing.Point(709, 11) + Me.Label35.Location = New System.Drawing.Point(759, 14) Me.Label35.Name = "Label35" Me.Label35.Size = New System.Drawing.Size(30, 13) Me.Label35.TabIndex = 32 @@ -1137,7 +1151,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label34 ' Me.Label34.AutoSize = True - Me.Label34.Location = New System.Drawing.Point(709, 30) + Me.Label34.Location = New System.Drawing.Point(759, 33) Me.Label34.Name = "Label34" Me.Label34.Size = New System.Drawing.Size(34, 13) Me.Label34.TabIndex = 39 @@ -1151,7 +1165,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button9.Location = New System.Drawing.Point(606, 8) Me.Button9.Margin = New System.Windows.Forms.Padding(0) Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(103, 41) + Me.Button9.Size = New System.Drawing.Size(106, 41) Me.Button9.TabIndex = 34 Me.Button9.Text = "Auswertung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Nach Kunden" Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -2970,4 +2984,5 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents FlenderBocholtZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem Friend WithEvents txtVermerk As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label48 As Label + Friend WithEvents Button24 As Button End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index a9062216..4c86e554 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -717,9 +717,16 @@ Public Class usrCntlSpeditionsBuchSuche MsgBox("Einträge können nur einzeln gelöscht werden!") Exit Sub End If + If vbYes = MsgBox("Möchten Sie den Eintrag wirklich löschen?", vbYesNoCancel) Then Dim r As DataGridViewRow = DataGridView.SelectedRows(0) - 'warum löschen? ev. wurde dieser Eintrag schon verrechnet???? + + Dim anzRechnung = SQL.getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[Rechnungsausgang] where AbfertigungsNr =" & (r.Cells("AbfertigungsNr").Value) & " AND FilialenNr = " & (r.Cells("FilialenNr").Value) & " AND SpeditionsbuchUnterNr = " & (r.Cells("UnterNr").Value), "FMZOLL") + + If CInt(anzRechnung) > 0 Then + MsgBox("Eintrag wurde bereits verrechnet (es existiert bereits ein Beleg " & vbNewLine & " mit dieser Abfertigungsnummer) und kann nicht gelöscht werden!") + Exit Sub + End If Dim spb As New cSpeditionsbuch(r.Cells("FilialenNr").Value, r.Cells("AbfertigungsNr").Value, r.Cells("UnterNr").Value) Dim arv As New cSpeditionsbucharchiv @@ -1082,7 +1089,7 @@ Public Class usrCntlSpeditionsBuchSuche DataGridView.DataSource = dt End Sub - Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles Button9.Click + Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles Button9.Click, Button24.Click Dim displayFilter = cbxFilterInBericht.Checked Dim groupByKd = cboRolle._value @@ -1098,83 +1105,93 @@ Public Class usrCntlSpeditionsBuchSuche Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr.Replace("XXXXX", groupByKd), "FMZOLL", , getSpedbuchList()) 'DataGridView.DataSource = dt + If sender.name = "Button24" Then - Dim print As New frmPrintLayout - print.Text = "Speditionsbericht" + Me.Cursor = Cursors.WaitCursor + cProgramFunctions.genExcelFromDT_NEW(dt) + Me.Cursor = Cursors.Default - Dim rpt As New rptSpeditionsberichtKunde - - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "IMEX" : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Label28.Text = "IMEX Customs Service GmbH" - Case "ATILLA" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "ATILLA Spedition" - Case Else - End Select - - rpt.DataSource = dt - - 'Filter anzeigen - If displayFilter Then - rpt.lblFilterTxt.Visible = displayFilter - rpt.txtFilter.Visible = displayFilter - rpt.txtFilter.Text = generateReadableFilter(SQL.getStringReplaceScalarVar(getSpedBuchWhere, getSpedbuchList)) Else - If txtUeberschr.Text <> "" Then - rpt.txtFilter.Text = txtUeberschr.Text - rpt.txtFilter.Visible = True - rpt.lblFilterTxt.Visible = True - rpt.lblFilterTxt.Text = "Beschreibung:" + + + Dim print As New frmPrintLayout + print.Text = "Speditionsbericht" + + Dim rpt As New rptSpeditionsberichtKunde + + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "IMEX" : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Label28.Text = "IMEX Customs Service GmbH" + Case "ATILLA" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "ATILLA Spedition" + Case Else + End Select + + rpt.DataSource = dt + + 'Filter anzeigen + If displayFilter Then + rpt.lblFilterTxt.Visible = displayFilter + rpt.txtFilter.Visible = displayFilter + rpt.txtFilter.Text = generateReadableFilter(SQL.getStringReplaceScalarVar(getSpedBuchWhere, getSpedbuchList)) + Else + If txtUeberschr.Text <> "" Then + rpt.txtFilter.Text = txtUeberschr.Text + rpt.txtFilter.Visible = True + rpt.lblFilterTxt.Visible = True + rpt.lblFilterTxt.Text = "Beschreibung:" + End If End If + + + If rpt.DataSource.rows.count = 0 Then + rpt.Dispose() : print.Dispose() + MsgBox("Keine Daten vorhanden!") + Exit Sub + End If + + Dim sum = 0 + Dim cnt = 0 + rpt.lblUeberschrift.Text = "Speditionsbericht nach Kunden " & txtAbfertDat.Text & " bis " & txtAbfertDatBis.Text + rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + 'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung + + 'Dim cnt As Integer = 0 + rpt.lblDat.Text = Now.ToLongDateString + Dim sumAnz As Double = 0 + Dim sumBar As Double = 0 + + rpt.lblFiliale.Text = "Alle Filialen" + + AddHandler rpt.Detail.Format, Sub() + cnt += 1 + ' rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString + ' rpt.lblBis.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString + rpt.lblNr.Text = cnt + ' rpt.lblAbfArtNr.Text = rpt.Fields.Item("Abfertigungsart").Value + ' rpt.lblAbfArt.Text = rpt.Fields.Item("Abfertigungsbezeichnung").Value + rpt.lblAbfAnz.Text = rpt.Fields.Item("Anzahl").Value + + rpt.lblKunde.Text = CInt(If(rpt.Fields.Item("KdNr").Value, "0")).ToString("D6") & " " & rpt.Fields.Item("Kunde").Value + + rpt.lblBarzahlungsbetrag.Text = CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value()).ToString("C") + + sumBar += CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value) + sumAnz += CDbl(rpt.Fields.Item("Anzahl").Value) + End Sub + AddHandler rpt.GroupHeader1.Format, Sub() + sumAnz = 0 + sumBar = 0 + End Sub + AddHandler rpt.GroupFooter1.Format, Sub() + rpt.lblSummeAnzahl.Text = sumAnz + rpt.lblSummeBar.Text = sumBar.ToString("C") + End Sub + + print.Viewer.LoadDocument(rpt) + print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous + print.Show() End If - - - If rpt.DataSource.rows.count = 0 Then - rpt.Dispose() : print.Dispose() - MsgBox("Keine Daten vorhanden!") - Exit Sub - End If - - Dim sum = 0 - Dim cnt = 0 - rpt.lblUeberschrift.Text = "Speditionsbericht nach Kunden " & txtAbfertDat.Text & " bis " & txtAbfertDatBis.Text - rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME - 'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung - - 'Dim cnt As Integer = 0 - rpt.lblDat.Text = Now.ToLongDateString - Dim sumAnz As Double = 0 - Dim sumBar As Double = 0 - - rpt.lblFiliale.Text = "Alle Filialen" - - AddHandler rpt.Detail.Format, Sub() - cnt += 1 - ' rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString - ' rpt.lblBis.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString - rpt.lblNr.Text = cnt - ' rpt.lblAbfArtNr.Text = rpt.Fields.Item("Abfertigungsart").Value - ' rpt.lblAbfArt.Text = rpt.Fields.Item("Abfertigungsbezeichnung").Value - rpt.lblAbfAnz.Text = rpt.Fields.Item("Anzahl").Value - - rpt.lblKunde.Text = CInt(If(rpt.Fields.Item("KdNr").Value, "0")).ToString("D6") & " " & rpt.Fields.Item("Kunde").Value - - rpt.lblBarzahlungsbetrag.Text = CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value()).ToString("C") - - sumBar += CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value) - sumAnz += CDbl(rpt.Fields.Item("Anzahl").Value) - End Sub - AddHandler rpt.GroupHeader1.Format, Sub() - sumAnz = 0 - sumBar = 0 - End Sub - AddHandler rpt.GroupFooter1.Format, Sub() - rpt.lblSummeAnzahl.Text = sumAnz - rpt.lblSummeBar.Text = sumBar.ToString("C") - End Sub - - print.Viewer.LoadDocument(rpt) - print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous - print.Show() End If + End Sub Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click @@ -1442,7 +1459,9 @@ Public Class usrCntlSpeditionsBuchSuche print.Viewer.LoadDocument(rpt) print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous print.Show() + End If + End Sub Function checkNull(o As Object, Optional ret As String = "") As Object @@ -2477,4 +2496,5 @@ Public Class usrCntlSpeditionsBuchSuche End Function + End Class diff --git a/SDL/frmdynMailvorlage.Designer.vb b/SDL/frmdynMailvorlage.Designer.vb index e60f493a..e7e23399 100644 --- a/SDL/frmdynMailvorlage.Designer.vb +++ b/SDL/frmdynMailvorlage.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmdynMailvorlage Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,10 +20,15 @@ Partial Class frmdynMailvorlage 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.mainPanel = New System.Windows.Forms.Panel() + Me.cbxSendungsvermerk = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.txtSendungsvermerk = New System.Windows.Forms.TextBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.cbSendungsvermerk = New System.Windows.Forms.CheckBox() Me.TextBox2 = New System.Windows.Forms.TextBox() Me.btn = New System.Windows.Forms.Button() Me.lblWordcount = New System.Windows.Forms.Label() @@ -54,11 +59,8 @@ Partial Class frmdynMailvorlage Me.Label3 = New System.Windows.Forms.Label() Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.cbSendungsvermerk = New System.Windows.Forms.CheckBox() - Me.txtSendungsvermerk = New System.Windows.Forms.TextBox() - Me.Label9 = New System.Windows.Forms.Label() - Me.cbxSendungsvermerk = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label10 = New System.Windows.Forms.Label() + Me.Label11 = New System.Windows.Forms.Label() + Me.rtb_txthtml = New System.Windows.Forms.RichTextBox() Me.mainPanel.SuspendLayout() Me.pnlTop.SuspendLayout() CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit() @@ -69,6 +71,8 @@ Partial Class frmdynMailvorlage Me.mainPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.mainPanel.Controls.Add(Me.Label11) + Me.mainPanel.Controls.Add(Me.rtb_txthtml) Me.mainPanel.Controls.Add(Me.cbxSendungsvermerk) Me.mainPanel.Controls.Add(Me.Label10) Me.mainPanel.Controls.Add(Me.txtSendungsvermerk) @@ -97,6 +101,57 @@ Partial Class frmdynMailvorlage Me.mainPanel.Size = New System.Drawing.Size(1283, 457) Me.mainPanel.TabIndex = 101 ' + 'cbxSendungsvermerk + ' + Me.cbxSendungsvermerk._allowedValuesFreiText = Nothing + Me.cbxSendungsvermerk._allowFreiText = False + Me.cbxSendungsvermerk._value = "" + Me.cbxSendungsvermerk.DropDownWidth = 250 + Me.cbxSendungsvermerk.FormattingEnabled = True + Me.cbxSendungsvermerk.Location = New System.Drawing.Point(678, 435) + Me.cbxSendungsvermerk.Name = "cbxSendungsvermerk" + Me.cbxSendungsvermerk.Size = New System.Drawing.Size(100, 21) + Me.cbxSendungsvermerk.TabIndex = 39 + Me.cbxSendungsvermerk.Visible = False + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(675, 419) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(107, 13) + Me.Label10.TabIndex = 38 + Me.Label10.Text = "Sendungsvermerk-ID" + Me.Label10.Visible = False + ' + 'txtSendungsvermerk + ' + Me.txtSendungsvermerk.Location = New System.Drawing.Point(791, 436) + Me.txtSendungsvermerk.Name = "txtSendungsvermerk" + Me.txtSendungsvermerk.Size = New System.Drawing.Size(290, 20) + Me.txtSendungsvermerk.TabIndex = 37 + Me.txtSendungsvermerk.Visible = False + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(788, 419) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(93, 13) + Me.Label9.TabIndex = 36 + Me.Label9.Text = "Sendungsvermerk" + Me.Label9.Visible = False + ' + 'cbSendungsvermerk + ' + Me.cbSendungsvermerk.AutoSize = True + Me.cbSendungsvermerk.Location = New System.Drawing.Point(678, 394) + Me.cbSendungsvermerk.Name = "cbSendungsvermerk" + Me.cbSendungsvermerk.Size = New System.Drawing.Size(211, 17) + Me.cbSendungsvermerk.TabIndex = 35 + Me.cbSendungsvermerk.Text = "Sendungsvermerk beim Senden setzen" + Me.cbSendungsvermerk.UseVisualStyleBackColor = True + ' 'TextBox2 ' Me.TextBox2.BackColor = System.Drawing.SystemColors.Control @@ -217,9 +272,11 @@ Partial Class frmdynMailvorlage ' 'rtb_Emailtext ' - Me.rtb_Emailtext.Location = New System.Drawing.Point(15, 72) + Me.rtb_Emailtext.AcceptsTab = True + Me.rtb_Emailtext.BackColor = System.Drawing.SystemColors.Window + Me.rtb_Emailtext.Location = New System.Drawing.Point(10, 72) Me.rtb_Emailtext.Name = "rtb_Emailtext" - Me.rtb_Emailtext.Size = New System.Drawing.Size(1245, 322) + Me.rtb_Emailtext.Size = New System.Drawing.Size(625, 322) Me.rtb_Emailtext.TabIndex = 22 Me.rtb_Emailtext.Text = "" ' @@ -426,56 +483,25 @@ Partial Class frmdynMailvorlage Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365) Me.dgvMailvorlagen.TabIndex = 104 ' - 'cbSendungsvermerk + 'Label11 ' - Me.cbSendungsvermerk.AutoSize = True - Me.cbSendungsvermerk.Location = New System.Drawing.Point(678, 394) - Me.cbSendungsvermerk.Name = "cbSendungsvermerk" - Me.cbSendungsvermerk.Size = New System.Drawing.Size(211, 17) - Me.cbSendungsvermerk.TabIndex = 35 - Me.cbSendungsvermerk.Text = "Sendungsvermerk beim Senden setzen" - Me.cbSendungsvermerk.UseVisualStyleBackColor = True + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(647, 56) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(89, 13) + Me.Label11.TabIndex = 41 + Me.Label11.Text = "Email-Text-HTML" ' - 'txtSendungsvermerk + 'rtb_txthtml ' - Me.txtSendungsvermerk.Location = New System.Drawing.Point(791, 436) - Me.txtSendungsvermerk.Name = "txtSendungsvermerk" - Me.txtSendungsvermerk.Size = New System.Drawing.Size(290, 20) - Me.txtSendungsvermerk.TabIndex = 37 - Me.txtSendungsvermerk.Visible = False - ' - 'Label9 - ' - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(788, 419) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(93, 13) - Me.Label9.TabIndex = 36 - Me.Label9.Text = "Sendungsvermerk" - Me.Label9.Visible = False - ' - 'cbxSendungsvermerk - ' - Me.cbxSendungsvermerk._allowedValuesFreiText = Nothing - Me.cbxSendungsvermerk._allowFreiText = False - Me.cbxSendungsvermerk._value = "" - Me.cbxSendungsvermerk.DropDownWidth = 250 - Me.cbxSendungsvermerk.FormattingEnabled = True - Me.cbxSendungsvermerk.Location = New System.Drawing.Point(678, 435) - Me.cbxSendungsvermerk.Name = "cbxSendungsvermerk" - Me.cbxSendungsvermerk.Size = New System.Drawing.Size(100, 21) - Me.cbxSendungsvermerk.TabIndex = 39 - Me.cbxSendungsvermerk.Visible = False - ' - 'Label10 - ' - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(675, 419) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(107, 13) - Me.Label10.TabIndex = 38 - Me.Label10.Text = "Sendungsvermerk-ID" - Me.Label10.Visible = False + Me.rtb_txthtml.AcceptsTab = True + Me.rtb_txthtml.BackColor = System.Drawing.SystemColors.Window + Me.rtb_txthtml.Location = New System.Drawing.Point(641, 72) + Me.rtb_txthtml.Name = "rtb_txthtml" + Me.rtb_txthtml.ReadOnly = True + Me.rtb_txthtml.Size = New System.Drawing.Size(625, 322) + Me.rtb_txthtml.TabIndex = 40 + Me.rtb_txthtml.Text = "" ' 'frmdynMailvorlage ' @@ -534,4 +560,6 @@ Partial Class frmdynMailvorlage Friend WithEvents txtSendungsvermerk As TextBox Friend WithEvents Label9 As Label Friend WithEvents cbSendungsvermerk As CheckBox + Friend WithEvents Label11 As Label + Friend WithEvents rtb_txthtml As RichTextBox End Class diff --git a/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb index 25406674..3d021e87 100644 --- a/SDL/frmdynMailvorlage.vb +++ b/SDL/frmdynMailvorlage.vb @@ -1,4 +1,5 @@ Imports System.Windows.Controls +Imports GrapeCity.ActiveReports.SectionReportModel Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN @@ -206,6 +207,7 @@ Public Class frmdynMailvorlage cbxAktiv.Checked = txtkonserve.txt_dynMailvorlage cboSprache._value = txtkonserve.txt_sprache rtb_Emailtext.Text = h2t.ToText(txtkonserve.txt_text) + rtb_txthtml.Text = txtkonserve.txt_text cboFirmensignatur.changeItem(txtkonserve.txt_firmaSig) cbxFirmaChange.changeItem(txtkonserve.txt_FIRMA) @@ -297,23 +299,20 @@ Public Class frmdynMailvorlage ElseIf cbxSpracheSelected._value = "" Then If ((dgvMailvorlagen.SelectedRows(0).Cells("txt_sprache").Value Is DBNull.Value Or dgvMailvorlagen.SelectedRows(0).Cells("txt_sprache").Value Is Nothing Or dgvMailvorlagen.SelectedRows(0).Cells("txt_sprache").Value = "") Or initialSave = True) Then 'And initialSave = False ??? - If setWarning Then - lblWarning.Text = "Bitte Sprache auswählen!" - Else - lblWarning.Text = "" - End If - - Return False + If setWarning Then + lblWarning.Text = "Bitte Sprache auswählen!" + Else + lblWarning.Text = "" End If - - lblWarning.Text = "" - Return True - - + Return False End If + lblWarning.Text = "" + Return True + + + End If Return True - End Function Private Function checkFields() As Boolean @@ -351,7 +350,7 @@ Public Class frmdynMailvorlage If rtb_Emailtext.Text <> "" AndAlso cboSprache._value <> "" Then Dim TextHTML = "" - TextHTML &= insertlinebreaks(rtb_Emailtext.Text) + TextHTML &= rtb_txthtml.Text TextHTML &= "
" TextHTML &= "
" TextHTML &= "Mit freundlichen Grüßen
" @@ -359,7 +358,6 @@ Public Class frmdynMailvorlage TextHTML &= "
" TextHTML &= cFakturierung.getSignature(cboSprache._value, cboFirmensignatur._value, True, True) - Mail.HTMLBody = "
" & TextHTML & "
" Mail.Subject = txtBetreff.Text @@ -377,7 +375,7 @@ Public Class frmdynMailvorlage Private Function insertlinebreaks(text As String) As String - Return text.ToString.Replace(vbLf, vbLf & "
") + Return text.ToString.Replace(vbLf, "
" & vbLf) End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb index 2b42fa84..774868e4 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb @@ -541,6 +541,8 @@ Public Class cRechnungsausgang End If End If + 'checkFirmen + Return True End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb index 02ed31d2..203592f2 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb @@ -21,6 +21,7 @@ Public Class cUeberstunden Property uest_overwriteValue As Boolean Property uest_paidout_sum As Object = Nothing Property uest_isParttime As Boolean + Property uest_ignorePayoutDate As Boolean Public hasEntry = False @@ -59,6 +60,7 @@ Public Class cUeberstunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_overwriteValue", uest_overwriteValue)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_paidout_sum", uest_paidout_sum)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_isParttime", uest_isParttime)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_ignorePayoutDate", uest_ignorePayoutDate)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index c8dc92f7..28efb88b 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -596,6 +596,7 @@ Public Class frmUeberstundenauszahlen Dim checkauszahlungsdatum As Boolean = False Dim meldung As String = "" Dim stichtag As Integer = 25 + Dim ignoreAuszahlungsdatum As Boolean = False Select Case MA.mit_firma Case "ATILLA" meldung = " des Vormonats" @@ -613,7 +614,13 @@ Public Class frmUeberstundenauszahlen If Not checkauszahlungsdatum Then Dim check = InputBox("Die Ü-Std. von " & MonthName(auszahlugsdatum.Month) & " wurden uU schon in die Lohnverrechnung übertragen (Stichtag: " & stichtag & meldung & ")!" & vbNewLine & "Wollten Sie die Ü-Std. trotzdem in Timas austragen, dann bitte GELESEN eingeben!", "Auszahlungsmonat beachten!") - If check <> "GELESEN" Then Exit Sub + If check <> "GELESEN" Then + Exit Sub + Else + ignoreAuszahlungsdatum = True + End If + + End If '65;"01-Lfd Saldo" @@ -750,6 +757,7 @@ Public Class frmUeberstundenauszahlen ues.uest_maxUE = CDbl(txtSummeAuszb.Text) ues.uest_paidout_sum = gesamt ues.uest_isParttime = cbxTeilzeit.Checked + ues.uest_ignorePayoutDate = ignoreAuszahlungsdatum If istTeilzeit Then ues.uest_25 = sum0 diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb index b06d211e..f9f495d9 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb @@ -79,7 +79,7 @@ End Function - Public Shared Function genDatensatzCSV_Stammdaten(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean + Public Shared Function genDatensatzCSV_Stammdaten(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1, Optional filepath As String = "") As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean Try Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID) @@ -147,6 +147,7 @@ End If updateFibu(filialNr) ' UPDATE FiBuSchnittstelle --> 0 + filepath = pathKD & DateinameKD Return True End If @@ -161,8 +162,10 @@ - Public Shared Function genDatensatzCSV_ALL(firma As String, Optional OpenFile As Boolean = False, Optional boolKunden As Boolean = True, Optional boolBuchungen As Boolean = True, Optional Geschaeftsjahr As Integer = -1) As Boolean + Public Shared Function genDatensatzCSV_ALL(firma As String, Optional OpenFile As Boolean = False, Optional boolKunden As Boolean = True, Optional boolBuchungen As Boolean = True, Optional Geschaeftsjahr As Integer = -1, Optional PathList As List(Of String) = Nothing) As Boolean + PathList.Clear() + Dim Path = "" If firma <> "AMBAR" Then MsgBox("Export für Firma" & firma & " nicht aktiviert") @@ -171,20 +174,26 @@ Dim CSV_ALL = True If boolKunden Then - If Not genDatensatzCSV_Stammdaten(24, OpenFile, Geschaeftsjahr) Then + If Not genDatensatzCSV_Stammdaten(24, OpenFile, Geschaeftsjahr, Path) Then CSV_ALL = False + If Path <> "" Then + PathList.Add(Path) + End If End If End If If boolBuchungen Then - If Not genDatensatzCSV_Buchungen(24, OpenFile, Geschaeftsjahr) Then + If Not genDatensatzCSV_Buchungen(24, OpenFile, Geschaeftsjahr, Path) Then CSV_ALL = False + If Path <> "" Then + PathList.Add(Path) + End If End If End If - Return CSV_ALL + Return True End Function - Public Shared Function genDatensatzCSV_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean + Public Shared Function genDatensatzCSV_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1, Optional ByRef filepath As String = "") As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean Try Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID) @@ -235,7 +244,7 @@ bool_DatenVorhanden = True 'Update Filename TrdIn - SQL.doSQL("update [tblTrdinInvoice] Set TrdinDateiname='" & Now.ToString("ddMMyyyyHHmm") & "' WHERE [Firma_ID] = " & FIRMA.Firma_ID & " AND TrdinDateiname is null ", "FMZOLL") + SQL.doSQL("update [tblTrdinInvoice] Set TrdinDateiname='" & Now.ToString("ddMMyyyyHHmm") & "' WHERE [Firma_ID] = " & FIRMA.Firma_ID & " AND TrdinDateiname is null ", "FMZOLL") file.Close() @@ -250,10 +259,11 @@ Else IO.File.Delete(path & Dateiname) End If - + filepath = path & Dateiname Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try + Return True End If Catch ex As Exception