From 1933cb843eae997433b240c17678ddceb99225e8 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 15 Apr 2025 09:45:02 +0200 Subject: [PATCH] ustva, fremdrechnungen, etc. --- SDL/Creditsafe/usrcntlVAT_ATEZ.vb | 23 +- SDL/USTV/ustCntlUSTV_AntragPosition.vb | 71 +++- SDL/kunden/frmKundenblatt.Designer.vb | 313 +++++++++--------- SDL/kunden/frmKundenblatt.vb | 3 + SDL/mdm/usrcntlFremdrechnungen.vb | 10 +- .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 7 +- 6 files changed, 232 insertions(+), 195 deletions(-) diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb index 13cf8b61..2a75c844 100644 --- a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb +++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb @@ -135,27 +135,13 @@ IIf(IsDBNull(row.Cells("seller_address_postcode").Value), "", row.Cells("seller_address_postcode").Value), IIf(IsDBNull(row.Cells("seller_address_street").Value), "", row.Cells("seller_address_street").Value), IIf(IsDBNull(row.Cells("seller_name").Value), "", row.Cells("seller_name").Value), - IIf(IsDBNull(row.Cells("invoice_date").Value), "", row.Cells("invoice_date").Value), - IIf(IsDBNull(row.Cells("total_VAT_amount").Value), "", row.Cells("total_VAT_amount").Value), + IIf(IsDBNull(row.Cells("total_VAT_amount").Value), "", row.Cells("total_VAT_amount").Value), + IIf(IsDBNull(row.Cells("invoice_date").Value) Or Not IsDate(row.Cells("invoice_date").Value), Nothing, CDate(row.Cells("invoice_date").Value)), IIf(IsDBNull(row.Cells("status").Value), "", row.Cells("status").Value)) Next - If va.invoice_id Is Nothing Or va.invoice_id = "" Then - If Not createCostumer Then - lblWarning.Text = "Daten von Creditsafe sind unvollständig, es kann kein Creditreport erstellt werden!" - o.DialogResult = DialogResult.None - Else - Dim a As MsgBoxResult = MsgBox("Die Daten des Unternehmens " & va.seller_VAT_id & " sind unvollständig " & vbNewLine & "Trotzdem fortfahren?", vbYesNo) - If a = vbYes Then - o.DialogResult = DialogResult.OK - Exit Sub - Else - o.DialogResult = DialogResult.None - End If - End If - - ElseIf va.status.ToLower <> "active" Then - Dim a As MsgBoxResult = MsgBox("Das Unternehmen " & va.status & " besitzt den Status: " & va.status & vbNewLine & "Trotzdem fortfahren?", vbYesNo) + If va.status.ToLower <> "success" Then + Dim a As MsgBoxResult = MsgBox("Die Rechnung " & va.invoice_id & " besitzt den Status: " & va.status & vbNewLine & "Trotzdem fortfahren?", vbYesNo) If a = vbYes Then o.DialogResult = DialogResult.OK Exit Sub @@ -173,7 +159,6 @@ End Sub - Public Class VAT Public Property currency As String diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index 761f65a0..39c3cb07 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -136,23 +136,25 @@ Public Class ustCntlUSTV_AntragPosition If UStV_POS Is Nothing OrElse UStV_POS.UStVAn_ID = 0 Then UStV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen() - UStV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - UStV_POS.UStVPo_Zeitstempel = Now + lblWarning.Text = "" If txtRgNr.Text <> "" Then UStV_POS.UStVPo_ReNr = txtRgNr.Text Else + lblWarning.Text = "RechnungsNr muss ausgefüllt werden." save = False End If If txtRgDatum.Text <> "" AndAlso IsDate(txtRgDatum.Text) Then UStV_POS.UStVPo_ReDat = txtRgDatum._value Else + lblWarning.Text = "Rechnungsdatum muss ausgefüllt werden." save = False End If If txtUSTBetrag.Text <> "" Then UStV_POS.UStVPo_USteuerbetrag = txtUSTBetrag.Text.Replace(",", ".") Else + lblWarning.Text = "UST-Betrag muss ausgefüllt werden." save = False End If @@ -164,6 +166,7 @@ Public Class ustCntlUSTV_AntragPosition If txtLeistungsbezeichnung.Text <> "" Then UStV_POS.UStVPo_Leistungsbezeichnung = txtLeistungsbezeichnung.Text Else + lblWarning.Text = "Leistungsbez. muss ausgefüllt werden." save = False End If If Not txtUmrechnungskurs.Text = "" Then @@ -171,6 +174,7 @@ Public Class ustCntlUSTV_AntragPosition UStV_POS.UStVPo_Umrechnungskurs = txtUmrechnungskurs.Text.Replace(",", ".") End If Else + lblWarning.Text = "Umrechnungskurs muss ausgefüllt werden." save = False End If @@ -192,6 +196,9 @@ Public Class ustCntlUSTV_AntragPosition UStV_POS.UStVPo_SchnittstellenNr = IIf(cboSchnittstellennr.SelectedItem IsNot Nothing, cboSchnittstellennr._value, -1) + UStV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + UStV_POS.UStVPo_Zeitstempel = Now + End Sub Private Sub ustCntlUSTV_AntragPosition_KeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles Me.PreviewKeyDown @@ -636,18 +643,60 @@ Public Class ustCntlUSTV_AntragPosition txtOrt.Text = f.usrcntlVAT_ATEZ1.va.seller_address_city txtLand.Text = f.usrcntlVAT_ATEZ1.va.seller_address_country txtPLZ.Text = f.usrcntlVAT_ATEZ1.va.seller_address_postcode - If IsNumeric(f.usrcntlVAT_ATEZ1.va.total_VAT_amount) AndAlso f.usrcntlVAT_ATEZ1.va.total_VAT_amount <> 0 Then - If f.usrcntlVAT_ATEZ1.va.currency = "EUR" AndAlso - txtUmrechnungskurs.Text = 1 Then - txtUSTBetragEUR.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount - txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + sbLeistender._value = f.usrcntlVAT_ATEZ1.va.seller_name + If IsNumeric(f.usrcntlVAT_ATEZ1.va.total_VAT_amount) AndAlso f.usrcntlVAT_ATEZ1.va.total_VAT_amount <> 0 AndAlso f.usrcntlVAT_ATEZ1.va.currency <> "" Then + Dim antr As New cUSTVAntrag(UStV_POS.UStVAn_ID) + + '1. Antragswährung = Belegswährung (EUR zu FREMD und FREMD zu EUR) + If f.usrcntlVAT_ATEZ1.va.currency = antr.UStVAn_Währungscode Then + Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode) + If antr.UStVAn_Währungscode = "EUR" Then + txtUSTBetragEUR.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + If antr.UStVAn_Währungscode <> "EUR" Then + txtUSTBetrag.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2) + txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100 + Else + txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + txtUmrechnungskurs.Text = 1 + End If + + Else + + txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2) + txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100 + + End If + Else - txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + '2. Antragswährung <> Belegswährung (EUR zu FREMD und FREMD zu EUR) + If antr.UStVAn_Währungscode = "EUR" Then + Dim kurs As New cEZB_Waehrungskurse(f.usrcntlVAT_ATEZ1.va.currency) + If f.usrcntlVAT_ATEZ1.va.currency <> "EUR" Then + txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2) + txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100 + ElseIf f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then + txtUSTBetrag.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2) + txtUSTBetragEUR.Text = txtUSTBetrag.Text + txtUmrechnungskurs.Text = 1 + + End If + + Else + '2.1 Antragswährung <> Belegswährung (FREMD zu FREMD) + + txtUSTBetrag.Text = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, antr.UStVAn_Währungscode) + Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode) + txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2) + txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100 + + End If + + End If End If - - End If - End If + End If Else diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index fe0b553e..e7f73678 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -23,14 +23,14 @@ Partial Class frmKundenblatt Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - 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 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() @@ -49,16 +49,17 @@ Partial Class frmKundenblatt Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() - Me.dgvUmsaetze = New System.Windows.Forms.DataGridView() Me.btnReloadOP = New System.Windows.Forms.Button() + Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() Me.Label10 = New System.Windows.Forms.Label() Me.btnOP = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() + Me.dgvUmsaetze = New System.Windows.Forms.DataGridView() Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label13 = New System.Windows.Forms.Label() Me.lblAdressenzusatz = New System.Windows.Forms.TextBox() @@ -137,8 +138,10 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -170,6 +173,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbFremdrechnungen = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -180,6 +184,7 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() @@ -205,11 +210,6 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -217,9 +217,9 @@ Partial Class frmKundenblatt Me.tbAllgemein.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() - CType(Me.dgvUmsaetze, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TabPage2.SuspendLayout() CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabPage2.SuspendLayout() + CType(Me.dgvUmsaetze, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() @@ -303,6 +303,16 @@ Partial Class frmKundenblatt Me.Panel4.Size = New System.Drawing.Size(1638, 1146) Me.Panel4.TabIndex = 0 ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1146) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -383,49 +393,6 @@ Partial Class frmKundenblatt Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True ' - 'dgvUmsaetze - ' - Me.dgvUmsaetze.AllowUserToAddRows = False - Me.dgvUmsaetze.AllowUserToDeleteRows = False - Me.dgvUmsaetze.AllowUserToResizeRows = False - DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsaetze.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 - Me.dgvUmsaetze.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.dgvUmsaetze.BackgroundColor = System.Drawing.Color.White - 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.dgvUmsaetze.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 - Me.dgvUmsaetze.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUmsaetze.DefaultCellStyle = DataGridViewCellStyle7 - Me.dgvUmsaetze.Location = New System.Drawing.Point(0, 22) - Me.dgvUmsaetze.Name = "dgvUmsaetze" - Me.dgvUmsaetze.ReadOnly = True - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 - Me.dgvUmsaetze.RowHeadersVisible = False - Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 484) - Me.dgvUmsaetze.TabIndex = 182 - ' 'btnReloadOP ' Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance_ @@ -440,41 +407,6 @@ Partial Class frmKundenblatt Me.btnReloadOP.UseVisualStyleBackColor = True Me.btnReloadOP.Visible = False ' - 'Label10 - ' - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(523, 11) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(149, 13) - Me.Label10.TabIndex = 177 - Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" - ' - 'btnOP - ' - Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn - Me.btnOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand - Me.btnOP.FlatAppearance.BorderSize = 0 - Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOP.Location = New System.Drawing.Point(681, 5) - Me.btnOP.Name = "btnOP" - Me.btnOP.Size = New System.Drawing.Size(24, 24) - Me.btnOP.TabIndex = 174 - Me.btnOP.UseVisualStyleBackColor = True - ' - 'TabPage2 - ' - Me.TabPage2.Controls.Add(Me.dgvUmsaetze) - Me.TabPage2.Controls.Add(Me.txtUmsatzJahr) - Me.TabPage2.Controls.Add(Me.Label13) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) - Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(710, 524) - Me.TabPage2.TabIndex = 1 - Me.TabPage2.Text = "Umsatzbericht" - Me.TabPage2.UseVisualStyleBackColor = True - ' 'dgvOffenePosten ' Me.dgvOffenePosten.AllowUserToAddRows = False @@ -518,6 +450,84 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 489) Me.dgvOffenePosten.TabIndex = 175 ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(523, 11) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(149, 13) + Me.Label10.TabIndex = 177 + Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" + ' + 'btnOP + ' + Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn + Me.btnOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnOP.FlatAppearance.BorderSize = 0 + Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOP.Location = New System.Drawing.Point(681, 5) + Me.btnOP.Name = "btnOP" + Me.btnOP.Size = New System.Drawing.Size(24, 24) + Me.btnOP.TabIndex = 174 + Me.btnOP.UseVisualStyleBackColor = True + ' + 'TabPage2 + ' + Me.TabPage2.Controls.Add(Me.dgvUmsaetze) + Me.TabPage2.Controls.Add(Me.txtUmsatzJahr) + Me.TabPage2.Controls.Add(Me.Label13) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(710, 524) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "Umsatzbericht" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'dgvUmsaetze + ' + Me.dgvUmsaetze.AllowUserToAddRows = False + Me.dgvUmsaetze.AllowUserToDeleteRows = False + Me.dgvUmsaetze.AllowUserToResizeRows = False + DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsaetze.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + Me.dgvUmsaetze.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.dgvUmsaetze.BackgroundColor = System.Drawing.Color.White + 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.dgvUmsaetze.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 + Me.dgvUmsaetze.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUmsaetze.DefaultCellStyle = DataGridViewCellStyle7 + Me.dgvUmsaetze.Location = New System.Drawing.Point(0, 22) + Me.dgvUmsaetze.Name = "dgvUmsaetze" + Me.dgvUmsaetze.ReadOnly = True + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 + Me.dgvUmsaetze.RowHeadersVisible = False + Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 484) + Me.dgvUmsaetze.TabIndex = 182 + ' 'txtUmsatzJahr ' Me.txtUmsatzJahr._DateTimeOnly = False @@ -1561,11 +1571,21 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(1630, 1120) + Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) + Me.usrcntlKarten.TabIndex = 0 + ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1573,7 +1593,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(1630, 1120) + Me.tbLKW.Size = New System.Drawing.Size(178, 39) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1585,9 +1605,22 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(1318, 1114) + Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) Me.pnlLKWRight.TabIndex = 2 ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) + Me.UsrCntlLKW1.TabIndex = 0 + ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1596,7 +1629,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 1114) + Me.pnlLKW.Size = New System.Drawing.Size(306, 33) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1637,7 +1670,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 940) + Me.dgvLKW.Size = New System.Drawing.Size(306, 0) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1649,7 +1682,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 1002) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1790,7 +1823,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(1630, 1120) + Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -1802,7 +1835,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1624, 1114) + Me.Panel3.Size = New System.Drawing.Size(172, 33) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -2020,7 +2053,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(1630, 1120) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -2029,7 +2062,7 @@ Partial Class frmKundenblatt ' Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22) Me.tbFremdrechnungen.Name = "tbFremdrechnungen" - Me.tbFremdrechnungen.Size = New System.Drawing.Size(1630, 1120) + Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39) Me.tbFremdrechnungen.TabIndex = 10 Me.tbFremdrechnungen.Text = "Fremdrechnungen" Me.tbFremdrechnungen.UseVisualStyleBackColor = True @@ -2045,6 +2078,16 @@ Partial Class frmKundenblatt Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1152) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) @@ -2178,11 +2221,19 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(1636, 1126) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'cntxtExcel ' Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2316,7 +2367,7 @@ Partial Class frmKundenblatt Me.ToolStripMenuItem4.MergeIndex = 10 Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" Me.ToolStripMenuItem4.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.ToolStripMenuItem4.Size = New System.Drawing.Size(94, 60) + Me.ToolStripMenuItem4.Size = New System.Drawing.Size(122, 60) Me.ToolStripMenuItem4.Text = "Maut/Diesel" Me.ToolStripMenuItem4.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.ToolStripMenuItem4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText @@ -2325,7 +2376,6 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2459,57 +2509,6 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1146) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(1624, 1114) - Me.usrcntlKarten.TabIndex = 0 - ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1152) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(1630, 1120) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2539,10 +2538,10 @@ Partial Class frmKundenblatt Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() - CType(Me.dgvUmsaetze, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage2.ResumeLayout(False) Me.TabPage2.PerformLayout() - CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvUmsaetze, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 71f5ef19..d9a1a282 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2080,5 +2080,8 @@ Public Class frmKundenblatt End Sub + Private Sub scanEULizenz_Load(sender As Object, e As EventArgs) Handles scanEULizenz.Load + + End Sub End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 36c8514f..97496897 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -727,7 +727,7 @@ Public Class usrcntlFremdrechnungen Select Case KUNDE.LandKz Case "TR" - Mail.Subject = KUNDE.Kurzname & "ORIJINAL FATURA " + Mail.Subject = KUNDE.Kurzname & " - ORIJINAL FATURA " Mail.HTMLBody = "Bayanlar ve Baylar!,

Ekte izlere orijinal faturalarinizi gönderiyoruz.

" @@ -738,7 +738,7 @@ Public Class usrcntlFremdrechnungen Case "A", "AT", "D", "DE", "CH" - Mail.Subject = KUNDE.Kurzname & "ORIGINAL RECHNUNG " + Mail.Subject = KUNDE.Kurzname & " - ORIGINAL RECHNUNG " Mail.HTMLBody = "Sehr geehrte Damen und Herren,

im Anhang senden wir Ihnen die Originalrechnungen.

" @@ -747,7 +747,7 @@ Public Class usrcntlFremdrechnungen Mail.HTMLBody &= "


Mit freundlichen Grüßen

" Case "RO" - Mail.Subject = KUNDE.Kurzname & "FACTURI RETURNATE " + Mail.Subject = KUNDE.Kurzname & " - FACTURI RETURNATE " Mail.HTMLBody = "Stimati domni, stimate doamne,

Va returnam facturile originale care nu au fost utilizate spre recuperare TVA.

Va multumim pentru colaborarea.

" @@ -756,7 +756,7 @@ Public Class usrcntlFremdrechnungen Mail.HTMLBody &= "


Cu stima

" Case "HR", "BIH", "SLO", "SRB", "BIH" - Mail.Subject = KUNDE.Kurzname & "ORGINALNI RACUNI " + Mail.Subject = KUNDE.Kurzname & " - ORGINALNI RACUNI " Mail.HTMLBody = "Postovanje,

prilozeno Vam dostavljamo orginalne racune za Vasu daljnu upotrebu.

Za pitanja stojimo na raspolaganju.

" @@ -766,7 +766,7 @@ Public Class usrcntlFremdrechnungen Mail.HTMLBody &= "


Srdacan pozdrav

" Case Else - Mail.Subject = KUNDE.Kurzname & "Invoice No." + Mail.Subject = KUNDE.Kurzname & " - Invoice No." Mail.HTMLBody = TextHTMLtable diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 1b0983c3..fcafc6de 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -877,7 +877,8 @@ Public Class cATEZ_NCTS_IN Dim R As DataRow = dt.NewRow R("currency") = checkNullStr(invoice.StringOf("currency")) - R("total_VAT_amount") = checkNulDbl(CDbl(invoice.StringOf("total_VAT_amount").Replace(".", ","))) + Dim totalAmonut As String = invoice.StringOf("total_VAT_amount").Replace(".", ",") + R("total_VAT_amount") = CDbl(checkNulDbl(totalAmonut)) R("invoice_id") = checkNullStr(invoice.StringOf("invoice_id")) R("invoice_date") = checkNullStr(invoice.StringOf("invoice_date")) R("seller_VAT_id") = checkNullStr(invoice.StringOf("seller_VAT_id")) @@ -919,10 +920,10 @@ Public Class cATEZ_NCTS_IN If IsNumeric(o) Then Return Math.Round(CDbl(o), 2) Else - Return -1 + Return 0 End If Else - Return -1 + Return 0 End If End Function