diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index b90b8284..9d9511dc 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -2062,7 +2062,7 @@ Public Class frmMDM_USTVAntrag Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVA_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & "_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr) - If DS IsNot Nothing Then + If DS IsNot Nothing AndAlso DS.da_id IsNot Nothing Then DS.DELETE_COMPLETE() End If @@ -2276,12 +2276,14 @@ Public Class frmMDM_USTVAntrag Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean - Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, LandKz as CountryOfRefund ,'EUR' as Currency ,replace([UStVPo_Leistender],'FR','') as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount + Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, LandKz as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory + ,Round((100 *[UStVPo_USteuerbetragEUR] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) as ExpenseNetAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round(Round((100 *[UStVPo_USteuerbetragEUR] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) + [UStVPo_USteuerbetragEUR],2) as ExpenseGrossAmount, + [Länderverzeichnis für die Außenhandelsstatistik].Steuersatz * 100 as TaxRate From [tblUStVPositionen] inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender] inner Join [tblUStVAntrag] as antr on antr.UStVAn_ID = [tblUStVPositionen].UStVAn_ID inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr - Where [tblUStVPositionen].UStVAn_ID ='" & UStVAn_ID & "' ORDER BY UStVPo_ID" + Where [tblUStVPositionen].UStVAn_ID =" & UStVAn_ID & " ORDER BY UStVPo_ID" Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 9f5521db..4c434706 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - 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 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht)) - 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 DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 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 DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() @@ -188,6 +188,7 @@ Partial Class usrCntlKundenuebersicht Me.tbVertraege = New System.Windows.Forms.TabPage() Me.dgvVertraege = New System.Windows.Forms.DataGridView() Me.Panel1 = New System.Windows.Forms.Panel() + Me.datVertragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button11 = New System.Windows.Forms.Button() Me.Button12 = New System.Windows.Forms.Button() Me.txtVertragVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -257,6 +258,7 @@ Partial Class usrCntlKundenuebersicht Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() + Me.MailHochladenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripMenuItem() Me.GültigungültigToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -266,7 +268,6 @@ Partial Class usrCntlKundenuebersicht Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SessionService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService() - Me.datVertragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cntxtAddVM.SuspendLayout() Me.tbWeitereKundenDetails.SuspendLayout() Me.tbOfferten.SuspendLayout() @@ -430,8 +431,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -451,8 +452,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True Me.dgvOffertenSperrliste.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -462,10 +463,10 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True Me.dgvOffertenSperrliste.RowHeadersVisible = False - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257) Me.dgvOffertenSperrliste.TabIndex = 0 @@ -603,8 +604,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffenePosten.AllowUserToAddRows = False Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill @@ -684,8 +685,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill @@ -748,8 +749,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvAnhaenge.AllowUserToAddRows = False Me.dgvAnhaenge.AllowUserToDeleteRows = False Me.dgvAnhaenge.AllowUserToResizeRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -2512,8 +2513,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVollmachten.AllowUserToDeleteRows = False Me.dgvVollmachten.AllowUserToOrderColumns = True Me.dgvVollmachten.AllowUserToResizeRows = False - DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill @@ -2566,8 +2567,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVertraege.AllowUserToDeleteRows = False Me.dgvVertraege.AllowUserToOrderColumns = True Me.dgvVertraege.AllowUserToResizeRows = False - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill @@ -2599,6 +2600,30 @@ Partial Class usrCntlKundenuebersicht Me.Panel1.Size = New System.Drawing.Size(473, 46) Me.Panel1.TabIndex = 1 ' + 'datVertragBis + ' + Me.datVertragBis._DateTimeOnly = False + Me.datVertragBis._numbersOnly = False + Me.datVertragBis._numbersOnlyKommastellen = "" + Me.datVertragBis._numbersOnlyTrennzeichen = True + Me.datVertragBis._Prozent = False + Me.datVertragBis._ShortDateNew = True + Me.datVertragBis._ShortDateOnly = False + Me.datVertragBis._TimeOnly = False + Me.datVertragBis._TimeOnly_Seconds = False + Me.datVertragBis._value = "" + Me.datVertragBis._Waehrung = False + Me.datVertragBis._WaehrungZeichen = True + Me.datVertragBis.ForeColor = System.Drawing.Color.Black + Me.datVertragBis.Location = New System.Drawing.Point(321, 23) + Me.datVertragBis.MaxLength = 10 + Me.datVertragBis.MaxLineLength = -1 + Me.datVertragBis.MaxLines_Warning = "" + Me.datVertragBis.MaxLines_Warning_Label = Nothing + Me.datVertragBis.Name = "datVertragBis" + Me.datVertragBis.Size = New System.Drawing.Size(65, 20) + Me.datVertragBis.TabIndex = 10 + ' 'Button11 ' Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2743,8 +2768,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvGestGarantie.AllowUserToDeleteRows = False Me.dgvGestGarantie.AllowUserToOrderColumns = True Me.dgvGestGarantie.AllowUserToResizeRows = False - DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill @@ -3234,24 +3259,24 @@ Partial Class usrCntlKundenuebersicht Me.dgvAufschub.AllowUserToResizeColumns = False Me.dgvAufschub.AllowUserToResizeRows = False Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN}) - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle24 Me.dgvAufschub.Location = New System.Drawing.Point(13, 61) Me.dgvAufschub.MultiSelect = False Me.dgvAufschub.Name = "dgvAufschub" @@ -3278,8 +3303,8 @@ Partial Class usrCntlKundenuebersicht ' 'HZA ' - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - Me.HZA.DefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + Me.HZA.DefaultCellStyle = DataGridViewCellStyle23 Me.HZA.HeaderText = "HZA" Me.HZA.Name = "HZA" Me.HZA.ReadOnly = True @@ -3336,34 +3361,34 @@ Partial Class usrCntlKundenuebersicht ' Me.ToolStripMenuItem3.Image = Global.SDL.My.Resources.Resources.del Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(139, 22) + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(180, 22) Me.ToolStripMenuItem3.Text = "Löschen" ' 'ÄndernToolStripMenuItem ' Me.ÄndernToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.stift Me.ÄndernToolStripMenuItem.Name = "ÄndernToolStripMenuItem" - Me.ÄndernToolStripMenuItem.Size = New System.Drawing.Size(139, 22) + Me.ÄndernToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ÄndernToolStripMenuItem.Text = "Ändern" ' 'HochladenToolStripMenuItem ' Me.HochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf Me.HochladenToolStripMenuItem.Name = "HochladenToolStripMenuItem" - Me.HochladenToolStripMenuItem.Size = New System.Drawing.Size(139, 22) + Me.HochladenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.HochladenToolStripMenuItem.Text = "Hochladen" ' 'ScannenToolStripMenuItem ' Me.ScannenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.scanner1 Me.ScannenToolStripMenuItem.Name = "ScannenToolStripMenuItem" - Me.ScannenToolStripMenuItem.Size = New System.Drawing.Size(139, 22) + Me.ScannenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ScannenToolStripMenuItem.Text = "Scannen" ' 'PDFLöschenToolStripMenuItem ' Me.PDFLöschenToolStripMenuItem.Name = "PDFLöschenToolStripMenuItem" - Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(139, 22) + Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.PDFLöschenToolStripMenuItem.Text = "PDF löschen" ' 'ContextMenuStrip2 @@ -3392,48 +3417,55 @@ Partial Class usrCntlKundenuebersicht ' 'ContextMenuStrip4 ' - Me.ContextMenuStrip4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.ToolStripMenuItem6, Me.ToolStripMenuItem7, Me.GültigungültigToolStripMenuItem}) + Me.ContextMenuStrip4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.MailHochladenToolStripMenuItem1, Me.ToolStripMenuItem6, Me.ToolStripMenuItem7, Me.GültigungültigToolStripMenuItem}) Me.ContextMenuStrip4.Name = "ContextMenuStrip1" - Me.ContextMenuStrip4.Size = New System.Drawing.Size(156, 136) + Me.ContextMenuStrip4.Size = New System.Drawing.Size(181, 180) ' 'ToolStripMenuItem1 ' Me.ToolStripMenuItem1.Image = Global.SDL.My.Resources.Resources.del Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" - Me.ToolStripMenuItem1.Size = New System.Drawing.Size(155, 22) + Me.ToolStripMenuItem1.Size = New System.Drawing.Size(156, 22) Me.ToolStripMenuItem1.Text = "Löschen" ' 'ToolStripMenuItem4 ' Me.ToolStripMenuItem4.Image = Global.SDL.My.Resources.Resources.stift Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" - Me.ToolStripMenuItem4.Size = New System.Drawing.Size(155, 22) + Me.ToolStripMenuItem4.Size = New System.Drawing.Size(156, 22) Me.ToolStripMenuItem4.Text = "Ändern" ' 'ToolStripMenuItem5 ' Me.ToolStripMenuItem5.Image = Global.SDL.My.Resources.Resources.pdf Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5" - Me.ToolStripMenuItem5.Size = New System.Drawing.Size(155, 22) + Me.ToolStripMenuItem5.Size = New System.Drawing.Size(156, 22) Me.ToolStripMenuItem5.Text = "Hochladen" ' + 'MailHochladenToolStripMenuItem1 + ' + Me.MailHochladenToolStripMenuItem1.Image = Global.SDL.My.Resources.Resources.email_big1 + Me.MailHochladenToolStripMenuItem1.Name = "MailHochladenToolStripMenuItem1" + Me.MailHochladenToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) + Me.MailHochladenToolStripMenuItem1.Text = "EMail hochladen" + ' 'ToolStripMenuItem6 ' Me.ToolStripMenuItem6.Image = Global.SDL.My.Resources.Resources.scanner1 Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" - Me.ToolStripMenuItem6.Size = New System.Drawing.Size(155, 22) + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(156, 22) Me.ToolStripMenuItem6.Text = "Scannen" ' 'ToolStripMenuItem7 ' Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7" - Me.ToolStripMenuItem7.Size = New System.Drawing.Size(155, 22) + Me.ToolStripMenuItem7.Size = New System.Drawing.Size(156, 22) Me.ToolStripMenuItem7.Text = "PDF löschen" ' 'GültigungültigToolStripMenuItem ' Me.GültigungültigToolStripMenuItem.Name = "GültigungültigToolStripMenuItem" - Me.GültigungültigToolStripMenuItem.Size = New System.Drawing.Size(155, 22) + Me.GültigungültigToolStripMenuItem.Size = New System.Drawing.Size(156, 22) Me.GültigungültigToolStripMenuItem.Text = "gültig/ungültig" ' 'btnReloadOP @@ -3497,30 +3529,6 @@ Partial Class usrCntlKundenuebersicht Me.SessionService1.Url = "https://finanzonline.bmf.gv.at/fonws/ws/session" Me.SessionService1.UseDefaultCredentials = False ' - 'datVertragBis - ' - Me.datVertragBis._DateTimeOnly = False - Me.datVertragBis._numbersOnly = False - Me.datVertragBis._numbersOnlyKommastellen = "" - Me.datVertragBis._numbersOnlyTrennzeichen = True - Me.datVertragBis._Prozent = False - Me.datVertragBis._ShortDateNew = True - Me.datVertragBis._ShortDateOnly = False - Me.datVertragBis._TimeOnly = False - Me.datVertragBis._TimeOnly_Seconds = False - Me.datVertragBis._value = "" - Me.datVertragBis._Waehrung = False - Me.datVertragBis._WaehrungZeichen = True - Me.datVertragBis.ForeColor = System.Drawing.Color.Black - Me.datVertragBis.Location = New System.Drawing.Point(321, 23) - Me.datVertragBis.MaxLength = 10 - Me.datVertragBis.MaxLineLength = -1 - Me.datVertragBis.MaxLines_Warning = "" - Me.datVertragBis.MaxLines_Warning_Label = Nothing - Me.datVertragBis.Name = "datVertragBis" - Me.datVertragBis.Size = New System.Drawing.Size(65, 20) - Me.datVertragBis.TabIndex = 10 - ' 'usrCntlKundenuebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3848,4 +3856,5 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents txtBelegMail_FixBetreffText As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents cbxBelegMail_FixBetreff As CheckBox Friend WithEvents datVertragBis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents MailHochladenToolStripMenuItem1 As ToolStripMenuItem End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 330957e1..9e81b4f1 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1,6 +1,8 @@ Imports System.Data.SqlClient Imports System.Globalization Imports System.IO +Imports GrapeCity.ActiveReports.ReportsCore.Tools +Imports GrapeCity.Viewer.Common.Model Imports org.BouncyCastle.Asn1.Ocsp Imports SDL.EORI Imports sun.util.resources.cldr.aa @@ -2495,6 +2497,8 @@ Public Class usrCntlKundenuebersicht Private Sub HochladenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HochladenToolStripMenuItem.Click If dgvGestGarantie.SelectedRows.Count = 1 Then + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "GESTELLUNGS_GARANTIEN", "", "", "", "GG_" & dgvGestGarantie.SelectedRows(0).Cells("gg_Zollamt").Value, kdNr) If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then Dim gg As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(dgvGestGarantie.SelectedRows(0).Cells("gg_id").Value) @@ -2502,6 +2506,7 @@ Public Class usrCntlKundenuebersicht gg.SAVE() initDGVGestGarantie() End If + End If End Sub @@ -2626,17 +2631,35 @@ Public Class usrCntlKundenuebersicht End If End Sub - Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem5.Click + Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem5.Click, MailHochladenToolStripMenuItem1.Click If dgvVertraege.SelectedRows.Count = 1 Then - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Kundendaten_bearbeiten", "SDL") Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraege.SelectedRows(0).Cells("kv_id").Value, kdNr) - If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then - Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value) - KV.kv_datenarchivId = DS.da_id - KV.SAVE() - initDGVVertraege() - End If - End If + + Select Case sender.Name + Case "ToolStripMenuItem5" + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Kundendaten_bearbeiten", "SDL") Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraege.SelectedRows(0).Cells("kv_id").Value, kdNr) + If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then + Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value) + KV.kv_datenarchivId = DS.da_id + KV.SAVE() + initDGVVertraege() + End If + End If + + Case "MailHochladenToolStripMenuItem1" + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Kundendaten_bearbeiten", "SDL") Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraege.SelectedRows(0).Cells("kv_id").Value, kdNr) + If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then + Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value) + KV.kv_datenarchivId = DS.da_id + KV.SAVE() + initDGVVertraege() + End If + End If + + End Select End If End Sub @@ -3463,4 +3486,6 @@ Public Class usrCntlKundenuebersicht Private Sub cbxBelegMail_FixBetreff_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBelegMail_FixBetreff.CheckedChanged txtBelegMail_FixBetreffText.Enabled = cbxBelegMail_FixBetreff.Checked End Sub + + End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb index a3cc88d7..24e13c0a 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb @@ -10,6 +10,7 @@ Public Class cKundenVertraege Property kv_vertragArtId As Integer Property kv_Info As Object = Nothing Property kv_datenarchivId As Object = Nothing + Property kv_datenarchivId_mail As Object = Nothing Property kv_gueltig As Boolean = True Public hasEntry As Boolean = False @@ -41,6 +42,7 @@ Public Class cKundenVertraege list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_vertragArtId", kv_vertragArtId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_Info", kv_Info)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_datenarchivId", kv_datenarchivId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_datenarchivId_mail", kv_datenarchivId_mail)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_gueltig", kv_gueltig)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_gueltigBis_Datum", kv_gueltigBis_Datum)) @@ -48,7 +50,7 @@ Public Class cKundenVertraege End Function Public Shared Function LOAD_LIST(KundenNr As Integer) As DataTable - Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_gueltig],kv_gueltigBis_Datum FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL") + Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_datenarchivId_mail],[kv_gueltig],kv_gueltigBis_Datum FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL") End Function Public Shared Function ENTRY_Exists(KundenNr As Integer, kv_vertragArtId As Integer) As Boolean