diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 0d98e0be..d12f54cd 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index fc47e190..b482af71 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -1,5 +1,4 @@ Imports System.Windows.Documents -Imports VERAG_PROG_ALLGEMEIN Public Class frmUSTVoffeneAntraege diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index aa658d15..1694ef9e 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -684,9 +684,6 @@ Public Class usrCntlUSTV Dim start_date As New Date(Today.Year, 1, 1) Dim end_date As New Date(Today.Year, 12, 31) - - - Dim ADR As cAdressen = New cAdressen(kdNr) Dim frm As New frmUSTVoffeneAntraege(start_date, end_date, kdNr, ADR.Name_1) @@ -1264,20 +1261,22 @@ Public Class usrCntlUSTV For Each r In dt_Data_selected.Rows + 'steuerland! If Not IsDBNull(r.item("SteuerLandKz")) Then Select Case r.item("SteuerLandKz") Case "HU" : TextHTML &= "
  • " & r.item("SteuerLandKz") & " (Na uverenju mora biti naveden datum kad ste registrovani kao PDV obaveznik, prevedite na Madarski, potpis sluzbene osobe ne smije biti faksimil mora bit vlastorucan)


    • " Case "SI" : TextHTML &= "
  • " & r.item("SteuerLandKz") & " (Na uverenju mora biti naveden datum kad ste registrovani kao PDV obaveznik, prevedite na Slovenacki)


    • " Case "LU" : TextHTML &= "
  • " & r.item("SteuerLandKz") & " (Na uverenju obavezno navedite sifru djelatnosti 4941, prevesti na Engleski)


    • " - Case "SK" : TextHTML &= "
  • " & r.item("SteuerLandKz") & " (Na uverenju mora biti naveden datum kad ste registrovani kao PDV obaveznik, prevedite na Engleski)


    • " : attachmentSK = True + Case "SK" : TextHTML &= "
  • " & r.item("SteuerLandKz") & " (Na uverenju mora biti naveden datum kad ste registrovani kao PDV obaveznik, prevedite na Engleski)


    • " : attachmentSK = False 'attachmentSK = true -> nicht mehr mitschicken! Case "RO" : TextHTML &= "
  • " & r.item("SteuerLandKz") & " (Na uverenju mora biti naveden datum kad ste registrovani kao PDV obaveznik, prevedite na Rumonski)


    • " - Case "HR" : TextHTML &= "
  • " & r.item("SteuerLandKz") & " (Na uverenju mora biti naveden datum kad ste registrovani kao PDV obaveznik, " & IIf(Not IsDBNull(r.item("KundeLand")) AndAlso r.item("KundeLand") = "BIH", "trazite da Vam izdaju uvjerenja na latinici da izbjegnete trosak prijevoda na Hrvatski jezik.", "prevedite na Hrvatski") & ")


    • " : attachmentHR = True + Case "HR" : TextHTML &= "
  • " & r.item("SteuerLandKz") & " (Na uverenju mora biti naveden datum kad ste registrovani kao PDV obaveznik, " & IIf(Not IsDBNull(r.item("KundeLand")) AndAlso r.item("KundeLand") = "BIH", "trazite da Vam izdaju uvjerenja na latinici da izbjegnete trosak prijevoda na Hrvatski jezik.", "prevedite na Hrvatski") & ")


    • " : attachmentHR = False 'attachmentHR = true -> nicht mehr mitschicken! Case Else TextHTML &= "
  • " & r.item("SteuerLandKz") & " (prevod na Engleski)


    • " End Select End If + 'kundeland If Not IsDBNull(r.item("KundeLand")) Then Select Case r.item("KundeLand") Case "SRB" : attachmentSRB = True @@ -1311,14 +1310,14 @@ Public Class usrCntlUSTV If filepath <> "" Then Mail.Attachments.Add(filepath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) End If - If attachmentBIH And attachmentSK Then + If attachmentSK Then Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "MDM", "", "SVK_FA_BESTAETIGUNG") Dim filepath = DS.GET_TOP1_PATH(False) If filepath <> "" Then Mail.Attachments.Add(filepath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) End If - If attachmentBIH And attachmentHR Then + If attachmentHR Then Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "MDM", "", "HR_FA_BESTAETIGUNG") Dim filepath = DS.GET_TOP1_PATH(False) If filepath <> "" Then Mail.Attachments.Add(filepath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index fb79079e..f1d577c1 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -45,7 +45,10 @@ Public Class frmMDMDatenverarbetiung Dim pruef As Boolean = False Select Case LIEFERANT - Case "PLOSE" : pruef = pruefData_PLOSE() + Case "PLOSE" + Dim plose As cPLOSE_Inv_Data + pruef = plose.checkImport() + pruef = pruefData_PLOSE() Case "ASFINAG" : pruef = pruefData_ASFINAG() Case "UTA" : pruef = pruefData_UTA() Case "IDS" : pruef = pruefData_IDS() diff --git a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb index ce8093cc..7615156e 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb @@ -23,8 +23,8 @@ Partial Class usrcntlFremdrechnungen Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.DetailsAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() Me.btnSDL_Alle = New System.Windows.Forms.Button() @@ -39,6 +39,7 @@ Partial Class usrcntlFremdrechnungen Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() + Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox() Me.cbxPDFhinterlegt = New System.Windows.Forms.CheckBox() Me.cbx = New System.Windows.Forms.CheckBox() Me.Label4 = New System.Windows.Forms.Label() @@ -61,7 +62,8 @@ Partial Class usrcntlFremdrechnungen Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() - Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.lblSumBto = New System.Windows.Forms.Label() Me.FlowLayoutPanel.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -275,6 +277,8 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel1.Controls.Add(Me.lblSumBto) + Me.Panel1.Controls.Add(Me.Label5) Me.Panel1.Controls.Add(Me.cbxMailoeffnen) Me.Panel1.Controls.Add(Me.cbxPDFhinterlegt) Me.Panel1.Controls.Add(Me.cbx) @@ -296,6 +300,18 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.Size = New System.Drawing.Size(260, 907) Me.Panel1.TabIndex = 23 ' + 'cbxMailoeffnen + ' + Me.cbxMailoeffnen.AutoSize = True + Me.cbxMailoeffnen.Checked = True + Me.cbxMailoeffnen.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxMailoeffnen.Location = New System.Drawing.Point(146, 183) + Me.cbxMailoeffnen.Name = "cbxMailoeffnen" + Me.cbxMailoeffnen.Size = New System.Drawing.Size(91, 17) + Me.cbxMailoeffnen.TabIndex = 54 + Me.cbxMailoeffnen.Text = "Mail anzeigen" + Me.cbxMailoeffnen.UseVisualStyleBackColor = True + ' 'cbxPDFhinterlegt ' Me.cbxPDFhinterlegt.AutoSize = True @@ -485,8 +501,8 @@ Partial Class usrcntlFremdrechnungen Me.dgvLFRechnung.AllowUserToDeleteRows = False Me.dgvLFRechnung.AllowUserToResizeColumns = False Me.dgvLFRechnung.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvLFRechnung.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvLFRechnung.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvLFRechnung.BackgroundColor = System.Drawing.Color.White Me.dgvLFRechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLFRechnung.Location = New System.Drawing.Point(4, 3) @@ -502,8 +518,8 @@ Partial Class usrcntlFremdrechnungen Me.dgvDetails.AllowUserToDeleteRows = False Me.dgvDetails.AllowUserToResizeColumns = False Me.dgvDetails.AllowUserToResizeRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvDetails.BackgroundColor = System.Drawing.Color.White Me.dgvDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvDetails.Location = New System.Drawing.Point(-1, 3) @@ -541,17 +557,24 @@ Partial Class usrcntlFremdrechnungen Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22) Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)" ' - 'cbxMailoeffnen + 'Label5 ' - Me.cbxMailoeffnen.AutoSize = True - Me.cbxMailoeffnen.Checked = True - Me.cbxMailoeffnen.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxMailoeffnen.Location = New System.Drawing.Point(146, 183) - Me.cbxMailoeffnen.Name = "cbxMailoeffnen" - Me.cbxMailoeffnen.Size = New System.Drawing.Size(91, 17) - Me.cbxMailoeffnen.TabIndex = 54 - Me.cbxMailoeffnen.Text = "Mail anzeigen" - Me.cbxMailoeffnen.UseVisualStyleBackColor = True + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(4, 20) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(76, 13) + Me.Label5.TabIndex = 55 + Me.Label5.Text = "Summe Brutto:" + ' + 'lblSumBto + ' + Me.lblSumBto.AutoSize = True + Me.lblSumBto.BackColor = System.Drawing.Color.White + Me.lblSumBto.Location = New System.Drawing.Point(190, 20) + Me.lblSumBto.Name = "lblSumBto" + Me.lblSumBto.Size = New System.Drawing.Size(13, 13) + Me.lblSumBto.TabIndex = 56 + Me.lblSumBto.Text = "0" ' 'usrcntlFremdrechnungen ' @@ -615,4 +638,6 @@ Partial Class usrcntlFremdrechnungen Friend WithEvents dgvDetails As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents cbxPDFhinterlegt As CheckBox Friend WithEvents cbxMailoeffnen As CheckBox + Friend WithEvents lblSumBto As Label + Friend WithEvents Label5 As Label End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 73c43b5b..f6e85c6c 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -293,6 +293,7 @@ Public Class usrcntlFremdrechnungen newBinding(SDLNrTmp, SQL_STR) initBtnClick(getSDLNrButton(SDLNrTmp)) + Dim sumBtto As Double = 0 With dgvLFRechnung @@ -324,6 +325,13 @@ Public Class usrcntlFremdrechnungen End If + For Each r As DataGridViewRow In .Rows + sumBtto += If(IsNumeric(r.Cells("Bruttobetrag").Value), CDbl(r.Cells("Bruttobetrag").Value), 0) + Next + + lblSumBto.Text = CDbl(sumBtto).ToString("C2") + + End With diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb index 241f0ced..426ea8de 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb @@ -144,6 +144,7 @@ Public Class cDY_Zollanmeldungen_Import Property Shipmentnummer As Object = Nothing Property Importstatus As Object = Nothing Property Importdate As Object = Nothing + Property Importfile As Object = Nothing Public hasEntry = False @@ -299,6 +300,7 @@ Public Class cDY_Zollanmeldungen_Import list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Shipmentnummer", Shipmentnummer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importstatus", Importstatus)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importdate", Importdate)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importfile", Importfile)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 9f37ecaa..5c2345d4 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -160,9 +160,13 @@ Public Class cCreditSafeAPI rest.PartSelector = "1" rest.AddHeader("Content-Disposition", "form-data; name=""importcsv""; filename=""importcsv.csv""") rest.AddHeader("Content-Type", "text/csv") - rest.SetMultipartBodyString("d.breimaier@verag.ag") rest.SetMultipartBodyStream(fileStream) + rest.PartSelector = "2" + rest.AddHeader("Content-Disposition", "form-data; name=""email""") + rest.SetMultipartBodyString("d.breimaier@verag.ag;as@verag.ag;Viktoria.Leirich@imex-group.at") + + rest.PartSelector = "0" Dim strResponseBody As String = rest.FullRequestMultipart(method, url.Replace(API_STRING, "")) @@ -1676,7 +1680,8 @@ Public Class cCreditSafeAPI Dim textVermerk As String = "" Select Case typ - Case "B-INDEX", "B-SCORE", "KREDITLIMIT" : textVermerk &= "ACHTUNG, Veränderung des " & typ & " von " & oldValue.ToString & " auf " & newValue.ToString & " ( um " & changedInProzent.ToString("F2") & "% ) " & Risk + Case "B-INDEX", "B-SCORE" : textVermerk &= "ACHTUNG, Veränderung des " & typ & " von " & oldValue.ToString & " auf " & newValue.ToString & " ( um " & changedInProzent.ToString("F2") & "% ) " & Risk + Case "KREDITLIMIT" : textVermerk &= "ACHTUNG, Veränderung des " & typ & " auf " & newValue.ToString & " ( um " & changedInProzent.ToString("F2") & "% ) " Case "BANKRUPT_REGISTERED" : textVermerk &= " KUNDE WURDE LAUT CREDITSAFE " & IIf(company IsNot Nothing, " AM " & company.BANKRUPT_REGISTERED_DATE.ToShortDateString, "") & " FÜR INSOLVENT ERKLÄRT " & Risk End Select