diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 7ca96d37..4061a994 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -718,13 +718,14 @@ Public Class cFakturierung 'End Function - Public Shared Function doRechnungsDruck_SRorER(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional printStbVdb As Boolean = False, Optional AnlageEinzelRg As Boolean = False, Optional sammelrechnungKopie As Boolean = False) As Boolean + + Public Shared Function doRechnungsDruck_SRorER(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional printStbVdb As Boolean = False, Optional AnlageEinzelRg As Boolean = False, Optional sammelrechnungKopie As Boolean = False, Optional onlyAsfinagAttach As Boolean = False) As Boolean If RK_ID <= 0 Then Return False Dim RG_TMP As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID) If RG_TMP.Sammelrechnung = 0 Then Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName, , printStbVdb) ElseIf RG_TMP.Sammelrechnung = 6 Then - Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, True, Rechnugnsdruck, Path, False,,,,,,,, True, True, sammelrechnungKopie,,, , True) + Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, True, Rechnugnsdruck, Path, False,,,,,,,, True, True, sammelrechnungKopie,,, onlyAsfinagAttach, True) Else Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, , Rechnugnsdruck, Path, True) End If diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index d292f429..9029adce 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -5575,6 +5575,11 @@ Public Class FormularManagerNEU mail_To = AD.E_Mail End If + If AD IsNot Nothing AndAlso AD.E_Mail2 <> "" Then + If mail_To <> "" Then mail_To &= ";" + mail_To &= AD.E_Mail2 + End If + Dim FISKAL As New cFiskal_Daten(usrCntl.KdNR) If FISKAL IsNot Nothing Then mail_To_Stb = If(FISKAL.fisk_schreibenSB_Mail, "") @@ -5875,6 +5880,13 @@ Public Class FormularManagerNEU If EMAILTMP = "" Then Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(usrCntl.KdNR) If AD IsNot Nothing Then Mail_To = If(AD.E_Mail, "") + If AD IsNot Nothing AndAlso AD.E_Mail2 IsNot Nothing Then + If Mail_To <> "" Then + Mail_To &= ";" & AD.E_Mail2 + Else + Mail_To = AD.E_Mail2 + End If + End If End If End If diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 48d7cb39..e3ac54a5 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 21015f00..36595acd 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -927,6 +927,9 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_daId = 0 Dim rkID = sql.getValueTxtBySql("SELECT TOP(1) isnull(RK_ID,0) FROM Rechnungsausgang where cast(Rechnungsausgang.RechnungsDatum as Date) ='" & USTV_POS.UStVPo_ReDat & "' and Rechnungsausgang.RechnungsNr='" & USTV_POS.UStVPo_ReNr & "' AND FilialenNr = " & r.Item("FilialenNr") & " AND RK_ID is not null", "FMZOLL") + + + If rkID <> "" AndAlso IsNumeric(rkID) Then USTV_POS.UStVPo_daId = rkID If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False @@ -3558,7 +3561,7 @@ Public Class frmMDM_USTVAntrag If IsNumeric(item.Name) Then Dim RG_PATH = "" - cFakturierung.doRechnungsDruck_SRorER(item.Name,, False, 4, RG_PATH,,, True) + cFakturierung.doRechnungsDruck_SRorER(item.Name,, False, 4, RG_PATH,,, True,, True) Process.Start(RG_PATH) End If diff --git a/SDL/kunden/frmOffertenBearbeiten.Designer.vb b/SDL/kunden/frmOffertenBearbeiten.Designer.vb index 6206da96..cdc4b578 100644 --- a/SDL/kunden/frmOffertenBearbeiten.Designer.vb +++ b/SDL/kunden/frmOffertenBearbeiten.Designer.vb @@ -28,6 +28,8 @@ Partial Class frmOffertenBearbeiten Me.lblBitteWahlenSieDieOffertenFurDenKundenAus = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label2 = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'FlowLayoutPanel @@ -90,12 +92,38 @@ Partial Class frmOffertenBearbeiten Me.cboSprache.Size = New System.Drawing.Size(51, 21) Me.cboSprache.TabIndex = 13 ' + 'cboFiliale + ' + Me.cboFiliale._allowedValuesFreiText = Nothing + Me.cboFiliale._allowFreiText = False + Me.cboFiliale._value = "" + Me.cboFiliale.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend + Me.cboFiliale.DropDownWidth = 50 + Me.cboFiliale.FormattingEnabled = True + Me.cboFiliale.Location = New System.Drawing.Point(274, 24) + Me.cboFiliale.Name = "cboFiliale" + Me.cboFiliale.Size = New System.Drawing.Size(51, 21) + Me.cboFiliale.TabIndex = 15 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(211, 27) + Me.Label2.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(44, 13) + Me.Label2.TabIndex = 14 + Me.Label2.Text = "Filiale:" + ' 'frmOffertenBearbeiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(337, 559) + Me.Controls.Add(Me.cboFiliale) + Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.cboSprache) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.lblBitteWahlenSieDieOffertenFurDenKundenAus) @@ -115,4 +143,6 @@ Partial Class frmOffertenBearbeiten Friend WithEvents lblBitteWahlenSieDieOffertenFurDenKundenAus As System.Windows.Forms.Label Friend WithEvents Label1 As Label Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label2 As Label End Class diff --git a/SDL/kunden/frmOffertenBearbeiten.vb b/SDL/kunden/frmOffertenBearbeiten.vb index f446c5dd..cd2d1b52 100644 --- a/SDL/kunden/frmOffertenBearbeiten.vb +++ b/SDL/kunden/frmOffertenBearbeiten.vb @@ -32,6 +32,8 @@ Public Class frmOffertenBearbeiten cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("RO", "RO")) cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TR", "TR")) + cboFiliale.fillWithSQL("SELECT Filialen.FilialenNr FROM Filialen ORDER BY Filialen.FilialenNr", False, "FMZOLL") + Dim where = "" Select Case FIRMA_TMP @@ -84,7 +86,7 @@ Public Class frmOffertenBearbeiten If c.GetType Is GetType(VERAG_PROG_ALLGEMEIN.MyCheckBoxValue) Then ' MsgBox(c._value) If c.enabled And c.checked Then - Dim o As New VERAG_PROG_ALLGEMEIN.cOfferte(kdnr, c._value, False) + Dim o As New VERAG_PROG_ALLGEMEIN.cOfferte(kdnr, c._value, cboFiliale._value, False) o.Art = "Neuanlage" o.SAVE() 'speichern o.LOAD_POSITIONEN() 'positionen Laden diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 3df41c11..4c66e29a 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -876,7 +876,8 @@ Public Class cMDMFunctionsAllgemein If dsID > 0 Then 'Me.Cursor = Cursors.WaitCursor Dim path As String - cFakturierung.doRechnungsDruck_SRorER(dsID,, False, 4, path) + Dim onlyAsfinat As Boolean = True + cFakturierung.doRechnungsDruck_SRorER(dsID,, False, 4, path,,,,, onlyAsfinat) If nummierung > 0 Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb index f85df762..c05d95e6 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb @@ -42,7 +42,7 @@ Public Class cOfferteList propInfo.SetValue(l, dr.Item(i.Text)) End If Next - If loadPos Then l.LOAD_POSITIONEN() + If loadPos Then l.LOAD_POSITIONEN(-1) LIST.Add(l) End While @@ -92,6 +92,13 @@ Public Class cOfferte LOAD(KundenNr, OffertenNr, loadPos) End Sub + Sub New(KundenNr, OffertenNr, FilialeNr, loadPos) + Me.KundenNr = KundenNr + Me.OffertenNr = OffertenNr + Me.FilialenNr = FilialeNr + LOAD(KundenNr, OffertenNr, loadPos) + End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) @@ -111,13 +118,14 @@ Public Class cOfferte Return list End Function - Public Sub LOAD(KundenNr, OffertenNr, loadPos) + Public Sub LOAD(KundenNr As Integer, OffertenNr As Integer, loadPos As Boolean, Optional FilialenNr As Integer = -1) Try POSITIONEN.Clear() Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT * FROM Offerten WHERE KundenNr=@KundenNr AND OffertenNr=@OffertenNr ", conn) + Using cmd As New SqlCommand("SELECT * FROM Offerten WHERE KundenNr=@KundenNr AND OffertenNr=@OffertenNr " & IIf(FilialenNr > 0, " AND FilialenNr=@FilialenNr", ""), conn) cmd.Parameters.AddWithValue("@KundenNr", KundenNr) cmd.Parameters.AddWithValue("@OffertenNr", OffertenNr) + If FilialenNr > 0 Then cmd.Parameters.AddWithValue("@FilialenNr", FilialenNr) Dim dr = cmd.ExecuteReader() If dr.Read Then 'Dim l As New cOfferte @@ -140,13 +148,14 @@ Public Class cOfferte End Sub - Public Sub LOAD_POSITIONEN() + Public Sub LOAD_POSITIONEN(Optional FilialenNr As Integer = -1) Try POSITIONEN.Clear() Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT * FROM Offertenpositionen WHERE KundenNr=@KundenNr and OffertenNr=@OffertenNr ", conn) + Using cmd As New SqlCommand("SELECT * FROM Offertenpositionen WHERE KundenNr=@KundenNr and OffertenNr=@OffertenNr " & IIf(FilialenNr > 0, " AND FilialenNr=@FilialenNr", ""), conn) cmd.Parameters.AddWithValue("@KundenNr", Me.KundenNr) cmd.Parameters.AddWithValue("@OffertenNr", Me.OffertenNr) + If FilialenNr > 0 Then cmd.Parameters.AddWithValue("@FilialenNr", FilialenNr) Dim dr = cmd.ExecuteReader() While dr.Read Dim l As New cOffertPosition