edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SDL Bugfixes Karten Retourniert, LKW Docs erw.; DTB an Dakosy (Stammref)

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-07-17 08:22:03 +02:00
parent e04b61d8f4
commit a4a94a81c4
13 changed files with 685 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SDL/Fakturierung/cFakturierung.vb
View File

@@ -645,6 +645,9 @@ Public Class cFakturierung
End Select
' MsgBox(sqlStr & " order by Firma_ID desc,LandKz desc,Offertennr desc")
If RECHNUNG.[Vorkasse] Then
sqlStr &= " AND (Textschlüssel<>16) " 'Bei Vorkasse soll dieser Text nicht aufscheinen (AMBAR)
End If
Dim dt_RechnungsTexte As DataTable = SQL.loadDgvBySql(sqlStr & " order by Firma_ID desc,LandKz desc,Offertennr desc", "FMZOLL")

19
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -393,8 +393,15 @@ Public Class frmFaktEmail
addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
Try
Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.de"
Catch ex2 As Exception
MsgBox(ex2.Message)
End Try
End If
Mail.Display()
Mail.Display()
'------------------------------------------------------------------------------------------
' STB /FA SR: ABFRAGE FISKAL-VZ
If isFiskal Then
@@ -511,6 +518,16 @@ Public Class frmFaktEmail
addAttachments(Mail, RECHNUNG.RechnungsNr, cbxMergePDF.Checked)
'-----------------------------------------------------------------
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
Try
Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.de"
Catch ex2 As Exception
MsgBox(ex2.Message)
End Try
End If
Mail.Display()
'------------------------------------------------------------------------------------------

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.2.9.8")>
<Assembly: AssemblyFileVersion("1.2.9.8")>
<Assembly: AssemblyVersion("1.2.9.9")>
<Assembly: AssemblyFileVersion("1.2.9.9")>

2
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb
View File

@@ -204,7 +204,7 @@ Public Class usrCntlATLAS_EZA
End Select
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' and dySr_visible=1", False, "FMZOLL", True)
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung='" & txtDyNiederlassung.Text.Replace("DTB", "SUB") & "' and dySr_visible=1", False, "FMZOLL", True)
cboStammreferenz.changeItem("")

2
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb
View File

@@ -174,7 +174,7 @@ Public Class usrCntlATLAS_NCTS004
End Select
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1", False, "FMZOLL", True)
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text.Replace("DTB", "SUB") & "') and dySr_visible=1", False, "FMZOLL", True)
cboStammreferenz.changeItem("")
SICHERHEIT = New usrCntlATLAS_NCTS004_Sicherheit(ncts_OUT, FIRMA_DY)

2
SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb
View File

@@ -32,7 +32,7 @@
SelectNL = False
Select Case FIRMA_DY
Case "VERAG" : txtDyMandant.Text = "VERG"
txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.ToString.Replace("DTB", "SUB")
' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
'Case "SUB" : txtDyNiederlassung.Text = "VERG"
'Case "SUW" : txtDyNiederlassung.Text = "ATIL"

968
SDL/kunden/frmKundenblatt.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

230
SDL/kunden/frmLKW_AnhaengeDatenarchiv.Designer.vb generated
View File

@@ -25,15 +25,6 @@ Partial Class frmLKW_AnhaengeDatenarchiv
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLKW_AnhaengeDatenarchiv))
Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.clmnLKW = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnZulassung_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnCEMT_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnLeasing_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnMiete_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnZulassung = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.clmnCEMT = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.clmnLeasing = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.Column1 = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
Me.cbxMiete = New System.Windows.Forms.CheckBox()
Me.cbxLeasing = New System.Windows.Forms.CheckBox()
@@ -44,6 +35,21 @@ Partial Class frmLKW_AnhaengeDatenarchiv
Me.Button1 = New System.Windows.Forms.Button()
Me.CheckBox4 = New System.Windows.Forms.CheckBox()
Me.Button2 = New System.Windows.Forms.Button()
Me.cbxCIF = New System.Windows.Forms.CheckBox()
Me.cbxCOC = New System.Windows.Forms.CheckBox()
Me.clmnLKW = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnZulassung_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnCEMT_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnLeasing_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnMiete_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnCIF_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnCOC_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnZulassung = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.clmnCEMT = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.clmnLeasing = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.Column1 = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.clmnCIF = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.clmnCOC = New System.Windows.Forms.DataGridViewCheckBoxColumn()
CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.MyPanel1.SuspendLayout()
Me.SuspendLayout()
@@ -56,82 +62,17 @@ Partial Class frmLKW_AnhaengeDatenarchiv
Me.MyDatagridview1.AllowUserToResizeColumns = False
Me.MyDatagridview1.AllowUserToResizeRows = False
Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.MyDatagridview1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnLKW, Me.clmnZulassung_docID, Me.clmnCEMT_docID, Me.clmnLeasing_docID, Me.clmnMiete_docID, Me.clmnZulassung, Me.clmnCEMT, Me.clmnLeasing, Me.Column1})
Me.MyDatagridview1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnLKW, Me.clmnZulassung_docID, Me.clmnCEMT_docID, Me.clmnLeasing_docID, Me.clmnMiete_docID, Me.clmnCIF_docID, Me.clmnCOC_docID, Me.clmnZulassung, Me.clmnCEMT, Me.clmnLeasing, Me.Column1, Me.clmnCIF, Me.clmnCOC})
Me.MyDatagridview1.Location = New System.Drawing.Point(13, 36)
Me.MyDatagridview1.Name = "MyDatagridview1"
Me.MyDatagridview1.ReadOnly = True
Me.MyDatagridview1.Size = New System.Drawing.Size(555, 383)
Me.MyDatagridview1.Size = New System.Drawing.Size(678, 383)
Me.MyDatagridview1.TabIndex = 0
'
'clmnLKW
'
Me.clmnLKW.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
Me.clmnLKW.HeaderText = "Bezeichnung"
Me.clmnLKW.Name = "clmnLKW"
Me.clmnLKW.ReadOnly = True
'
'clmnZulassung_docID
'
Me.clmnZulassung_docID.HeaderText = "Column1"
Me.clmnZulassung_docID.Name = "clmnZulassung_docID"
Me.clmnZulassung_docID.ReadOnly = True
Me.clmnZulassung_docID.Visible = False
'
'clmnCEMT_docID
'
Me.clmnCEMT_docID.HeaderText = "Column1"
Me.clmnCEMT_docID.Name = "clmnCEMT_docID"
Me.clmnCEMT_docID.ReadOnly = True
Me.clmnCEMT_docID.Visible = False
'
'clmnLeasing_docID
'
Me.clmnLeasing_docID.HeaderText = "Column1"
Me.clmnLeasing_docID.Name = "clmnLeasing_docID"
Me.clmnLeasing_docID.ReadOnly = True
Me.clmnLeasing_docID.Visible = False
'
'clmnMiete_docID
'
Me.clmnMiete_docID.HeaderText = "Column2"
Me.clmnMiete_docID.Name = "clmnMiete_docID"
Me.clmnMiete_docID.ReadOnly = True
Me.clmnMiete_docID.Visible = False
'
'clmnZulassung
'
Me.clmnZulassung.HeaderText = "Zulassung"
Me.clmnZulassung.Name = "clmnZulassung"
Me.clmnZulassung.ReadOnly = True
Me.clmnZulassung.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
Me.clmnZulassung.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
Me.clmnZulassung.Width = 60
'
'clmnCEMT
'
Me.clmnCEMT.HeaderText = "CEMT"
Me.clmnCEMT.Name = "clmnCEMT"
Me.clmnCEMT.ReadOnly = True
Me.clmnCEMT.Width = 60
'
'clmnLeasing
'
Me.clmnLeasing.HeaderText = "Leasing"
Me.clmnLeasing.Name = "clmnLeasing"
Me.clmnLeasing.ReadOnly = True
Me.clmnLeasing.Width = 60
'
'Column1
'
Me.Column1.HeaderText = "Miete"
Me.Column1.Name = "Column1"
Me.Column1.ReadOnly = True
Me.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
Me.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
Me.Column1.Width = 60
'
'MyPanel1
'
Me.MyPanel1.Controls.Add(Me.cbxCOC)
Me.MyPanel1.Controls.Add(Me.cbxCIF)
Me.MyPanel1.Controls.Add(Me.cbxMiete)
Me.MyPanel1.Controls.Add(Me.cbxLeasing)
Me.MyPanel1.Controls.Add(Me.cbxCEMT)
@@ -139,7 +80,7 @@ Partial Class frmLKW_AnhaengeDatenarchiv
Me.MyPanel1.Controls.Add(Me.cbx)
Me.MyPanel1.Location = New System.Drawing.Point(13, 12)
Me.MyPanel1.Name = "MyPanel1"
Me.MyPanel1.Size = New System.Drawing.Size(555, 26)
Me.MyPanel1.Size = New System.Drawing.Size(678, 26)
Me.MyPanel1.TabIndex = 1
'
'cbxMiete
@@ -191,7 +132,7 @@ Partial Class frmLKW_AnhaengeDatenarchiv
'Button3
'
Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button3.Location = New System.Drawing.Point(377, 443)
Me.Button3.Location = New System.Drawing.Point(560, 425)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(131, 54)
Me.Button3.TabIndex = 17
@@ -203,7 +144,7 @@ Partial Class frmLKW_AnhaengeDatenarchiv
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Image = Global.SDL.My.Resources.Resources.email_big1
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button1.Location = New System.Drawing.Point(274, 443)
Me.Button1.Location = New System.Drawing.Point(457, 425)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(97, 54)
Me.Button1.TabIndex = 18
@@ -226,7 +167,7 @@ Partial Class frmLKW_AnhaengeDatenarchiv
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.Image = Global.SDL.My.Resources.Resources.open
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button2.Location = New System.Drawing.Point(156, 444)
Me.Button2.Location = New System.Drawing.Point(339, 426)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(112, 54)
Me.Button2.TabIndex = 20
@@ -234,12 +175,129 @@ Partial Class frmLKW_AnhaengeDatenarchiv
Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button2.UseVisualStyleBackColor = True
'
'cbxCIF
'
Me.cbxCIF.AutoSize = True
Me.cbxCIF.Location = New System.Drawing.Point(579, 4)
Me.cbxCIF.Name = "cbxCIF"
Me.cbxCIF.Size = New System.Drawing.Size(15, 14)
Me.cbxCIF.TabIndex = 5
Me.cbxCIF.UseVisualStyleBackColor = True
'
'cbxCOC
'
Me.cbxCOC.AutoSize = True
Me.cbxCOC.Location = New System.Drawing.Point(640, 4)
Me.cbxCOC.Name = "cbxCOC"
Me.cbxCOC.Size = New System.Drawing.Size(15, 14)
Me.cbxCOC.TabIndex = 6
Me.cbxCOC.UseVisualStyleBackColor = True
'
'clmnLKW
'
Me.clmnLKW.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
Me.clmnLKW.HeaderText = "Bezeichnung"
Me.clmnLKW.Name = "clmnLKW"
Me.clmnLKW.ReadOnly = True
'
'clmnZulassung_docID
'
Me.clmnZulassung_docID.HeaderText = "Column1"
Me.clmnZulassung_docID.Name = "clmnZulassung_docID"
Me.clmnZulassung_docID.ReadOnly = True
Me.clmnZulassung_docID.Visible = False
'
'clmnCEMT_docID
'
Me.clmnCEMT_docID.HeaderText = "Column1"
Me.clmnCEMT_docID.Name = "clmnCEMT_docID"
Me.clmnCEMT_docID.ReadOnly = True
Me.clmnCEMT_docID.Visible = False
'
'clmnLeasing_docID
'
Me.clmnLeasing_docID.HeaderText = "Column1"
Me.clmnLeasing_docID.Name = "clmnLeasing_docID"
Me.clmnLeasing_docID.ReadOnly = True
Me.clmnLeasing_docID.Visible = False
'
'clmnMiete_docID
'
Me.clmnMiete_docID.HeaderText = "Column2"
Me.clmnMiete_docID.Name = "clmnMiete_docID"
Me.clmnMiete_docID.ReadOnly = True
Me.clmnMiete_docID.Visible = False
'
'clmnCIF_docID
'
Me.clmnCIF_docID.HeaderText = "Column2"
Me.clmnCIF_docID.Name = "clmnCIF_docID"
Me.clmnCIF_docID.ReadOnly = True
Me.clmnCIF_docID.Visible = False
'
'clmnCOC_docID
'
Me.clmnCOC_docID.HeaderText = "Column2"
Me.clmnCOC_docID.Name = "clmnCOC_docID"
Me.clmnCOC_docID.ReadOnly = True
Me.clmnCOC_docID.Visible = False
'
'clmnZulassung
'
Me.clmnZulassung.HeaderText = "Zulassung"
Me.clmnZulassung.Name = "clmnZulassung"
Me.clmnZulassung.ReadOnly = True
Me.clmnZulassung.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
Me.clmnZulassung.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
Me.clmnZulassung.Width = 60
'
'clmnCEMT
'
Me.clmnCEMT.HeaderText = "CEMT"
Me.clmnCEMT.Name = "clmnCEMT"
Me.clmnCEMT.ReadOnly = True
Me.clmnCEMT.Width = 60
'
'clmnLeasing
'
Me.clmnLeasing.HeaderText = "Leasing"
Me.clmnLeasing.Name = "clmnLeasing"
Me.clmnLeasing.ReadOnly = True
Me.clmnLeasing.Width = 60
'
'Column1
'
Me.Column1.HeaderText = "Miete"
Me.Column1.Name = "Column1"
Me.Column1.ReadOnly = True
Me.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
Me.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
Me.Column1.Width = 60
'
'clmnCIF
'
Me.clmnCIF.HeaderText = "CIF"
Me.clmnCIF.Name = "clmnCIF"
Me.clmnCIF.ReadOnly = True
Me.clmnCIF.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
Me.clmnCIF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
Me.clmnCIF.Width = 60
'
'clmnCOC
'
Me.clmnCOC.HeaderText = "COC"
Me.clmnCOC.Name = "clmnCOC"
Me.clmnCOC.ReadOnly = True
Me.clmnCOC.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
Me.clmnCOC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
Me.clmnCOC.Width = 60
'
'frmLKW_AnhaengeDatenarchiv
'
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(582, 503)
Me.ClientSize = New System.Drawing.Size(704, 490)
Me.Controls.Add(Me.Button2)
Me.Controls.Add(Me.CheckBox4)
Me.Controls.Add(Me.Button1)
@@ -268,13 +326,19 @@ Partial Class frmLKW_AnhaengeDatenarchiv
Friend WithEvents CheckBox4 As CheckBox
Friend WithEvents Button2 As Button
Friend WithEvents cbxMiete As CheckBox
Friend WithEvents cbxCOC As CheckBox
Friend WithEvents cbxCIF As CheckBox
Friend WithEvents clmnLKW As DataGridViewTextBoxColumn
Friend WithEvents clmnZulassung_docID As DataGridViewTextBoxColumn
Friend WithEvents clmnCEMT_docID As DataGridViewTextBoxColumn
Friend WithEvents clmnLeasing_docID As DataGridViewTextBoxColumn
Friend WithEvents clmnMiete_docID As DataGridViewTextBoxColumn
Friend WithEvents clmnCIF_docID As DataGridViewTextBoxColumn
Friend WithEvents clmnCOC_docID As DataGridViewTextBoxColumn
Friend WithEvents clmnZulassung As DataGridViewCheckBoxColumn
Friend WithEvents clmnCEMT As DataGridViewCheckBoxColumn
Friend WithEvents clmnLeasing As DataGridViewCheckBoxColumn
Friend WithEvents Column1 As DataGridViewCheckBoxColumn
Friend WithEvents clmnCIF As DataGridViewCheckBoxColumn
Friend WithEvents clmnCOC As DataGridViewCheckBoxColumn
End Class

12
SDL/kunden/frmLKW_AnhaengeDatenarchiv.resx
View File

@@ -132,6 +132,12 @@
<metadata name="clmnMiete_docID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnCIF_docID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnCOC_docID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnZulassung.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -144,6 +150,12 @@
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnCIF.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnCOC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

8
SDL/kunden/frmLKW_AnhaengeDatenarchiv.vb
View File

@@ -57,16 +57,20 @@ Public Class frmLKW_AnhaengeDatenarchiv
Dim CEMT = ""
Dim Leasing = ""
Dim Miete = ""
Dim CIF = ""
Dim COC = ""
For Each r In dt.Rows
If r("coll_pfad") IsNot DBNull.Value AndAlso r("coll_pfad") <> "" Then
If r("da_name") = "Zulassungsschein" Then Zulassungsschein = r("coll_pfad")
If r("da_name") = "CEMT" Then CEMT = r("coll_pfad")
If r("da_name") = "Leasing-Vertrag" Then Leasing = r("coll_pfad")
If r("da_name") = "Miet-Vertrag" Then Miete = r("coll_pfad")
If r("da_name") = "CIF-Dokument" Then CIF = r("coll_pfad")
If r("da_name") = "COC-Dokument" Then COC = r("coll_pfad")
End If
Next
MyDatagridview1.Rows.Add(l, Zulassungsschein, CEMT, Leasing, Miete, (Zulassungsschein <> ""), (CEMT <> ""), (Leasing <> ""), (Miete <> ""))
MyDatagridview1.Rows.Add(l, Zulassungsschein, CEMT, Leasing, Miete, CIF, COC, (Zulassungsschein <> ""), (CEMT <> ""), (Leasing <> ""), (Miete <> ""), (CIF <> ""), (COC <> ""))
Next
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
@@ -101,6 +105,8 @@ Public Class frmLKW_AnhaengeDatenarchiv
If cbxCEMT.Checked Then If r.Cells("clmnCEMT_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnCEMT_docID").Value, r.Cells("clmnLKW").Value, "CEMT", zielPfad)) 'r.Cells("clmnCEMT_docID").Value)
If cbxLeasing.Checked Then If r.Cells("clmnLeasing_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnLeasing_docID").Value, r.Cells("clmnLKW").Value, "Leasing", zielPfad)) 'r.Cells("clmnLeasing_docID").Value)
If cbxMiete.Checked Then If r.Cells("clmnMiete_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnMiete_docID").Value, r.Cells("clmnLKW").Value, "Miete", zielPfad)) 'r.Cells("clmnLeasing_docID").Value)
If cbxCIF.Checked Then If r.Cells("clmnCIF_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnCIF_docID").Value, r.Cells("clmnLKW").Value, "CIF", zielPfad)) 'r.Cells("clmnLeasing_docID").Value)
If cbxCOC.Checked Then If r.Cells("clmnCOC_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnCOC_docID").Value, r.Cells("clmnLKW").Value, "COC", zielPfad)) 'r.Cells("clmnLeasing_docID").Value)
Next
'zusammenfassen
If CheckBox4.Checked Then

6
SDL/kunden/usrCntlCBAM.vb
View File

@@ -50,7 +50,7 @@ Public Class usrCntlCBAM
OR ezaWP_WarennummerEZT like '280410%'
)
and ezaWP_WarennummerEZT not like '310560%'
and eza_status between 50 and 60
and (eza_status between 50 and 60 or [eza_ANR] LIKE 'ATC%')
"
If cbxVERAG.Checked Then
@@ -334,7 +334,7 @@ Public Class usrCntlCBAM
OR ezaWP_WarennummerEZT like '280410%'
)
and ezaWP_WarennummerEZT not like '310560%'
and eza_status between 50 and 60
and (eza_status between 50 and 60 or [eza_ANR] LIKE 'ATC%')
"
@@ -409,7 +409,7 @@ Public Class usrCntlCBAM
)
and ezaWP_WarennummerEZT not like '310560%'
and eza_status between 50 and 60
and (eza_status between 50 and 60 or [eza_ANR] LIKE 'ATC%')
"

2
SDL/kunden/usrCntlKundenBesonderheiten.vb
View File

@@ -84,7 +84,7 @@ Public Class usrCntlKundenBesonderheiten
End Try
End Sub
Private Sub initDGV(Optional kdnrTmp = -1, Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")
If dgvBesonderheiten IsNot Nothing Then Exit Sub
If dgvBesonderheiten.Columns IsNot Nothing AndAlso dgvBesonderheiten.Columns.Count > 0 Then
dgvBesonderheiten.Columns.Clear()
End If

9
SDL/mdm/usrCntlKartenDaten.vb
View File

@@ -1203,10 +1203,10 @@ Public Class usrCntlKartenDaten
Case 210 : odoc = getWordRetourniert_SI(odoc, kdNr, datum)
Case 211 : odoc = getWordRetourniert_MULTI(odoc, kdNr, datum)
Case 213 : odoc = getWordRetourniert_HUGO(odoc, kdNr, datum)
Case 214 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum)
Case 214 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum, "214")
Case 215 : odoc = getWordRetourniert_PLOSE_IT(odoc, kdNr, datum)
Case 216 : odoc = getWordRetourniert_PLOSE_MEDPASS(odoc, kdNr, datum)
Case 217 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum)
Case 217 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum, "217")
Case 218 : odoc = getWordRetourniert_PLOSE_TRUCKMASTER(odoc, kdNr, datum)
Case Else : odoc.Close() : MsgBox("Falsche Leistung")
End Select
@@ -1365,9 +1365,9 @@ Public Class usrCntlKartenDaten
End Try
Return odoc
End Function
Function getWordRetourniert_PLOSE(odoc As Microsoft.Office.Interop.Word.Document, kdNr As Integer, datum As Date) As Microsoft.Office.Interop.Word.Document
Function getWordRetourniert_PLOSE(odoc As Microsoft.Office.Interop.Word.Document, kdNr As Integer, datum As Date, SDLNr As String) As Microsoft.Office.Interop.Word.Document
Try
Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr=214 AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'")
Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr IN (" & SDLNr & ") AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'")
Dim KUNDE = kundenSQL.getKundeFMZOLLByKdNr(kdNr)
If KUNDE Is Nothing Then MsgBox("Kunde nicht gefunden!") : Return odoc
Dim PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll = kundenSQL.getPartnerKdNrFromFMZOLL(kdNr)
@@ -1386,6 +1386,7 @@ Public Class usrCntlKartenDaten
oTable = odoc.Bookmarks("TabelleKarten2").Range.Tables(1)
Dim i = 1
For Each r As DataRow In dt.Rows
' MsgBox(cSqlDb.checkNullStr(r("OBUID")))
oTable.Rows(i + 1).Cells(1).Range.Text = cSqlDb.checkNullStr(r("KfzKennzeichen"))
oTable.Rows(i + 1).Cells(2).Range.Text = cSqlDb.checkNullStr(r("KartenNr"))
oTable.Rows(i + 1).Cells(3).Range.Text = cSqlDb.checkNullStr(r("OBUID"))