diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb
index fa368cc0..ded76a62 100644
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -1580,15 +1580,7 @@ Public Class cFakturierung
Dim MonthStart As String = IIf(CDate(MWSTAntrag.UStVAn_ReDatVon).Month < 10, "0", "") & CDate(MWSTAntrag.UStVAn_ReDatVon).Month
Dim MonthEnd As String = IIf(CDate(MWSTAntrag.UStVAn_ReDatBis).Month < 10, "0", "") & CDate(MWSTAntrag.UStVAn_ReDatBis).Month
- If rpt.txtLeistung.Text.Contains("-00") Then
- rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("-00", MonthStart & "-" & MonthEnd)
- ElseIf rpt.txtLeistung.Text.Contains("00-") Then
- rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00-", MonthStart & "-" & MonthEnd)
- ElseIf rpt.txtLeistung.Text.Contains("00") Then
- rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00", MonthStart & "-" & MonthEnd)
- End If
-
- If rpt.txtLeistung.Text.Contains("00/23") Then
+ If rpt.txtLeistung.Text.Contains("00-00/23") Then
rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
ElseIf rpt.txtLeistung.Text.Contains("DL/23") Then
rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("DL/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
@@ -1596,6 +1588,13 @@ Public Class cFakturierung
rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
End If
+ If rpt.txtLeistung.Text.Contains("-00") Then
+ rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("-00", MonthStart & "-" & MonthEnd)
+ ElseIf rpt.txtLeistung.Text.Contains("00-") Then
+ rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00-", MonthStart & "-" & MonthEnd)
+ ElseIf rpt.txtLeistung.Text.Contains("00") Then
+ rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00", MonthStart & "-" & MonthEnd)
+ End If
End If
@@ -1704,6 +1703,16 @@ Public Class cFakturierung
End If
End If
+ If RECHNUNG.Firma_ID = 19 Then
+
+ rpt.lblSteuersatz.Visible = False
+ rpt.lblSteuerbetrag.Visible = False
+ rpt.lblSteuerpflichtigGes.Visible = False
+ rpt.lblSteuerfreiGes.Visible = False
+ rpt.lblZwText.Visible = False
+ rpt.lblZWSumme.Visible = False
+ End If
+
End Sub
diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
index 1092a3e0..4c9ce608 100644
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -1793,7 +1793,7 @@ Public Class usrCntlFaktAbrechnung
'soll immer alle POS bekommen! laut Lidya! 28.04.2025 - aber nicht im Excel-Format sondern als PDF-Batinic 15.05.2025
Dim dtPOSList As New DataTable
- Dim prt As String = func.generatePosList(USTV, "", "", "", False, "prt", dtPOSList, isVZ)
+ Dim prt As String = func.generatePosList(USTV, "", "", "", False, "prt", dtPOSList, isVZ, IIf(RECHNUNG IsNot Nothing, RECHNUNG.RK_ID, -1))
If prt <> "" Then
Try
@@ -1843,6 +1843,15 @@ Public Class usrCntlFaktAbrechnung
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "POS_LISTE", "", "", SPEDBUCH.AbfertigungsNr & ".pdf", USTV.UStVAn_KuNr, False)
DS.uploadDataToDATENSERVER(tmpPath,,, False,,, True)
+
+ If .Rows.Count > 0 Then
+
+ For Each r As DataGridViewRow In .Rows
+ If r.Cells("Art").Value = "POS-LIST" Then .Rows.Remove(r)
+ Next
+
+ End If
+
.Rows.Add(-1, "POS-LIST", DS.da_name, DS.da_id, -1)
End If
Catch ex As Exception
diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
index 7c3f7ffc..5c61c995 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
@@ -132,12 +132,12 @@ Partial Class frmMDM_USTVAntrag
Me.VorauszahlungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
- Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
Me.ncs_Belege = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
+ Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
+ Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
Me.pnlBottom.SuspendLayout()
CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1706,13 +1706,13 @@ Partial Class frmMDM_USTVAntrag
'
Me.cns_vorauszahlen.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VorauszahlungToolStripMenuItem})
Me.cns_vorauszahlen.Name = "cns_vorauszahlen"
- Me.cns_vorauszahlen.Size = New System.Drawing.Size(152, 26)
+ Me.cns_vorauszahlen.Size = New System.Drawing.Size(181, 48)
'
'VorauszahlungToolStripMenuItem
'
Me.VorauszahlungToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AktivierenToolStripMenuItem, Me.DeaktivierenToolStripMenuItem})
Me.VorauszahlungToolStripMenuItem.Name = "VorauszahlungToolStripMenuItem"
- Me.VorauszahlungToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
+ Me.VorauszahlungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.VorauszahlungToolStripMenuItem.Text = "Vorauszahlung"
'
'AktivierenToolStripMenuItem
@@ -1727,22 +1727,6 @@ Partial Class frmMDM_USTVAntrag
Me.DeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(138, 22)
Me.DeaktivierenToolStripMenuItem.Text = "deaktivieren"
'
- 'UstCntlUSTV_AntragPosition1
- '
- Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
- Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
- Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261)
- Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
- '
- 'UstCntlUSTV_AntragErstattungen1
- '
- Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
- Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
- Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259)
- Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
- '
'ncs_Belege
'
Me.ncs_Belege.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1})
@@ -1768,6 +1752,22 @@ Partial Class frmMDM_USTVAntrag
Me.ToolStripMenuItem3.Size = New System.Drawing.Size(138, 22)
Me.ToolStripMenuItem3.Text = "deaktivieren"
'
+ 'UstCntlUSTV_AntragPosition1
+ '
+ Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
+ Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+ Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261)
+ Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+ '
+ 'UstCntlUSTV_AntragErstattungen1
+ '
+ Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
+ Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
+ Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259)
+ Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
+ '
'frmMDM_USTVAntrag
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
diff --git a/SDL/USTV/frmMDM_USTVAntrag.resx b/SDL/USTV/frmMDM_USTVAntrag.resx
index 00f9f2a1..f8944b93 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.resx
+++ b/SDL/USTV/frmMDM_USTVAntrag.resx
@@ -234,7 +234,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
- 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB4JJREFUSEu9lntM1FcW
+ 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAB4JJREFUSEu9lntM1FcW
x0+yNWpdBURGEJ0ZXtVqZX0hFJAB5gVILVbQTRCQ1wwDw7wYGMSCgiI+IoivtbpBwOLqqnUXq30YlVrX
bXAFu6Ua2ShG0jVoq1ZFwQffzb3zhG22/+0vOZnf3Nz8Pjn3nPs9X1qx10yqpnWU27iOEuo0pG6qpMKP
qyljXxkpt6hozdF6qvxkN2XuW0OymiwqO1I33tBUPTNhsypTUpVuydhTOi5jTynNL08mQUEkiQwyEhql
@@ -394,7 +394,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
- 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAABM1JREFUOE9dU3tM01cU
+ 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAABM1JREFUOE9dU3tM01cU
PjDIeGjymyTMQDFz6MwGIWJJKNBNrXGG+MfiNDPGqIMCnfjPGNMUjQlla9PiLEJnE17hJSDWKoKKrQUH
OFcYNjhfCKaIggg+ECwtLbTf8vsB9fElX+65557z5Zx77qUgHx8KpnkEEFHqhg2xlwcHW5q6uuoazeba
Zoultun69drLFkut4fbt2qu9vef1zc0qWW4uc/LkSdJoNFRWVkZbt24lgUBAlBMente5du2dc19+9Zcu
diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index bb9bc362..6208ff7c 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -4,6 +4,7 @@ Imports System.Windows.Documents
Imports DocumentFormat.OpenXml.Drawing.Diagrams
Imports itextsharp.text.pdf
Imports Microsoft.Office.Interop
+Imports sun.swing
Imports VERAG_PROG_ALLGEMEIN
Imports VERAG_PROG_ALLGEMEIN.TESTJSON
@@ -2023,6 +2024,12 @@ Public Class frmMDM_USTVAntrag
cns_neAntraege.Items.Add(oa)
End If
+ If Not cns_neAntraege.Items.ContainsKey("zuwenig") Then
+ Dim oa = New ToolStripMenuItem() With {.Text = "zu wenig Email", .Name = "zuwenig", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ AddHandler oa.Click, AddressOf mnuItem_Clicked
+ cns_neAntraege.Items.Add(oa)
+ End If
+
cns_neAntraege.Show(Cursor.Position)
@@ -2039,6 +2046,9 @@ Public Class frmMDM_USTVAntrag
ElseIf item.Name = "mail" Then
mailmitExcelauswertung()
+ ElseIf item.Name = "zuwenig" Then
+ zuwenigMail()
+
ElseIf item.Name = "offeneAntraege" Then
Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID)
@@ -2224,8 +2234,98 @@ Public Class frmMDM_USTVAntrag
End Sub
- Private Sub dgvUSTVPositionen_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvUSTVPositionen.CellContentDoubleClick
+ Private Sub zuwenigMail()
+ Try
+
+
+ Dim spracheMail = ""
+ Dim listOfTextconserven = New cTextkonserve_LIST(6, "", 19)
+
+
+ Select Case USTV_ANTRAG.UStVAn_LandKz
+ Case "HR", "SRB" : spracheMail = "SRB"
+ Case "A", "AT", "D", "DE", "CH" : spracheMail = "DE"
+ Case "RO" : spracheMail = "RO"
+ Case Else
+ spracheMail = "DE"
+ End Select
+
+
+ If listOfTextconserven.LIST.Any(Function(c) c.txt_sprache = spracheMail) Then
+ Dim r As cTextkonserve = listOfTextconserven.LIST.Find(Function(c) c.txt_sprache = spracheMail)
+ If r IsNot Nothing Then
+ Dim Mail_Subject = ""
+ Dim Mail_HTMLBody = ""
+
+ Dim Mail_To = ""
+ Dim Mail_CC = ""
+ Dim Mail_BCC = ""
+
+ Mail_Subject = r.txt_betreff
+ Dim TextHTML = ""
+ TextHTML &= r.txt_text
+
+ 'Mail_Subject = Mail_Subject.Replace("%BelegNr%", (USTV_ANTRAG.UStVAn_ReDatVon)
+ ' Mail_Subject = Mail_Subject.Replace("%Belegdatum%", row.Item("Belegdatum"))
+ ' Mail_Subject = Mail_Subject.Replace("%Name%", row.Item("Name"))
+ ' Mail_Subject = Mail_Subject.Replace("%AbfertigungsNr%", row.Item("AbfertigungsNr"))
+ ' Mail_Subject = Mail_Subject.Replace("%FilialenNr%", row.Item("FilialenNr"))
+ ' Mail_Subject = Mail_Subject.Replace("%MWST%", row.Item("MWST"))
+ ' Mail_Subject = Mail_Subject.Replace("%Betrag%", row.Item("Betrag"))
+
+ ' TextHTML = TextHTML.Replace("%BelegNr%", row.Item("Belegnummer"))
+ ' TextHTML = TextHTML.Replace("%Belegdatum%", row.Item("Belegdatum"))
+ ' TextHTML = TextHTML.Replace("%Betrag%", row.Item("Betrag"))
+ ' TextHTML = TextHTML.Replace("%Name%", row.Item("Name"))
+ ' TextHTML = TextHTML.Replace("%AbfertigungsNr%", row.Item("AbfertigungsNr"))
+ ' TextHTML = TextHTML.Replace("%MWST%", row.Item("MWST"))
+ ' TextHTML = TextHTML.Replace("%FilialenNr%", row.Item("FilialenNr"))
+
+ Mail_HTMLBody = "" & TextHTML & "
"
+ Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(USTV_ANTRAG.UStVAn_KuNr, "Rechnung an")
+ Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(USTV_ANTRAG.UStVAn_KuNr, "Rechnung an")
+ Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(USTV_ANTRAG.UStVAn_KuNr, "Rechnung an")
+ Mail_HTMLBody &= "
" & cFakturierung.getSignature(USTV_ANTRAG.UStVAn_LandKz, 19)
+
+
+ Dim outl As New Outlook.Application
+ Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+ Mail = outl.CreateItem(0)
+ Mail.Subject = Mail_Subject
+ Mail.HTMLBody = Mail_HTMLBody
+
+ Mail.To = Mail_To
+ Mail.CC = Mail_CC
+ Mail.BCC = Mail_BCC
+
+ For Each row As DataGridViewRow In dgvUSTVPositionen.SelectedRows.Cast(Of DataGridViewRow)().OrderBy(Function(dgvr) dgvr.Index)
+
+ Dim pdf As String = ""
+ pdf = func.getPDF(row.Cells("UStVPo_SchnittstellenNr").Value, row.Cells("UStVPo_ReNr").Value, row.Cells("UStVPo_ReDat").Value, row.Cells("UStVPo_daId").Value, -1, True, Antrag_LandKz, USTV_ANTRAG, New cFakturierung, False)
+
+ If pdf <> "" Then
+ Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+ End If
+
+ Next
+
+
+
+ Try
+ Catch ex2 As Exception
+ MsgBox(ex2.Message)
+ End Try
+ Mail.Display()
+
+ End If
+ End If
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+ End Try
+ End Sub
+
+ Private Sub dgvUSTVPositionen_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvUSTVPositionen.CellContentDoubleClick
Try
If e.RowIndex >= 0 AndAlso e.ColumnIndex >= 0 Then
diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb
index 342ef7f6..307c1d37 100644
--- a/SDL/buchhaltung/frmBU_Mahnlauf.vb
+++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb
@@ -45,7 +45,11 @@ 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, max(KTO.dec_wert3) as Risiko,sum(case when OP.c_typ = 'g' then isnull(OP.eur_bruttobetrag, 0) + isnull(OP.eur_zahlung, 0) else 0 end) as Gutschrift, cast(MAX(d_mahnung)as date) Mahndatum,
+ "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,
+
+ 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,
+
+ sum(case when OP.c_typ = 'g' then isnull(OP.eur_bruttobetrag, 0) + isnull(OP.eur_zahlung, 0) else 0 end) as Gutschrift, cast(MAX(d_mahnung)as date) Mahndatum,
case
when max(si_mahnstufe) = 1 Then 'telefonisch'
when max(si_mahnstufe) = 2 Then 'Freitag'
@@ -79,12 +83,11 @@ Public Class frmBU_Mahnlauf
FROM [FIBU2].[dbo].[fibu_belegzeile] as BU
RIGHT join fibu_konto KTO on KTO.i_konto=BU.i_konto AND BU.i_firm_refid=KTO.i_firm_refid
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))
+ 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 Konto, i_beleg_refid, i_zeilen_refid"
-
'MsgBox(sqlStr)
Dim dt_OP As DataTable = SQL.loadDgvBySql(If(Firma_ID = 19, IIf(zahlungseingaenge, sqlStringVerag360Zahlungseingaenge, sqlStringVerag360), sqlStr), "FIBU")
@@ -426,15 +429,15 @@ Public Class frmBU_Mahnlauf
Select Case FIRMA.Firma_ID
Case 1 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo 'is eh standard
- Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing
+ Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med ': rpt.Picture1.Image = Nothing
Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = Nothing
Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex
Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT
Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE
- Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing
+ Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo ': rpt.Picture1.Image = Nothing
Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT
- Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing
- Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing : rpt.lblFirmaFax.Visible = False : rpt.lblEmail.Visible = False : rpt.lblFaxNr.Visible = False
+ Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal ': rpt.Picture1.Image = Nothing
+ Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.lblFirmaFax.Visible = False : rpt.lblEmail.Visible = False : rpt.lblFaxNr.Visible = False ': rpt.Picture1.Image = Nothing
End Select
Dim ZZTage = 10
diff --git a/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb
index 83ff75cc..00333eb7 100644
--- a/SDL/frmdynMailvorlage.vb
+++ b/SDL/frmdynMailvorlage.vb
@@ -57,6 +57,8 @@ Public Class frmdynMailvorlagen
cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mahnung", "2"))
cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("OP-Liste", "3"))
cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MDM-SR", "4"))
+ cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Erstattungsschreiben", "5"))
+ cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Zu Wenig", "6"))
cbxTyp.changeItem("")
@@ -430,6 +432,11 @@ Public Class frmdynMailvorlagen
Case 1
'Sendungsvariable
txtVariablen.Text = "%VAR-GRENZE%, %LKW%, %LKWKennzeichen%, %Empfaenger%, %voraus-Eintreffen%, %FilialenNr%, %AbfertigungsNr%, %Absender%, %Gewicht%, %ImEx%, %Zollstelle%"
+
+ Case 5
+ 'Erstattungsschreiben
+ txtVariablen.Text = "%BelegNr%, %Belegdatum%, %Betrag%, %Name%, %AbfertigungsNr%, %FilialenNr%, %Name%, %MWST%"
+
Case Else
'Mahnvariable
txtVariablen.Text = " %Mahntext%, %KdNr%, %email_mahnung%"
diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
index c8b32820..c96a5adf 100644
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -23,31 +23,31 @@ Partial Class usrcntlKundeBearbeitenFull
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle49 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle50 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ 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()
+ Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ 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()
Me.tbcntrDetails = New System.Windows.Forms.TabControl()
Me.tbAbfertigung = New System.Windows.Forms.TabPage()
Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox()
@@ -104,7 +104,9 @@ Partial Class usrcntlKundeBearbeitenFull
Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten()
Me.tbVerrechnung = New System.Windows.Forms.TabPage()
Me.pnlverag360 = New System.Windows.Forms.Panel()
+ Me.Label111 = New System.Windows.Forms.Label()
Me.txtFR = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.cbxErstattungsart = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.cbxFR = New System.Windows.Forms.CheckBox()
Me.txtAnmerkungAntraege = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.gbMWSTAntraege = New System.Windows.Forms.GroupBox()
@@ -1191,7 +1193,9 @@ Partial Class usrcntlKundeBearbeitenFull
'
'pnlverag360
'
+ Me.pnlverag360.Controls.Add(Me.Label111)
Me.pnlverag360.Controls.Add(Me.txtFR)
+ Me.pnlverag360.Controls.Add(Me.cbxErstattungsart)
Me.pnlverag360.Controls.Add(Me.cbxFR)
Me.pnlverag360.Controls.Add(Me.txtAnmerkungAntraege)
Me.pnlverag360.Controls.Add(Me.gbMWSTAntraege)
@@ -1199,9 +1203,19 @@ Partial Class usrcntlKundeBearbeitenFull
Me.pnlverag360.Controls.Add(Me.cbxVorauszahlung)
Me.pnlverag360.Location = New System.Drawing.Point(417, 247)
Me.pnlverag360.Name = "pnlverag360"
- Me.pnlverag360.Size = New System.Drawing.Size(252, 169)
+ Me.pnlverag360.Size = New System.Drawing.Size(252, 204)
Me.pnlverag360.TabIndex = 49
'
+ 'Label111
+ '
+ Me.Label111.AutoSize = True
+ Me.Label111.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label111.Location = New System.Drawing.Point(10, 175)
+ Me.Label111.Name = "Label111"
+ Me.Label111.Size = New System.Drawing.Size(75, 13)
+ Me.Label111.TabIndex = 50
+ Me.Label111.Text = "Erstattungsart:"
+ '
'txtFR
'
Me.txtFR._DateTimeOnly = False
@@ -1226,6 +1240,22 @@ Partial Class usrcntlKundeBearbeitenFull
Me.txtFR.Size = New System.Drawing.Size(123, 20)
Me.txtFR.TabIndex = 51
'
+ 'cbxErstattungsart
+ '
+ Me.cbxErstattungsart._allowedValuesFreiText = Nothing
+ Me.cbxErstattungsart._allowFreiText = False
+ Me.cbxErstattungsart._value = ""
+ Me.cbxErstattungsart.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+ Me.cbxErstattungsart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbxErstattungsart.DropDownWidth = 200
+ Me.cbxErstattungsart.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.cbxErstattungsart.ForeColor = System.Drawing.Color.Black
+ Me.cbxErstattungsart.FormattingEnabled = True
+ Me.cbxErstattungsart.Location = New System.Drawing.Point(110, 172)
+ Me.cbxErstattungsart.Name = "cbxErstattungsart"
+ Me.cbxErstattungsart.Size = New System.Drawing.Size(123, 21)
+ Me.cbxErstattungsart.TabIndex = 51
+ '
'cbxFR
'
Me.cbxFR.AutoSize = True
@@ -3066,8 +3096,8 @@ Partial Class usrcntlKundeBearbeitenFull
Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
Me.dgvUmsatzbericht.AllowUserToResizeRows = False
- DataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32
+ DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25)
@@ -3166,8 +3196,8 @@ Partial Class usrcntlKundeBearbeitenFull
Me.dgvOffenePosten.AllowUserToDeleteRows = False
Me.dgvOffenePosten.AllowUserToOrderColumns = True
Me.dgvOffenePosten.AllowUserToResizeRows = False
- DataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle33
+ DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38)
@@ -3328,41 +3358,41 @@ Partial Class usrcntlKundeBearbeitenFull
Me.dgvKreditkarten.AllowUserToDeleteRows = False
Me.dgvKreditkarten.AllowUserToOrderColumns = True
Me.dgvKreditkarten.AllowUserToResizeRows = False
- DataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle34
+ DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle35
+ DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle36
+ DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5
Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20)
Me.dgvKreditkarten.MultiSelect = False
Me.dgvKreditkarten.Name = "dgvKreditkarten"
Me.dgvKreditkarten.ReadOnly = True
- DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle37
+ DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
Me.dgvKreditkarten.RowHeadersVisible = False
- DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle38
+ DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7
Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312)
@@ -3442,26 +3472,26 @@ Partial Class usrcntlKundeBearbeitenFull
'
'dgvMWST
'
- DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39
+ DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
Me.dgvMWST.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40
+ DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9
Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle41
+ DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window
+ 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.ControlText
+ DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10
Me.dgvMWST.Location = New System.Drawing.Point(9, 359)
Me.dgvMWST.Name = "dgvMWST"
Me.dgvMWST.Size = New System.Drawing.Size(171, 125)
@@ -3546,26 +3576,26 @@ Partial Class usrcntlKundeBearbeitenFull
'
'dgvUstv_LaenderUndSteuernummern
'
- DataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle42
+ DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43
+ 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.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle44
+ DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13
Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94)
Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern"
Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259)
@@ -3771,26 +3801,26 @@ Partial Class usrcntlKundeBearbeitenFull
'dgvIDS_Rabatte
'
Me.dgvIDS_Rabatte.AllowUserToResizeRows = False
- DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26
+ DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27
+ DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15
Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle28
+ DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle16
Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(9, 317)
Me.dgvIDS_Rabatte.MultiSelect = False
Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte"
@@ -3929,26 +3959,26 @@ Partial Class usrcntlKundeBearbeitenFull
'dgvSonst_IDSKunden
'
Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False
- DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29
+ DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle30
+ DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18
Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle31
+ DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle19
Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214)
Me.dgvSonst_IDSKunden.MultiSelect = False
Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden"
@@ -4259,26 +4289,26 @@ Partial Class usrcntlKundeBearbeitenFull
'DataGridView1
'
Me.DataGridView1.AllowUserToResizeRows = False
- DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45
+ DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
Me.DataGridView1.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46
+ DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21
Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle47
+ DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle22
Me.DataGridView1.Enabled = False
Me.DataGridView1.Location = New System.Drawing.Point(6, 111)
Me.DataGridView1.MultiSelect = False
@@ -4332,26 +4362,26 @@ Partial Class usrcntlKundeBearbeitenFull
'
Me.dgvBankverbindungen.AllowUserToDeleteRows = False
Me.dgvBankverbindungen.AllowUserToResizeRows = False
- DataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle48
+ DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle49
+ DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24
Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle50
+ DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle25
Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40)
Me.dgvBankverbindungen.MultiSelect = False
Me.dgvBankverbindungen.Name = "dgvBankverbindungen"
@@ -5935,4 +5965,6 @@ Partial Class usrcntlKundeBearbeitenFull
Friend WithEvents lblIDS_Rabatte As Label
Friend WithEvents Label113 As Label
Friend WithEvents Label112 As Label
+ Friend WithEvents Label111 As Label
+ Friend WithEvents cbxErstattungsart As VERAG_PROG_ALLGEMEIN.MyComboBox
End Class
diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
index 31d7355b..a9c655b6 100644
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -91,6 +91,14 @@
End If
+ If isVerag360 Then
+ cbxErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", 0))
+ cbxErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1.Gegenrechnen", 1))
+ cbxErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2.Überweisung", 2))
+ cbxErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3.Bankverbindung", 3))
+ cbxErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4.Auf Sicherheit", 4))
+ End If
+
bntGOBOXUmstellung.Enabled = isVerag360
btnKKhinzufuegen.Enabled = isVerag360
Button9.Enabled = isVerag360
@@ -253,6 +261,7 @@
Case "J" : rbJ.Checked = True
End Select
+ cbxErstattungsart.changeItem(loadValue(KUNDE_ERW.kde_Erstattungsart, ""))
' ----- Versicherung -----
txtVers_HermesRefNr.Text = loadValue(KUNDE.Referenznummer, "")
@@ -424,7 +433,6 @@
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 303000-303999: DE - KUNDEN", "303000-303999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 400000-499999: YU - KUNDEN", "400000-499999"))
-
Else
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
@@ -665,6 +673,7 @@
If rbHJ.Checked = True Then KUNDE_ERW.kde_MWStAbrechnung = "H"
If rbQ.Checked = True Then KUNDE_ERW.kde_MWStAbrechnung = "Q"
+ KUNDE_ERW.kde_Erstattungsart = cbxErstattungsart._value
' ----- Versicherung -----
KUNDE.Referenznummer = isLeerNothing(txtVers_HermesRefNr.Text)
diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb
index 852ba615..11a0f3f7 100644
--- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb
+++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb
@@ -120,6 +120,7 @@ Partial Class usrCntlMDMAuswertungen
Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label36 = New System.Windows.Forms.Label()
Me.TabPage3 = New System.Windows.Forms.TabPage()
+ Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg()
Me.tbIDS = New System.Windows.Forms.TabPage()
Me.Label60 = New System.Windows.Forms.Label()
Me.GroupBox18 = New System.Windows.Forms.GroupBox()
@@ -152,6 +153,7 @@ Partial Class usrCntlMDMAuswertungen
Me.Label41 = New System.Windows.Forms.Label()
Me.Button12 = New System.Windows.Forms.Button()
Me.TabPage4 = New System.Windows.Forms.TabPage()
+ Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV()
Me.TabPage5 = New System.Windows.Forms.TabPage()
Me.Label56 = New System.Windows.Forms.Label()
Me.GroupBox17 = New System.Windows.Forms.GroupBox()
@@ -176,8 +178,10 @@ Partial Class usrCntlMDMAuswertungen
Me.btnContractdaten = New System.Windows.Forms.Button()
Me.Button15 = New System.Windows.Forms.Button()
Me.pnl = New System.Windows.Forms.Panel()
- Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg()
- Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV()
+ Me.GroupBox13 = New System.Windows.Forms.GroupBox()
+ Me.Button14 = New System.Windows.Forms.Button()
+ Me.Label62 = New System.Windows.Forms.Label()
+ Me.Button18 = New System.Windows.Forms.Button()
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -210,6 +214,7 @@ Partial Class usrCntlMDMAuswertungen
Me.GroupBox15.SuspendLayout()
Me.GroupBox14.SuspendLayout()
Me.pnl.SuspendLayout()
+ Me.GroupBox13.SuspendLayout()
Me.SuspendLayout()
'
'GroupBox1
@@ -1322,8 +1327,18 @@ Partial Class usrCntlMDMAuswertungen
Me.TabPage3.Text = "WÖLFL"
Me.TabPage3.UseVisualStyleBackColor = True
'
+ 'UsrCntlWoelfl_IM_CSVRg1
+ '
+ Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White
+ Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167)
+ Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1"
+ Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97)
+ Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10
+ '
'tbIDS
'
+ Me.tbIDS.Controls.Add(Me.Label62)
+ Me.tbIDS.Controls.Add(Me.GroupBox13)
Me.tbIDS.Controls.Add(Me.Label60)
Me.tbIDS.Controls.Add(Me.GroupBox18)
Me.tbIDS.Controls.Add(Me.Label18)
@@ -1655,6 +1670,14 @@ Partial Class usrCntlMDMAuswertungen
Me.TabPage4.Text = "MSE"
Me.TabPage4.UseVisualStyleBackColor = True
'
+ 'UsrCntlMSE_KonvertCSV1
+ '
+ Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White
+ Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7)
+ Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1"
+ Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97)
+ Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0
+ '
'TabPage5
'
Me.TabPage5.Controls.Add(Me.Label56)
@@ -1914,21 +1937,48 @@ Partial Class usrCntlMDMAuswertungen
Me.pnl.Size = New System.Drawing.Size(1057, 54)
Me.pnl.TabIndex = 26
'
- 'UsrCntlWoelfl_IM_CSVRg1
+ 'GroupBox13
'
- Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White
- Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167)
- Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1"
- Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97)
- Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10
+ Me.GroupBox13.Controls.Add(Me.Button18)
+ Me.GroupBox13.Controls.Add(Me.Button14)
+ Me.GroupBox13.Location = New System.Drawing.Point(322, 182)
+ Me.GroupBox13.Name = "GroupBox13"
+ Me.GroupBox13.Size = New System.Drawing.Size(297, 134)
+ Me.GroupBox13.TabIndex = 25
+ Me.GroupBox13.TabStop = False
'
- 'UsrCntlMSE_KonvertCSV1
+ 'Button14
'
- Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White
- Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7)
- Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1"
- Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97)
- Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0
+ Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.Button14.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.Button14.Location = New System.Drawing.Point(6, 19)
+ Me.Button14.Name = "Button14"
+ Me.Button14.Size = New System.Drawing.Size(121, 49)
+ Me.Button14.TabIndex = 4
+ Me.Button14.Text = "Kunden"
+ Me.Button14.UseVisualStyleBackColor = True
+ '
+ 'Label62
+ '
+ Me.Label62.AutoSize = True
+ Me.Label62.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label62.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+ Me.Label62.Location = New System.Drawing.Point(325, 162)
+ Me.Label62.Name = "Label62"
+ Me.Label62.Size = New System.Drawing.Size(146, 17)
+ Me.Label62.TabIndex = 26
+ Me.Label62.Text = "IDS Preise/Rabatte"
+ '
+ 'Button18
+ '
+ Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.Button18.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.Button18.Location = New System.Drawing.Point(153, 19)
+ Me.Button18.Name = "Button18"
+ Me.Button18.Size = New System.Drawing.Size(121, 49)
+ Me.Button18.TabIndex = 5
+ Me.Button18.Text = "Preise"
+ Me.Button18.UseVisualStyleBackColor = True
'
'usrCntlMDMAuswertungen
'
@@ -1995,6 +2045,7 @@ Partial Class usrCntlMDMAuswertungen
Me.GroupBox14.PerformLayout()
Me.pnl.ResumeLayout(False)
Me.pnl.PerformLayout()
+ Me.GroupBox13.ResumeLayout(False)
Me.ResumeLayout(False)
End Sub
@@ -2153,4 +2204,8 @@ Partial Class usrCntlMDMAuswertungen
Friend WithEvents TextBox2 As TextBox
Friend WithEvents Label59 As Label
Friend WithEvents Button17 As Button
+ Friend WithEvents Label62 As Label
+ Friend WithEvents GroupBox13 As GroupBox
+ Friend WithEvents Button18 As Button
+ Friend WithEvents Button14 As Button
End Class
diff --git a/SDL/mdm/usrCntlMDMAuswertungen.resx b/SDL/mdm/usrCntlMDMAuswertungen.resx
index bdf171c7..05de4ba7 100644
--- a/SDL/mdm/usrCntlMDMAuswertungen.resx
+++ b/SDL/mdm/usrCntlMDMAuswertungen.resx
@@ -120,26 +120,26 @@
- iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
- kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
- fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
- mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
+ 0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
+ hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
+ BXidk8YAAAAAAElFTkSuQmCC
- iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
- kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
- fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
- mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
+ 0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
+ hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
+ BXidk8YAAAAAAElFTkSuQmCC
- iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
- kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
- fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
- mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
+ 0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
+ hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
+ BXidk8YAAAAAAElFTkSuQmCC
\ No newline at end of file
diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb
index 24d80440..1aca9996 100644
--- a/SDL/mdm/usrCntlMDMAuswertungen.vb
+++ b/SDL/mdm/usrCntlMDMAuswertungen.vb
@@ -1409,7 +1409,9 @@ Public Class usrCntlMDMAuswertungen
Me.Cursor = Cursors.Default
End Sub
+ Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
+ End Sub
End Class
diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb
index 84669888..8741a767 100644
--- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb
+++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb
@@ -46,6 +46,8 @@ Partial Class usrcntlFakturierung
Me.Button18 = New System.Windows.Forms.Button()
Me.Label44 = New System.Windows.Forms.Label()
Me.GBSammelrechnung = New System.Windows.Forms.GroupBox()
+ Me.lblAnzRE = New System.Windows.Forms.Label()
+ 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()
@@ -94,8 +96,6 @@ Partial Class usrcntlFakturierung
Me.btnRePos = New System.Windows.Forms.Button()
Me.Validation1 = New SDL.EORI.validation()
Me.btnWikiStatusmails = New System.Windows.Forms.Button()
- Me.Label10 = New System.Windows.Forms.Label()
- Me.lblAnzRE = New System.Windows.Forms.Label()
Me.GroupBox1.SuspendLayout()
Me.GBMautberichte.SuspendLayout()
CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -119,7 +119,7 @@ Partial Class usrcntlFakturierung
Me.GroupBox1.Controls.Add(Me.btnRechnugnsdaten)
Me.GroupBox1.Location = New System.Drawing.Point(14, 20)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(697, 86)
+ Me.GroupBox1.Size = New System.Drawing.Size(876, 86)
Me.GroupBox1.TabIndex = 0
Me.GroupBox1.TabStop = False
'
@@ -128,7 +128,7 @@ Partial Class usrcntlFakturierung
Me.btnLieferantenrechnungen.Enabled = False
Me.btnLieferantenrechnungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnLieferantenrechnungen.ForeColor = System.Drawing.Color.Black
- Me.btnLieferantenrechnungen.Location = New System.Drawing.Point(525, 18)
+ Me.btnLieferantenrechnungen.Location = New System.Drawing.Point(679, 18)
Me.btnLieferantenrechnungen.Name = "btnLieferantenrechnungen"
Me.btnLieferantenrechnungen.Size = New System.Drawing.Size(139, 44)
Me.btnLieferantenrechnungen.TabIndex = 52
@@ -140,7 +140,7 @@ Partial Class usrcntlFakturierung
Me.btnMDMSammelrechnung.Enabled = False
Me.btnMDMSammelrechnung.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnMDMSammelrechnung.ForeColor = System.Drawing.Color.Black
- Me.btnMDMSammelrechnung.Location = New System.Drawing.Point(350, 19)
+ Me.btnMDMSammelrechnung.Location = New System.Drawing.Point(475, 19)
Me.btnMDMSammelrechnung.Name = "btnMDMSammelrechnung"
Me.btnMDMSammelrechnung.Size = New System.Drawing.Size(121, 44)
Me.btnMDMSammelrechnung.TabIndex = 51
@@ -164,7 +164,7 @@ Partial Class usrcntlFakturierung
Me.btnRechnugnsdaten.Enabled = False
Me.btnRechnugnsdaten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnRechnugnsdaten.ForeColor = System.Drawing.Color.Black
- Me.btnRechnugnsdaten.Location = New System.Drawing.Point(186, 19)
+ Me.btnRechnugnsdaten.Location = New System.Drawing.Point(267, 18)
Me.btnRechnugnsdaten.Name = "btnRechnugnsdaten"
Me.btnRechnugnsdaten.Size = New System.Drawing.Size(121, 44)
Me.btnRechnugnsdaten.TabIndex = 4
@@ -210,7 +210,7 @@ Partial Class usrcntlFakturierung
Me.GBMautberichte.Enabled = False
Me.GBMautberichte.Location = New System.Drawing.Point(10, 131)
Me.GBMautberichte.Name = "GBMautberichte"
- Me.GBMautberichte.Size = New System.Drawing.Size(697, 211)
+ Me.GBMautberichte.Size = New System.Drawing.Size(880, 211)
Me.GBMautberichte.TabIndex = 16
Me.GBMautberichte.TabStop = False
'
@@ -390,10 +390,28 @@ Partial Class usrcntlFakturierung
Me.GBSammelrechnung.Enabled = False
Me.GBSammelrechnung.Location = New System.Drawing.Point(10, 356)
Me.GBSammelrechnung.Name = "GBSammelrechnung"
- Me.GBSammelrechnung.Size = New System.Drawing.Size(697, 494)
+ Me.GBSammelrechnung.Size = New System.Drawing.Size(880, 403)
Me.GBSammelrechnung.TabIndex = 14
Me.GBSammelrechnung.TabStop = False
'
+ 'lblAnzRE
+ '
+ Me.lblAnzRE.AutoSize = True
+ Me.lblAnzRE.Location = New System.Drawing.Point(608, 62)
+ Me.lblAnzRE.Name = "lblAnzRE"
+ Me.lblAnzRE.Size = New System.Drawing.Size(30, 13)
+ Me.lblAnzRE.TabIndex = 123
+ Me.lblAnzRE.Text = "0 / 0"
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = True
+ Me.Label10.Location = New System.Drawing.Point(434, 63)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(126, 13)
+ Me.Label10.TabIndex = 122
+ Me.Label10.Text = "Anzahl RE offen/erledigt:"
+ '
'Label9
'
Me.Label9.Location = New System.Drawing.Point(13, 307)
@@ -451,7 +469,7 @@ Partial Class usrcntlFakturierung
'
Me.btnAbfdruck.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAbfdruck.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.btnAbfdruck.Location = New System.Drawing.Point(144, 396)
+ Me.btnAbfdruck.Location = New System.Drawing.Point(745, 20)
Me.btnAbfdruck.Name = "btnAbfdruck"
Me.btnAbfdruck.Size = New System.Drawing.Size(106, 32)
Me.btnAbfdruck.TabIndex = 115
@@ -462,7 +480,7 @@ Partial Class usrcntlFakturierung
'
Me.btnREJdruck.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnREJdruck.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.btnREJdruck.Location = New System.Drawing.Point(16, 396)
+ Me.btnREJdruck.Location = New System.Drawing.Point(745, 58)
Me.btnREJdruck.Name = "btnREJdruck"
Me.btnREJdruck.Size = New System.Drawing.Size(106, 32)
Me.btnREJdruck.TabIndex = 114
@@ -511,9 +529,9 @@ Partial Class usrcntlFakturierung
'
Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.Button3.Location = New System.Drawing.Point(535, 396)
+ Me.Button3.Location = New System.Drawing.Point(744, 147)
Me.Button3.Name = "Button3"
- Me.Button3.Size = New System.Drawing.Size(121, 32)
+ Me.Button3.Size = New System.Drawing.Size(107, 32)
Me.Button3.TabIndex = 109
Me.Button3.Text = "BS berechnen"
Me.Button3.UseVisualStyleBackColor = True
@@ -523,7 +541,7 @@ Partial Class usrcntlFakturierung
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.Button2.Location = New System.Drawing.Point(416, 396)
+ Me.Button2.Location = New System.Drawing.Point(745, 104)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(106, 32)
Me.Button2.TabIndex = 108
@@ -886,24 +904,6 @@ Partial Class usrcntlFakturierung
Me.btnWikiStatusmails.TabIndex = 72
Me.btnWikiStatusmails.UseVisualStyleBackColor = True
'
- 'Label10
- '
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(434, 63)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(126, 13)
- Me.Label10.TabIndex = 122
- Me.Label10.Text = "Anzahl RE offen/erledigt:"
- '
- 'lblAnzRE
- '
- Me.lblAnzRE.AutoSize = True
- Me.lblAnzRE.Location = New System.Drawing.Point(608, 62)
- Me.lblAnzRE.Name = "lblAnzRE"
- Me.lblAnzRE.Size = New System.Drawing.Size(30, 13)
- Me.lblAnzRE.TabIndex = 123
- Me.lblAnzRE.Text = "0 / 0"
- '
'usrcntlFakturierung
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -917,7 +917,7 @@ Partial Class usrcntlFakturierung
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.GroupBox1)
Me.Name = "usrcntlFakturierung"
- Me.Size = New System.Drawing.Size(1149, 866)
+ Me.Size = New System.Drawing.Size(1149, 782)
Me.GroupBox1.ResumeLayout(False)
Me.GBMautberichte.ResumeLayout(False)
Me.GBMautberichte.PerformLayout()
diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb
index 9629329f..0bc62d76 100644
--- a/SDL/seriendruck/usrCntlFakturierung.vb
+++ b/SDL/seriendruck/usrCntlFakturierung.vb
@@ -1957,7 +1957,7 @@ Public Class usrcntlFakturierung
For Each row In dt.Rows
If Not IsDBNull(row("SteuerpflichtigerGesamtbetrag")) AndAlso IsNumeric(row("SteuerpflichtigerGesamtbetrag")) Then SteuerpflichtigerBetrag += CDbl(row("SteuerpflichtigerGesamtbetrag"))
If Not IsDBNull(row("SteuerfreierGesamtbetrag")) AndAlso IsNumeric(row("SteuerfreierGesamtbetrag")) Then SteuerfreierBetrag += CDbl(row("SteuerfreierGesamtbetrag"))
- If Not IsDBNull(row("Anzahl")) AndAlso IsNumeric(row("Anzahl")) Then Anzahl += CInt(row("Anzahl"))
+ If dt.Columns.Contains("Anzahl") AndAlso Not IsDBNull(row("Anzahl")) AndAlso IsNumeric(row("Anzahl")) Then Anzahl += CInt(row("Anzahl"))
Next
diff --git a/SDL/seriendruck/usrCntlSeriendruck.Designer.vb b/SDL/seriendruck/usrCntlSeriendruck.Designer.vb
index 9d279586..7705a1af 100644
--- a/SDL/seriendruck/usrCntlSeriendruck.Designer.vb
+++ b/SDL/seriendruck/usrCntlSeriendruck.Designer.vb
@@ -37,8 +37,20 @@ Partial Class usrCntlSeriendruck
Me.cbxErstSprache = New System.Windows.Forms.ComboBox()
Me.btnWord = New System.Windows.Forms.Button()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
- Me.Button2 = New System.Windows.Forms.Button()
+ Me.txtErstattungsUnterNr_Mail = New System.Windows.Forms.TextBox()
+ Me.cboErstattungsart = New System.Windows.Forms.ComboBox()
+ Me.txtErstattungsNr_Mail = New System.Windows.Forms.TextBox()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.txtFiliale_Mail = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Button1 = New System.Windows.Forms.Button()
+ Me.btnMail_Intern = New System.Windows.Forms.Button()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.datBis = New System.Windows.Forms.DateTimePicker()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.datVon = New System.Windows.Forms.DateTimePicker()
Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.SuspendLayout()
@@ -239,24 +251,153 @@ Partial Class usrCntlSeriendruck
'
'GroupBox2
'
- Me.GroupBox2.Controls.Add(Me.Button2)
+ Me.GroupBox2.Controls.Add(Me.txtErstattungsUnterNr_Mail)
+ Me.GroupBox2.Controls.Add(Me.cboErstattungsart)
+ Me.GroupBox2.Controls.Add(Me.txtErstattungsNr_Mail)
+ Me.GroupBox2.Controls.Add(Me.Label6)
+ Me.GroupBox2.Controls.Add(Me.Label5)
+ Me.GroupBox2.Controls.Add(Me.txtFiliale_Mail)
+ Me.GroupBox2.Controls.Add(Me.Button1)
+ Me.GroupBox2.Controls.Add(Me.btnMail_Intern)
+ Me.GroupBox2.Controls.Add(Me.Label9)
+ Me.GroupBox2.Controls.Add(Me.datBis)
+ Me.GroupBox2.Controls.Add(Me.Label10)
+ Me.GroupBox2.Controls.Add(Me.datVon)
Me.GroupBox2.Location = New System.Drawing.Point(14, 240)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(646, 182)
Me.GroupBox2.TabIndex = 1
Me.GroupBox2.TabStop = False
- Me.GroupBox2.Text = "GroupBox2"
- Me.GroupBox2.Visible = False
'
- 'Button2
+ 'txtErstattungsUnterNr_Mail
'
- Me.Button2.Enabled = False
- Me.Button2.Location = New System.Drawing.Point(519, 147)
- Me.Button2.Name = "Button2"
- Me.Button2.Size = New System.Drawing.Size(121, 23)
- Me.Button2.TabIndex = 0
- Me.Button2.Text = "Button2"
- Me.Button2.UseVisualStyleBackColor = True
+ Me.txtErstattungsUnterNr_Mail.Location = New System.Drawing.Point(221, 17)
+ Me.txtErstattungsUnterNr_Mail.MaxLength = 2
+ Me.txtErstattungsUnterNr_Mail.Name = "txtErstattungsUnterNr_Mail"
+ Me.txtErstattungsUnterNr_Mail.Size = New System.Drawing.Size(22, 20)
+ Me.txtErstattungsUnterNr_Mail.TabIndex = 12
+ Me.txtErstattungsUnterNr_Mail.Text = "00"
+ '
+ 'cboErstattungsart
+ '
+ Me.cboErstattungsart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cboErstattungsart.FlatStyle = System.Windows.Forms.FlatStyle.System
+ Me.cboErstattungsart.FormattingEnabled = True
+ Me.cboErstattungsart.Location = New System.Drawing.Point(130, 43)
+ Me.cboErstattungsart.Name = "cboErstattungsart"
+ Me.cboErstattungsart.Size = New System.Drawing.Size(113, 21)
+ Me.cboErstattungsart.TabIndex = 11
+ '
+ 'txtErstattungsNr_Mail
+ '
+ Me.txtErstattungsNr_Mail.Location = New System.Drawing.Point(130, 17)
+ Me.txtErstattungsNr_Mail.MaxLength = 20
+ Me.txtErstattungsNr_Mail.Name = "txtErstattungsNr_Mail"
+ Me.txtErstattungsNr_Mail.Size = New System.Drawing.Size(85, 20)
+ Me.txtErstattungsNr_Mail.TabIndex = 11
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(16, 46)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(75, 13)
+ Me.Label6.TabIndex = 51
+ Me.Label6.Text = "Erstattungsart:"
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(16, 17)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(36, 13)
+ Me.Label5.TabIndex = 50
+ Me.Label5.Text = "Filiale:"
+ '
+ 'txtFiliale_Mail
+ '
+ Me.txtFiliale_Mail._DateTimeOnly = False
+ Me.txtFiliale_Mail._numbersOnly = True
+ Me.txtFiliale_Mail._numbersOnlyKommastellen = ""
+ Me.txtFiliale_Mail._numbersOnlyTrennzeichen = False
+ Me.txtFiliale_Mail._Prozent = False
+ Me.txtFiliale_Mail._ShortDateNew = False
+ Me.txtFiliale_Mail._ShortDateOnly = False
+ Me.txtFiliale_Mail._TimeOnly = False
+ Me.txtFiliale_Mail._TimeOnly_Seconds = False
+ Me.txtFiliale_Mail._value = ""
+ Me.txtFiliale_Mail._Waehrung = False
+ Me.txtFiliale_Mail._WaehrungZeichen = True
+ Me.txtFiliale_Mail.ForeColor = System.Drawing.Color.Black
+ Me.txtFiliale_Mail.Location = New System.Drawing.Point(91, 14)
+ Me.txtFiliale_Mail.MaxLineLength = -1
+ Me.txtFiliale_Mail.MaxLines_Warning = ""
+ Me.txtFiliale_Mail.MaxLines_Warning_Label = Nothing
+ Me.txtFiliale_Mail.Name = "txtFiliale_Mail"
+ Me.txtFiliale_Mail.Size = New System.Drawing.Size(33, 20)
+ Me.txtFiliale_Mail.TabIndex = 11
+ Me.txtFiliale_Mail.Text = "4817"
+ '
+ 'Button1
+ '
+ Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.Button1.ForeColor = System.Drawing.Color.Black
+ Me.Button1.Location = New System.Drawing.Point(519, 17)
+ Me.Button1.Name = "Button1"
+ Me.Button1.Size = New System.Drawing.Size(121, 23)
+ Me.Button1.TabIndex = 11
+ Me.Button1.Text = "Datensatz anzeigen"
+ Me.Button1.UseVisualStyleBackColor = True
+ '
+ 'btnMail_Intern
+ '
+ Me.btnMail_Intern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.btnMail_Intern.BackgroundImage = Global.SDL.My.Resources.Resources.email_big1
+ Me.btnMail_Intern.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnMail_Intern.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnMail_Intern.Location = New System.Drawing.Point(519, 61)
+ Me.btnMail_Intern.Name = "btnMail_Intern"
+ Me.btnMail_Intern.Size = New System.Drawing.Size(41, 34)
+ Me.btnMail_Intern.TabIndex = 49
+ Me.btnMail_Intern.UseVisualStyleBackColor = True
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = True
+ Me.Label9.Location = New System.Drawing.Point(190, 78)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(23, 13)
+ Me.Label9.TabIndex = 14
+ Me.Label9.Text = "bis:"
+ Me.Label9.Visible = False
+ '
+ 'datBis
+ '
+ Me.datBis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+ Me.datBis.Location = New System.Drawing.Point(219, 75)
+ Me.datBis.Name = "datBis"
+ Me.datBis.Size = New System.Drawing.Size(93, 20)
+ Me.datBis.TabIndex = 13
+ Me.datBis.Visible = False
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = True
+ Me.Label10.Location = New System.Drawing.Point(13, 78)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(72, 13)
+ Me.Label10.TabIndex = 12
+ Me.Label10.Text = "Zeitraum von:"
+ Me.Label10.Visible = False
+ '
+ 'datVon
+ '
+ Me.datVon.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+ Me.datVon.Location = New System.Drawing.Point(91, 75)
+ Me.datVon.Name = "datVon"
+ Me.datVon.Size = New System.Drawing.Size(93, 20)
+ Me.datVon.TabIndex = 11
+ Me.datVon.Visible = False
'
'Label3
'
@@ -269,11 +410,23 @@ Partial Class usrCntlSeriendruck
Me.Label3.TabIndex = 2
Me.Label3.Text = "Gutschrift - Erstattungsschreiben"
'
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label4.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.Label4.Location = New System.Drawing.Point(11, 220)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(283, 17)
+ Me.Label4.TabIndex = 3
+ Me.Label4.Text = "Gutschrift - Erstattungsschreiben Mail"
+ '
'usrCntlSeriendruck
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
+ Me.Controls.Add(Me.Label4)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.GroupBox2)
Me.Controls.Add(Me.GroupBox1)
@@ -282,6 +435,7 @@ Partial Class usrCntlSeriendruck
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
Me.GroupBox2.ResumeLayout(False)
+ Me.GroupBox2.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -292,7 +446,6 @@ Partial Class usrCntlSeriendruck
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents btnShowData As System.Windows.Forms.Button
Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
- Friend WithEvents Button2 As System.Windows.Forms.Button
Friend WithEvents txtErstattungAbfNr As System.Windows.Forms.TextBox
Friend WithEvents Label2 As System.Windows.Forms.Label
Friend WithEvents btnWordPrint As System.Windows.Forms.Button
@@ -303,4 +456,17 @@ Partial Class usrCntlSeriendruck
Friend WithEvents txtErstattungAbfUnterNr_neu As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txtErstattungAbfNr_neu As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txtErstattungAbfNrFiliale_neu As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label4 As Label
+ Friend WithEvents Label9 As Label
+ Friend WithEvents datBis As DateTimePicker
+ Friend WithEvents Label10 As Label
+ Friend WithEvents datVon As DateTimePicker
+ Friend WithEvents Button1 As Button
+ Friend WithEvents btnMail_Intern As Button
+ Friend WithEvents cboErstattungsart As ComboBox
+ Friend WithEvents Label6 As Label
+ Friend WithEvents Label5 As Label
+ Friend WithEvents txtFiliale_Mail As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents txtErstattungsUnterNr_Mail As TextBox
+ Friend WithEvents txtErstattungsNr_Mail As TextBox
End Class
diff --git a/SDL/seriendruck/usrCntlSeriendruck.vb b/SDL/seriendruck/usrCntlSeriendruck.vb
index 2cd2819f..923cfbab 100644
--- a/SDL/seriendruck/usrCntlSeriendruck.vb
+++ b/SDL/seriendruck/usrCntlSeriendruck.vb
@@ -1,6 +1,7 @@
Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
+
Public Class usrCntlSeriendruck
Dim withPrint As Boolean = False
@@ -98,7 +99,7 @@ Public Class usrCntlSeriendruck
frmShowData.Label2.Text = "Anzahl: " & frmShowData.DataGridView1.RowCount
End Sub
- Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+ Private Sub Button2_Click(sender As Object, e As EventArgs)
Dim von As DateTime = Now
@@ -132,8 +133,8 @@ Public Class usrCntlSeriendruck
Dim sqlstr As String = "SELECT * FROM vwUStSerienbriefStNrGueltigkeitsdatum WHERE LandKz='RO' AND StNrGültigkeitsdatum BETWEEN '" & von.ToShortDateString & "' AND '" & bis.ToShortDateString & "' GROUP BY [Name 1],StraßePostfach,PLZ ORDER BY PLZ, AdressenNr "
- WordDoc.MailMerge.OpenDataSource(Name:="", _
- Connection:="DSN=dbConn_FMZOLL;DATABASE=VERAG;uid=sa;pwd=BmWr501956;", _
+ WordDoc.MailMerge.OpenDataSource(Name:="",
+ Connection:="DSN=dbConn_FMZOLL;DATABASE=VERAG;uid=sa;pwd=BmWr501956;",
SQLStatement:=sqlstr, SubType:=Microsoft.Office.Interop.Word.WdMergeSubType.wdMergeSubTypeWord2000)
'Provider=SQLOLEDB;Server=DEVELOPER\DEVSQL;Database=VERAG;uid=sa;Password=BmWr501956;
@@ -198,6 +199,14 @@ Public Class usrCntlSeriendruck
cbxErstSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("YU", "YU"))
cbxErstSprache.SelectedIndex = 0
txtErstattungAbfNr_neu.Focus()
+
+ cboErstattungsart.Items.Clear()
+ cboErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", 0))
+ cboErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1.Gegenrechnen", 1))
+ cboErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2.Überweisung", 2))
+ cboErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3.Bankverbindung", 3))
+ cboErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4.Auf Sicherheit", 4))
+
End Sub
Public Function NurZahlen(ByVal Text As String) As Boolean
If Text.Length = 0 Then Return False
@@ -217,5 +226,153 @@ Public Class usrCntlSeriendruck
End If
End Sub
+ Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
+
+ frmShowData.Show()
+
+ frmShowData.DataGridView1.DataSource = generateDTErstattungen()
+ frmShowData.Label2.Text = "Anzahl: " & frmShowData.DataGridView1.RowCount
+
+ End Sub
+
+ Private Sub btnMail_Intern_Click(sender As Object, e As EventArgs) Handles btnMail_Intern.Click
+
+ If txtErstattungsNr_Mail.Text = "" Then
+ txtErstattungsNr_Mail.Focus()
+ Exit Sub
+ End If
+
+ If txtErstattungsUnterNr_Mail.Text = "" Then
+ txtErstattungsUnterNr_Mail.Focus()
+ Exit Sub
+ End If
+
+ If cboErstattungsart.SelectedIndex <> 4 Then
+ MsgBox("Die Erstattungsschreiben sind aktuell nur für den Typ 4 - Auf Sicherheit verfügbar!")
+ Exit Sub
+ End If
+
+ Dim dt As New DataTable
+ dt =
+ generateDTErstattungen()
+
+ If dt.Rows.Count > 0 Then
+
+ If vbYes = MsgBox("Möchten Sie " & dt.Rows.Count & " Emails für den Versand der Erstattungsinfo für die Erstattungsart " & cboErstattungsart.SelectedText & " erstellen ?", vbYesNoCancel) Then
+
+ Dim listOfTextconserven As New cTextkonserve_LIST(5, "", 19)
+
+ For Each row In dt.Rows
+
+ Dim spracheMail As String = "EN" 'Defaultsprache
+
+ Select Case row.Item("LandKz")
+ Case "HR", "SRB" : spracheMail = "SRB"
+ Case "A", "AT", "D", "DE", "CH" : spracheMail = "DE"
+ Case "RO" : spracheMail = "RO"
+ Case Else
+ spracheMail = "DE"
+ End Select
+
+
+ If listOfTextconserven.LIST.Any(Function(c) c.txt_sprache = spracheMail) Then
+
+
+ Dim r As cTextkonserve = listOfTextconserven.LIST.Find(Function(c) c.txt_sprache = spracheMail)
+ If r IsNot Nothing Then
+
+ Dim Mail_Subject = ""
+ Dim Mail_HTMLBody = ""
+
+ Dim Mail_To = ""
+ Dim Mail_CC = ""
+ Dim Mail_BCC = ""
+
+ Mail_Subject = r.txt_betreff
+ Dim TextHTML = ""
+ TextHTML &= r.txt_text
+
+ Mail_Subject = Mail_Subject.Replace("%BelegNr%", row.Item("Belegnummer"))
+ Mail_Subject = Mail_Subject.Replace("%Belegdatum%", row.Item("Belegdatum"))
+ Mail_Subject = Mail_Subject.Replace("%Name%", row.Item("Name"))
+ Mail_Subject = Mail_Subject.Replace("%AbfertigungsNr%", row.Item("AbfertigungsNr"))
+ Mail_Subject = Mail_Subject.Replace("%FilialenNr%", row.Item("FilialenNr"))
+ Mail_Subject = Mail_Subject.Replace("%MWST%", row.Item("MWST"))
+ Mail_Subject = Mail_Subject.Replace("%Betrag%", row.Item("Betrag"))
+
+ TextHTML = TextHTML.Replace("%BelegNr%", row.Item("Belegnummer"))
+ TextHTML = TextHTML.Replace("%Belegdatum%", row.Item("Belegdatum"))
+ TextHTML = TextHTML.Replace("%Betrag%", row.Item("Betrag"))
+ TextHTML = TextHTML.Replace("%Name%", row.Item("Name"))
+ TextHTML = TextHTML.Replace("%AbfertigungsNr%", row.Item("AbfertigungsNr"))
+ TextHTML = TextHTML.Replace("%MWST%", row.Item("MWST"))
+ TextHTML = TextHTML.Replace("%FilialenNr%", row.Item("FilialenNr"))
+
+ Mail_HTMLBody = "" & TextHTML & "
"
+ Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(row.Item("kdNr"), "Rechnung an")
+ Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(row.Item("kdNr"), "Rechnung an")
+ Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(row.Item("kdNr"), "Rechnung an")
+ Mail_HTMLBody &= "
" & cFakturierung.getSignature(row.Item("LandKz"), 19)
+
+
+ Dim outl As New Outlook.Application
+ Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+ Mail = outl.CreateItem(0)
+ Mail.Subject = Mail_Subject
+ Mail.HTMLBody = Mail_HTMLBody
+
+ Mail.To = Mail_To
+ Mail.CC = Mail_CC
+ Mail.BCC = Mail_BCC
+
+ Try
+ 'Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR") ',"buchhaltung@verag.ag"
+ Catch ex2 As Exception
+ MsgBox(ex2.Message)
+ End Try
+ Mail.Display()
+
+ End If
+ End If
+
+
+
+ Next
+ End If
+
+ End If
+
+
+ End Sub
+
+
+ Private Function generateDTErstattungen() As DataTable
+
+ Dim dt As New DataTable
+
+ If txtFiliale_Mail.Text = "" Then Return Nothing
+
+ Dim SQLString = "SELECT dbo.tblUStVAntrag.UStVAn_KuNr as kdNr,Rechnungsausgang.RechnungsNr as Belegnummer, cast(Rechnungsausgang.RechnungsDatum as date) as Belegdatum, CONVERT(varchar(512), dbo.tblUStVAntrag.UStVAn_Name) AS Name, CONVERT(varchar(512), ISNULL(dbo.tblUStVAntrag.UStVAn_Straße, '')) AS Straße, CONVERT(varchar(255),
+ dbo.tblUStVAntrag.UStVAn_PLZ + ' ' + dbo.tblUStVAntrag.UStVAn_Ort) AS Ort, CONVERT(varchar(10), dbo.tblUStVAntrag.UStVAn_LandKz) AS LandKz, CONVERT(varchar(255),
+ dbo.[Länderverzeichnis für die Außenhandelsstatistik].LandKz + ' ' + SUBSTRING(CONVERT(varchar(10), dbo.tblUStVAntrag.UStVAn_ReDatVon, 20), 6, 2) + '-' + SUBSTRING(CONVERT(varchar(10),
+ dbo.tblUStVAntrag.UStVAn_ReDatBis, 20), 6, 2) + '/' + SUBSTRING(CONVERT(varchar(10), dbo.tblUStVAntrag.UStVAn_ReDatBis, 20), 1, 4)) AS MWST, dbo.Rechnungsausgang.AbfertigungsNr,
+ dbo.Rechnungsausgang.FilialenNr, dbo.Rechnungsausgang.UnterNr, ABS(CONVERT(decimal(12, 2),
+ dbo.Rechnungsausgang.SteuerpflichtigerGesamtbetrag + dbo.Rechnungsausgang.SteuerfreierGesamtbetrag)) AS Betrag, ISNULL(dbo.Kunden.KD_Korrespondenz, '')
+ AS KorrAdresse
+ FROM dbo.Rechnungsausgang
+ INNER JOIN dbo.tblUStVAntrag ON dbo.Rechnungsausgang.AbfertigungsNr = dbo.tblUStVAntrag.AbfertigungsNr AND dbo.Rechnungsausgang.FilialenNr = dbo.tblUStVAntrag.FilialenNr
+ INNER JOIN dbo.[Länderverzeichnis für die Außenhandelsstatistik] ON dbo.tblUStVAntrag.UStVAn_LandNr = dbo.[Länderverzeichnis für die Außenhandelsstatistik].LandNr
+ INNER JOIN dbo.Kunden ON dbo.tblUStVAntrag.UStVAn_KuNr = dbo.Kunden.KundenNr
+ WHERE dbo.Rechnungsausgang.AbfertigungsNr= " & txtErstattungsNr_Mail.Text & " AND dbo.Rechnungsausgang.FilialenNr = " & txtFiliale_Mail.Text & " AND dbo.Rechnungsausgang.UnterNr=" & txtErstattungsUnterNr_Mail.Text
+
+
+ dt = (New SQL).loadDgvBySql(SQLString, "FMZOLL")
+
+ If dt.Rows.Count > 0 Then
+
+ Return dt
+ End If
+
+ End Function
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
index 7452d4c3..cf32797f 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
@@ -94,6 +94,9 @@ Public Class cKundenErweitert
Property kde_AnmerkungFR As Object = Nothing
Property kde_FR As Boolean = False
Property kde_AnmerkungAntrag As Object = Nothing
+ Property kde_Erstattungsart As Object = Nothing
+
+
Dim SQL As New SQL
@@ -190,6 +193,7 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungAntrag", kde_AnmerkungAntrag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungFR", kde_AnmerkungFR))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_FR", kde_FR))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Erstattungsart", kde_Erstattungsart))
Return list
End Function
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
index 3932dae2..ebffacee 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
@@ -1032,7 +1032,7 @@ Public Class cMDMFunctionsAllgemein
End Function
- Shared Function generatePosList(USTV_ANTRAG As cUSTVAntrag, posId As String, Antrag_LandKz As String, SteuerNR As String, openFile As Boolean, type As String, ByRef dt As DataTable, Optional isVZ As Boolean = False) As String
+ Shared Function generatePosList(USTV_ANTRAG As cUSTVAntrag, posId As String, Antrag_LandKz As String, SteuerNR As String, openFile As Boolean, type As String, ByRef dt As DataTable, Optional isVZ As Boolean = False, Optional RK_ID As Integer = -1) As String
Dim sql As New SQL
@@ -1040,7 +1040,7 @@ Public Class cMDMFunctionsAllgemein
If posId <> "" Then
sqlWHere = " And UStVPo_ID in(" & posId & ")"
ElseIf isVZ Then
- sqlWHere = " and UStVPo_VZ = 1 And UStVPo_VZ_RKID is null"
+ sqlWHere = " and UStVPo_VZ = 1 And (UStVPo_VZ_RKID is null" & IIf(RK_ID > 0, " or UStVPo_VZ_RKID = " & RK_ID & ")", ")")
End If
Dim StringSQL = "SELECT [UStVPo_ID] as Number ,[UStVPo_ReDat] as 'Date of Invoice',[UStVPo_ReNr] as 'Number of invoice' ,[UStVPo_Leistungsbezeichnung] as 'Name of service',[UStVPo_Leistender] as 'Name of supplier',leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as Street,