edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Änderungen f Ambar (ilyas)

Browse Source
This commit is contained in:
d.breimaier
2024-05-06 17:18:10 +02:00
parent 7213bb20e4
commit 8e74142d59
16 changed files with 116 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/Classes/cFinanzOnlineWebService.vb
View File

@@ -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"

26
SDL/Fakturierung/cFakturierung.vb
View File

@@ -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 &= "<div style=""font-size:12px"">A 4975 Suben, Autobahngrenze 15 <br><b>T</b> +43 7711 31630 | <b>F</b> +43 7711 31630-1 | <b>@</b> " & If(individuell, emailindividuell, "info@imex-group.at") & " | www.imex-group.at | FN 410356s</div>"
If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
Case 24 'AMBAR
Dim defaultMail = getDefaultMail("AMBAR", departmentmailadress)
Dim defaultMail = getDefaultMail("AMBAR", departmentmailadress, fakturierung)
getSignature &= "<img width=""250"" height=""70"" src=""" & imgsrc & "ambar_boarder.png""/>"
If displayFirmenmane Then getSignature &= "<br><b>AMBAR Logistic Services GmbH</b><br>"
getSignature &= "<div style=""font-size:12px"">D 83435 Bad Reichenhall, Reichenhallerstrasse 62<br><b>T</b> +49 8651 99624911 | <b>F</b> +49 8651 9962493 | <b>@</b> " & If(individuell, emailindividuell, defaultMail) & " | www.ambarlog.com | DE309105428</div>"
getSignature &= "<div style=""font-size:12px"">D 83435 Bad Reichenhall, Reichenhallerstrasse 62<br><b>T</b> +49 8651 9962492 | <b>F</b> +49 8651 9962493 | <b>@</b> " & If(individuell, emailindividuell, defaultMail) & " | www.ambarlog.com | DE309105428</div>"
If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
Case 21 'UNISPED
getSignature &= "<img width=""250"" height=""50"" src=""" & imgsrc & "Unisped_logo.jpg""/>"
@@ -1877,6 +1877,20 @@ Public Class cFakturierung
getSignature &= "<br>"
End Select
End If
Select Case firma
Case 24 'AMBAR
Select Case landKz
Case "D", "A", "DE", "AT", "CH"
getSignature &= "<span style=""font-size:9px"">Wir arbeiten ausschließlich auf Grundlage der Allgemeinen Deutschen Spediteurbedingungen 2017 – ADSp 2017 –.</span>"
Case Else
getSignature &= "<span style=""font-size:9px"">Wir arbeiten ausschließlich auf Grundlage der Allgemeinen Deutschen Spediteurbedingungen 2017 – ADSp 2017 –.</span>"
End Select
Case Else
Select Case landKz
Case "D", "A", "DE", "AT", "CH"
getSignature &= "<span style=""font-size:9px"">Wir arbeiten ausschließlich auf Grund der Allgemeinen Österreichischen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten,<br>
@@ -1892,9 +1906,11 @@ Public Class cFakturierung
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.</span>"
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

8
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -306,10 +306,12 @@ Public Class frmFaktEmail
End If
Dim outl As New Outlook.Application
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
'-----------------------------------------------------------------
@@ -328,7 +330,7 @@ Public Class frmFaktEmail
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine) & "</div>"
Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "</div>"
Mail.HTMLBody = TextHTML
Mail.Subject = txtSubject.Text
@@ -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 = "<div style=""font-family:Calibri, Arial"">"
Select Case cboFaStb_Sprache._value

2
SDL/Fakturierung/rptRechnungDruck.Designer.vb generated
View File

@@ -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
'

38
SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb generated
View File

@@ -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

38
SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb generated
View File

@@ -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

2
SDL/My Project/Resources.resx
View File

@@ -914,6 +914,6 @@
<value>..\Resources\cbam_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ambar_boarder" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>..\Resources\ambar_boarder.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
SDL/Resources/ambar_boarder.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 KiB

BIN
SDL/Resources/ambar_boarder1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 187 KiB

2
SDL/SDL.vbproj
View File

@@ -4746,6 +4746,8 @@
<None Include="Resources\air-pollution.png" />
<None Include="Resources\cbam_s.png" />
<None Include="Resources\ambar_boarder.png" />
<None Include="Resources\ambar_boarder1.jpg" />
<None Include="Resources\ambar_boarder.jpg" />
<Content Include="Resources\food.png" />
<None Include="Resources\food1.png" />
<None Include="Resources\food2.png" />

2
SDL/kunden/frmBonitaet.vb
View File

@@ -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)

17
SDL/kunden/usrCntlKundenuebersicht.vb
View File

@@ -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

2
SDL/kunden/usrcntlKundeBearbeitenFull.vb
View File

@@ -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("-")

5
VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb
View File

@@ -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") & "'")

6
VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb
View File

@@ -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