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

MDM-Vollmachten, Mahnungen, Fremdwährung, Gesamtsicherheiten

Browse Source
This commit is contained in:
d.breimaier
2024-10-10 11:32:28 +02:00
parent 82be7a58d3
commit f9003db09d
15 changed files with 185 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb generated
View File

@@ -84,6 +84,7 @@ Partial Class usrcntlVollmacht_MDM_EU
Me.CheckedListBox1 = New System.Windows.Forms.CheckedListBox()
Me.txt_GF_nachname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txt_GF_vorname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.cbxRMC = New System.Windows.Forms.CheckBox()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@@ -1033,12 +1034,23 @@ Partial Class usrcntlVollmacht_MDM_EU
Me.txt_GF_vorname.Size = New System.Drawing.Size(163, 20)
Me.txt_GF_vorname.TabIndex = 146
'
'cbxRMC
'
Me.cbxRMC.AutoSize = True
Me.cbxRMC.Location = New System.Drawing.Point(5, 46)
Me.cbxRMC.Name = "cbxRMC"
Me.cbxRMC.Size = New System.Drawing.Size(50, 17)
Me.cbxRMC.TabIndex = 147
Me.cbxRMC.Text = "RMC"
Me.cbxRMC.UseVisualStyleBackColor = True
'
'usrcntlVollmacht_MDM_EU
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.WhiteSmoke
Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Controls.Add(Me.cbxRMC)
Me.Controls.Add(Me.CheckedListBox1)
Me.Controls.Add(Me.cbx_GF_Geburtsland)
Me.Controls.Add(Me.Label21)
@@ -1170,4 +1182,5 @@ Partial Class usrcntlVollmacht_MDM_EU
Friend WithEvents CheckedListBox1 As CheckedListBox
Friend WithEvents txt_GF_nachname As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txt_GF_vorname As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents cbxRMC As CheckBox
End Class

6
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.vb
View File

@@ -52,6 +52,12 @@ Public Class usrcntlVollmacht_MDM_EU
Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KdNR)
Dim KK_List As New VERAG_PROG_ALLGEMEIN.cKundenKontakteList(KdNR)
If IsNumeric(KdNR) AndAlso (KdNR >= 150000 And KdNR <= 159999) Then
cbxRMC.Checked = True
Else
cbxRMC.Checked = False
End If
Dim GF As cKundenKontakte = KK_List.LIST.Find(Function(c) c.kkd_kkaId = 13 And c.kkd_KundenNr = KdNR)
If GF IsNot Nothing Then
txt_GF_nachname.Text = IIf(GF.kkd_AnsprechpartnerNachname <> "", GF.kkd_AnsprechpartnerNachname & " ", "")

11
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb
View File

@@ -10,8 +10,6 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
Public Event MOVE_DOWN(c As Control)
Public KdNR As Integer = -1
Dim anzahlKopienWord As Integer = 1
Dim anzahlKopienPDF As Integer = 1
Public Sub ChangeKDNr(kdnr As Integer) Implements FormualrInterface.ChangeKDNr
initKdNR(kdnr)
End Sub
@@ -178,17 +176,8 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
Case "NL"
privatfirma = True
Case "HR"
privatfirma = True
anzahlKopienPDF = 10
Case "LU"
anzahlKopienPDF = 5
Case "AT"
anzahlKopienPDF = 10
Case Else
privatfirma = False

54
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -2017,6 +2017,8 @@ Public Class FormularManagerNEU
Dim odoc As Microsoft.Office.Interop.Word.Document = Nothing
Dim oWord As New Microsoft.Office.Interop.Word.Application
Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID)
Dim FIRMA_DE As New VERAG_PROG_ALLGEMEIN.cFirmen(2)
Dim isKundeDE = IIf(usrCntl.cbxLandKz._value = "DE" Or usrCntl.cbxLandKz._value = "D", True, False)
Dim docBez As String = ""
@@ -2064,29 +2066,51 @@ Public Class FormularManagerNEU
Case "ceo_birthcountry" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Geburtsland._value
Case "ceo_passportvaliduntil" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Passgueltigbis.Text
Case "c_name" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
Case "c_name1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
Case "c_name2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
Case "c_name3" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
Case "c_name4" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
Case "c_name5" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
Case "c_name6" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
Case "c_name7" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
Case "c_address" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort
Case "c_street" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
Case "c_name" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
Case "c_name1" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
Case "c_name2" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
Case "c_name3" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
Case "c_name4" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
Case "c_name5" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
Case "c_name6" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
Case "c_name7" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
Case "c_address" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort, FIRMA_DE.Firma_Straße & " " & FIRMA_DE.Firma_Ort)
Case "c_street" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Straße, FIRMA_DE.Firma_Straße)
Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Ort, FIRMA_DE.Firma_Ort)
Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_UID, FIRMA_DE.Firma_UID)
Case "c_phone" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
Case "c_mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmailzurueck.Text
Case "c_bank" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bankverbindung1
Case "c_iban" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
Case "c_bic" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
Case "c_bank" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bankverbindung1, FIRMA_DE.Firma_Bankverbindung1)
Case "c_iban" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_IBAN1.Replace("IBAN:", ""), FIRMA_DE.Firma_IBAN1.Replace("IBAN:", ""))
Case "c_bic" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_BIC1.Replace("BIC:", ""), FIRMA_DE.Firma_BIC1.Replace("BIC:", ""))
Case "place_date" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text & ", " & IIf(IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text, "")
End Select
Next
For Each s As Microsoft.Office.Interop.Word.Section In odoc.Sections
For Each header As Microsoft.Office.Interop.Word.HeaderFooter In s.Headers
For Each img_word As Microsoft.Office.Interop.Word.Shape In header.Shapes
If img_word.AlternativeText.ToLower.Contains("rmc-logo") Then
img_word.Visible = usrCntl.cbxRMC.Checked
End If
If img_word.AlternativeText.ToLower.Contains("verag360-logo") Then
'\\developer.verag.ost.dmn\F\Grafik\VERAG\LOGOs\VERIMEX360.jpg
img_word.Visible = Not isKundeDE
End If
If img_word.AlternativeText.ToLower.Contains("veraggmbh-logo") Then
'\\developer.verag.ost.dmn\F\Grafik\VERAG\LOGOs\VERAG GmbH\Verag-Spedition-GMBH-Logo.png
img_word.Visible = isKundeDE
End If
Next
Next
Next
odoc.Save() : odoc.Activate()

3
SDL/Speditionsbuch/Nacherfassung/rptSpeditionsberichtKdSpez.vb
View File

@@ -3,7 +3,6 @@ Imports GrapeCity.ActiveReports.Document
Public Class rptSpeditionsberichtKdSpez
Private Sub GroupHeader3_Format(sender As Object, e As EventArgs) Handles GroupHeader3.Format
End Sub
End Class

2
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

@@ -1249,6 +1249,8 @@ Public Class usrCntlSpeditionsBuchSuche
Dim rpt As New rptSpeditionsberichtKdSpez
rpt.PageSettings.PaperKind = GrapeCity.ActiveReports.Printing.PaperKind.A4
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX" : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Label28.Text = "IMEX Customs Service GmbH"
Case "ATILLA" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "ATILLA Spedition"

18
SDL/buchhaltung/rptMahnung.Designer.vb generated
View File

File diff suppressed because one or more lines are too long

6
SDL/buchhaltung/rptMahnung.resx
View File

File diff suppressed because one or more lines are too long

11
SDL/buchhaltung/usrCntlBH.vb
View File

@@ -94,7 +94,7 @@ Public Class usrCntlBH
Me.Cursor = Cursors.Default
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -223,6 +223,7 @@ Public Class usrCntlBH
sqlStr &= "SELECT * FROM ("
sqlStr &= " SELECT Ordnungsbegriff, AdressenNr as KdNr, Adressen.LandKz, "
If cbxDeckungsstoppAnzeigen.Checked Then sqlStr &= " (SELECT TOP 1 ISNULL([kde_Versicherung_DeckungsstoppDatum],'') FROM [tblKundenErweitert] where kde_Versicherung_Deckungsstopp=1 and kde_KundenNr=AdressenNr) AS DS, "
sqlStr &= " (SELECT TOP 1 ISNULL(kde_txtVersicherungNichtVersicherbar,'') FROM [tblKundenErweitert] where kde_KundenNr=AdressenNr) AS nichtVersicherbar, "
If True Then sqlStr &= " isnull((SELECT TOP 1 [kde_Versicherung_GemeldeterBetrag] FROM [tblKundenErweitert] where kde_KundenNr=AdressenNr),0) AS GemeldeterBetrag, "
sqlStr &= " (SELECT SUM(Saldo) FROM dbo.[Offene_Posten_DVO] WHERE (KundenNr = AdressenNr )) AS LfdSaldo, "
sqlStr &= " (SELECT MIN(Datum) AS Expr1"
@@ -450,7 +451,7 @@ Public Class usrCntlBH
print.Show()
Catch ex As Exception
MsgBox(ex.Message)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Me.Cursor = Cursors.Default
End Sub
@@ -634,7 +635,7 @@ Public Class usrCntlBH
OP.SAVE()
Catch ex As Exception
MsgBox("KdNr: " & kdnr & vbNewLine & ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
@@ -653,7 +654,7 @@ Public Class usrCntlBH
'For Each currentField In currentRow
'Next
Catch ex As Exception
MsgBox(kdnr_tmp & " " & ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End While
Label30.Text = (cnt + 1) & " / " & LineCount
@@ -666,7 +667,7 @@ Public Class usrCntlBH
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Finally
End Try

1
SDL/kunden/frmKundenblatt.Designer.vb generated
View File

@@ -2241,7 +2241,6 @@ Partial Class frmKundenblatt
'
Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
Me.cntxtCntxtMDM.Text = "cntxtMDM"
'

4
SDL/kunden/usrcntlKundeBearbeitenFull.vb
View File

@@ -835,7 +835,9 @@ Public Class usrcntlKundeBearbeitenFull
Private Sub loadControls()
cboAbf_Waehrung.fillWithSQL("SELECT [Währungscode],[Land] FROM Währungstabelle ORDER BY Währungscode", , "FMZOLL", False)
cbxKapitalWaehrung.Items.AddRange(cboAbf_Waehrung.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
cbxKapitalWaehrung.fillWithSQL("SELECT fw_iso3, fw_land FROM [VERAG].[dbo].[tblWahrungtabelleNEU] order by fw_land ", , "FMZOLL", False)
'cbxKapitalWaehrung.Items.AddRange(cboAbf_Waehrung.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
cboAbf_Steuerschluessel.fillWithSQL("SELECT [Steuerschlüssel], isnull(cast(cast( [Steuersatz %]*100 as decimal(2))as varchar(5)) + '% - ' +AuswahlSteuerbezeichnung,'') as Bezeichnung FROM [Steuertabelle] ORDER BY Steuerschlüssel", False, "FMZOLL", True)