diff --git a/SDL/Classes/cFinanzOnlineWebService.vb b/SDL/Classes/cFinanzOnlineWebService.vb index e2bee0c3..4026a770 100644 --- a/SDL/Classes/cFinanzOnlineWebService.vb +++ b/SDL/Classes/cFinanzOnlineWebService.vb @@ -315,7 +315,7 @@ Public Class cFinanzOnlineWebService Call_Web_Service_MethodUID_Logout_NEU2020() Return returnInt Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) Call_Web_Service_MethodUID_Logout_NEU2020() End Try Return "-1" diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 96488aab..ecbbe3c3 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1776,7 +1776,7 @@ Public Class cFakturierung Return getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.Firma_ID) End Function - Shared Function getSignature(Optional landKz = "", Optional firma = -1, Optional individuell = False, Optional displayFirmenmane = True, Optional special = "", Optional additionalLine = "", Optional departmentmailadress = True) As String + Shared Function getSignature(Optional landKz = "", Optional firma = -1, Optional individuell = False, Optional displayFirmenmane = True, Optional special = "", Optional additionalLine = "", Optional departmentmailadress = True, Optional fakturierung = False) As String getSignature = "" firma = getFirmaNr(firma) @@ -1821,10 +1821,10 @@ Public Class cFakturierung getSignature &= "
A 4975 Suben, Autobahngrenze 15
T +43 7711 31630 | F +43 7711 31630-1 | @ " & If(individuell, emailindividuell, "info@imex-group.at") & " | www.imex-group.at | FN 410356s
" If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine Case 24 'AMBAR - Dim defaultMail = getDefaultMail("AMBAR", departmentmailadress) + Dim defaultMail = getDefaultMail("AMBAR", departmentmailadress, fakturierung) getSignature &= "" If displayFirmenmane Then getSignature &= "
AMBAR Logistic Services GmbH
" - getSignature &= "
D 83435 Bad Reichenhall, Reichenhallerstrasse 62
T +49 8651 99624911 | F +49 8651 9962493 | @ " & If(individuell, emailindividuell, defaultMail) & " | www.ambarlog.com | DE309105428
" + getSignature &= "
D 83435 Bad Reichenhall, Reichenhallerstrasse 62
T +49 8651 9962492 | F +49 8651 9962493 | @ " & If(individuell, emailindividuell, defaultMail) & " | www.ambarlog.com | DE309105428
" If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine Case 21 'UNISPED getSignature &= "" @@ -1877,24 +1877,40 @@ Public Class cFakturierung getSignature &= "
" End Select End If - Select Case landKz - Case "D", "A", "DE", "AT", "CH" - getSignature &= "Wir arbeiten ausschließlich auf Grund der Allgemeinen Österreichischen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten,
- Spesen und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding. Steuer-Zoll - und Tarifauskünfte sind unverbindlich." - Case "E", "GB" - getSignature &= "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially
- charged on freight, fees and interests and at last on customs duties. The place of jurisdiction is Schärding or Ried. Tax, customs and tariff information are not binding." + + Select Case firma + Case 24 'AMBAR + + Select Case landKz + Case "D", "A", "DE", "AT", "CH" + getSignature &= "Wir arbeiten ausschließlich auf Grundlage der Allgemeinen Deutschen Spediteurbedingungen 2017 – ADSp 2017 –." + + Case Else + getSignature &= "Wir arbeiten ausschließlich auf Grundlage der Allgemeinen Deutschen Spediteurbedingungen 2017 – ADSp 2017 –." + + End Select + Case Else - getSignature &= "Wir arbeiten ausschließlich auf Grund der Allgemeinen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten,
+ Select Case landKz + Case "D", "A", "DE", "AT", "CH" + getSignature &= "Wir arbeiten ausschließlich auf Grund der Allgemeinen Österreichischen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten,
Spesen und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding. Steuer-Zoll - und Tarifauskünfte sind unverbindlich." - getSignature &= "
" - getSignature &= "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially
+ Case "E", "GB" + getSignature &= "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially
+ charged on freight, fees and interests and at last on customs duties. The place of jurisdiction is Schärding or Ried. Tax, customs and tariff information are not binding." + Case Else + getSignature &= "Wir arbeiten ausschließlich auf Grund der Allgemeinen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten,
+ Spesen und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding. Steuer-Zoll - und Tarifauskünfte sind unverbindlich." + getSignature &= "
" + getSignature &= "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially
charged on freight, fees and interests and at last on customs duties. The place of jurisdiction is Schärding or Ried. Tax, customs and tariff information are not binding." + End Select End Select + End Function - Shared Function getDefaultMail(firma, Optional useDepartmentmailadress = True) As String + Shared Function getDefaultMail(firma, Optional useDepartmentmailadress = True, Optional fakturierung = False) As String Dim defaultMail = "" Select Case firma Case "AMBAR" @@ -1903,6 +1919,8 @@ Public Class cFakturierung If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "BH" Then defaultMail = "buchhaltung@ambarlog.de" If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "EXPORT" Then defaultMail = "office@ambarlog.de" End If + If fakturierung Then defaultMail = "buchhaltung@ambarlog.de" + End Select Return defaultMail End Function diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 3bed6d20..1aa3cd7c 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -306,14 +306,16 @@ Public Class frmFaktEmail End If Dim outl As New Outlook.Application - Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Mail = outl.CreateItem(0) Mail.Subject = txtSubject.Text + If Firma_ID = 24 Then Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR",, True) - 'Mail-Adressen eintragen - '----------------------------------------------------------------- - For Each r In dgvEmail.Rows + 'Mail-Adressen eintragen + '----------------------------------------------------------------- + For Each r In dgvEmail.Rows If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";" Next For Each r In dgvEmailCC.Rows @@ -328,9 +330,9 @@ Public Class frmFaktEmail txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr) - Dim TextHTML = "
" & RichTextBox.Text.Replace(ControlChars.Lf, "
") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine) & "
" + Dim TextHTML = "
" & RichTextBox.Text.Replace(ControlChars.Lf, "
") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "
" - Mail.HTMLBody = TextHTML + Mail.HTMLBody = TextHTML Mail.Subject = txtSubject.Text ATTACHMENTS.Clear() @@ -404,6 +406,7 @@ Public Class frmFaktEmail Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Mail = outl.CreateItem(0) + If Firma_ID = 24 Then Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR",, True) 'Mail-Adressen eintragen '----------------------------------------------------------------- @@ -571,6 +574,9 @@ Public Class frmFaktEmail Mail_StbFA = outl.CreateItem(0) Mail_StbFA.Subject = txtSubject.Text + If Firma_ID = 24 Then Mail_StbFA.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR",, True) + + Dim TextHTML = "
" Select Case cboFaStb_Sprache._value diff --git a/SDL/Fakturierung/rptRechnungDruck.Designer.vb b/SDL/Fakturierung/rptRechnungDruck.Designer.vb index f72c124d..7b8b3a82 100644 --- a/SDL/Fakturierung/rptRechnungDruck.Designer.vb +++ b/SDL/Fakturierung/rptRechnungDruck.Designer.vb @@ -403,7 +403,7 @@ Partial Public Class rptRechnungDruck "455" Me.txtBank3.Top = 0.1173228! Me.txtBank3.Visible = False - Me.txtBank3.Width = 1.788977! + Me.txtBank3.Width = 1.945276! ' 'ReportHeader1 ' diff --git a/SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb b/SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb index 99153569..17f95a83 100644 --- a/SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb +++ b/SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb @@ -37,6 +37,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck Me.txtBank1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtBank2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtDisclaimer = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.txtBank3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.ReportHeader1 = New GrapeCity.ActiveReports.SectionReportModel.ReportHeader() Me.lblRgNr = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblRgNrUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label() @@ -98,7 +99,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck Me.Line15 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Line17 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() - Me.txtBank3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() CType(Me.lblPosNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblDatum, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).BeginInit() @@ -112,6 +112,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblRgNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblRgNrUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Picture1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -155,7 +156,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck CType(Me.lblPosNrUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSendungUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -375,6 +375,22 @@ Partial Public Class rptSammelRechnungAnlagenDruck Me.txtDisclaimer.Top = 0.6082678! Me.txtDisclaimer.Width = 7.466143! ' + 'txtBank3 + ' + Me.txtBank3.DataField = "" + Me.txtBank3.DistinctField = "" + Me.txtBank3.Height = 0.4181104! + Me.txtBank3.Left = 4.761418! + Me.txtBank3.Name = "txtBank3" + Me.txtBank3.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; text-justify" & + ": auto; ddo-char-set: 1" + Me.txtBank3.SummaryGroup = "" + Me.txtBank3.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L" & + "455" + Me.txtBank3.Top = 0.1173228! + Me.txtBank3.Visible = False + Me.txtBank3.Width = 1.921653! + ' 'ReportHeader1 ' Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.lblFirma, Me.lblRechnungAn, Me.Line13}) @@ -1098,22 +1114,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck Me.GroupFooter4.Height = 0! Me.GroupFooter4.Name = "GroupFooter4" ' - 'txtBank3 - ' - Me.txtBank3.DataField = "" - Me.txtBank3.DistinctField = "" - Me.txtBank3.Height = 0.4181104! - Me.txtBank3.Left = 4.761418! - Me.txtBank3.Name = "txtBank3" - Me.txtBank3.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; text-justify" & - ": auto; ddo-char-set: 1" - Me.txtBank3.SummaryGroup = "" - Me.txtBank3.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L" & - "455" - Me.txtBank3.Top = 0.1173228! - Me.txtBank3.Visible = False - Me.txtBank3.Width = 1.78622! - ' 'rptSammelRechnungAnlagenDruck ' Me.PageSettings.Margins.Bottom = 0.3937008! @@ -1149,6 +1149,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblRgNr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblRgNrUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Picture1, System.ComponentModel.ISupportInitialize).EndInit() @@ -1192,7 +1193,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck CType(Me.lblPosNrUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblSendungUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub diff --git a/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb b/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb index fd22790f..19262da6 100644 --- a/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb +++ b/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb @@ -33,6 +33,7 @@ Partial Public Class rptSammelRechnungDruck Me.txtBank1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtBank2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtDisclaimer = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.txtBank3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.ReportHeader1 = New GrapeCity.ActiveReports.SectionReportModel.ReportHeader() Me.lblRgNr = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblRgNrUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label() @@ -99,7 +100,6 @@ Partial Public Class rptSammelRechnungDruck Me.Line15 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Line17 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() - Me.txtBank3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() CType(Me.lblLeistungNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblAnzahl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).BeginInit() @@ -110,6 +110,7 @@ Partial Public Class rptSammelRechnungDruck CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblRgNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblRgNrUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Picture1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -158,7 +159,6 @@ Partial Public Class rptSammelRechnungDruck CType(Me.lblLeistungUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblAnzahlUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -334,6 +334,22 @@ Partial Public Class rptSammelRechnungDruck Me.txtDisclaimer.Top = 0.6082678! Me.txtDisclaimer.Width = 7.466143! ' + 'txtBank3 + ' + Me.txtBank3.DataField = "" + Me.txtBank3.DistinctField = "" + Me.txtBank3.Height = 0.4181104! + Me.txtBank3.Left = 4.700394! + Me.txtBank3.Name = "txtBank3" + Me.txtBank3.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; text-justify" & + ": auto; ddo-char-set: 1" + Me.txtBank3.SummaryGroup = "" + Me.txtBank3.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L" & + "455" + Me.txtBank3.Top = 0.1901575! + Me.txtBank3.Visible = False + Me.txtBank3.Width = 1.941338! + ' 'ReportHeader1 ' Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma, Me.lblLKWIdUebeschrift, Me.lblLKWId, Me.lblRechnungAn}) @@ -1115,22 +1131,6 @@ Partial Public Class rptSammelRechnungDruck Me.GroupFooter4.Height = 0! Me.GroupFooter4.Name = "GroupFooter4" ' - 'txtBank3 - ' - Me.txtBank3.DataField = "" - Me.txtBank3.DistinctField = "" - Me.txtBank3.Height = 0.4181104! - Me.txtBank3.Left = 4.700394! - Me.txtBank3.Name = "txtBank3" - Me.txtBank3.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; text-justify" & - ": auto; ddo-char-set: 1" - Me.txtBank3.SummaryGroup = "" - Me.txtBank3.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L" & - "455" - Me.txtBank3.Top = 0.1901575! - Me.txtBank3.Visible = False - Me.txtBank3.Width = 1.795669! - ' 'rptSammelRechnungDruck ' Me.PageSettings.Margins.Bottom = 0.3937008! @@ -1163,6 +1163,7 @@ Partial Public Class rptSammelRechnungDruck CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblRgNr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblRgNrUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Picture1, System.ComponentModel.ISupportInitialize).EndInit() @@ -1211,7 +1212,6 @@ Partial Public Class rptSammelRechnungDruck CType(Me.lblLeistungUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblAnzahlUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index accec4d9..c90b509b 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -914,6 +914,6 @@ ..\Resources\cbam_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ambar_boarder.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/SDL/Resources/ambar_boarder.jpg b/SDL/Resources/ambar_boarder.jpg new file mode 100644 index 00000000..83f39217 Binary files /dev/null and b/SDL/Resources/ambar_boarder.jpg differ diff --git a/SDL/Resources/ambar_boarder1.jpg b/SDL/Resources/ambar_boarder1.jpg new file mode 100644 index 00000000..b61fccac Binary files /dev/null and b/SDL/Resources/ambar_boarder1.jpg differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 4598939a..02545800 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4746,6 +4746,8 @@ + + diff --git a/SDL/kunden/frmBonitaet.vb b/SDL/kunden/frmBonitaet.vb index 58ac34e2..d7b3b33f 100644 --- a/SDL/kunden/frmBonitaet.vb +++ b/SDL/kunden/frmBonitaet.vb @@ -30,6 +30,8 @@ Public Class frmBonitaet cBonitaetsauskunft = New VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft ElseIf vbYes <> MsgBox("Es wurde heute um '" & cBonitaetsauskunft.ba_Datum.ToShortTimeString & "' bereits eine Bonitätsauskunft für den Kunden eingeholt, möchten Sie diese überschreiben?", vbYesNoCancel) Then Exit Sub + Else + cBonitaetsauskunft.ba_datenarchivId = Nothing End If cBonitaetsauskunft.ba_KundenNr = (KdNR) diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index f4bbfbfa..0d521675 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -2709,6 +2709,7 @@ Public Class usrCntlKundenuebersicht Dim name As String = checkNullStr(ADRESSE.Name_1) Cursor = Cursors.WaitCursor + btnCreditsafe.Enabled = False 'doppelklick verhindern! KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdNr) @@ -2754,7 +2755,6 @@ Public Class usrCntlKundenuebersicht Case "A" : land = "AT" Case "D" : land = "DE" - Case Else land = ADRESSE.LandKz @@ -2765,9 +2765,23 @@ Public Class usrCntlKundenuebersicht If lblBonitaetsdatum._value <> Nothing Then + Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) company.lastChecked = lastChecked + If lastChecked = Today Then + Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today) + If bonaus.ba_Pruefungstool = "creditsafe API" AndAlso bonaus.ba_datenarchivId > -1 Then + MsgBox("Heute wurde bereits eine erfolgreiche Abfrage durchgeführt" & vbNewLine & "Vorgang wird abgebrochen!") + Cursor = Cursors.Default + btnCreditsafe.Enabled = True + Exit Sub + End If + End If + + + + If cs.checkDateOfLastRequest(company) < lastChecked Then Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo) If a = vbYes Then @@ -2797,6 +2811,7 @@ Public Class usrCntlKundenuebersicht initCreditsave() setKD(kdNr) Cursor = Cursors.Default + btnCreditsafe.Enabled = True End Sub diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 924be8fa..8e6ac8f3 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -426,6 +426,8 @@ Public Class usrcntlKundeBearbeitenFull Else kundenkreis = "2262630-2291290" 'ausl.Kundenkreis End If + Case "AMBAR" + cbxFiBu.Checked = True End Select Dim s_KdNr = kundenkreis.Split("-") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb index 1b9b09cf..6dcca81e 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb @@ -224,7 +224,8 @@ Public Class cUIDPruefung counter += 1 Dim errorCode = -99 - Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode) + Dim errormsg = "" + Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errorMsg) If UID_TMP IsNot Nothing Then If UID_TMP.uid_valid Then r("Ergebnis") = "OK" @@ -242,7 +243,7 @@ Public Class cUIDPruefung Else r("Ergebnis") = "ERROR" r("Error-Code") = errorCode.ToString() - r("Error-Text") = FO.GetCodeText(errorCode) + r("Error-Text") = FO.GetCodeText(errorCode) & errormsg ' Bei ERROR soll er ebenfalls einzeln durchgehen! Besprochen mit A.Stockenhuber 'For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'") diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 5a466dce..9103fdf3 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -468,7 +468,7 @@ Public Class cCreditSafeAPI Else - Debug.WriteLine("creditScore object not found.") + Debug.WriteLine("creditScore object not found.") Return "creditScore object not found" End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb index cdaebce6..107bdb43 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb @@ -89,7 +89,7 @@ Public Class cFinanzOnlineWebService - Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ba_KundenNr, Optional AskIfDouble = False, Optional SaveErgInAdressen = True, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0) As VERAG_PROG_ALLGEMEIN.cUIDPruefung + Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ba_KundenNr, Optional AskIfDouble = False, Optional SaveErgInAdressen = True, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0, Optional ByRef errorMsg = "") As VERAG_PROG_ALLGEMEIN.cUIDPruefung Dim AD As New cAdressen(ba_KundenNr) Dim multiUID = False If AD IsNot Nothing Then @@ -133,9 +133,11 @@ Public Class cFinanzOnlineWebService Try returnInt = CallWebService.uidAbfrage(tid, benid, SESSION_ID, uid, countryCode & vatNumber, StufeAbf, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6) + If msg <> "" Then errorMsg = " " & msg errorCode = returnInt Catch ex As Exception - MsgBox("Fehler im externen Webservice '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, "Fehler im externen Webservice " & System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) Exit Function End Try @@ -219,7 +221,7 @@ Public Class cFinanzOnlineWebService End If - If (returnInt = 0) Then 'OK + If (returnInt = 0) Then 'OK If SaveErgInAdressen Then AD.UstIdGeprüft = Now.ToShortDateString AD.SAVE()