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

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-01-25 11:18:00 +01:00
parent c47bba6714 b9bc63e18c
commit a4609e853d
3 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@
Dim r As DataGridViewRow = dgvVorkosten.Rows(i)
If Not IsNumeric(r.Cells("LeistungsNr").Value) Then MsgBox("Leistungsnummer muss eine Zahl sein!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub
If Not IsNumeric(r.Cells("Preis").Value) Then MsgBox("Preis muss eine Zahl sein!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub
If r.Cells("LeistungsBez").Value.ToString.Length > 30 Then MsgBox("Leistungbezeichnung zu lang (max 30 Zeichen)!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub
VORKOSTEN.Add(New VERAG_PROG_ALLGEMEIN.cVorkosten(FilialenNr, AbfertigungsNr, UnterNr, CInt(r.Cells("LeistungsNr").Value), CStr(r.Cells("Leistungsbez").Value), CDbl(r.Cells("Preis").Value)))
Next
Me.Close()
@@ -122,6 +123,8 @@
If txtLeistungsbezeichnung.Text = "" Then Label24.Visible = True : txtLeistungsbezeichnung.Focus() : Exit Sub
If txtPreis._value = "" Then Label1.Visible = True : txtPreis.Focus() : Exit Sub
If txtLeistungsbezeichnung.Text.Length > 30 Then MsgBox("Leistungbezeichnung zu lang (max 30 Zeichen)!") : Label24.Visible = True : txtLeistungsbezeichnung.Focus() : Exit Sub
If VK_EDIT >= 0 Then
dgvVorkosten.Rows.RemoveAt(VK_EDIT)
dgvVorkosten.Rows.Insert(VK_EDIT, cboLeistungs._value, txtLeistungsbezeichnung.Text, txtPreis._value)

98
SDL/mdm/usrCntlMDMAuswertungen.vb
View File

@@ -1241,6 +1241,8 @@ Public Class usrCntlMDMAuswertungen
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim frm As New Form
Dim dgv As New DataGridView()
Dim dt As DataTable = SQL.loadDgvBySql("SELECT
PKFileName,
@@ -1260,75 +1262,91 @@ Public Class usrCntlMDMAuswertungen
Exit Sub
End If
Dim print As New frmPrintLayout
print.Text = "ASFINAG"
dgv.DataSource = dt
Dim rpt As New rptASFINAG_TransaktionenSumary
If dgv IsNot Nothing Then
frm.Size = New Size(1400, 1000)
dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50)
dgv.Dock = DockStyle.Fill
dgv.Anchor = AnchorStyles.Left
dgv.Anchor = AnchorStyles.Top
dgv.ReadOnly = True
frm.Controls.Add(dgv)
frm.StartPosition = FormStartPosition.CenterScreen
frm.ShowDialog()
End If
rpt.DataSource = dt
'Dim print As New frmPrintLayout
'print.Text = "ASFINAG"
'Dim rpt As New rptASFINAG_TransaktionenSumary
'rpt.DataSource = dt
Dim sum = 0
rpt.lblUeberschrift.Text = "ASFINAG Transaktionssummen " & CDate(dat_Sum_Bis.Value.ToShortDateString)
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
'Dim sum = 0
'rpt.lblUeberschrift.Text = "ASFINAG Transaktionssummen " & CDate(dat_Sum_Bis.Value.ToShortDateString)
'rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
rpt.Label10.Visible = False
Label1.Text = "Dateiname"
Label8.Text = "Erstellungsdatum"
'Dim cnt As Integer = 0
rpt.lblDat.Text = Now.ToLongDateString
'rpt.Label10.Visible = False
'Label1.Text = "Dateiname"
'Label8.Text = "Erstellungsdatum"
''Dim cnt As Integer = 0
'rpt.lblDat.Text = Now.ToLongDateString
Dim sumNetto As Double = 0
Dim sumMWST As Double = 0
Dim sumBrutto As Double = 0
'Dim sumNetto As Double = 0
'Dim sumMWST As Double = 0
'Dim sumBrutto As Double = 0
Dim sumperKdNrNetto As Double = 0
Dim sumperKdNrMWST As Double = 0
Dim sumperKdNrBrutto As Double = 0
'Dim sumperKdNrNetto As Double = 0
'Dim sumperKdNrMWST As Double = 0
'Dim sumperKdNrBrutto As Double = 0
AddHandler rpt.Detail.Format, Sub()
'AddHandler rpt.Detail.Format, Sub()
rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("PKFileName").Value, "")
rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("FileCreationDate").Value, "")
rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Abrechnungsdatum").Value, "")
' rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("PKFileName").Value, "")
' rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("FileCreationDate").Value, "")
' rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Abrechnungsdatum").Value, "")
rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 2, "")
rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 2, "")
rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 2, "")
' rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 2, "")
' rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 2, "")
' rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 2, "")
rpt.lblSumNet.Visible = False
rpt.lblSumVat.Visible = False
rpt.lblSumBrt.Visible = False
' rpt.lblSumNet.Visible = False
' rpt.lblSumVat.Visible = False
' rpt.lblSumBrt.Visible = False
sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 4, 0)
sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 4, 0)
sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 4, 0)
' sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 4, 0)
' sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 4, 0)
' sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 4, 0)
End Sub
' End Sub
AddHandler rpt.ReportFooter1.Format, Sub()
'AddHandler rpt.ReportFooter1.Format, Sub()
rpt.lblSumNetto.Text = sumNetto.ToString("N2")
rpt.lblSumMwst.Text = sumMWST.ToString("N2")
rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
' rpt.lblSumNetto.Text = sumNetto.ToString("N2")
' rpt.lblSumMwst.Text = sumMWST.ToString("N2")
' rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
End Sub
' End Sub
print.Viewer.LoadDocument(rpt)
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
print.Show()
'print.Viewer.LoadDocument(rpt)
'print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
'print.Show()
Catch ex As System.Exception

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
View File

@@ -263,7 +263,7 @@ Public Class cTimasAPI
success = json.UpdateString("phone1", mitarbeiter.mit_telefonnr & " " & mitarbeiter.mit_durchwahl)
success = json.UpdateString("phone2", mitarbeiter.mit_mobiltel)
success = json.UpdateString("password", mitarbeiter.mit_pwd)
success = json.UpdateString("clientNumber", IIf(ClientNr <> "", ClientNr, mitarbeiter.mit_firma & " - " & mitarbeiter.mit_abteilung))
success = json.UpdateString("clientNumber", IIf(ClientNr <> "", ClientNr, mitarbeiter.mit_firma))
success = json.UpdateBool("resetPassword", 0)
Dim i As Integer = 0