From 5c1bb5855d405550fef0458bf26c3ade9748efd3 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 18 Oct 2023 16:03:11 +0200 Subject: [PATCH 01/10] essensbestellungen --- SDL/frmEssensbestellungen.vb | 3 +++ VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb | 2 ++ VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb | 13 ++++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/SDL/frmEssensbestellungen.vb b/SDL/frmEssensbestellungen.vb index e3a49f5e..5d93cf9d 100644 --- a/SDL/frmEssensbestellungen.vb +++ b/SDL/frmEssensbestellungen.vb @@ -1,4 +1,5 @@  +Imports com.sun.org.apache.xpath.internal.functions Imports VERAG_PROG_ALLGEMEIN Public Class frmEssensbestellungen @@ -153,6 +154,8 @@ Public Class frmEssensbestellungen essen.eb_datum = CDate(dt.Rows(0).Item("MenuDateVon")) essen.eb_gebaeude = cbxGebauede._value essen.eb_anmerkung = txtAnmerkung.Text + essen.eb_firma = cAllgemein.MITARBEITER.getFirma + essen.SAVE() loadDGVBestellungen() diff --git a/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb b/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb index 8f22e2dd..b4146468 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb @@ -23,6 +23,7 @@ Public Class cEssensbestellung Property eb_anmerkung As Object = Nothing Property eb_gesendet_am As Object = Nothing Property eb_gesendet As Boolean + Property eb_firma As Object = Nothing Public hasEntry = False @@ -72,6 +73,7 @@ Public Class cEssensbestellung list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_anmerkung", eb_anmerkung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_gesendet", eb_gesendet)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_gesendet_am", eb_gesendet_am)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_firma", eb_firma)) Return list diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 3fb50dd0..f642b6c8 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -12,7 +12,7 @@ Imports Spire.Pdf.HtmlConverter Imports System.Threading Imports System.Net Imports Spire.Pdf.Tables - +Imports System.Windows.Forms.VisualStyles Public Class cDATENSERVER @@ -1374,9 +1374,16 @@ Public Class cFormularManager - Public Shared Function getPDFViaSpirePDF_FromURLStream(URL As String, Optional targetPath As String = "", Optional openFileAfterDownload As Boolean = True) As String + Public Shared Function getPDFViaSpirePDF_FromURLStream(URL As String, Optional filename As String = "", Optional targetPath As String = "", Optional openFileAfterDownload As Boolean = True) As String Try - If targetPath = "" Then targetPath = getTMPPath_PDF() + If targetPath = "" Then + If filename <> "" Then + targetPath = System.IO.Path.GetTempPath() & filename & ".pdf" + Else + targetPath = getTMPPath_PDF() + End If + End If + VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() From 6652acae7e97c5814d6ee7fb1c9fa607cd55250e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 20 Oct 2023 14:36:03 +0200 Subject: [PATCH 02/10] commit_sdl --- SDL/SDL.vbproj | 14 +++++++------- SDL/kassenbuch/frmNacherfassungLeihgeld.vb | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 2f0e7bea..8ae049a4 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -104,6 +104,9 @@ ..\..\..\AVISO\Aviso\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll + + ..\..\..\ADMIN\ADMIN\DAKOSY_Worker\bin\Debug\DAKOSY_Worker.dll + False ..\..\..\dll\SharpSSH\DiffieHellman.dll @@ -114,9 +117,6 @@ ..\..\..\AVISO\Aviso\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll - - ..\..\..\Aviso\AVISO\Gemeinsames\bin\x64\Debug\Gemeinsames.dll - False ..\..\..\dll\Ghostscript.NET.dll @@ -4928,10 +4928,6 @@ - - {50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f} - DAKOSY_Worker_lib - {2e4dbc09-e57b-4ac5-8554-6117d71f993b} MDM_Worker_lib @@ -4940,6 +4936,10 @@ {5b947a66-009a-4bb6-b925-f84a01045095} TELOTEC_Worker_lib + + {110c923b-cb02-4fd0-af24-95e0f0eeeff5} + Gemeinsames + {e4190547-b222-4ae3-a0be-a44eaee70335} Parkzeit diff --git a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb index 34e87107..6be89f83 100644 --- a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb +++ b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb @@ -1,5 +1,6 @@  Imports GrapeCity.ActiveReports +Imports SDL Public Class frmNacherfassungLeihgeld Dim cOptionenDAL As New cOptionenDAL From 4928261378baa049728d108844dafb523215dda8 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 23 Oct 2023 08:51:47 +0200 Subject: [PATCH 03/10] commit addIn --- SDL/SDL.vbproj | 9 ++++----- SDL/frmMain.vb | 16 +++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 8ae049a4..18df9182 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -84,7 +84,7 @@ true - true + false false @@ -286,6 +286,9 @@ False ..\..\..\dll\SharpSSH\Org.Mentalis.Security.dll + + ..\..\..\Parkzeit\Parkzeit\Parkzeit\bin\Debug\Parkzeit.exe + @@ -4940,10 +4943,6 @@ {110c923b-cb02-4fd0-af24-95e0f0eeeff5} Gemeinsames - - {e4190547-b222-4ae3-a0be-a44eaee70335} - Parkzeit - {a3b497bd-842c-4a2b-b398-ed1976849df1} VERAG_PROG_ALLGEMEIN diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index de7c7801..6895fe66 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -1,11 +1,9 @@ Imports System.IO -Imports System.Data.OleDb Imports Microsoft.Office.Interop -Imports VERAGRegistrierkasse -Imports Gemeinsames Imports System.Drawing.Drawing2D Imports VERAG_PROG_ALLGEMEIN + Public Class frmMain Dim dgvKunden As DataGridView @@ -142,18 +140,18 @@ Public Class frmMain If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then - Dim timas As New cTimasAPI - Dim infoMessage As String = "" - Dim timeEntryExisting As Boolean = False + Dim timas As New cTimasAPI + Dim infoMessage As String = "" + Dim timeEntryExisting As Boolean = False timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, Nothing, timeEntryExisting) If Not timeEntryExisting Then Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst!" & vbNewLine & Now.ToString() & " als Startzeit erfassen?", vbYesNo) If a = vbYes Then - Dim info - timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in") + Dim info + timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in") MsgBox(info) End If - End If + End If End If From 511fb02a8d1603dc04ffe03bb7513951cfd5ff27 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 23 Oct 2023 09:13:00 +0200 Subject: [PATCH 04/10] Release x64 delete --- VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 2dd2d9ba..f681f645 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -59,7 +59,7 @@ true - bin\x64\Release\ + bin\Release\ VERAG_PROG_ALLGEMEIN.xml true 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 From 791c4fb31efa1a8d77ab52caf060086ee673f37a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 23 Oct 2023 14:41:35 +0200 Subject: [PATCH 05/10] Homeoffice --- .../frmMitarbeitersuche.Designer.vb | 15 +++++++++++++++ .../Mitarbeiterverzeichnis/frmMitarbeitersuche.vb | 4 ++-- .../Schnittstellen/TIMAS/cTimasAPI.vb | 4 ++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb index 4cea2e95..abf337b4 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb @@ -73,6 +73,7 @@ Partial Class frmMitarbeitersuche Me.lblFirma = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() + Me.cbxHomeoffice = New System.Windows.Forms.CheckBox() Me.pnlSrch.SuspendLayout() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlMain.SuspendLayout() @@ -217,6 +218,7 @@ Partial Class frmMitarbeitersuche ' 'pnlZeiten ' + Me.pnlZeiten.Controls.Add(Me.cbxHomeoffice) Me.pnlZeiten.Controls.Add(Me.btnZEGehen) Me.pnlZeiten.Controls.Add(Me.btnZEKommen) Me.pnlZeiten.Controls.Add(Me.lblTimasSaldo) @@ -658,6 +660,17 @@ Partial Class frmMitarbeitersuche Me.Label3.Text = "Niederlassung:" Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' + 'cbxHomeoffice + ' + Me.cbxHomeoffice.AutoSize = True + Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black + Me.cbxHomeoffice.Location = New System.Drawing.Point(262, 7) + Me.cbxHomeoffice.Name = "cbxHomeoffice" + Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17) + Me.cbxHomeoffice.TabIndex = 125 + Me.cbxHomeoffice.Text = "Homeoffice" + Me.cbxHomeoffice.UseVisualStyleBackColor = True + ' 'frmMitarbeitersuche ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -679,6 +692,7 @@ Partial Class frmMitarbeitersuche Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() Me.pnlZeiten.ResumeLayout(False) + Me.pnlZeiten.PerformLayout() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlWohnadresse.ResumeLayout(False) CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() @@ -742,4 +756,5 @@ Partial Class frmMitarbeitersuche Friend WithEvents pnlZeiten As Windows.Forms.Panel Friend WithEvents btnZEGehen As Windows.Forms.Button Friend WithEvents btnZEKommen As Windows.Forms.Button + Friend WithEvents cbxHomeoffice As Windows.Forms.CheckBox End Class diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb index ebc226c5..cce7c09a 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb @@ -305,10 +305,10 @@ Public Class frmMitarbeitersuche If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then Dim timas As New cTimasAPI - Dim a As MsgBoxResult = MsgBox(sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo) + Dim a As MsgBoxResult = MsgBox(IIf(cbxHomeoffice.Checked, "Homeoffice", "Büro") & vbNewLine & sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo) If a = vbYes Then Dim info - timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, art) + timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, art, IIf(cbxHomeoffice.Checked, 3, 0)) MsgBox(info) Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB requestDone = False diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index 02f52c54..0d1fcc98 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -774,7 +774,7 @@ Public Class cTimasAPI - Public Function setTimeEntry(ByVal mitarbeiter As cMitarbeiter, ByVal timeEntry As DateTime, ByRef info As String, ByRef inout As String) + Public Function setTimeEntry(ByVal mitarbeiter As cMitarbeiter, ByVal timeEntry As DateTime, ByRef info As String, ByRef inout As String, Optional ByRef art As Integer = 0) Dim failureText As String = "" Dim timeEntryCreated As Boolean = False @@ -805,7 +805,7 @@ Public Class cTimasAPI Dim json As New Chilkat.JsonObject json.UpdateString("stamp", timeEntry.ToString("yyyy-MM-ddTHH:mm:ss")) - json.UpdateInt("statusnumber", 0) ' + json.UpdateInt("statusnumber", art) '0 Standardanwesenheit, 3 Homeoffice json.UpdateString("type", inout) json.UpdateString("employeeid", mitarbeiter.mit_timasId) From 08c4d0f6b2e6c993c43e3f4e4d754570bec02f9e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 24 Oct 2023 11:24:56 +0200 Subject: [PATCH 06/10] =?UTF-8?q?EORI-Antrag=20f=C3=BCr=20Privatpersonen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usrcntlEORI_Antrag.Designer.vb | 25 +++++++ .../FormulareBaukasten/usrcntlEORI_Antrag.vb | 17 ++++- SDL/Formulare/KDFormulare/frmFormulare.vb | 71 ++++++++++++++++--- 3 files changed, 103 insertions(+), 10 deletions(-) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb index 748fc2ce..f22f2f57 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb @@ -62,6 +62,8 @@ Partial Class usrcntlEORI_Antrag Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() Me.Label14 = New System.Windows.Forms.Label() Me.cbxDatum = New System.Windows.Forms.CheckBox() + Me.cboPrivatperson = New System.Windows.Forms.CheckBox() + Me.gebDatum = New System.Windows.Forms.DateTimePicker() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -470,6 +472,7 @@ Partial Class usrcntlEORI_Antrag 'lblHerrFrau ' Me.lblHerrFrau.AutoSize = True + Me.lblHerrFrau.Cursor = System.Windows.Forms.Cursors.Arrow Me.lblHerrFrau.Location = New System.Drawing.Point(16, 67) Me.lblHerrFrau.Name = "lblHerrFrau" Me.lblHerrFrau.Size = New System.Drawing.Size(56, 13) @@ -629,12 +632,32 @@ Partial Class usrcntlEORI_Antrag Me.cbxDatum.TabIndex = 70 Me.cbxDatum.UseVisualStyleBackColor = True ' + 'cboPrivatperson + ' + Me.cboPrivatperson.AutoSize = True + Me.cboPrivatperson.Location = New System.Drawing.Point(678, 12) + Me.cboPrivatperson.Name = "cboPrivatperson" + Me.cboPrivatperson.Size = New System.Drawing.Size(112, 17) + Me.cboPrivatperson.TabIndex = 71 + Me.cboPrivatperson.Text = "für Privatpersonen" + Me.cboPrivatperson.UseVisualStyleBackColor = True + ' + 'gebDatum + ' + Me.gebDatum.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.gebDatum.Location = New System.Drawing.Point(100, 147) + Me.gebDatum.Name = "gebDatum" + Me.gebDatum.Size = New System.Drawing.Size(78, 20) + Me.gebDatum.TabIndex = 72 + ' 'usrcntlEORI_Antrag ' 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.gebDatum) + Me.Controls.Add(Me.cboPrivatperson) Me.Controls.Add(Me.cbxDatum) Me.Controls.Add(Me.Label14) Me.Controls.Add(Me.DateTimePicker1) @@ -722,4 +745,6 @@ Partial Class usrcntlEORI_Antrag Friend WithEvents DateTimePicker1 As DateTimePicker Friend WithEvents Label14 As Label Friend WithEvents cbxDatum As CheckBox + Friend WithEvents cboPrivatperson As CheckBox + Friend WithEvents gebDatum As DateTimePicker End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb index e203cd0d..aed83a7f 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb @@ -8,7 +8,6 @@ Public Event MOVE_UP(c As Control) Public Event MOVE_DOWN(c As Control) - Public KdNR As Integer = -1 Public Sub ChangeKDNr(kdnr As Integer) _ Implements FormualrInterface.ChangeKDNr @@ -67,6 +66,8 @@ cbxAntragsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Änderung", "Änderung")) cbxAntragsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Beendigung", "Beendigung")) + cboPrivatperson.Checked = False + If KdNR > 0 Then initKdNR(KdNR) End If @@ -107,4 +108,18 @@ End Sub + Private Sub cboPrivatperson_CheckedChanged(sender As Object, e As EventArgs) Handles cboPrivatperson.CheckedChanged + If cboPrivatperson.Checked Then + Label2.Text = "Geburtsdat:" + txtUid.Visible = False + gebDatum.Visible = True + lblHerrFrau.Text = "Vor - Nachname:" + + Else + Label2.Text = "UID-Nr:" + txtUid.Visible = True + gebDatum.Visible = False + lblHerrFrau.Text = "Herr/Frau:" + End If + End Sub End Class diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index a537f35f..0682c70a 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -4186,7 +4186,10 @@ Public Class FormularManagerNEU Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) - Dim top = -5S + Dim top = 0 + If usrCntl.cboPrivatperson.Checked Then top = -2 + + Select Case usrCntl.cboSprache._value Case "EN" @@ -4197,7 +4200,6 @@ Public Class FormularManagerNEU Case "Neuzugang" listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 139, 38, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) - Case "Änderung" listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 139, 45, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) @@ -4237,21 +4239,62 @@ Public Class FormularManagerNEU Case Else + + Select Case usrCntl.cbxAntragsart._value Case "Neuzugang" - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 43, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 43 + top, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) Case "Änderung" - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 50, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 50 + top, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) Case "Beendigung" - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 57, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 57 + top, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) End Select - If usrCntl.DateTimePicker1 IsNot Nothing AndAlso IsDate((usrCntl.DateTimePicker1.Value)) Then + If usrCntl.cboPrivatperson.Checked Then + + If usrCntl.DateTimePicker1 IsNot Nothing AndAlso IsDate((usrCntl.DateTimePicker1.Value)) Then + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Day, 135, 82 + top, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Month, 145, 82 + top, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Year, 157, 82 + top, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + End If + + If usrCntl.gebDatum IsNot Nothing AndAlso IsDate((usrCntl.gebDatum.Value)) Then + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Day, 25, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Month, 35, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Year, 47, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + End If + + + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 25, 84 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + + 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 25, 103, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + 'Splittung von Vor und Nachname + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(0, usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim, 25, 96, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(usrCntl.txtHerrFrau.Text.IndexOf(" "), usrCntl.txtHerrFrau.TextLength - usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim(), 25, 113, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + + + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtOrt.Text, 25, 158, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 25, 166, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.MyTextBox2.Text, 25, 177, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLand.Text, 25, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPLZ.Text, 45, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + + + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 25, 226, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 25, 210, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 25, 184, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT, 2)) + + + + Else + + If usrCntl.DateTimePicker1 IsNot Nothing AndAlso IsDate((usrCntl.DateTimePicker1.Value)) Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Day, 135, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Month, 145, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Year, 157, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) @@ -4276,6 +4319,9 @@ Public Class FormularManagerNEU listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 25, 173, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 25, 184, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT, 2)) + + End If + End Select @@ -4283,9 +4329,16 @@ Public Class FormularManagerNEU Case "EN" Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag_EN", listTowrite) - Case Else - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag", listTowrite) - End Select + Case Else + If usrCntl.cboPrivatperson.Checked Then + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag_Privat", listTowrite) + Else + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag", listTowrite) + End If + + + + End Select From b9a41c6002889c7e427d15b73075ec3eeb291dbb Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 24 Oct 2023 14:24:16 +0200 Subject: [PATCH 07/10] EORI-Privat --- .../usrcntlEORI_Antrag.Designer.vb | 29 +++++++++++++++++++ .../FormulareBaukasten/usrcntlEORI_Antrag.vb | 11 +++++++ SDL/Formulare/KDFormulare/frmFormulare.vb | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb index f22f2f57..75e6f3e7 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb @@ -64,6 +64,8 @@ Partial Class usrcntlEORI_Antrag Me.cbxDatum = New System.Windows.Forms.CheckBox() Me.cboPrivatperson = New System.Windows.Forms.CheckBox() Me.gebDatum = New System.Windows.Forms.DateTimePicker() + Me.linkBMF = New System.Windows.Forms.LinkLabel() + Me.cbxGebDatu = New System.Windows.Forms.CheckBox() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -649,6 +651,29 @@ Partial Class usrcntlEORI_Antrag Me.gebDatum.Name = "gebDatum" Me.gebDatum.Size = New System.Drawing.Size(78, 20) Me.gebDatum.TabIndex = 72 + Me.gebDatum.Visible = False + ' + 'linkBMF + ' + Me.linkBMF.AutoSize = True + Me.linkBMF.Location = New System.Drawing.Point(791, 12) + Me.linkBMF.Name = "linkBMF" + Me.linkBMF.Size = New System.Drawing.Size(67, 13) + Me.linkBMF.TabIndex = 73 + Me.linkBMF.TabStop = True + Me.linkBMF.Text = "Onlineantrag" + ' + 'cbxGebDatu + ' + Me.cbxGebDatu.AutoSize = True + Me.cbxGebDatu.Checked = True + Me.cbxGebDatu.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxGebDatu.Location = New System.Drawing.Point(184, 150) + Me.cbxGebDatu.Name = "cbxGebDatu" + Me.cbxGebDatu.Size = New System.Drawing.Size(15, 14) + Me.cbxGebDatu.TabIndex = 74 + Me.cbxGebDatu.UseVisualStyleBackColor = True + Me.cbxGebDatu.Visible = False ' 'usrcntlEORI_Antrag ' @@ -656,6 +681,8 @@ Partial Class usrcntlEORI_Antrag Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.cbxGebDatu) + Me.Controls.Add(Me.linkBMF) Me.Controls.Add(Me.gebDatum) Me.Controls.Add(Me.cboPrivatperson) Me.Controls.Add(Me.cbxDatum) @@ -747,4 +774,6 @@ Partial Class usrcntlEORI_Antrag Friend WithEvents cbxDatum As CheckBox Friend WithEvents cboPrivatperson As CheckBox Friend WithEvents gebDatum As DateTimePicker + Friend WithEvents linkBMF As LinkLabel + Friend WithEvents cbxGebDatu As CheckBox End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb index aed83a7f..abdf4147 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb @@ -114,12 +114,23 @@ txtUid.Visible = False gebDatum.Visible = True lblHerrFrau.Text = "Vor - Nachname:" + cbxGebDatu.Visible = True Else Label2.Text = "UID-Nr:" txtUid.Visible = True gebDatum.Visible = False lblHerrFrau.Text = "Herr/Frau:" + cbxGebDatu.Visible = False End If End Sub + + Private Sub linkBMF_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkBMF.LinkClicked + If cboPrivatperson.Checked Then + Process.Start("https://www.formulare-bfinv.de/ffw/catalog/openForm.do?path=catalog%3A%2F%2FUnternehmen%2Fzoelle%2Fatlas%2F0870c") + Else + Process.Start("https://www.formulare-bfinv.de/ffw/catalog/openForm.do?path=catalog%3A%2F%2FUnternehmen%2Fzoelle%2Fatlas%2F0870a") + End If + + End Sub End Class diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 0682c70a..3d73f312 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -4263,7 +4263,7 @@ Public Class FormularManagerNEU listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Year, 157, 82 + top, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) End If - If usrCntl.gebDatum IsNot Nothing AndAlso IsDate((usrCntl.gebDatum.Value)) Then + If usrCntl.gebDatum IsNot Nothing AndAlso IsDate((usrCntl.gebDatum.Value)) AndAlso usrCntl.cbxGebDatu.Checked Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Day, 25, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Month, 35, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Year, 47, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) From 23c1077235597958910f1e67cd1690581f6decfd Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 25 Oct 2023 11:56:40 +0200 Subject: [PATCH 08/10] =?UTF-8?q?Berechigungspr=C3=BCfung=20bei=20Rechnugs?= =?UTF-8?q?ansicht=20im=20Therefore=20(f=C3=BCr=20IMEX)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/kunden/frmKundenUebersichtZollRgDetails.vb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SDL/kunden/frmKundenUebersichtZollRgDetails.vb b/SDL/kunden/frmKundenUebersichtZollRgDetails.vb index 80f25461..15848575 100644 --- a/SDL/kunden/frmKundenUebersichtZollRgDetails.vb +++ b/SDL/kunden/frmKundenUebersichtZollRgDetails.vb @@ -85,9 +85,14 @@ Public Class frmKundenUebersichtZollRgDetails Private Sub Button15_Click(sender As Object, e As EventArgs) Handles Button15.Click Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "IMEX", "ATILLA" : Exit Sub + Case "ATILLA" : Exit Sub + Case "IMEX" 'Imex nur mit Berechtigungsgruppe FAKTURIERUNG im SDL + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG", "SDL") Then + Exit Sub + End If End Select Try + If DataGridView.SelectedRows.Count = 0 Then Exit Sub If Not IsNumeric(filialeTmp) Then Exit Sub If Not IsNumeric(abfertigungsNrTmp) Then Exit Sub From d68eda93d06be824ba2dd51b195da0eb5eb03597 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 25 Oct 2023 17:02:10 +0200 Subject: [PATCH 09/10] Vorauskasse > Offerte laden --- .../usrcntlVorauskasse.Designer.vb | 54 ++++++++++++++- .../FormulareBaukasten/usrcntlVorauskasse.vb | 67 ++++++++++++++++++- 2 files changed, 117 insertions(+), 4 deletions(-) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb index 5887e3e8..1f5ff444 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb @@ -155,6 +155,9 @@ Partial Class usrcntlVorauskasse Me.txtFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label17 = New System.Windows.Forms.Label() Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnOffertladen = New System.Windows.Forms.Button() + Me.txtPos = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label47 = New System.Windows.Forms.Label() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlBottom.SuspendLayout() Me.Panel4.SuspendLayout() @@ -1195,6 +1198,9 @@ Partial Class usrcntlVorauskasse ' 'Panel5 ' + Me.Panel5.Controls.Add(Me.Label47) + Me.Panel5.Controls.Add(Me.txtPos) + Me.Panel5.Controls.Add(Me.btnOffertladen) Me.Panel5.Controls.Add(Me.lblWaehrung) Me.Panel5.Controls.Add(Me.Button5) Me.Panel5.Controls.Add(Me.txtSonstigeKostenText) @@ -1299,7 +1305,7 @@ Partial Class usrcntlVorauskasse ' Me.LinkLabel1.AutoSize = True Me.LinkLabel1.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel1.Location = New System.Drawing.Point(268, 88) + Me.LinkLabel1.Location = New System.Drawing.Point(287, 84) Me.LinkLabel1.Name = "LinkLabel1" Me.LinkLabel1.Size = New System.Drawing.Size(39, 13) Me.LinkLabel1.TabIndex = 10 @@ -2296,6 +2302,49 @@ Partial Class usrcntlVorauskasse Me.cboSprache.Size = New System.Drawing.Size(89, 21) Me.cboSprache.TabIndex = 51 ' + 'btnOffertladen + ' + Me.btnOffertladen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOffertladen.Location = New System.Drawing.Point(332, 81) + Me.btnOffertladen.Name = "btnOffertladen" + Me.btnOffertladen.Size = New System.Drawing.Size(73, 21) + Me.btnOffertladen.TabIndex = 37 + Me.btnOffertladen.Text = "Offert laden" + Me.btnOffertladen.UseVisualStyleBackColor = True + Me.btnOffertladen.Visible = False + ' + 'txtPos + ' + Me.txtPos._DateTimeOnly = False + Me.txtPos._numbersOnly = False + Me.txtPos._numbersOnlyKommastellen = "" + Me.txtPos._numbersOnlyTrennzeichen = True + Me.txtPos._Prozent = False + Me.txtPos._ShortDateNew = False + Me.txtPos._ShortDateOnly = False + Me.txtPos._TimeOnly = False + Me.txtPos._TimeOnly_Seconds = False + Me.txtPos._value = Nothing + Me.txtPos._Waehrung = False + Me.txtPos._WaehrungZeichen = True + Me.txtPos.Location = New System.Drawing.Point(300, 100) + Me.txtPos.MaxLength = 200 + Me.txtPos.MaxLineLength = -1 + Me.txtPos.MaxLines_Warning = "" + Me.txtPos.MaxLines_Warning_Label = Nothing + Me.txtPos.Name = "txtPos" + Me.txtPos.Size = New System.Drawing.Size(26, 20) + Me.txtPos.TabIndex = 38 + ' + 'Label47 + ' + Me.Label47.AutoSize = True + Me.Label47.Location = New System.Drawing.Point(269, 103) + Me.Label47.Name = "Label47" + Me.Label47.Size = New System.Drawing.Size(25, 13) + Me.Label47.TabIndex = 39 + Me.Label47.Text = "Pos" + ' 'usrcntlVorauskasse ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2501,4 +2550,7 @@ Partial Class usrcntlVorauskasse Friend WithEvents Label17 As Label Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents btnFremdWaehrungBerechnen As Button + Friend WithEvents btnOffertladen As Button + Friend WithEvents Label47 As Label + Public WithEvents txtPos As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb index ded90e24..2fc65005 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb @@ -1,4 +1,7 @@ -Public Class usrcntlVorauskasse +Imports DocumentFormat.OpenXml.Drawing.Diagrams +Imports VERAG_PROG_ALLGEMEIN + +Public Class usrcntlVorauskasse Implements FormualrInterface 'IMPORTAVISO_AG Public Event CHANGED(name, value) @@ -10,10 +13,11 @@ Public KdNR As Integer = -1 Public KdFirma As String = "" Public SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing - Public AVISO As VERAG_PROG_ALLGEMEIN.caviso = Nothing + Public AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing Public ROLLE As String = "" Dim VK_ID = -1 + Dim SQL As New SQL Sub New() @@ -167,10 +171,13 @@ LinkLabel1.Visible = True Button2.Visible = True LinkLabel3.Visible = True + btnOffertladen.Visible = True + btnOffertladen.Enabled = CInt(SQL.getValueTxtBySql("Select count([LeistungsNr]) From Offertenpositionen WHERE KundenNr='" & KdNR & "' and OffertenNr='1'", "FMZOLL")) > 0 Else LinkLabel1.Visible = False Button2.Visible = False LinkLabel3.Visible = False + btnOffertladen.Visible = False End If End Sub @@ -534,7 +541,7 @@ btnDelFD.Visible = False lklEintragAufheben.Visible = False End If - initKdNRLbl() + initKdNrLbl() End Sub Private Sub lklEintragAufheben_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lklEintragAufheben.LinkClicked initControlsSave(Nothing) @@ -768,6 +775,60 @@ lblRechnungsbetrag._value = f.txtWarenwertUmrechnung.Text End If End If + End Sub + + Private Sub btnOffertladen_Click(sender As Object, e As EventArgs) Handles btnOffertladen.Click + + + 'Dim SQL As New SQL + Dim dt As DataTable = SQL.loadDgvBySql("SELECT [LeistungsNr], [BerechnungsartNr], [Preis], [Anzahl], [BGebLeistungsNr], [BGebProzent], [BGebMinBetrag], BerechnungsartPosInkludiert,[Eingegeben am],[Geändert am], [Sachbearbeiter], [PreisänderungProzent], [PreisAlt], [Preisänderung], KundenNr, OffertenNr FROM [Offertenpositionen] WHERE KundenNr='" & KdNR & "' and OffertenNr='1'", "FMZOLL") + + ' wenn AnzahlPos angegeben, dann nur Berechnungsart = 10 verwenden, + If txtPos.Text <> "" AndAlso CInt(txtPos.Text) > 0 Then + For Each row As DataRow In dt.Select("BerechnungsartNr = '10'") + If row("LeistungsNr") = 340 AndAlso Not IsDBNull(row("Preis")) Then + + If IsDBNull(row("BerechnungsartPosInkludiert")) Then + txtWeitereTarifPos.Text = row("Preis") * txtPos.Text + Exit For + End If + + If row("BerechnungsartPosInkludiert") >= txtPos.Text Then + txtWeitereTarifPos.Text = row("Preis") * 1 + Exit For + Else + txtWeitereTarifPos.Text = row("Preis") * (txtPos.Text - row("BerechnungsartPosInkludiert") + 1) + Exit For + End If + + End If + Next + + End If + + 'Automatisches laden der Offerte -> Parameter müssen noch angepasst werden! + + 'For Each row As DataRow In dt.Select("BerechnungsartNr = '1' AND Preis is not null") + ' If row("LeistungsNr") = 348 Then txtAviso.Text = row("Preis") + + 'Next + + 'For Each row As DataRow In dt.Select("BerechnungsartNr = '8' AND Preis is not null") + + ' If row("LeistungsNr") = 60 Then txtVerzollungskosten.Text = row("Preis") + ' If row("LeistungsNr") = 20 Then txtZoll._value = row("Preis") + + 'Next + + + + + + + + + + End Sub End Class From 7f93965282376252b55f0b0cb48ee2b16ead7e7f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 27 Oct 2023 13:35:36 +0200 Subject: [PATCH 10/10] Vorauskassen-Aviso - Offertenberechnung, DigicustAPI Fix --- .../usrcntlVorauskasse.Designer.vb | 4 +- .../FormulareBaukasten/usrcntlVorauskasse.vb | 43 +++++++++---------- .../Schnittstellen/Digicast/cDigicustAPI.vb | 3 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb index 1f5ff444..aa97aefb 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb @@ -361,9 +361,9 @@ Partial Class usrcntlVorauskasse Me.Label16.AutoSize = True Me.Label16.Location = New System.Drawing.Point(18, 240) Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(67, 13) + Me.Label16.Size = New System.Drawing.Size(53, 13) Me.Label16.TabIndex = 26 - Me.Label16.Text = "Papiere Porti" + Me.Label16.Text = "Fixe Taxe" ' 'Label18 ' diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb index 2fc65005..60ad5325 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb @@ -781,23 +781,30 @@ Public Class usrcntlVorauskasse 'Dim SQL As New SQL - Dim dt As DataTable = SQL.loadDgvBySql("SELECT [LeistungsNr], [BerechnungsartNr], [Preis], [Anzahl], [BGebLeistungsNr], [BGebProzent], [BGebMinBetrag], BerechnungsartPosInkludiert,[Eingegeben am],[Geändert am], [Sachbearbeiter], [PreisänderungProzent], [PreisAlt], [Preisänderung], KundenNr, OffertenNr FROM [Offertenpositionen] WHERE KundenNr='" & KdNR & "' and OffertenNr='1'", "FMZOLL") + ' Dim dt As DataTable = SQL.loadDgvBySql("SELECT [LeistungsNr], [Preis], [Anzahl], BerechnungsartPosInkludiert FROM [Offertenpositionen] WHERE KundenNr='" & KdNR & "' and OffertenNr='1' and preis is not null order by LeistungsNr, Preis desc", "FMZOLL") - ' wenn AnzahlPos angegeben, dann nur Berechnungsart = 10 verwenden, + Dim dt As DataTable = SQL.loadDgvBySql("SELECT [LeistungsNr], [Preis], [BerechnungsartNr] ,[Anzahl], BerechnungsartPosInkludiert FROM [Offertenpositionen] WHERE KundenNr='" & KdNR & "' and OffertenNr=(SELECT ISNULL(AO.ao_OffertenNr,-1) FROM tblAbfertigungsartOffertenstamm as AO WHERE AO.ao_Abfertigungsart='" & SENDUNG.tblSnd_Abfertigungsart_ID & "') and preis is not null order by LeistungsNr, Preis desc", "FMZOLL") + + If dt.Rows.Count = 0 Then + MsgBox("Es konnten keine Offertpositionen für Abfertigunsgart" & SENDUNG.tblSnd_Abfertigungsart_ID & " ermittelt werden!") + Exit Sub + End If + + ' wenn AnzahlPos angegeben, dann Berechnungsart = 10 verwenden, If txtPos.Text <> "" AndAlso CInt(txtPos.Text) > 0 Then For Each row As DataRow In dt.Select("BerechnungsartNr = '10'") - If row("LeistungsNr") = 340 AndAlso Not IsDBNull(row("Preis")) Then + If row("LeistungsNr") = 340 Then If IsDBNull(row("BerechnungsartPosInkludiert")) Then - txtWeitereTarifPos.Text = row("Preis") * txtPos.Text + txtWeitereTarifPos._value = row("Preis") * txtPos.Text Exit For End If If row("BerechnungsartPosInkludiert") >= txtPos.Text Then - txtWeitereTarifPos.Text = row("Preis") * 1 + txtWeitereTarifPos._value = row("Preis") * 1 Exit For Else - txtWeitereTarifPos.Text = row("Preis") * (txtPos.Text - row("BerechnungsartPosInkludiert") + 1) + txtWeitereTarifPos._value = row("Preis") * (txtPos.Text - row("BerechnungsartPosInkludiert") + 1) Exit For End If @@ -806,29 +813,21 @@ Public Class usrcntlVorauskasse End If - 'Automatisches laden der Offerte -> Parameter müssen noch angepasst werden! + For Each row As DataRow In dt.Select("Anzahl = '1'") + If row("LeistungsNr") = 348 Then txtAviso._value = row("Preis") + If row("LeistungsNr") = 340 Then txtVerzollungskosten._value = row("Preis") + If row("LeistungsNr") = 324 Then txtATLAS._value = row("Preis") + If row("LeistungsNr") = 440 Then txtPapierePorti._value = row("Preis") - 'For Each row As DataRow In dt.Select("BerechnungsartNr = '1' AND Preis is not null") - ' If row("LeistungsNr") = 348 Then txtAviso.Text = row("Preis") + Next - 'Next + initBerechnung() - 'For Each row As DataRow In dt.Select("BerechnungsartNr = '8' AND Preis is not null") + 'For Each row As DataRow In dt.Select("BerechnungsartNr = '8'") ' If row("LeistungsNr") = 60 Then txtVerzollungskosten.Text = row("Preis") ' If row("LeistungsNr") = 20 Then txtZoll._value = row("Preis") - 'Next - - - - - - - - - - End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb index e874ed4f..f25004f4 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb @@ -651,6 +651,7 @@ Public Class cDigicustAPI 'afterNormalization(overwrite -> werden mit mitgeschickten Infos überschrieben). json.UpdateString("priority", "afterNormalization") json.UpdateString("documentStatus", "finished") + json.UpdateString("documentType", "UserInput") If sendung.consignee_name <> "" Then json.UpdateString("annotatedAggregated.consignee.name.input", sendung.consignee_name) @@ -659,7 +660,7 @@ Public Class cDigicustAPI If sendung.consignee_eori <> "" Then json.UpdateString("annotatedAggregated.consignee.EORI.input", sendung.consignee_eori) If sendung.licencePlate <> "" AndAlso sendung.lkwCountryId <> "" Then - json.UpdateString("annotatedAggregated.meansOfTransportation[0].type", "Inland") + json.UpdateString("annotatedAggregated.meansOfTransportation[0].type", "Border") json.UpdateString("annotatedAggregated.meansOfTransportation[0].value", "Road") json.UpdateString("annotatedAggregated.meansOfTransportation[0].licensePlate", sendung.licencePlate) json.UpdateString("annotatedAggregated.meansOfTransportation[0].countryCode", sendung.lkwCountryId)