diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index e3e4bed7..d4251908 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -574,12 +574,12 @@ Public Class frmUSTVoffeneAntraege Next If dtKundeMWST.Columns.Contains("KdNr") Then - If dtKundeMWST.Rows.Count > 0 Then sqlwhereLand &= "And " - For Each row As DataRow In dtKundeMWST.Rows - landBez = row.Item("abc").ToString.Replace(";", "'") - counter = counter + 1 - sqlwhereLand &= " ( AdressenNr = " & row.Item("KdNr") & " AND Einreichland Not in (" & landBez.ToString.Substring(0, landBez.ToString.Length - 1) & ") " & IIf(dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count, "OR ", klammer) - Next + 'If dtKundeMWST.Rows.Count > 0 Then sqlwhereLand &= "And " + 'For Each row As DataRow In dtKundeMWST.Rows + ' landBez = row.Item("abc").ToString.Replace(";", "'") + ' counter = counter + 1 + ' sqlwhereLand &= " ( AdressenNr = " & row.Item("KdNr") & " AND Einreichland Not in (" & landBez.ToString.Substring(0, landBez.ToString.Length - 1) & ") " & IIf(dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count, "OR ", klammer) + 'Next Else diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 74106082..e0c6ef50 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -80,7 +80,7 @@ Public Class frmBU_Mahnlauf where cast(d_beleg as date) = '" & txtZahlEingaenge._value & "' and BU.i_firm_refid=" & Firma_ID & SQLWhere & " and (BU.i_konto in (2800, 2801, 2802, 2803, 2811, 2812, 2813, 2814, 2817, 2818, 2822 ,2826, 2827, 2828, 2831, 2832, 2833, 2837, 2845) or i_gegenkonto in (2800, 2801, 2802, 2803, 2811, 2812, 2813, 2814, 2817, 2818, 2822 ,2826, 2827, 2828, 2831, 2832, 2833, 2837, 2845)) - order by i_konto, i_beleg_refid, i_zeilen_refid" + order by Konto, i_beleg_refid, i_zeilen_refid" diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index e7f73678..88d2b2a1 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -1853,7 +1853,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(1630, 1120) + Me.tbDokumente.Size = New System.Drawing.Size(178, 39) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -2376,6 +2376,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index d9a1a282..fc891fc6 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2,6 +2,7 @@ Imports System.ComponentModel Imports System.Reflection Imports javax.xml.bind.annotation +Imports VERAG_PROG_ALLGEMEIN Public Class frmKundenblatt @@ -291,6 +292,20 @@ Public Class frmKundenblatt Case "tbOfferte" : UsrCntlOfferte1.init(kdNr, isVerag360) End Select + + + If tbcntrMDM.SelectedTab.Name = "tbDokumente" Then + Dim ADR As New cAdressen(kdNr) + Dim isEU As Boolean = True + If Not IsDBNull(ADR.LandKz) Then + isEU = SQL.getValueTxtBySql("select MitgliedslandEU as bit from Währungstabelle where LandKz ='" & ADR.LandKz & "'", "FMZOLL") + End If + If Not isEU Then + scanEULizenz._TEXT_PDF = "Transportlizenz" + scanEULizenz.Name = scanEULizenz._TEXT_PDF + End If + End If + End If 'tbcntrMDM.ResumeLayout() End Sub @@ -2080,8 +2095,5 @@ Public Class frmKundenblatt End Sub - Private Sub scanEULizenz_Load(sender As Object, e As EventArgs) Handles scanEULizenz.Load - - End Sub End Class diff --git a/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb b/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb index e3944b0e..66a84066 100644 --- a/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb +++ b/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb @@ -48,6 +48,7 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung Me.rtbLkwStatusMail = New System.Windows.Forms.RichTextBox() Me.FlatButton5 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Panel1 = New System.Windows.Forms.Panel() + Me.btnWikiStatusmails = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'cboFreigabe_SteuerbescheidBedingung @@ -359,12 +360,26 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung Me.Panel1.Size = New System.Drawing.Size(460, 1) Me.Panel1.TabIndex = 69 ' + 'btnWikiStatusmails + ' + Me.btnWikiStatusmails.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.btnWikiStatusmails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnWikiStatusmails.FlatAppearance.BorderSize = 0 + Me.btnWikiStatusmails.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnWikiStatusmails.Location = New System.Drawing.Point(454, 3) + Me.btnWikiStatusmails.Name = "btnWikiStatusmails" + Me.btnWikiStatusmails.Size = New System.Drawing.Size(25, 20) + Me.btnWikiStatusmails.TabIndex = 70 + Me.btnWikiStatusmails.UseVisualStyleBackColor = True + Me.btnWikiStatusmails.Visible = False + ' 'usrCntlKundenAvisoMailBenachrichtigung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.btnWikiStatusmails) Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.rtbLkwStatusMail) @@ -424,4 +439,5 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung Friend WithEvents rtbLkwStatusMail As RichTextBox Friend WithEvents FlatButton5 As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents Panel1 As Panel + Friend WithEvents btnWikiStatusmails As Button End Class diff --git a/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.vb b/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.vb index 4b284a85..c9dfb900 100644 --- a/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.vb +++ b/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.vb @@ -244,4 +244,9 @@ f.ShowDialog(Me) loadEmails() End Sub + + Private Sub btnWikiStatusmails_Click(sender As Object, e As EventArgs) Handles btnWikiStatusmails.Click + Dim webAddress As String = "https://wiki.verag.ag/software/aviso/howtos/Statusmails" + Process.Start(webAddress) + End Sub End Class