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

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-01-07 15:46:52 +01:00
parent 5f18e9816c 9b53783b0d
commit 7cd106a413
12 changed files with 450 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SDL/kunden/frmKundenUebersichtZollRgDetails.Designer.vb generated
View File

@@ -25,6 +25,7 @@ Partial Class frmKundenUebersichtZollRgDetails
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenUebersichtZollRgDetails))
Me.pnl = New System.Windows.Forms.Panel()
Me.Button2 = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
Me.Label2 = New System.Windows.Forms.Label()
Me.Button15 = New System.Windows.Forms.Button()
@@ -58,6 +59,7 @@ Partial Class frmKundenUebersichtZollRgDetails
'pnl
'
Me.pnl.BackColor = System.Drawing.Color.White
Me.pnl.Controls.Add(Me.Button2)
Me.pnl.Controls.Add(Me.Button1)
Me.pnl.Controls.Add(Me.Label2)
Me.pnl.Controls.Add(Me.Button15)
@@ -90,12 +92,24 @@ Partial Class frmKundenUebersichtZollRgDetails
Me.pnl.Size = New System.Drawing.Size(560, 517)
Me.pnl.TabIndex = 0
'
'Button2
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button2.Location = New System.Drawing.Point(117, 419)
Me.Button2.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(105, 25)
Me.Button2.TabIndex = 93
Me.Button2.Text = "ZUGFeRD"
Me.Button2.UseVisualStyleBackColor = True
'
'Button1
'
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Image = Global.SDL.My.Resources.pdf1
Me.Button1.Image = Global.SDL.My.Resources.Resources.pdf1
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button1.Location = New System.Drawing.Point(128, 445)
Me.Button1.Location = New System.Drawing.Point(117, 445)
Me.Button1.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(105, 60)
@@ -117,12 +131,12 @@ Partial Class frmKundenUebersichtZollRgDetails
'Button15
'
Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button15.Image = Global.SDL.My.Resources.therefore1
Me.Button15.Image = Global.SDL.My.Resources.Resources.therefore1
Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button15.Location = New System.Drawing.Point(12, 445)
Me.Button15.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
Me.Button15.Name = "Button15"
Me.Button15.Size = New System.Drawing.Size(103, 60)
Me.Button15.Size = New System.Drawing.Size(92, 60)
Me.Button15.TabIndex = 89
Me.Button15.Text = "Therefore" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "öffnen"
Me.Button15.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -140,6 +154,7 @@ Partial Class frmKundenUebersichtZollRgDetails
Me.cbxLastschrift.TabIndex = 15
Me.cbxLastschrift.Text = "Lastschrift"
Me.cbxLastschrift.UseVisualStyleBackColor = True
Me.cbxLastschrift.Visible = False
'
'Label18
'
@@ -405,4 +420,5 @@ Partial Class frmKundenUebersichtZollRgDetails
Friend WithEvents lblAbfNr As System.Windows.Forms.Label
Friend WithEvents Label2 As System.Windows.Forms.Label
Friend WithEvents Button1 As Button
Friend WithEvents Button2 As Button
End Class

41
SDL/kunden/frmKundenUebersichtZollRgDetails.vb
View File

@@ -110,4 +110,45 @@ Public Class frmKundenUebersichtZollRgDetails
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 3,,,,, sammelrechnungskopie)
End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
Dim Path_temp As String = ""
cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 3, Path_temp,,,, sammelrechnungskopie)
If Path_temp <> "" Then
Try
Dim psi As New ProcessStartInfo()
psi.FileName = "C:\Program Files\Eclipse Adoptium\jre-11.0.28.6-hotspot\bin\java.exe"
psi.Arguments = "-jar ""C:\Users\d.breimaier\Downloads\Mustang-CLI-2.21.0.jar"" --no-notices --action validate --source " & Path_temp & ""
psi.RedirectStandardOutput = True
psi.RedirectStandardError = True
psi.UseShellExecute = False
psi.CreateNoWindow = True
Using p As Process = Process.Start(psi)
Dim output = p.StandardOutput.ReadToEnd()
Dim err = p.StandardError.ReadToEnd()
p.WaitForExit()
Console.WriteLine("ExitCode: " & p.ExitCode)
Console.WriteLine(output)
Console.WriteLine(err)
If err <> "" Then MsgBox(err)
End Using
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End If
End Sub
End Class

2
SDL/kunden/usrcntlKundeBearbeitenFull.vb
View File

@@ -940,7 +940,7 @@ Public Class usrcntlKundeBearbeitenFull
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)
cboUSt_UstIdNrLand.fillWithSQL(" SELECT [Länderverzeichnis für die Außenhandelsstatistik].LandKz,[Länderverzeichnis für die Außenhandelsstatistik].LandBez " &
cboUSt_UstIdNrLand.fillWithSQL(" SELECT [Länderverzeichnis für die Außenhandelsstatistik].UIDLandz,[Länderverzeichnis für die Außenhandelsstatistik].LandBez " &
" FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN [Währungstabelle] ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = [Währungstabelle].[Währungsschlüssel] " &
" WHERE ([Währungstabelle].[MitgliedslandEU] = 1) " &
" ORDER BY [Länderverzeichnis für die Außenhandelsstatistik].LandKz ", , "FMZOLL", True)