diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 16650b1b..cbd7759c 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2064,7 +2064,7 @@ Public Class cFakturierung getNewRgNr = RG_NR.LfdRechnungsNr ' --> Die in der DB gespeicherte RgNr wird verwendet ' Nächste Rechnungsnummer speichern. - RG_NR.INCREASE_RGNR() ' SOFORT Speichern, Sonst gibt es wieder eine Doppelvergabe! + 'RG_NR.INCREASE_RGNR() ' SOFORT Speichern, Sonst gibt es wieder eine Doppelvergabe! ' Prüfung, ob RgNr schon vergeben wurde --> dann +1, bis freie Nr. (sollte EÃœGENTLICH nicht vorkommen) getNewRgNr = VERAG_PROG_ALLGEMEIN.cRechnungsnummern.CHECK_RGNR_NEW(getNewRgNr, Firma_ID, Buchungsjahr) diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index b3e4d7d1..680da2b5 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -90,7 +90,7 @@ false - SDL_TemporaryKey.pfx + Test.pfx diff --git a/SDL/frmMain.Designer.vb b/SDL/frmMain.Designer.vb index e6451241..13cd2de2 100644 --- a/SDL/frmMain.Designer.vb +++ b/SDL/frmMain.Designer.vb @@ -105,6 +105,7 @@ Partial Class frmMain Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.AuswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) + Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.pnlLeft.SuspendLayout() Me.MenuStripSDL.SuspendLayout() Me.Panel1.SuspendLayout() @@ -483,6 +484,7 @@ Partial Class frmMain 'pnlHeader ' Me.pnlHeader.BackColor = System.Drawing.Color.White + Me.pnlHeader.Controls.Add(Me.btnMitarbeiterKonto) Me.pnlHeader.Controls.Add(Me.pnlInfo) Me.pnlHeader.Controls.Add(Me.Label9) Me.pnlHeader.Controls.Add(Me.Button9) @@ -831,6 +833,7 @@ Partial Class frmMain Me.KdSearchBox1._displayWoelflKd = False Me.KdSearchBox1._hideIfListEmpty = True Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True Me.KdSearchBox1._UseFIRMA = "" Me.KdSearchBox1._ValueKdAndName = True Me.KdSearchBox1.dgvpos = "RIGHT" @@ -951,6 +954,24 @@ Partial Class frmMain Me.Timer_REFRESH.Enabled = True Me.Timer_REFRESH.Interval = 5000 ' + 'btnMitarbeiterKonto + ' + Me.btnMitarbeiterKonto.allowBorder = False + Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White + Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0 + Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black + Me.btnMitarbeiterKonto.Image = CType(resources.GetObject("btnMitarbeiterKonto.Image"), System.Drawing.Image) + Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(716, 0) + Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" + Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) + Me.btnMitarbeiterKonto.TabIndex = 87 + Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer" + Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -1067,4 +1088,5 @@ Partial Class frmMain Friend WithEvents USTVAnträgeToolStripMenuItem As ToolStripMenuItem Friend WithEvents BesuchsberichteToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents mnueEssensbestellung As ToolStripMenuItem + Friend WithEvents btnMitarbeiterKonto As VERAG_PROG_ALLGEMEIN.FlatButton End Class diff --git a/SDL/frmMain.resx b/SDL/frmMain.resx index 8f53135c..2c4cfb81 100644 --- a/SDL/frmMain.resx +++ b/SDL/frmMain.resx @@ -123,6 +123,38 @@ 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAFy0lEQVRYR81YZ3BVRRSOvY69 + 964zjjo6Yy9j+eGMIwEJCoQiKgiKCCpNwEFEWhDEoUgbBERQmoimkPBSXwpJXt6DhDQTSEJeKqmkt+N+ + 57qXvfftCxic0R9fkvPt3rN7T/l2bwKI6H8DLekP3T09dKy6lX6OL6NRyw7SoxMT6NrhUXTNsCj+/cjH + CTRiqYd+ivVScVULdXX3iMf0vnTQkv5QWd9O6yNLaOhiN105NJIC+oX64PLB++itRRm0NqKEymrbxGN6 + XzpoSTsaWzpp5o95/PZY8LFJTvrw+yyasy2fNkeX0m8HKvg37AlrDtMTnyXyvCuGRNKMzblU09gh3Oh9 + q9CSKsJdVXT/uFh2PmldNsVm1ghaP1dFfFYNTfkhh5+7a0wM7UmpELR+roSWlJi9NZ/OfyOc+s1NI8+R + BkHp5/WGg0cbaXBIBp3TP4ymis3Zx1VoSWDyhhx28KXYUEeXbyF2Cq72RAcX8/RNuZzGsPQqAm+fi8IP + 2VXI/pBe+7iElkRE8OBGxzFh+o6viSim4Us8dJ9I37kDwjgVAKKIbkrJqxPTfJ/bEuPtNUI+BGoCjhER + +xjgLmzgwpQb0OHGkfupREiA/Vlg8e5CnhOaViVM65jFqG5op9vfi6ZXZqUI0+Dqmjo4/NCOKtHaiTm1 + dJloX/sGVFw8KIIiROFX1LXRJkcpObNrTX9A/6/TecPlttY3/wDQmnCGRWHvTCyn56YlmYv8klBGbR3d + dN3fLe4PiJy3xhBH2BcMDKfRyw9Ra3s3+z3e2M48ag22BP9AgUKgoCNjV2byBDx4dbB1UQgZxm55x2Hh + 7bjpbQfPQ82p/LhVmYRixhj0CMpdVNlC7Z3GJnkzCJd8MDW/ngdOtHaxPqjOVoYW8dg971t5O+4cHcPz + oNYqj+LN9zbxGKQC3OrwYrO+eDPbnWUs4VBOeZ4gWs9MOZmiq4IjKbOokX5PraSLgiJMXofzRIchpX+W + NXNtSP7swDD6Nfmk+D07NYle/yrN7Fom0aYoSoQONoC8PvRRvOno5ZlGUb86O9XkesML05N5PgRTctgk + Xhw8MHHtYa6noAUu5piUi0JfYAN4SDoBHvggjvM9bWOuhfeHMSsOsS+c5JLDZnY4y801Fu4sYF6mlcnr + RxihhCjBBpDTS9+0pgNtijE1fTpgA0gzulHlzwoMpe/2HjXX2JVkjKP7YDMprwPQE9gSG6Ks3XDbu9GU + IUQPBQctUcdUYLy+uZPuHWscsCpQl2h7+I90VzMHqYDNi+oiI/HSjBSLsxeFjXQNW+K28BKDFrqoua3L + POl1kOvs1kXm4Qm+NSNhrx0ciDgMIQEqL5FX2sT3F7WLgKcmJ/IRg6sFlBm+F4nDE2N3CNWHzQsGf+Pm + +kB1w1aBt1CdQqXBN4g0oCDVMRya4DG+TNSGOrY1zjfquB/Bx4B56TzG5LZ4Lw2c7+J8woYi4s1xusoi + RirR1jgoMWe/5zgXpLogbOgQxgvLm+m1OalmhJAK+EvOreMjBXPQ/vC5bp+h7LwZHAXoFDy0dM8RvmzL + BdB241dnmQ6wmfk7CugGWxokcIQgeq4CQ8khooj43Yqao95W/FHEf+OIsSgwChIih7utfABvifsrxgEU + 25AQfdH6A6KtihxqRk3tg+PjuH6k6vMkCUQFk3CNkHdWXLRPpSunAtIPmYA/yIeMEkQPnIRlM+gCaEng + XKOg/LVvX4G2h9+R33q4lvDpA1vCshkAN7BbxRUBh5jO4ZniaRFlvLB6LEhYDInTPX/6CvVAVuFDSMza + kqd1dKbAV4e8YNnhQ6iYt72ALrEdln3FhUHh9IV4QfsaKrSkCoiY/FztK/APAkiD3bcdWtIOfGsvEEKH + 4tMt5g+Pf+okRPdf+9ZWAae4g3yyPptvcjePcvC9FgKJcwkX8ecFjwKF2MmvjNOFluwNuLzvPVDJ6gzd + QLSeFGmEMEJxPxefH0iJvLP8E2jJ/wYU8Bck0ufMw70OAQAAAABJRU5ErkJggg== + + 280, 17 @@ -132,7 +164,6 @@ 1557, 17 - AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index b7406f84..3f621d1f 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -3,6 +3,8 @@ Imports System.Data.OleDb Imports Microsoft.Office.Interop Imports VERAGRegistrierkasse Imports Gemeinsames +Imports System.Drawing.Drawing2D +Imports VERAG_PROG_ALLGEMEIN Public Class frmMain @@ -134,6 +136,29 @@ Public Class frmMain KdSearchBox1.dgvpos = "RIGHT" KdSearchBox1.initKdBox(Me) 'initKdSearch() + btnMitarbeiterKonto.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + setProfileImage() + + If False Then 'Bei Produktivstart Bedingung auf True!!!!! + + 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 + timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, 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") + MsgBox(info) + Else + + End If + End If + + End If + End If AddHandler KdSearchBox1.PropertyChanged, Sub() Try @@ -945,6 +970,71 @@ Public Class frmMain Dim f As New frmEssensbestellungen() f.Show() End Sub + + Private Sub btnMitarbeiterKonto_Click(sender As Object, e As EventArgs) Handles btnMitarbeiterKonto.Click + Me.Cursor = Cursors.WaitCursor + Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) + f.Show() + Me.Cursor = Cursors.Default + End Sub + + Public Sub setProfileImage() + Try + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId IsNot Nothing Then + + Dim originalImage = Image.FromFile(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId)) 'My.Resources.Koerfez61 + + Dim picSize = 35 + + Dim space_X As Integer = 0 + Dim space_Y As Integer = 0 + Dim picWidth As Integer = 0 + Dim picHheight As Integer = 0 + + Dim factor As Double = 1 + If originalImage.Height < originalImage.Width Then + factor = picSize / originalImage.Height + picWidth = originalImage.Width * factor + picHheight = originalImage.Height * factor + + + Else + factor = picSize / originalImage.Width + picWidth = originalImage.Width * factor + picHheight = originalImage.Height * factor + + End If + + + Dim croppedImage As New Bitmap(picWidth, picHheight) + + Using g = Graphics.FromImage(croppedImage) + Dim path As New GraphicsPath + + + path.AddEllipse(0, 0, picSize, picSize) + + Dim reg As New Region(path) + + + g.Clip = reg + + g.DrawImage(originalImage, 0, 0, picWidth, picHheight) + End Using + + + btnMitarbeiterKonto.Image = croppedImage + + Exit Sub + End If + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + + End Try + 'btnMitarbeiterKonto.Image = My.Resources.mitarbeiter_s + + End Sub + End Class Public Class MyRenderer diff --git a/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb b/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb index 1c511bfe..5970d364 100644 --- a/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb +++ b/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb @@ -80,7 +80,6 @@ Partial Public Class rptFiskalkunde Me.Shape23 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape24 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape25 = New GrapeCity.ActiveReports.SectionReportModel.Shape() - Me.Shape26 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape27 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape28 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape29 = New GrapeCity.ActiveReports.SectionReportModel.Shape() @@ -89,7 +88,6 @@ Partial Public Class rptFiskalkunde Me.Shape32 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape33 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape34 = New GrapeCity.ActiveReports.SectionReportModel.Shape() - Me.Shape35 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape36 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape37 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape38 = New GrapeCity.ActiveReports.SectionReportModel.Shape() @@ -98,7 +96,6 @@ Partial Public Class rptFiskalkunde Me.Label15 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label16 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label17 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label18 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label19 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label20 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label21 = New GrapeCity.ActiveReports.SectionReportModel.Label() @@ -107,16 +104,10 @@ Partial Public Class rptFiskalkunde Me.txtAnzMA = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtKredit = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtImport = New GrapeCity.ActiveReports.SectionReportModel.TextBox() - Me.txtGesellschafter = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtGF = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtSteuerberater = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtSonstiges = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.lblKontrolle = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.PageFooter = New GrapeCity.ActiveReports.SectionReportModel.PageFooter() - Me.Label28 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Line3 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.ReportInfo2 = New GrapeCity.ActiveReports.SectionReportModel.ReportInfo() - Me.lblDat = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Shape39 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape40 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape41 = New GrapeCity.ActiveReports.SectionReportModel.Shape() @@ -125,6 +116,11 @@ Partial Public Class rptFiskalkunde Me.txtUVMJa = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.Shape42 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Label22 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.PageFooter = New GrapeCity.ActiveReports.SectionReportModel.PageFooter() + Me.Label28 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.Line3 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.ReportInfo2 = New GrapeCity.ActiveReports.SectionReportModel.ReportInfo() + Me.lblDat = New GrapeCity.ActiveReports.SectionReportModel.Label() CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit() @@ -165,7 +161,6 @@ Partial Public Class rptFiskalkunde CType(Me.Label15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label16, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label17, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label19, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label21, System.ComponentModel.ISupportInitialize).BeginInit() @@ -174,18 +169,17 @@ Partial Public Class rptFiskalkunde CType(Me.txtAnzMA, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtKredit, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtImport, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtGesellschafter, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtGF, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtSteuerberater, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtSonstiges, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblKontrolle, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label28, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.lblDat, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtUVM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtUVMNein, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtUVMJa, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label22, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Label28, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblDat, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -218,7 +212,7 @@ Partial Public Class rptFiskalkunde ' 'Detail ' - Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label5, Me.txtEMail, Me.txtAnsprechpartner, Me.txtKdNr, Me.Label1, Me.lblWebsite, Me.txtKundeSeit, Me.txtWebsite, Me.Line, Me.Label7, Me.txtFirma, Me.Label10, Me.Label11, Me.Shape1, Me.Shape2, Me.Shape3, Me.Shape4, Me.Shape5, Me.Shape6, Me.Shape7, Me.Shape8, Me.Shape9, Me.Shape10, Me.Shape11, Me.Shape12, Me.Shape13, Me.Shape14, Me.Shape15, Me.Shape17, Me.Shape18, Me.Shape19, Me.Label2, Me.Label3, Me.Label6, Me.Label4, Me.txtHR, Me.txtBon, Me.txtUmsatz, Me.txtVM, Me.txtHRja, Me.txtHRnein, Me.txtWSja, Me.txtWSnein, Me.txtBONnein, Me.txtBONja, Me.txtUmsatzJa, Me.txtUmsatzNein, Me.txtVMNein, Me.txtVMJa, Me.Shape16, Me.Shape20, Me.Label8, Me.Label9, Me.Label12, Me.Shape21, Me.Shape22, Me.Shape23, Me.Shape24, Me.Shape25, Me.Shape26, Me.Shape27, Me.Shape28, Me.Shape29, Me.Shape30, Me.Shape31, Me.Shape32, Me.Shape33, Me.Shape34, Me.Shape35, Me.Shape36, Me.Shape37, Me.Shape38, Me.Label13, Me.Label14, Me.Label15, Me.Label16, Me.Label17, Me.Label18, Me.Label19, Me.Label20, Me.Label21, Me.txtGZ, Me.txtGJ, Me.txtAnzMA, Me.txtKredit, Me.txtImport, Me.txtGesellschafter, Me.txtGF, Me.txtSteuerberater, Me.txtSonstiges, Me.lblKontrolle, Me.Shape39, Me.Shape40, Me.Shape41, Me.txtUVM, Me.txtUVMNein, Me.txtUVMJa, Me.Shape42, Me.Label22}) + Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label5, Me.txtEMail, Me.txtAnsprechpartner, Me.txtKdNr, Me.Label1, Me.lblWebsite, Me.txtKundeSeit, Me.txtWebsite, Me.Line, Me.Label7, Me.txtFirma, Me.Label10, Me.Label11, Me.Shape1, Me.Shape2, Me.Shape3, Me.Shape4, Me.Shape5, Me.Shape6, Me.Shape7, Me.Shape8, Me.Shape9, Me.Shape10, Me.Shape11, Me.Shape12, Me.Shape13, Me.Shape14, Me.Shape15, Me.Shape17, Me.Shape18, Me.Shape19, Me.Label2, Me.Label3, Me.Label6, Me.Label4, Me.txtHR, Me.txtBon, Me.txtUmsatz, Me.txtVM, Me.txtHRja, Me.txtHRnein, Me.txtWSja, Me.txtWSnein, Me.txtBONnein, Me.txtBONja, Me.txtUmsatzJa, Me.txtUmsatzNein, Me.txtVMNein, Me.txtVMJa, Me.Shape16, Me.Shape20, Me.Label8, Me.Label9, Me.Label12, Me.Shape21, Me.Shape22, Me.Shape23, Me.Shape24, Me.Shape25, Me.Shape27, Me.Shape28, Me.Shape29, Me.Shape30, Me.Shape31, Me.Shape32, Me.Shape33, Me.Shape34, Me.Shape36, Me.Shape37, Me.Shape38, Me.Label13, Me.Label14, Me.Label15, Me.Label16, Me.Label17, Me.Label19, Me.Label20, Me.Label21, Me.txtGZ, Me.txtGJ, Me.txtAnzMA, Me.txtKredit, Me.txtImport, Me.txtGF, Me.txtSteuerberater, Me.txtSonstiges, Me.lblKontrolle, Me.Shape39, Me.Shape40, Me.Shape41, Me.txtUVM, Me.txtUVMNein, Me.txtUVMJa, Me.Shape42, Me.Label22}) Me.Detail.Height = 6.456694! Me.Detail.Name = "Detail" ' @@ -376,28 +370,28 @@ Partial Public Class rptFiskalkunde 'Shape1 ' Me.Shape1.Height = 0.25! - Me.Shape1.Left = 2.802! + Me.Shape1.Left = 2.8! Me.Shape1.Name = "Shape1" Me.Shape1.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape1.Top = 0.851! + Me.Shape1.Top = 0.85! Me.Shape1.Width = 0.4! ' 'Shape2 ' Me.Shape2.Height = 0.25! - Me.Shape2.Left = 3.202! + Me.Shape2.Left = 3.2! Me.Shape2.Name = "Shape2" Me.Shape2.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape2.Top = 0.851! + Me.Shape2.Top = 0.85! Me.Shape2.Width = 0.4! ' 'Shape3 ' Me.Shape3.Height = 0.25! - Me.Shape3.Left = 3.592! + Me.Shape3.Left = 3.59! Me.Shape3.Name = "Shape3" Me.Shape3.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape3.Top = 0.851! + Me.Shape3.Top = 0.85! Me.Shape3.Width = 3.878! ' 'Shape4 @@ -406,34 +400,34 @@ Partial Public Class rptFiskalkunde Me.Shape4.Left = 0.01! Me.Shape4.Name = "Shape4" Me.Shape4.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape4.Top = 0.851! + Me.Shape4.Top = 0.85! Me.Shape4.Width = 2.792! ' 'Shape5 ' Me.Shape5.Height = 0.25! - Me.Shape5.Left = 2.802! + Me.Shape5.Left = 2.8! Me.Shape5.Name = "Shape5" Me.Shape5.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape5.Top = 1.101! + Me.Shape5.Top = 1.1! Me.Shape5.Width = 0.4! ' 'Shape6 ' Me.Shape6.Height = 0.25! - Me.Shape6.Left = 3.202! + Me.Shape6.Left = 3.2! Me.Shape6.Name = "Shape6" Me.Shape6.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape6.Top = 1.101! + Me.Shape6.Top = 1.1! Me.Shape6.Width = 0.4! ' 'Shape7 ' Me.Shape7.Height = 0.25! - Me.Shape7.Left = 3.592! + Me.Shape7.Left = 3.59! Me.Shape7.Name = "Shape7" Me.Shape7.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape7.Top = 1.101! + Me.Shape7.Top = 1.1! Me.Shape7.Width = 3.878! ' 'Shape8 @@ -442,34 +436,34 @@ Partial Public Class rptFiskalkunde Me.Shape8.Left = 0.01! Me.Shape8.Name = "Shape8" Me.Shape8.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape8.Top = 1.351! + Me.Shape8.Top = 1.35! Me.Shape8.Width = 2.792! ' 'Shape9 ' Me.Shape9.Height = 0.25! - Me.Shape9.Left = 2.802! + Me.Shape9.Left = 2.8! Me.Shape9.Name = "Shape9" Me.Shape9.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape9.Top = 1.351! + Me.Shape9.Top = 1.35! Me.Shape9.Width = 0.4! ' 'Shape10 ' Me.Shape10.Height = 0.25! - Me.Shape10.Left = 3.202! + Me.Shape10.Left = 3.2! Me.Shape10.Name = "Shape10" Me.Shape10.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape10.Top = 1.351! + Me.Shape10.Top = 1.35! Me.Shape10.Width = 0.4! ' 'Shape11 ' Me.Shape11.Height = 0.25! - Me.Shape11.Left = 3.592! + Me.Shape11.Left = 3.59! Me.Shape11.Name = "Shape11" Me.Shape11.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape11.Top = 1.351! + Me.Shape11.Top = 1.35! Me.Shape11.Width = 3.878! ' 'Shape12 @@ -478,61 +472,61 @@ Partial Public Class rptFiskalkunde Me.Shape12.Left = 0.01! Me.Shape12.Name = "Shape12" Me.Shape12.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape12.Top = 1.101! + Me.Shape12.Top = 1.1! Me.Shape12.Width = 2.792! ' 'Shape13 ' Me.Shape13.Height = 0.25! - Me.Shape13.Left = 2.802! + Me.Shape13.Left = 2.8! Me.Shape13.Name = "Shape13" Me.Shape13.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape13.Top = 1.601! + Me.Shape13.Top = 1.6! Me.Shape13.Width = 0.4! ' 'Shape14 ' Me.Shape14.Height = 0.25! - Me.Shape14.Left = 3.202! + Me.Shape14.Left = 3.2! Me.Shape14.Name = "Shape14" Me.Shape14.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape14.Top = 1.601! + Me.Shape14.Top = 1.6! Me.Shape14.Width = 0.4! ' 'Shape15 ' Me.Shape15.Height = 0.25! - Me.Shape15.Left = 3.592! + Me.Shape15.Left = 3.59! Me.Shape15.Name = "Shape15" Me.Shape15.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape15.Top = 1.601! + Me.Shape15.Top = 1.6! Me.Shape15.Width = 3.878! ' 'Shape17 ' Me.Shape17.Height = 0.25! - Me.Shape17.Left = 2.802! + Me.Shape17.Left = 2.8! Me.Shape17.Name = "Shape17" Me.Shape17.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape17.Top = 1.851! + Me.Shape17.Top = 1.85! Me.Shape17.Width = 0.4! ' 'Shape18 ' Me.Shape18.Height = 0.25! - Me.Shape18.Left = 3.202! + Me.Shape18.Left = 3.2! Me.Shape18.Name = "Shape18" Me.Shape18.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape18.Top = 1.851! + Me.Shape18.Top = 1.85! Me.Shape18.Width = 0.4! ' 'Shape19 ' Me.Shape19.Height = 0.25! - Me.Shape19.Left = 3.592! + Me.Shape19.Left = 3.59! Me.Shape19.Name = "Shape19" Me.Shape19.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape19.Top = 1.851! + Me.Shape19.Top = 1.85! Me.Shape19.Width = 3.878! ' 'Label2 @@ -768,7 +762,7 @@ Partial Public Class rptFiskalkunde Me.Shape16.Left = 0.01! Me.Shape16.Name = "Shape16" Me.Shape16.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape16.Top = 1.601! + Me.Shape16.Top = 1.6! Me.Shape16.Width = 2.792! ' 'Shape20 @@ -777,7 +771,7 @@ Partial Public Class rptFiskalkunde Me.Shape20.Left = 0.01! Me.Shape20.Name = "Shape20" Me.Shape20.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape20.Top = 1.851! + Me.Shape20.Top = 1.85! Me.Shape20.Width = 2.792! ' 'Label8 @@ -818,164 +812,146 @@ Partial Public Class rptFiskalkunde ' 'Shape21 ' - Me.Shape21.Height = 0.25! - Me.Shape21.Left = 0.00000001024455! + Me.Shape21.Height = 0.5! + Me.Shape21.Left = 0.01! Me.Shape21.Name = "Shape21" Me.Shape21.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape21.Top = 2.351! - Me.Shape21.Width = 2.802! + Me.Shape21.Top = 2.35! + Me.Shape21.Width = 2.792! ' 'Shape22 ' Me.Shape22.Height = 0.25! - Me.Shape22.Left = 0.00000001024455! + Me.Shape22.Left = 0.01! Me.Shape22.Name = "Shape22" Me.Shape22.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape22.Top = 2.601! - Me.Shape22.Width = 2.802! + Me.Shape22.Top = 2.85! + Me.Shape22.Width = 2.792! ' 'Shape23 ' Me.Shape23.Height = 0.25! - Me.Shape23.Left = 0.00000001024455! + Me.Shape23.Left = 0.01! Me.Shape23.Name = "Shape23" Me.Shape23.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape23.Top = 2.851! - Me.Shape23.Width = 2.802! + Me.Shape23.Top = 3.1! + Me.Shape23.Width = 2.792! ' 'Shape24 ' Me.Shape24.Height = 0.25! - Me.Shape24.Left = 0.00000001024455! + Me.Shape24.Left = 0.01! Me.Shape24.Name = "Shape24" Me.Shape24.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape24.Top = 3.101! - Me.Shape24.Width = 2.802! + Me.Shape24.Top = 3.35! + Me.Shape24.Width = 2.792! ' 'Shape25 ' Me.Shape25.Height = 0.25! - Me.Shape25.Left = 0.00000001024455! + Me.Shape25.Left = 0.01! Me.Shape25.Name = "Shape25" Me.Shape25.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape25.Top = 3.351! - Me.Shape25.Width = 2.802! - ' - 'Shape26 - ' - Me.Shape26.Height = 0.25! - Me.Shape26.Left = 0.00000001024455! - Me.Shape26.Name = "Shape26" - Me.Shape26.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape26.Top = 3.601! - Me.Shape26.Width = 2.802! + Me.Shape25.Top = 3.6! + Me.Shape25.Width = 2.792! ' 'Shape27 ' Me.Shape27.Height = 0.25! - Me.Shape27.Left = 9.313226E-10! + Me.Shape27.Left = 0.01! Me.Shape27.Name = "Shape27" Me.Shape27.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape27.Top = 3.851! - Me.Shape27.Width = 2.802! + Me.Shape27.Top = 3.85! + Me.Shape27.Width = 2.792! ' 'Shape28 ' Me.Shape28.Height = 0.25! - Me.Shape28.Left = 0.00000001024455! + Me.Shape28.Left = 0.01! Me.Shape28.Name = "Shape28" Me.Shape28.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape28.Top = 4.101! - Me.Shape28.Width = 2.802! + Me.Shape28.Top = 4.1! + Me.Shape28.Width = 2.792! ' 'Shape29 ' Me.Shape29.Height = 0.25! - Me.Shape29.Left = 9.313226E-10! + Me.Shape29.Left = 0.01! Me.Shape29.Name = "Shape29" Me.Shape29.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape29.Top = 4.351! - Me.Shape29.Width = 2.802! + Me.Shape29.Top = 4.35! + Me.Shape29.Width = 2.792! ' 'Shape30 ' - Me.Shape30.Height = 0.25! - Me.Shape30.Left = 2.802! + Me.Shape30.Height = 0.5! + Me.Shape30.Left = 2.8! Me.Shape30.Name = "Shape30" Me.Shape30.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape30.Top = 2.351! + Me.Shape30.Top = 2.35! Me.Shape30.Width = 4.668! ' 'Shape31 ' Me.Shape31.Height = 0.25! - Me.Shape31.Left = 2.802! + Me.Shape31.Left = 2.8! Me.Shape31.Name = "Shape31" Me.Shape31.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape31.Top = 2.601! + Me.Shape31.Top = 2.85! Me.Shape31.Width = 4.668! ' 'Shape32 ' Me.Shape32.Height = 0.25! - Me.Shape32.Left = 2.802! + Me.Shape32.Left = 2.8! Me.Shape32.Name = "Shape32" Me.Shape32.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape32.Top = 3.101! + Me.Shape32.Top = 3.35! Me.Shape32.Width = 4.668! ' 'Shape33 ' Me.Shape33.Height = 0.25! - Me.Shape33.Left = 2.802! + Me.Shape33.Left = 2.8! Me.Shape33.Name = "Shape33" Me.Shape33.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape33.Top = 3.351! + Me.Shape33.Top = 3.6! Me.Shape33.Width = 4.668! ' 'Shape34 ' Me.Shape34.Height = 0.25! - Me.Shape34.Left = 2.802! + Me.Shape34.Left = 2.8! Me.Shape34.Name = "Shape34" Me.Shape34.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape34.Top = 2.851! + Me.Shape34.Top = 3.1! Me.Shape34.Width = 4.668! ' - 'Shape35 - ' - Me.Shape35.Height = 0.25! - Me.Shape35.Left = 2.802! - Me.Shape35.Name = "Shape35" - Me.Shape35.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape35.Top = 3.601! - Me.Shape35.Width = 4.668! - ' 'Shape36 ' Me.Shape36.Height = 0.25! - Me.Shape36.Left = 2.802! + Me.Shape36.Left = 2.8! Me.Shape36.Name = "Shape36" Me.Shape36.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape36.Top = 4.101! + Me.Shape36.Top = 4.1! Me.Shape36.Width = 4.668! ' 'Shape37 ' Me.Shape37.Height = 0.25! - Me.Shape37.Left = 2.802! + Me.Shape37.Left = 2.8! Me.Shape37.Name = "Shape37" Me.Shape37.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape37.Top = 4.351! + Me.Shape37.Top = 4.35! Me.Shape37.Width = 4.668! ' 'Shape38 ' Me.Shape38.Height = 0.25! - Me.Shape38.Left = 2.802! + Me.Shape38.Left = 2.8! Me.Shape38.Name = "Shape38" Me.Shape38.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape38.Top = 3.851! + Me.Shape38.Top = 3.85! Me.Shape38.Width = 4.668! ' 'Label13 @@ -994,62 +970,50 @@ Partial Public Class rptFiskalkunde ' Me.Label14.Height = 0.1574803! Me.Label14.HyperLink = Nothing - Me.Label14.Left = 0.04000001! + Me.Label14.Left = 0.04! Me.Label14.Name = "Label14" Me.Label14.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label14.Text = "Gründungsjahr:" - Me.Label14.Top = 2.652! + Me.Label14.Top = 2.902! Me.Label14.Width = 2.718! ' 'Label15 ' Me.Label15.Height = 0.157! Me.Label15.HyperLink = Nothing - Me.Label15.Left = 0.04000001! + Me.Label15.Left = 0.04! Me.Label15.Name = "Label15" Me.Label15.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label15.Text = "Anzahl Mitarbeiter:" - Me.Label15.Top = 2.893! + Me.Label15.Top = 3.143! Me.Label15.Width = 2.718! ' 'Label16 ' Me.Label16.Height = 0.157! Me.Label16.HyperLink = Nothing - Me.Label16.Left = 0.04000001! + Me.Label16.Left = 0.04! Me.Label16.Name = "Label16" Me.Label16.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label16.Text = "Höchstkredit:" - Me.Label16.Top = 3.133! + Me.Label16.Top = 3.383! Me.Label16.Width = 2.718! ' 'Label17 ' Me.Label17.Height = 0.157! Me.Label17.HyperLink = Nothing - Me.Label17.Left = 0.04000001! + Me.Label17.Left = 0.04! Me.Label17.Name = "Label17" Me.Label17.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label17.Text = "Import von welchen Waren" - Me.Label17.Top = 3.417! + Me.Label17.Top = 3.667! Me.Label17.Width = 2.718! ' - 'Label18 - ' - Me.Label18.Height = 0.157! - Me.Label18.HyperLink = Nothing - Me.Label18.Left = 0.04000001! - Me.Label18.Name = "Label18" - Me.Label18.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & - "1" - Me.Label18.Text = "Gesellschafter:" - Me.Label18.Top = 3.66! - Me.Label18.Width = 2.718! - ' 'Label19 ' Me.Label19.Height = 0.157! @@ -1089,7 +1053,7 @@ Partial Public Class rptFiskalkunde ' Me.txtGZ.DataField = "" Me.txtGZ.DistinctField = "" - Me.txtGZ.Height = 0.1574803! + Me.txtGZ.Height = 0.4070001! Me.txtGZ.Left = 2.881! Me.txtGZ.Name = "txtGZ" Me.txtGZ.Style = "color: Black" @@ -1108,7 +1072,7 @@ Partial Public Class rptFiskalkunde Me.txtGJ.Style = "color: Black" Me.txtGJ.SummaryGroup = "" Me.txtGJ.Text = "-" - Me.txtGJ.Top = 2.652! + Me.txtGJ.Top = 2.902! Me.txtGJ.Width = 4.508! ' 'txtAnzMA @@ -1121,7 +1085,7 @@ Partial Public Class rptFiskalkunde Me.txtAnzMA.Style = "color: Black" Me.txtAnzMA.SummaryGroup = "" Me.txtAnzMA.Text = "-" - Me.txtAnzMA.Top = 2.893! + Me.txtAnzMA.Top = 3.143! Me.txtAnzMA.Width = 4.508! ' 'txtKredit @@ -1134,7 +1098,7 @@ Partial Public Class rptFiskalkunde Me.txtKredit.Style = "color: Black" Me.txtKredit.SummaryGroup = "" Me.txtKredit.Text = "-" - Me.txtKredit.Top = 3.133! + Me.txtKredit.Top = 3.383! Me.txtKredit.Width = 4.508! ' 'txtImport @@ -1147,22 +1111,9 @@ Partial Public Class rptFiskalkunde Me.txtImport.Style = "color: Black" Me.txtImport.SummaryGroup = "" Me.txtImport.Text = "-" - Me.txtImport.Top = 3.417! + Me.txtImport.Top = 3.667! Me.txtImport.Width = 4.508! ' - 'txtGesellschafter - ' - Me.txtGesellschafter.DataField = "" - Me.txtGesellschafter.DistinctField = "" - Me.txtGesellschafter.Height = 0.1574803! - Me.txtGesellschafter.Left = 2.881! - Me.txtGesellschafter.Name = "txtGesellschafter" - Me.txtGesellschafter.Style = "color: Black" - Me.txtGesellschafter.SummaryGroup = "" - Me.txtGesellschafter.Text = "-" - Me.txtGesellschafter.Top = 3.658! - Me.txtGesellschafter.Width = 4.508! - ' 'txtGF ' Me.txtGF.DataField = "" @@ -1198,6 +1149,7 @@ Partial Public Class rptFiskalkunde Me.txtSonstiges.Name = "txtSonstiges" Me.txtSonstiges.Style = "color: Black" Me.txtSonstiges.SummaryGroup = "" + Me.txtSonstiges.Text = Nothing Me.txtSonstiges.Top = 4.393! Me.txtSonstiges.Width = 4.508! ' @@ -1213,6 +1165,93 @@ Partial Public Class rptFiskalkunde Me.lblKontrolle.Top = 5.22! Me.lblKontrolle.Width = 2.649606! ' + 'Shape39 + ' + Me.Shape39.Height = 0.25! + Me.Shape39.Left = 2.8! + Me.Shape39.Name = "Shape39" + Me.Shape39.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) + Me.Shape39.Top = 2.1! + Me.Shape39.Width = 0.4! + ' + 'Shape40 + ' + Me.Shape40.Height = 0.25! + Me.Shape40.Left = 3.2! + Me.Shape40.Name = "Shape40" + Me.Shape40.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) + Me.Shape40.Top = 2.1! + Me.Shape40.Width = 0.4! + ' + 'Shape41 + ' + Me.Shape41.Height = 0.25! + Me.Shape41.Left = 3.59! + Me.Shape41.Name = "Shape41" + Me.Shape41.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) + Me.Shape41.Top = 2.1! + Me.Shape41.Width = 3.878! + ' + 'txtUVM + ' + Me.txtUVM.DataField = "" + Me.txtUVM.DistinctField = "" + Me.txtUVM.Height = 0.157! + Me.txtUVM.Left = 3.667! + Me.txtUVM.Name = "txtUVM" + Me.txtUVM.Style = "color: Black" + Me.txtUVM.SummaryGroup = "" + Me.txtUVM.Text = "-" + Me.txtUVM.Top = 2.16! + Me.txtUVM.Width = 3.732! + ' + 'txtUVMNein + ' + Me.txtUVMNein.DataField = "" + Me.txtUVMNein.DistinctField = "" + Me.txtUVMNein.Height = 0.15! + Me.txtUVMNein.Left = 3.25! + Me.txtUVMNein.Name = "txtUVMNein" + Me.txtUVMNein.Style = "color: Black; text-align: center" + Me.txtUVMNein.SummaryGroup = "" + Me.txtUVMNein.Text = Nothing + Me.txtUVMNein.Top = 2.16! + Me.txtUVMNein.Width = 0.3! + ' + 'txtUVMJa + ' + Me.txtUVMJa.DataField = "" + Me.txtUVMJa.DistinctField = "" + Me.txtUVMJa.Height = 0.15! + Me.txtUVMJa.Left = 2.843! + Me.txtUVMJa.Name = "txtUVMJa" + Me.txtUVMJa.Style = "color: Black; text-align: center" + Me.txtUVMJa.SummaryGroup = "" + Me.txtUVMJa.Text = Nothing + Me.txtUVMJa.Top = 2.16! + Me.txtUVMJa.Width = 0.3! + ' + 'Shape42 + ' + Me.Shape42.Height = 0.25! + Me.Shape42.Left = 0.01000023! + Me.Shape42.Name = "Shape42" + Me.Shape42.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) + Me.Shape42.Top = 2.1! + Me.Shape42.Width = 2.792! + ' + 'Label22 + ' + Me.Label22.Height = 0.1574803! + Me.Label22.HyperLink = Nothing + Me.Label22.Left = 0.05000025! + Me.Label22.Name = "Label22" + Me.Label22.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & + "1" + Me.Label22.Text = "Untervollmacht liegt vor ?:" + Me.Label22.Top = 2.153! + Me.Label22.Width = 2.718! + ' 'PageFooter ' Me.PageFooter.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label28, Me.Line3, Me.ReportInfo2, Me.lblDat}) @@ -1264,93 +1303,6 @@ Partial Public Class rptFiskalkunde Me.lblDat.Top = 0.08622044! Me.lblDat.Width = 2.649606! ' - 'Shape39 - ' - Me.Shape39.Height = 0.25! - Me.Shape39.Left = 2.802! - Me.Shape39.Name = "Shape39" - Me.Shape39.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape39.Top = 2.101! - Me.Shape39.Width = 0.4! - ' - 'Shape40 - ' - Me.Shape40.Height = 0.25! - Me.Shape40.Left = 3.202! - Me.Shape40.Name = "Shape40" - Me.Shape40.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape40.Top = 2.101! - Me.Shape40.Width = 0.4! - ' - 'Shape41 - ' - Me.Shape41.Height = 0.25! - Me.Shape41.Left = 3.592! - Me.Shape41.Name = "Shape41" - Me.Shape41.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape41.Top = 2.101! - Me.Shape41.Width = 3.878! - ' - 'txtUVM - ' - Me.txtUVM.DataField = "" - Me.txtUVM.DistinctField = "" - Me.txtUVM.Height = 0.157! - Me.txtUVM.Left = 3.667! - Me.txtUVM.Name = "txtUVM" - Me.txtUVM.Style = "color: Black" - Me.txtUVM.SummaryGroup = "" - Me.txtUVM.Text = "-" - Me.txtUVM.Top = 2.16! - Me.txtUVM.Width = 3.732! - ' - 'txtUVMNein - ' - Me.txtUVMNein.DataField = "" - Me.txtUVMNein.DistinctField = "" - Me.txtUVMNein.Height = 0.15! - Me.txtUVMNein.Left = 3.25! - Me.txtUVMNein.Name = "txtUVMNein" - Me.txtUVMNein.Style = "color: Black; text-align: center" - Me.txtUVMNein.SummaryGroup = "" - Me.txtUVMNein.Text = Nothing - Me.txtUVMNein.Top = 2.16! - Me.txtUVMNein.Width = 0.3! - ' - 'txtUVMJa - ' - Me.txtUVMJa.DataField = "" - Me.txtUVMJa.DistinctField = "" - Me.txtUVMJa.Height = 0.15! - Me.txtUVMJa.Left = 2.843! - Me.txtUVMJa.Name = "txtUVMJa" - Me.txtUVMJa.Style = "color: Black; text-align: center" - Me.txtUVMJa.SummaryGroup = "" - Me.txtUVMJa.Text = Nothing - Me.txtUVMJa.Top = 2.16! - Me.txtUVMJa.Width = 0.3! - ' - 'Shape42 - ' - Me.Shape42.Height = 0.25! - Me.Shape42.Left = 0.01000023! - Me.Shape42.Name = "Shape42" - Me.Shape42.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape42.Top = 2.101! - Me.Shape42.Width = 2.792! - ' - 'Label22 - ' - Me.Label22.Height = 0.1574803! - Me.Label22.HyperLink = Nothing - Me.Label22.Left = 0.05000025! - Me.Label22.Name = "Label22" - Me.Label22.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & - "1" - Me.Label22.Text = "Untervollmacht liegt vor ?:" - Me.Label22.Top = 2.153! - Me.Label22.Width = 2.718! - ' 'rptFiskalkunde ' Me.PageSettings.Margins.Bottom = 0.3937008! @@ -1409,7 +1361,6 @@ Partial Public Class rptFiskalkunde CType(Me.Label15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label16, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label17, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label19, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label21, System.ComponentModel.ISupportInitialize).EndInit() @@ -1418,18 +1369,17 @@ Partial Public Class rptFiskalkunde CType(Me.txtAnzMA, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtKredit, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtImport, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtGesellschafter, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtGF, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtSteuerberater, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtSonstiges, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblKontrolle, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label28, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.lblDat, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtUVM, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtUVMNein, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtUVMJa, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label22, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Label28, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblDat, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub @@ -1498,7 +1448,6 @@ Partial Public Class rptFiskalkunde Private WithEvents Shape23 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape24 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape25 As GrapeCity.ActiveReports.SectionReportModel.Shape - Private WithEvents Shape26 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape27 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape28 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape29 As GrapeCity.ActiveReports.SectionReportModel.Shape @@ -1507,7 +1456,6 @@ Partial Public Class rptFiskalkunde Private WithEvents Shape32 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape33 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape34 As GrapeCity.ActiveReports.SectionReportModel.Shape - Private WithEvents Shape35 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape36 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape37 As GrapeCity.ActiveReports.SectionReportModel.Shape Private WithEvents Shape38 As GrapeCity.ActiveReports.SectionReportModel.Shape @@ -1516,7 +1464,6 @@ Partial Public Class rptFiskalkunde Private WithEvents Label15 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label16 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label17 As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label18 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label19 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label20 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label21 As GrapeCity.ActiveReports.SectionReportModel.Label @@ -1525,7 +1472,6 @@ Partial Public Class rptFiskalkunde Private WithEvents txtAnzMA As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents txtKredit As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents txtImport As GrapeCity.ActiveReports.SectionReportModel.TextBox - Private WithEvents txtGesellschafter As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents txtGF As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents txtSteuerberater As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents txtSonstiges As GrapeCity.ActiveReports.SectionReportModel.TextBox diff --git a/SDL/kunden/Berichte/rptFiskalkunde.vb b/SDL/kunden/Berichte/rptFiskalkunde.vb index 5a4f2e71..2478380d 100644 --- a/SDL/kunden/Berichte/rptFiskalkunde.vb +++ b/SDL/kunden/Berichte/rptFiskalkunde.vb @@ -13,9 +13,10 @@ Public Class rptFiskalkunde Dim EORI As cEORIPruefung Dim UID As cUIDPruefung Dim UVM As cKundenVollmachten + Dim VMOriginal As Boolean = False Dim unterlagenliste As List(Of String) - Sub New(KdNr As Integer, FiskalId As Integer, VM As cKundenVollmachten, BR As cBonitaetsauskunft, EORI As cEORIPruefung, UID As cUIDPruefung, UVM As cKundenVollmachten, unterlagenliste As List(Of String), Optional Firma As String = "VERAG") + Sub New(KdNr As Integer, FiskalId As Integer, VM As cKundenVollmachten, BR As cBonitaetsauskunft, EORI As cEORIPruefung, UID As cUIDPruefung, UVM As cKundenVollmachten, VMOriginal As Boolean, unterlagenliste As List(Of String), Optional Firma As String = "VERAG") ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -60,6 +61,8 @@ Public Class rptFiskalkunde End If If IsDate(VM.kdvm_erhalten_Datum) Then txtVM.Text &= CDate(VM.kdvm_erhalten_Datum).ToShortDateString + + If VMOriginal Then txtVM.Text &= " (Original vorhanden)" Else txtVMNein.Text = "X" End If @@ -104,6 +107,7 @@ Public Class rptFiskalkunde If IsNumeric(FK.FK_KreditMax) Then txtKredit.Text = CDbl(FK.FK_KreditMax) + If IsNumeric(FK.FK_Umsatz) Then txtUmsatz.Text = CDbl(FK.FK_Umsatz) If IsNumeric(FK.FK_AnzahlMitarbeiter) Then txtAnzMA.Text = CDbl(FK.FK_AnzahlMitarbeiter) If IsDate(FK.FK_Gruendungsdatum) Then txtGJ.Text = CDate(FK.FK_Gruendungsdatum).ToShortDateString txtImport.Text = IIf(FK.FK_Waren <> "", FK.FK_Waren, "") diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb index ed0658b7..57dca697 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb @@ -39,6 +39,8 @@ Partial Class usrcntlFiskaluebersicht Me.btnPDFReport = New System.Windows.Forms.Button() Me.dgvFiskaluebersicht = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.Label14 = New System.Windows.Forms.Label() + Me.txtUmsatz = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxUntervm = New System.Windows.Forms.CheckBox() Me.txtUVM = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.picOKSt = New System.Windows.Forms.PictureBox() @@ -182,12 +184,14 @@ Partial Class usrcntlFiskaluebersicht ' 'lblAbschluss ' - Me.lblAbschluss.AutoSize = True + Me.lblAbschluss.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAbschluss.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAbschluss.Location = New System.Drawing.Point(858, 12) + Me.lblAbschluss.Location = New System.Drawing.Point(559, 14) Me.lblAbschluss.Name = "lblAbschluss" - Me.lblAbschluss.Size = New System.Drawing.Size(0, 20) + Me.lblAbschluss.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblAbschluss.Size = New System.Drawing.Size(301, 20) Me.lblAbschluss.TabIndex = 138 + Me.lblAbschluss.TextAlign = System.Drawing.ContentAlignment.TopRight ' 'cbxFiskalart ' @@ -286,6 +290,8 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.AutoScrollMinSize = New System.Drawing.Size(0, 10) Me.MyPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.MyPanel2.BackColor = System.Drawing.Color.White + Me.MyPanel2.Controls.Add(Me.Label14) + Me.MyPanel2.Controls.Add(Me.txtUmsatz) Me.MyPanel2.Controls.Add(Me.cbxUntervm) Me.MyPanel2.Controls.Add(Me.txtUVM) Me.MyPanel2.Controls.Add(Me.picOKSt) @@ -343,6 +349,39 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Size = New System.Drawing.Size(721, 657) Me.MyPanel2.TabIndex = 110 ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.Location = New System.Drawing.Point(5, 190) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(48, 13) + Me.Label14.TabIndex = 185 + Me.Label14.Text = "Umsatz" + ' + 'txtUmsatz + ' + Me.txtUmsatz._DateTimeOnly = False + Me.txtUmsatz._numbersOnly = True + Me.txtUmsatz._numbersOnlyKommastellen = "" + Me.txtUmsatz._numbersOnlyTrennzeichen = True + Me.txtUmsatz._Prozent = False + Me.txtUmsatz._ShortDateNew = False + Me.txtUmsatz._ShortDateOnly = False + Me.txtUmsatz._TimeOnly = False + Me.txtUmsatz._TimeOnly_Seconds = False + Me.txtUmsatz._value = "" + Me.txtUmsatz._Waehrung = True + Me.txtUmsatz._WaehrungZeichen = True + Me.txtUmsatz.ForeColor = System.Drawing.Color.Black + Me.txtUmsatz.Location = New System.Drawing.Point(155, 187) + Me.txtUmsatz.MaxLineLength = -1 + Me.txtUmsatz.MaxLines_Warning = "" + Me.txtUmsatz.MaxLines_Warning_Label = Nothing + Me.txtUmsatz.Name = "txtUmsatz" + Me.txtUmsatz.Size = New System.Drawing.Size(86, 20) + Me.txtUmsatz.TabIndex = 184 + ' 'cbxUntervm ' Me.cbxUntervm.AutoSize = True @@ -461,7 +500,7 @@ Partial Class usrcntlFiskaluebersicht 'rtfZwischenh ' Me.rtfZwischenh.Enabled = False - Me.rtfZwischenh.Location = New System.Drawing.Point(237, 293) + Me.rtfZwischenh.Location = New System.Drawing.Point(237, 311) Me.rtfZwischenh.Name = "rtfZwischenh" Me.rtfZwischenh.Size = New System.Drawing.Size(225, 153) Me.rtfZwischenh.TabIndex = 176 @@ -477,7 +516,7 @@ Partial Class usrcntlFiskaluebersicht Me.dgvZwischenh.AllowUserToResizeRows = False Me.dgvZwischenh.BackgroundColor = System.Drawing.Color.White Me.dgvZwischenh.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvZwischenh.Location = New System.Drawing.Point(237, 270) + Me.dgvZwischenh.Location = New System.Drawing.Point(237, 288) Me.dgvZwischenh.MultiSelect = False Me.dgvZwischenh.Name = "dgvZwischenh" Me.dgvZwischenh.ReadOnly = True @@ -490,7 +529,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(233, 247) + Me.Label6.Location = New System.Drawing.Point(233, 265) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(167, 16) Me.Label6.TabIndex = 174 @@ -499,7 +538,7 @@ Partial Class usrcntlFiskaluebersicht 'rtfEmpfaenger ' Me.rtfEmpfaenger.Enabled = False - Me.rtfEmpfaenger.Location = New System.Drawing.Point(477, 293) + Me.rtfEmpfaenger.Location = New System.Drawing.Point(477, 311) Me.rtfEmpfaenger.Name = "rtfEmpfaenger" Me.rtfEmpfaenger.Size = New System.Drawing.Size(224, 153) Me.rtfEmpfaenger.TabIndex = 173 @@ -509,7 +548,7 @@ Partial Class usrcntlFiskaluebersicht 'rtfLieferanten ' Me.rtfLieferanten.Enabled = False - Me.rtfLieferanten.Location = New System.Drawing.Point(6, 293) + Me.rtfLieferanten.Location = New System.Drawing.Point(6, 311) Me.rtfLieferanten.Name = "rtfLieferanten" Me.rtfLieferanten.Size = New System.Drawing.Size(215, 153) Me.rtfLieferanten.TabIndex = 172 @@ -525,7 +564,7 @@ Partial Class usrcntlFiskaluebersicht Me.dgvEmpfaenger.AllowUserToResizeRows = False Me.dgvEmpfaenger.BackgroundColor = System.Drawing.Color.White Me.dgvEmpfaenger.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvEmpfaenger.Location = New System.Drawing.Point(477, 270) + Me.dgvEmpfaenger.Location = New System.Drawing.Point(477, 288) Me.dgvEmpfaenger.MultiSelect = False Me.dgvEmpfaenger.Name = "dgvEmpfaenger" Me.dgvEmpfaenger.ReadOnly = True @@ -543,7 +582,7 @@ Partial Class usrcntlFiskaluebersicht Me.dgvLieferanten.AllowUserToResizeRows = False Me.dgvLieferanten.BackgroundColor = System.Drawing.Color.White Me.dgvLieferanten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvLieferanten.Location = New System.Drawing.Point(6, 270) + Me.dgvLieferanten.Location = New System.Drawing.Point(6, 288) Me.dgvLieferanten.MultiSelect = False Me.dgvLieferanten.Name = "dgvLieferanten" Me.dgvLieferanten.ReadOnly = True @@ -556,7 +595,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(473, 247) + Me.Label3.Location = New System.Drawing.Point(473, 265) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(126, 16) Me.Label3.TabIndex = 168 @@ -566,7 +605,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(5, 251) + Me.Label2.Location = New System.Drawing.Point(5, 269) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(128, 16) Me.Label2.TabIndex = 167 @@ -729,7 +768,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtWaren._Waehrung = False Me.txtWaren._WaehrungZeichen = True Me.txtWaren.ForeColor = System.Drawing.Color.Black - Me.txtWaren.Location = New System.Drawing.Point(155, 214) + Me.txtWaren.Location = New System.Drawing.Point(155, 232) Me.txtWaren.MaxLineLength = -1 Me.txtWaren.MaxLines_Warning = "" Me.txtWaren.MaxLines_Warning_Label = Nothing @@ -741,7 +780,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label8.AutoSize = True Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(4, 217) + Me.Label8.Location = New System.Drawing.Point(4, 235) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(44, 13) Me.Label8.TabIndex = 156 @@ -796,7 +835,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtGeschaeftszweck._Waehrung = False Me.txtGeschaeftszweck._WaehrungZeichen = True Me.txtGeschaeftszweck.ForeColor = System.Drawing.Color.Black - Me.txtGeschaeftszweck.Location = New System.Drawing.Point(155, 191) + Me.txtGeschaeftszweck.Location = New System.Drawing.Point(155, 209) Me.txtGeschaeftszweck.MaxLineLength = -1 Me.txtGeschaeftszweck.MaxLines_Warning = "" Me.txtGeschaeftszweck.MaxLines_Warning_Label = Nothing @@ -808,7 +847,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(3, 194) + Me.Label5.Location = New System.Drawing.Point(5, 212) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(100, 13) Me.Label5.TabIndex = 152 @@ -1216,4 +1255,6 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents Button3 As Button Friend WithEvents cbxUntervm As CheckBox Friend WithEvents txtUVM As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label14 As Label + Friend WithEvents txtUmsatz As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/kunden/usrcntlFiskaluebersicht.resx b/SDL/kunden/usrcntlFiskaluebersicht.resx index ca08742d..2a1c87ad 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.resx +++ b/SDL/kunden/usrcntlFiskaluebersicht.resx @@ -143,4 +143,7 @@ True + + True + \ No newline at end of file diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 0acdd095..4def93b4 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -1,5 +1,6 @@  Imports System.Globalization +Imports System.Linq.Expressions Imports System.Net Imports System.Text.RegularExpressions Imports com.sun.tools.doclets.internal.toolkit.util @@ -56,7 +57,7 @@ Public Class usrcntlFiskaluebersicht Label2.Text = "Top 5 Lieferanten (" & year & ")" With dgvLieferanten .Columns.Clear() - .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [AbsenderKundenNr] as KdNr, MAX(Absender) as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY AbsenderKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) isnull(cast([AbsenderKundenNr] as nvarchar(7)) + ' ','') as KdNr, MAX(Absender) as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY AbsenderKundenNr, [Absender] ORDER BY Anzahl DESC ", "FMZOLL") .Columns("KdNr").Width = 50 .Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Anzahl").Width = 40 @@ -80,7 +81,7 @@ Public Class usrcntlFiskaluebersicht Label3.Text = "Top 5 Empfänger (" & year & ")" With dgvEmpfaenger .Columns.Clear() - .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & "AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) isnull(cast([EmpfängerKundenNr]as nvarchar(7)) + ' ','') as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & "AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr, Empfänger ORDER BY Anzahl DESC ", "FMZOLL") .Columns("KdNr").Width = 50 .Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Anzahl").Width = 40 @@ -102,7 +103,7 @@ Public Class usrcntlFiskaluebersicht Label6.Text = "Top 5 Auftraggeber (" & year & ")" With dgvZwischenh .Columns.Clear() - .DataSource() = SQL.loadDgvBySql("SELECT [VermittlerKundenNr] as KdNr, CASE WHEN [VermittlerKundenNr] IS NULL THEN '-' ELSE MAX(Vermittler) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY VermittlerKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) isnull(cast([VermittlerKundenNr]as nvarchar(7)) + ' ','') as KdNr, CASE WHEN [VermittlerKundenNr] IS NULL THEN '-' ELSE MAX(Vermittler) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY VermittlerKundenNr, Vermittler ORDER BY Anzahl DESC ", "FMZOLL") .Columns("KdNr").Width = 50 .Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Anzahl").Width = 40 @@ -247,6 +248,7 @@ Public Class usrcntlFiskaluebersicht Private Sub btnPDFReport_Click(sender As Object, e As EventArgs) Handles btnPDFReport.Click Try + Me.Cursor = Cursors.WaitCursor Dim listeUnterlagen As New List(Of String) If dgvUnterlagen.Rows.Count > 0 Then @@ -258,7 +260,7 @@ Public Class usrcntlFiskaluebersicht Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Fiskalanalyse", ".pdf", , False) - Dim rptFiskalkunden As New SDL.rptFiskalkunde(kdNr, fk.FK_Id, VM, BA, EORI, UID, UVM, listeUnterlagen) + Dim rptFiskalkunden As New SDL.rptFiskalkunde(kdNr, fk.FK_Id, VM, BA, EORI, UID, UVM, fk.FK_VollmachtOriginal, listeUnterlagen) Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport rptFiskalkunden.Run(False) @@ -290,13 +292,13 @@ Public Class usrcntlFiskaluebersicht End If End If - End If + End If - Dim MailFileUVM - If UVM IsNot Nothing Then - If UVM.kdvm_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_datenarchivId)) - If UVM.kdvm_emailId > 0 Then - MailFileUVM = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_emailId) + Dim MailFileUVM + If UVM IsNot Nothing Then + If UVM.kdvm_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_datenarchivId)) + If UVM.kdvm_emailId > 0 Then + MailFileUVM = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_emailId) If Not System.IO.File.Exists(MailFileUVM) Then MsgBox("Die Datei Untervollmacht existiert nicht!") @@ -312,21 +314,22 @@ Public Class usrcntlFiskaluebersicht End If - End If - If BA IsNot Nothing Then - If BA.ba_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(BA.ba_datenarchivId)) - End If - For Each r As DataGridViewRow In dgvUnterlagen.Rows - files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value)) - Next - VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile) + End If + If BA IsNot Nothing Then + If BA.ba_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(BA.ba_datenarchivId)) + End If + For Each r As DataGridViewRow In dgvUnterlagen.Rows + files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value)) + Next + VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile) Process.Start(outputFile) - + Me.Cursor = Cursors.Default Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Me.Cursor = Cursors.Default End Try - Me.Cursor = Cursors.Default + End Sub Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click @@ -359,6 +362,9 @@ Public Class usrcntlFiskaluebersicht Private Sub dgvFiskaluebersicht_SelectionChanged(sender As Object, e As EventArgs) Handles dgvFiskaluebersicht.SelectionChanged + + + If dgvFiskaluebersicht.SelectedRows.Count > 0 Then fk = New cFiskalkunden(dgvFiskaluebersicht.SelectedRows(0).Cells("FK_Id").Value) @@ -375,14 +381,17 @@ Public Class usrcntlFiskaluebersicht Button4.Enabled = True setAbschlusstxt(locked) + BA = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrWithingDate(kdNr) + setControlButtons() + Else Button4.Enabled = False clearTXT() End If - BA = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrWithingDate(kdNr) - setControlButtons() + 'BA = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrWithingDate(kdNr) + 'setControlButtons() End Sub @@ -433,6 +442,7 @@ Public Class usrcntlFiskaluebersicht txtWebsiteSt.Text = checkNullStr(fk.FK_WebsiteSt_URL) cbxVMOriginal.Checked = checkNullStr(fk.FK_VollmachtOriginal) txtSteuerberater.Text = checkNullStr(fk.FK_Steuerberater) + txtUmsatz.Text = checkNullStr(fk.FK_Umsatz) If txtBon.Text = "" Then Dim baid = SQL.getValueTxtBySql("SELECT TOP(1) ba_id FROM [tblBonitaetsauskunft] where ba_KundenNr=" & kdNr & " ORDER BY ba_Datum DESC", "FMZOLL") @@ -603,6 +613,10 @@ Public Class usrcntlFiskaluebersicht fk.FK_KreditMax = Double.Parse(txtKredit.Text) End If + If txtUmsatz.Text <> "" Then + fk.FK_Umsatz = Double.Parse(txtUmsatz.Text) + End If + fk.FK_Geschaeftsfuehrer = txtGF.Text fk.FK_Geschaeftszweck = txtGeschaeftszweck.Text fk.FK_AnzahlMitarbeiter = txtAnzMA.Text @@ -678,7 +692,7 @@ Public Class usrcntlFiskaluebersicht Private Sub txtVM_TextChanged(sender As Object, e As EventArgs) Handles txtVM.TextChanged If txtVM._value <> "" Then Dim a As Date = Date.ParseExact(txtVM._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - If a > fk.FK_Datum.AddDays(-daysWithinDocumentAreValid) Then + If a > fk.FK_Datum.AddYears(-2) Then 'Vollmacahten sollten grundsätzlich 2 Jahre ab Austellung gültig sein! cbxVollmacht.Checked = True txtVM.ForeColor = Color.Black Else @@ -863,6 +877,7 @@ Public Class usrcntlFiskaluebersicht Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Me.Cursor = Cursors.WaitCursor Dim url As String = "" lblWarning.Text = "" txtHomepage.ForeColor = Color.Black @@ -873,6 +888,7 @@ Public Class usrcntlFiskaluebersicht If anh_list.Count > 0 Then DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(anh_list.ElementAt(0).fka_docId) DS.OPEN_SINGLE() + Me.Cursor = Cursors.Default Exit Sub End If @@ -880,26 +896,13 @@ Public Class usrcntlFiskaluebersicht If txtHomepage.Text = "" Then picOK.Visible = False + Me.Cursor = Cursors.Default Exit Sub End If If Not IsValidURL(txtHomepage.Text) Then Exit Sub - Dim req As System.Net.WebRequest - Dim res As System.Net.WebResponse - - Try - url = txtHomepage.Text - req = System.Net.WebRequest.Create(url) - - res = req.GetResponse() - Catch ex As WebException - lblWarning.Text = ex.Message - txtHomepage.ForeColor = Color.Red - picOK.Visible = False - Exit Sub - End Try - + If Not checkWebsite(url) Then Exit Sub Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) 'UU langsam.... @@ -926,6 +929,7 @@ Public Class usrcntlFiskaluebersicht If Not cbxHomepage.Checked Then cbxHomepage.Checked = True initDGVUnterlagen() + Me.Cursor = Cursors.Default End Sub @@ -1020,11 +1024,26 @@ Public Class usrcntlFiskaluebersicht End Sub Private Sub somethingChanged() + If fk.FK_locked Then + btnSave.Enabled = False + btnOK.Enabled = False + Exit Sub + End If If Not btnSave.Enabled Then btnSave.Enabled = True End Sub Private Sub setControlButtons() + If fk IsNot Nothing Then + + If fk.FK_locked Then + btnSave.Enabled = False + btnOK.Enabled = False + Exit Sub + End If + End If + + For Each c As Control In MyPanel1.Controls c.Enabled = dgvFiskaluebersicht.SelectedRows.Count > 0 @@ -1073,21 +1092,7 @@ Public Class usrcntlFiskaluebersicht If Not IsValidURL(txtWebsiteSt.Text) Then Exit Sub - Dim req As System.Net.WebRequest - Dim res As System.Net.WebResponse - - Try - url = txtWebsiteSt.Text - req = System.Net.WebRequest.Create(url) - - res = req.GetResponse() - Catch ex As WebException - lblWarning.Text = ex.Message - txtWebsiteSt.ForeColor = Color.Red - picOKSt.Visible = False - Exit Sub - End Try - + If Not checkWebsite(url) Then Exit Sub Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) 'UU langsam.... @@ -1111,4 +1116,27 @@ Public Class usrcntlFiskaluebersicht initDGVUnterlagen() End Sub + + Private Function checkWebsite(url As String) As Boolean + + Dim req As System.Net.HttpWebRequest + Dim res As System.Net.HttpWebResponse + + Try + url = txtHomepage.Text + req = System.Net.HttpWebRequest.Create(url) + req.Timeout = 5000 + req.UserAgent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36" + res = req.GetResponse() + Catch ex As WebException + lblWarning.Text = ex.Message + txtHomepage.ForeColor = Color.Red + picOK.Visible = False + Me.Cursor = Cursors.Default + Return False + End Try + + Return True + + End Function End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb index 4c3d3fa7..ae506f4d 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb @@ -29,6 +29,7 @@ Public Class cAufschubKonten Sub New(brgakto_gs_standort As String) Me.brgakto_gs_standort = brgakto_gs_standort LOADStandort() + brgakto_betrag = getReferenzbetrag(Today) End Sub Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) @@ -172,7 +173,8 @@ Public Class cAufschubKonten Return SQL.doSQL("Update [tblBrgAufschubKonten] Set brgakto_gs_aktSaldo = CAST(REPLACE('" & brgakto_gs_aktSaldo & "' ,',','.')AS decimal(18,2)) WHERE brgakto_gs_standort = '" & brgakto_gs_standort & "'", "ADMIN") End Function - Public Function CalcSaldo() As String + Public Function CalcSaldo(Optional dtDate As DataTable = Nothing) As String + Dim SaldoString As String = "select @@ -189,18 +191,32 @@ Public Class cAufschubKonten when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) when gsp_art = 'Close' then gsp_sicherheitsbetrag end) - as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where gs_standort = '" & brgakto_gs_standort & "' ))" + as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where gs_standort = '" & brgakto_gs_standort & "' And ISNULL(gs_ReferenzAenderung,0) = 0 ))" Dim dt As New DataTable - Dim mrn As Double = 0 - dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True) - If dt.Rows(0).Item(0).ToString.Length > 0 Then - mrn = dt.Rows(0).Item(0) - End If + Dim mrn As Double = 0 + dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True) + If dt.Rows(0).Item(0).ToString.Length > 0 Then + mrn = dt.Rows(0).Item(0) + End If - brgakto_gs_aktSaldo = brgakto_betrag + mrn + brgakto_gs_aktSaldo = getReferenzbetrag(Today) + mrn updateSaldo() + + Return brgakto_gs_aktSaldo End Function + Public Function getReferenzbetrag(nowDate As Date) As Double + + Try + + Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]='" & brgakto_id & "' and brgarefb_gs_aktiv = 1 And [brgarefb_gueltig_ab] <= '" & nowDate & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,) + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + + End Function + End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb index a18e1624..118948df 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb @@ -29,6 +29,7 @@ Public Class cFiskalkunden Property FK_KreditMax As Object = Nothing Property FK_Geschaeftsfuehrer As Object = Nothing Property FK_Steuerberater As Object = Nothing + Property FK_Umsatz As Object = Nothing Public hasEntry = False @@ -71,6 +72,7 @@ Public Class cFiskalkunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_KreditMax", FK_KreditMax)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Geschaeftsfuehrer", FK_Geschaeftsfuehrer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Steuerberater", FK_Steuerberater)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Umsatz", FK_Umsatz)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb index 96710f93..fdf78875 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb @@ -20,6 +20,7 @@ Public Class cMitarbeiter Property mit_abteilung As String = "" Property mit_position As String = "" Property mit_durchwahl As String = "" + Property mit_telefonnr As String = "" Property mit_email As String = "" Property mit_mobiltel As String = "" Property mit_allowAnruf As Boolean @@ -78,10 +79,11 @@ Public Class cMitarbeiter Property mit_foto_DocId As Object = Nothing Property mit_sprache As String = "DE" Property mit_fakturierungsgruppe As String = "" - Property mit_CSuser As Object = Nothing - Property mit_CSpwd As Object = Nothing + Property mit_PersonalNr As Object = Nothing + Property mit_timasId As Object = Nothing + Dim SQL As New SQL @@ -130,6 +132,7 @@ Public Class cMitarbeiter list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_niederlassung", mit_niederlassung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_abteilung", mit_abteilung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_position", mit_position)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_telefonnr", mit_telefonnr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_durchwahl", mit_durchwahl)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_email", mit_email)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_mobiltel", mit_mobiltel)) @@ -149,48 +152,39 @@ Public Class cMitarbeiter list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_DpUserStandardDP", mit_DpUserStandardDP)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_DpUserStandardFirma", mit_DpUserStandardFirma)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_DpUserStandardFirma2", mit_DpUserStandardFirma2)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_EZOLL_SB", mit_EZOLL_SB)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ATLAS_SB", mit_ATLAS_SB)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_pseudoUser", mit_pseudoUser)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_FirmenDatenAnzeige", mit_FirmenDatenAnzeige)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_DAKOSY_SB", mit_DAKOSY_SB)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_DAKOSY_SBFull", mit_DAKOSY_SBFull)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_TESTonly", mit_TESTonly)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_PasswortChanged", mit_PasswortChanged)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_TELOTEC_SB", mit_TELOTEC_SB)) - - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_AliasAD_Domain", mit_AliasAD_Domain)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_AliasAD_Username", mit_AliasAD_Username)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_AliasAD_Domain2", mit_AliasAD_Domain2)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_AliasAD_Username2", mit_AliasAD_Username2)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_teamId", mit_teamId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatBenutzer", mit_ChatBenutzer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_FirmaHaupt", mit_FirmaHaupt)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatEasteregg", mit_ChatEasteregg)) - - - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_SettingsTstmp", mit_MAVerzeichnis_SettingsTstmp)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowGebDat", mit_MAVerzeichnis_allowGebDat)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowWohnadresse", mit_MAVerzeichnis_allowWohnadresse)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowGebDatOhneJahr", mit_MAVerzeichnis_allowGebDatOhneJahr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowHandynummer", mit_MAVerzeichnis_allowHandynummer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowFoto", mit_MAVerzeichnis_allowFoto)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_Motto", mit_MAVerzeichnis_Motto)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_Spitzname", mit_MAVerzeichnis_Spitzname)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_foto_DocId", mit_foto_DocId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_sprache", mit_sprache)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_fakturierungsgruppe", mit_fakturierungsgruppe)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_CSuser", mit_CSuser)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_CSpwd", mit_CSpwd)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_PersonalNr", mit_PersonalNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_timasId", mit_timasId)) + Return list End Function @@ -321,6 +315,7 @@ Public Class cMitarbeiter Me.mit_niederlassung = dr.Item("mit_niederlassung") Me.mit_abteilung = dr.Item("mit_abteilung") Me.mit_position = dr.Item("mit_position") + If Not dr.Item("mit_telefonnr") Is DBNull.Value Then Me.mit_telefonnr = dr.Item("mit_telefonnr") Me.mit_durchwahl = dr.Item("mit_durchwahl") Me.mit_email = dr.Item("mit_email") Me.mit_mobiltel = dr.Item("mit_mobiltel") @@ -359,14 +354,11 @@ Public Class cMitarbeiter If Not dr.Item("mit_AliasAD_Username2") Is DBNull.Value Then Me.mit_AliasAD_Username2 = dr.Item("mit_AliasAD_Username2") If Not dr.Item("mit_teamId") Is DBNull.Value Then Me.mit_teamId = dr.Item("mit_teamId") - Me.mit_ChatBenutzer = dr.Item("mit_ChatBenutzer") Me.mit_ChatEasteregg = dr.Item("mit_ChatEasteregg") - If Not dr.Item("mit_FirmaHaupt") Is DBNull.Value Then Me.mit_FirmaHaupt = dr.Item("mit_FirmaHaupt") - If Not dr.Item("mit_MAVerzeichnis_SettingsTstmp") Is DBNull.Value Then Me.mit_MAVerzeichnis_SettingsTstmp = dr.Item("mit_MAVerzeichnis_SettingsTstmp") Me.mit_MAVerzeichnis_allowGebDat = dr.Item("mit_MAVerzeichnis_allowGebDat") Me.mit_MAVerzeichnis_allowGebDatOhneJahr = dr.Item("mit_MAVerzeichnis_allowGebDatOhneJahr") @@ -381,6 +373,8 @@ Public Class cMitarbeiter If Not dr.Item("mit_fakturierungsgruppe") Is DBNull.Value Then Me.mit_fakturierungsgruppe = dr.Item("mit_fakturierungsgruppe") If Not dr.Item("mit_CSuser") Is DBNull.Value Then Me.mit_CSuser = dr.Item("mit_CSuser") If Not dr.Item("mit_CSpwd") Is DBNull.Value Then Me.mit_CSpwd = dr.Item("mit_CSpwd") + If Not dr.Item("mit_PersonalNr") Is DBNull.Value Then Me.mit_PersonalNr = dr.Item("mit_PersonalNr") + If Not dr.Item("mit_timasId") Is DBNull.Value Then Me.mit_timasId = dr.Item("mit_timasId") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb index 05e682d2..84718783 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb @@ -4,8 +4,6 @@ Imports System.Data.SqlClient Public Class cRechnungsnummern Property SpeditionsbuchNr As String = "" 'FIRMA! Property Buchungsjahr As String = "" - - Property VonRechnungsNr As Integer = -1 Property BisRechnungsNr As Integer = -1 Property LfdRechnungsNr As Integer = 0 @@ -58,9 +56,9 @@ Public Class cRechnungsnummern LfdRechnungsNr = VonRechnungsNr '------------------------------------- - + LOADANDUPDATE(SpeditionsbuchNr, Buchungsjahr, LfdRechnungsNr, VonRechnungsNr, BisRechnungsNr) 'LOAD(SpeditionsbuchNr, Buchungsjahr) - LOAD(SpeditionsbuchNr, Buchungsjahr) + End Sub @@ -108,7 +106,7 @@ Public Class cRechnungsnummern Dim RG_NR As New VERAG_PROG_ALLGEMEIN.cRechnungsnummern(SpeditionsbuchNr, Buchungsjahr) aktuelleRechnungsnummer = RG_NR.LfdRechnungsNr ' --> Die in der DB gespeicherte RgNr wird verwendet CHECK_RGNR_NEW = RG_NR.LfdRechnungsNr ' --> Die in der DB gespeicherte RgNr wird verwendet - RG_NR.INCREASE_RGNR() ' ..... und gelcih wieder hcoh zählen + 'RG_NR.INCREASE_RGNR() ' ..... und gelcih wieder hcoh zählen System.Threading.Thread.Sleep(50) ' nur, um abzuwarten falls parallel eine Nr vergeben wird End While @@ -162,6 +160,42 @@ Public Class cRechnungsnummern ' Return Nothing End Sub + Public Sub LOADANDUPDATE(ByVal SpeditionsbuchNr As String, ByVal Buchungsjahr As String, ByRef LfdRechnungsNr As Integer, ByVal VonRechnungsNr As String, ByVal BisRechnungsNr As String) + Try + + Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand( + "BEGIN TRAN IF EXISTS (SELECT * FROM Rechnungsnummern WITH(updlock,serializable) WHERE [SpeditionsbuchNr]=@SpeditionsbuchNr AND Buchungsjahr=@Buchungsjahr) + BEGIN + UPDATE dbo.Rechnungsnummern SET LfdRechnungsNr= (SELECT [LfdRechnungsNr] as newNr FROM dbo.Rechnungsnummern WHERE [SpeditionsbuchNr]=@Speditionsbuchnr AND Buchungsjahr=@Buchungsjahr) + 1 WHERE [SpeditionsbuchNr]=@Speditionsbuchnr AND Buchungsjahr=@Buchungsjahr + SELECT [LfdRechnungsNr] FROM dbo.Rechnungsnummern WHERE [SpeditionsbuchNr]=@Speditionsbuchnr AND Buchungsjahr=@Buchungsjahr + END; + else + BEGIN + INSERT INTO [Rechnungsnummern](SpeditionsbuchNr,[Buchungsjahr],[VonRechnungsNr],[BisRechnungsNr],[LfdRechnungsNr]) + OUTPUT @LfdRechnungsNr AS [LfdRechnungsNr] + VALUES (@SpeditionsbuchNr, @Buchungsjahr,@VonRechnungsNr,@BisRechnungsNr,@LfdRechnungsNr) + END + COMMIT TRAN", conn) + cmd.Parameters.AddWithValue("@SpeditionsbuchNr", SpeditionsbuchNr) + cmd.Parameters.AddWithValue("@Buchungsjahr", Buchungsjahr) + cmd.Parameters.AddWithValue("@LfdRechnungsNr", LfdRechnungsNr) + cmd.Parameters.AddWithValue("@VonRechnungsNr", VonRechnungsNr) + cmd.Parameters.AddWithValue("@BisRechnungsNr", BisRechnungsNr) + + Dim dr = cmd.ExecuteScalar() + + LfdRechnungsNr = dr + + End Using + End Using + + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + ' Return Nothing + End Sub Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.MyListItem2) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem2) diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb index 289821d3..f1357a3e 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb @@ -22,13 +22,11 @@ Partial Class frmMitarbeitersuche 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMitarbeitersuche)) Me.pnlSrch = New System.Windows.Forms.Panel() Me.Button4 = New System.Windows.Forms.Button() Me.btnClose = New System.Windows.Forms.Button() Me.PictureBox2 = New System.Windows.Forms.PictureBox() - Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.pnlMain = New System.Windows.Forms.Panel() Me.pnl = New System.Windows.Forms.Panel() Me.btnSettings = New System.Windows.Forms.Button() @@ -55,7 +53,10 @@ Partial Class frmMitarbeitersuche Me.pnlGeburtstag = New System.Windows.Forms.Panel() Me.lblGeburtstag = New System.Windows.Forms.Label() Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblTimasZeiten = New System.Windows.Forms.Label() + Me.lblTimasSaldo = New System.Windows.Forms.Label() + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel() Me.lblPosition = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() @@ -64,7 +65,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.Panel1 = New System.Windows.Forms.Panel() + Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.pnlSrch.SuspendLayout() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlMain.SuspendLayout() @@ -134,32 +135,6 @@ Partial Class frmMitarbeitersuche Me.PictureBox2.TabIndex = 18 Me.PictureBox2.TabStop = False ' - 'sbMitarbeiter - ' - Me.sbMitarbeiter._allowFreitext = False - Me.sbMitarbeiter._AllowSetValue = False - Me.sbMitarbeiter._allowSpaceAsSplitter = True - Me.sbMitarbeiter._autoSizeGross = False - Me.sbMitarbeiter._hideIfListEmpty = True - Me.sbMitarbeiter._value = Nothing - Me.sbMitarbeiter.conn_art = "FMZOLL" - Me.sbMitarbeiter.dgvpos = "LEFT" - Me.sbMitarbeiter.DISPLAY_PARAM = Nothing - Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!) - Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing - Me.sbMitarbeiter.key_visible = False - Me.sbMitarbeiter.KEYPARAM = Nothing - Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11) - Me.sbMitarbeiter.Name = "sbMitarbeiter" - Me.sbMitarbeiter.searchActive = True - Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29) - Me.sbMitarbeiter.SQL_ORDER_BY = Nothing - Me.sbMitarbeiter.SQL_SELECT = Nothing - Me.sbMitarbeiter.SQL_WHERE = Nothing - Me.sbMitarbeiter.SQL_WhereParamList = Nothing - Me.sbMitarbeiter.TabIndex = 0 - Me.sbMitarbeiter.usrcntl = Nothing - ' 'pnlMain ' Me.pnlMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -173,7 +148,9 @@ Partial Class frmMitarbeitersuche 'pnl ' Me.pnl.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.pnl.Controls.Add(Me.lblTimasSaldo) Me.pnl.Controls.Add(Me.btnSettings) + Me.pnl.Controls.Add(Me.lblTimasZeiten) Me.pnl.Controls.Add(Me.pnlWohnadresse) Me.pnl.Controls.Add(Me.lblSpitzname) Me.pnl.Controls.Add(Me.Panel4) @@ -406,7 +383,7 @@ Partial Class frmMitarbeitersuche Me.lblName.Font = New System.Drawing.Font("Microsoft Sans Serif", 22.0!) Me.lblName.Location = New System.Drawing.Point(12, 38) Me.lblName.Name = "lblName" - Me.lblName.Size = New System.Drawing.Size(695, 52) + Me.lblName.Size = New System.Drawing.Size(629, 52) Me.lblName.TabIndex = 1 Me.lblName.Text = "Max Mustermann" Me.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -441,6 +418,32 @@ Partial Class frmMitarbeitersuche Me.PictureBox1.TabIndex = 13 Me.PictureBox1.TabStop = False ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel1.Location = New System.Drawing.Point(214, 230) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(553, 1) + Me.Panel1.TabIndex = 29 + ' + 'lblTimasZeiten + ' + Me.lblTimasZeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) + Me.lblTimasZeiten.Location = New System.Drawing.Point(203, 396) + Me.lblTimasZeiten.Name = "lblTimasZeiten" + Me.lblTimasZeiten.Size = New System.Drawing.Size(563, 25) + Me.lblTimasZeiten.TabIndex = 12 + Me.lblTimasZeiten.Visible = False + ' + 'lblTimasSaldo + ' + Me.lblTimasSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) + Me.lblTimasSaldo.Location = New System.Drawing.Point(6, 396) + Me.lblTimasSaldo.Name = "lblTimasSaldo" + Me.lblTimasSaldo.Size = New System.Drawing.Size(196, 24) + Me.lblTimasSaldo.TabIndex = 30 + Me.lblTimasSaldo.Visible = False + ' 'MyPanel1 ' Me.MyPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer)) @@ -545,13 +548,31 @@ Partial Class frmMitarbeitersuche Me.Label3.Text = "Niederlassung:" Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' - 'Panel1 + 'sbMitarbeiter ' - Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Panel1.Location = New System.Drawing.Point(214, 230) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(553, 1) - Me.Panel1.TabIndex = 29 + Me.sbMitarbeiter._allowFreitext = False + Me.sbMitarbeiter._AllowSetValue = False + Me.sbMitarbeiter._allowSpaceAsSplitter = True + Me.sbMitarbeiter._autoSizeGross = False + Me.sbMitarbeiter._hideIfListEmpty = True + Me.sbMitarbeiter._value = Nothing + Me.sbMitarbeiter.conn_art = "FMZOLL" + Me.sbMitarbeiter.dgvpos = "LEFT" + Me.sbMitarbeiter.DISPLAY_PARAM = Nothing + Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!) + Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing + Me.sbMitarbeiter.key_visible = False + Me.sbMitarbeiter.KEYPARAM = Nothing + Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11) + Me.sbMitarbeiter.Name = "sbMitarbeiter" + Me.sbMitarbeiter.searchActive = True + Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29) + Me.sbMitarbeiter.SQL_ORDER_BY = Nothing + Me.sbMitarbeiter.SQL_SELECT = Nothing + Me.sbMitarbeiter.SQL_WHERE = Nothing + Me.sbMitarbeiter.SQL_WhereParamList = Nothing + Me.sbMitarbeiter.TabIndex = 0 + Me.sbMitarbeiter.usrcntl = Nothing ' 'frmMitarbeitersuche ' @@ -626,4 +647,6 @@ Partial Class frmMitarbeitersuche Friend WithEvents Label8 As Windows.Forms.Label Friend WithEvents Panel1 As Windows.Forms.Panel Friend WithEvents btnSettings As Windows.Forms.Button + Friend WithEvents lblTimasZeiten As Windows.Forms.Label + Friend WithEvents lblTimasSaldo As Windows.Forms.Label End Class diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb index 8efa9aa7..34c7d8e1 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb @@ -1,9 +1,13 @@ Imports System.ComponentModel Imports System.Drawing +Imports System.Net +Imports VERAG_PROG_ALLGEMEIN.cCreditSafeAPI Public Class frmMitarbeitersuche Dim mit_id As Integer = -1 Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim timas As New cTimasAPI + Dim requestDone As Boolean = False Sub New() ' Dieser Aufruf ist für den Designer erforderlich. @@ -57,6 +61,8 @@ Public Class frmMitarbeitersuche Sub initMA() btn.Visible = False pnl.Visible = False + lblTimasZeiten.Visible = False + lblTimasSaldo.Visible = False Panel1.Visible = False btnSettings.Visible = False Dim MA As cMitarbeiter = Nothing @@ -152,6 +158,17 @@ Public Class frmMitarbeitersuche End If If VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = MA.mit_id Then btn.Visible = True + 'Eintrag für Zeitübersicht + lblTimasZeiten.Visible = True + lblTimasSaldo.Visible = True + If Not requestDone Then + + If timas IsNot Nothing Then + timas.getTimeSaldo(MA.mit_timasId, lblTimasSaldo.Text) + timas.getTimeEntries(MA.mit_timasId, lblTimasZeiten.Text, requestDone) + End If + + End If End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MA_TeamBearbeiten", "SDL") Then @@ -208,4 +225,164 @@ Public Class frmMitarbeitersuche initMA() End Sub + Private Sub getTime(maid) + Try + Dim returnText As String = "" + lblTimasZeiten.Text = "" + + If maid Is Nothing Then + Exit Sub + End If + + VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() + Dim rest As New Chilkat.Rest + Dim API_STRING As String + + + API_STRING = "https://zeit.verag.ag" + + Dim success As Boolean + + rest.VerboseLogging = True + Dim bTls As Boolean = True + Dim port As Integer = 443 + Dim bAutoReconnect As Boolean = True + success = rest.Connect(API_STRING, port, bTls, bAutoReconnect) + If (success <> True) Then + Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason) + Debug.WriteLine(rest.LastErrorText) + 'lblTimas.Text = rest.LastErrorText + + End If + + success = rest.SetAuthBasic("admin", "BmWr501956") + + If (success <> True) Then + Debug.WriteLine("BAFailReason: " & rest.ConnectFailReason) + Debug.WriteLine(rest.LastErrorText) + 'lblTimas.Text = rest.LastErrorText + + End If + + + Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/balance") + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + Exit Sub + End If + + If (rest.ResponseStatusCode <> 200) Then + Debug.WriteLine(rest.ResponseHeader) + 'lblTimas.Text = rest.ResponseStatusCode & " " & rest.ResponseStatusText + Exit Sub + End If + + Debug.WriteLine(responseJson) + + + Dim json As New Chilkat.JsonObject + success = json.Load(responseJson) + If (success <> True) Then + Debug.WriteLine(json.LastErrorText) + End If + + Debug.WriteLine(json) + + '"overallBalance" 101580, + '"dailyBalance": -17340, + '"monthlyBalance": -328380, + '"actualTimeOfDay": 4260, + + + Dim saldo = json.StringOf("dailyBalanceYesterday") 'Tagessaldo (gestern) in Sekunden + + If saldo IsNot Nothing Then + Dim saldoAsDouble = CDbl(saldo) + saldoAsDouble = Math.Round(saldoAsDouble / 3600, 2) + returnText = "Saldo Vortag: " & saldoAsDouble & "h" + End If + lblTimasSaldo.Text = returnText + + + Dim yesterdayMidnight As DateTime + yesterdayMidnight = Today().AddDays(-5) + rest.AddQueryParam("id", maid) + rest.AddQueryParam("from", yesterdayMidnight.ToString("yyyy-MM-ddThh:mm:ss")) + rest.AddQueryParam("to", Now().ToString("yyyy-MM-ddThh:mm:ss")) + + + + Dim Response As String + Response = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/bookings") + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + Exit Sub + End If + + If (rest.ResponseStatusCode <> 200) Then + Debug.WriteLine(rest.ResponseHeader) + 'rest.ResponseStatusCode & " " & rest.ResponseStatusText + Exit Sub + End If + + Debug.WriteLine(Response) + Dim jsonArray As New Chilkat.JsonArray + success = jsonArray.Load(Response) + If (success <> True) Then + Debug.WriteLine(jsonArray.LastErrorText) + Exit Sub + End If + + + If jsonArray.Size = -1 Then + Exit Sub + End If + + 'Dim dt As New DataTable + 'dt.Columns.Add("statusid", GetType(Integer)) + 'dt.Columns.Add("stamp", GetType(DateTime)) + 'dt.Columns.Add("type", GetType(String)) + + + + Dim j As Integer = 0 + While j < jsonArray.Size + + Dim timeEntry As Chilkat.JsonObject = jsonArray.ObjectAt(j) + + If IsDate(timeEntry.StringOf("stamp")) Then + If CDate(timeEntry.StringOf("stamp")) >= Today() Then + + + 'Dim R As DataRow = dt.NewRow + 'R("statusid") = timeEntry.StringOf("statusid") + 'R("stamp") = timeEntry.StringOf("stamp") + 'R("type") = timeEntry.StringOf("type") + 'dt.Rows.Add(R) + + lblTimasZeiten.Text &= " " & IIf(timeEntry.StringOf("type") = "in", "+", " - ") & CDate(timeEntry.StringOf("stamp")).ToString("hh:mm:ss") + If jsonArray.Size - 1 = j Then + lblTimasZeiten.Text &= " Status: " & IIf(timeEntry.StringOf("type") = "in", "Anwesend", "Abwesend") + End If + + End If + End If + j = j + 1 + End While + + + + requestDone = True + rest.ClearAllQueryParams() + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + + + End Sub + + + End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/cATEZ_NCTS.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/ATEZ_OUT_VERAG_IN/cATEZ_NCTS.vb similarity index 100% rename from VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/cATEZ_NCTS.vb rename to VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/ATEZ_OUT_VERAG_IN/cATEZ_NCTS.vb diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb new file mode 100644 index 00000000..b66e44fb --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -0,0 +1,373 @@ +Imports System.Data.SqlClient +Imports System.Net +Imports System.Reflection +Imports System.Threading +Imports System.Web.Routing +Imports System.Windows.Forms +Imports VERAG_PROG_ALLGEMEIN.cCreditSafeAPI + +Public Class cATEZ_NCTS_DATA + + Public Property Id As String + Public Property VERAG_LRN As String + Public Property LicensePlateContainerNo As String + Public Property DepartureCustomsOffice As String + Public Property DestinationCustomsOffice As String + Public Property DatDeterminationLimit As String + Public Property CoolingTemperature As String + Public Property DAKOSY_TemplateCode As String + Public Property DAKOSY_IOPartner As String + Public Property DAKOSY_Division1 As String + Public Property DAKOSY_Division2 As String + Public Property DAKOSY_Division3 As String + Public Property status As Object = 0 + Property erstellung As DateTime = Now + Public Property Route_Country As String + Public Property Carrier_Name As String + Public Property Carrier_Adress_Country As String + Public Property Carrier_Adress_Postcode As String + Public Property Carrier_Adress_City As String + Public Property Carrier_Adress_Street As String + Public Property Carrier_EORI As String + Public Property Guarantee_GRN As String + Public Property TransitCustomsOffices As cATEZ_NCTS_DATA_TransitCustomsOffice() + Public Property Attachments As cATEZ_NCTS_DATA_Attachments + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Dim hasEntry As Boolean + + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Id", Id, , True, True)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VERAG_LRN", VERAG_LRN)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LicensePlateContainerNo", LicensePlateContainerNo)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DepartureCustomsOffice", DepartureCustomsOffice)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DestinationCustomsOffice", DestinationCustomsOffice)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DatDeterminationLimit", DatDeterminationLimit)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CoolingTemperature", CoolingTemperature)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_TemplateCode", DAKOSY_TemplateCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_IOPartner", DAKOSY_IOPartner)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_Division1", DAKOSY_Division1)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_Division2", DAKOSY_Division2)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_Division3", DAKOSY_Division3)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Route_Country", Route_Country)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_Name", Carrier_Name)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_Adress_Country", Carrier_Adress_Country)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_Adress_Postcode", Carrier_Adress_Postcode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_Adress_City", Carrier_Adress_City)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_Adress_Street", Carrier_Adress_Street)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_EORI", Carrier_EORI)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Guarantee_GRN", Guarantee_GRN)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("status", status)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("erstellung", erstellung)) + + Return list + End Function + + Sub New() + + End Sub + + Sub New(VERAG_LRN) + Me.VERAG_LRN = VERAG_LRN + LOAD() + End Sub + + Public Function UPDATE_STATUS(status) As Boolean + Me.status = status + Return Me.SAVE + End Function + + Public Function SAVE(Optional errHinweis = "") As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblATEZ_NCTS_DATA WITH(updlock,serializable) WHERE Id=@Id) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Dim IdTMP = Id + IdTMP = SQL.doSQLVarListID(IdTMP, sqlstr, "FMZOLL", , list, , errHinweis) + If _Id <= 0 Then Id = IdTMP + Return Id > 0 + End Function + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [tblATEZ_NCTS_DATA] SET " & str & " WHERE Id=@Id ") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tblATEZ_NCTS_DATA (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblATEZ_NCTS_DATA WHERE Id=@Id ", conn) + cmd.Parameters.AddWithValue("@Id", Id) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + +End Class + + +Public Class cATEZ_NCTS_DATA_TransitCustomsOffice + Public Property TransitCustomsOffice As String +End Class + +Public Class cATEZ_NCTS_DATA_Attachment + Public Property FileType As String + Public Property DocumentType As String + Public Property base64BinaryStream As String +End Class + +Public Class cATEZ_NCTS_DATA_Attachments + Public Property Attachment As cATEZ_NCTS_DATA_Attachment() +End Class + +Public Class cATEZ_NCTS_IN + + + + 'DEV + Shared API_STRING As String = "https://dev-tds.singlewindow.io" + Shared token As String = "" + Public dataTable As New DataTable() + + + Shared Function SendRequestAuthentificationToken(ByVal myuri As String, ByVal contentType As String, ByVal method As String, ByRef Itoken As String) As String + Try + If Itoken <> "" Then Return "token filled" + + VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() + + Dim rest As New Chilkat.Rest + Dim success As Boolean + + + Dim bTls As Boolean = True + Dim port As Integer = 443 + Dim bAutoReconnect As Boolean = True + success = rest.Connect(API_STRING, port, bTls, bAutoReconnect) + If (success <> True) Then + Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason) + Debug.WriteLine(rest.LastErrorText) + Return rest.LastErrorText + + End If + + + Dim json As New Chilkat.JsonObject + json.UpdateString("password", "V3r4gAtez2023!") + json.UpdateString("username", "atez-integration@verag.ag") + + + rest.AddHeader("Content-Type", contentType) + + Dim sbRequestBody As New Chilkat.StringBuilder + json.EmitSb(sbRequestBody) + + + Dim sbResponseBody As New Chilkat.StringBuilder + Dim ResponseStr = rest.FullRequestSb(method, myuri, sbRequestBody, sbResponseBody) + + + If (rest.ResponseStatusCode <> 200) Then + Return rest.ResponseStatusCode & " " & rest.ResponseStatusText + End If + + Dim jsonResp = New Chilkat.JsonObject() + jsonResp.LoadSb(sbResponseBody) + + token = jsonResp.StringOf("access_token") + Itoken = token + + Return rest.ResponseStatusCode & " " & rest.ResponseStatusText + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Function + + Shared Function authenticate() As String + + Dim myUri As String = API_STRING & "/api/tds/auth/" + Dim response = SendRequestAuthentificationToken(myUri, "application/json", "POST", token) + + Return response + + + End Function + + Shared Function SendRequestWithAuthHeader(acceptContentType As String, json As Chilkat.JsonObject, ByRef failureDesc As String) As String + Try + + VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() + + Dim rest As New Chilkat.Rest + Dim success As Boolean + + + Dim bTls As Boolean = True + Dim port As Integer = 443 + Dim bAutoReconnect As Boolean = True + success = rest.Connect(API_STRING, port, bTls, bAutoReconnect) + If (success <> True) Then + Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason) + Debug.WriteLine(rest.LastErrorText) + failureDesc = rest.LastErrorText + Return failureDesc + End If + + + rest.AddHeader("Content-Type", "application/json") + rest.AddHeader("Authorization", "Bearer " & token) + rest.AddHeader("Accept", acceptContentType) + + Dim sbRequestBody As New Chilkat.StringBuilder + json.EmitSb(sbRequestBody) + Debug.WriteLine(sbRequestBody) + + 'rest.DebugMode = True + + Dim sbResponseBody As New Chilkat.StringBuilder + success = rest.FullRequestSb("POST", "/api/integrations/verag", sbRequestBody, sbResponseBody) + + 'Dim bdRequest As New Chilkat.BinData + 'success = rest.GetLastDebugRequest(bdRequest) + 'Debug.WriteLine("----") + 'Debug.WriteLine(bdRequest.GetString("utf-8")) + 'Debug.WriteLine("----") + + + + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + failureDesc = rest.LastErrorText + Return failureDesc + + Else + If (rest.ResponseStatusCode <> 200) Then + failureDesc = rest.ResponseStatusText + Return failureDesc + Else + + Dim jsonResult As New Chilkat.JsonObject + success = jsonResult.LoadSb(sbResponseBody) + Return jsonResult.Emit() + + End If + + End If + + + + + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Function + + Shared Function setJson(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) + + + Dim success As Boolean + Dim json As New Chilkat.JsonObject + success = json.UpdateString("VERAG_LRN", ncts.VERAG_LRN) + success = json.UpdateString("LicensePlateContainerNo", ncts.LicensePlateContainerNo) + success = json.UpdateString("DAKOSY.TemplateCode", ncts.DAKOSY_TemplateCode) + success = json.UpdateString("DAKOSY.IOPartner", ncts.DAKOSY_IOPartner) + success = json.UpdateString("DAKOSY.Division1", ncts.DAKOSY_Division1) + success = json.UpdateString("DAKOSY.Division2", ncts.DAKOSY_Division2) + success = json.UpdateString("DAKOSY.Division3", ncts.DAKOSY_Division3) + success = json.UpdateString("DepartureCustomsOffice", ncts.DepartureCustomsOffice) + success = json.UpdateString("DestinationCustomsOffice", ncts.DestinationCustomsOffice) + success = json.UpdateString("DatDeterminationLimit", ncts.DatDeterminationLimit) + success = json.UpdateString("CoolingTemperature", ncts.CoolingTemperature) + success = json.UpdateString("Carrier.Name", ncts.Carrier_Name) + success = json.UpdateString("Carrier.Adress.Country", ncts.Carrier_Adress_Country) + success = json.UpdateString("Carrier.Adress.Postcode", ncts.Carrier_Adress_Postcode) + success = json.UpdateString("Carrier.Adress.City", ncts.Carrier_Adress_City) + success = json.UpdateString("Carrier.Adress.Street", ncts.Carrier_Adress_Street) + success = json.UpdateString("Guarantee.GRN", ncts.Guarantee_GRN) + success = json.UpdateString("Route[0].Country", ncts.Route_Country) + success = json.UpdateString("TransitCustomsOffices[0].TransitCustomsOffice", "text") + success = json.UpdateString("TransitCustomsOffices[1].TransitCustomsOffice", "text") + success = json.UpdateString("TransitCustomsOffices[2].TransitCustomsOffice", "text") + + + For Each r As DataGridViewRow In dgv.SelectedRows + Dim i As Integer = 0 + Dim bd As New Chilkat.BinData + Dim json1 As New Chilkat.JsonObject + success = bd.LoadFile(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value)) + 'json1.UpdateBd("", "base64", bd) + success = json.UpdateString("Attachments.Attachment[" & i & "].FileType", "text") + success = json.UpdateString("Attachments.Attachment[" & i & "].DocumentType", "INVOICE") + success = json.UpdateString("Attachments.Attachment[" & i & "].base64BinaryStream", bd.GetEncoded("base64")) + i = +1 + Next + + Return success + + End Function + + + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb index 8c6f85b9..b2137187 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb @@ -124,7 +124,7 @@ Public Class cCreditSafeAPI Return failureDesc Else If (rest.ResponseStatusCode <> 200) Then - For i = 0 To 4 'Versuche das PDF 5x abzufragen (funktioniert ab und zu nicht). + For i = 0 To 15 'Versuche das PDF 16x abzufragen (funktioniert ab und zu nicht). responseJson = rest.FullRequestNoBodyBd(method, url, pdfData) If rest.ResponseStatusCode = 200 Then Exit For Thread.Sleep(500) @@ -293,9 +293,12 @@ Public Class cCreditSafeAPI 'Abfragen für DE benötigen einen Reason-Code myUrl &= "?customData=de_reason_code::3" myUrl &= "&?language=DE" - Else + ElseIf company.country = "AT" Then myUrl &= "?language=DE" + Else + myUrl &= "?language=EN" + End If Dim acceptContentType = "application/json" @@ -457,7 +460,7 @@ Public Class cCreditSafeAPI myUrl &= "?customData=de_reason_code::3" myUrl &= "&?language=DE" Else - myUrl &= "?language=DE" + myUrl &= "?language=EN" End If Dim acceptContentType = "application/pdf" @@ -465,7 +468,16 @@ Public Class cCreditSafeAPI Dim failureDesc As String = "" Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc) - If failureDesc <> "" Then Return Nothing + If failureDesc <> "" Then + Dim jsonFailure As New Chilkat.JsonObject + Dim success As Boolean = jsonFailure.Load(jsonRespString) + If (success <> True) Then + failure = jsonFailure.LastErrorText + Return Nothing + End If + failure = jsonFailure.StringOf("details") + Return Nothing + End If If jsonRespString IsNot Nothing Then Dim success = pdfData2.AppendEncoded(jsonRespString, "base64") diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTimasAPI.vb new file mode 100644 index 00000000..cffa6b93 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTimasAPI.vb @@ -0,0 +1,510 @@ +Imports System.Net + +Public Class cTimasAPI + + Dim API_STRING = "https://zeit.verag.ag" + Dim rest As New Chilkat.Rest + + + + Sub New() + VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() + End Sub + + + Public Function checkConnectionTImas(ByRef failureText As String) As Boolean + Try + Dim success As Boolean + + rest.VerboseLogging = False + Dim bTls As Boolean = True + Dim port As Integer = 443 + Dim bAutoReconnect As Boolean = True + success = rest.Connect(API_STRING, port, bTls, bAutoReconnect) + If (success <> True) Then + Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason) + Debug.WriteLine(rest.LastErrorText) + failureText = rest.LastErrorText + Return False + End If + + success = rest.SetAuthBasic("admin", "BmWr501956") + + If (success <> True) Then + Debug.WriteLine("BAFailReason: " & rest.ConnectFailReason) + Debug.WriteLine(rest.LastErrorText) + failureText = rest.LastErrorText + Return False + End If + + Return True + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Function + + Public Sub getTimeSaldo(ByVal maid As Integer, ByRef info As String, Optional ByRef requestDone As Boolean = False) + Try + Dim returnText As String = "" + Dim failureText As String = "" + + + If maid < 1 Then + Exit Sub + End If + + If Not checkConnectionTImas(failureText) Then + Exit Sub + End If + + + Dim success As Boolean + + + Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/balance") + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + Exit Sub + End If + + If (rest.ResponseStatusCode <> 200) Then + Debug.WriteLine(rest.ResponseHeader) + 'lblTimas.Text = rest.ResponseStatusCode & " " & rest.ResponseStatusText + Exit Sub + End If + + Debug.WriteLine(responseJson) + + + Dim json As New Chilkat.JsonObject + success = json.Load(responseJson) + If (success <> True) Then + Debug.WriteLine(json.LastErrorText) + End If + + Debug.WriteLine(json) + + '"overallBalance" 101580, + '"dailyBalance": -17340, + '"monthlyBalance": -328380, + '"actualTimeOfDay": 4260, + + + Dim saldo = json.StringOf("dailyBalanceYesterday") 'Tagessaldo (gestern) in Sekunden + + If saldo IsNot Nothing Then + Dim saldoAsDouble = CDbl(saldo) + saldoAsDouble = Math.Round(saldoAsDouble / 3600, 2) + info = "Saldo Vortag: " & saldoAsDouble & "h" + End If + + + + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Sub + + Public Sub getTimeEntries(ByVal maid As Integer, ByRef info As String, Optional ByRef entryExistingToday As Boolean = True, Optional ByRef requestDone As Boolean = False) + Try + + Dim returnText As String = "" + Dim failureText As String = "" + + + If maid < 1 Then + Exit Sub + End If + + If Not checkConnectionTImas(failureText) Then + Exit Sub + End If + + Dim success As Boolean + + rest.AddQueryParam("id", maid) + rest.AddQueryParam("from", Today().AddDays(-1).ToString("yyyy-MM-ddTHH:mm:ss")) + rest.AddQueryParam("to", Now().ToString("yyyy-MM-ddTHH:mm:ss")) + + + + Dim Response As String + Response = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/bookings") + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + Exit Sub + End If + + If (rest.ResponseStatusCode <> 200) Then + Debug.WriteLine(rest.ResponseHeader) + 'rest.ResponseStatusCode & " " & rest.ResponseStatusText + Exit Sub + End If + + Debug.WriteLine(Response) + Dim jsonArray As New Chilkat.JsonArray + success = jsonArray.Load(Response) + If (success <> True) Then + Debug.WriteLine(jsonArray.LastErrorText) + Exit Sub + End If + + + If jsonArray.Size = -1 Then + Exit Sub + End If + + Dim dt As New DataTable + dt.Columns.Add("statusid", GetType(Integer)) + dt.Columns.Add("stamp", GetType(DateTime)) + dt.Columns.Add("type", GetType(String)) + + + entryExistingToday = False + Dim j As Integer = 0 + While j < jsonArray.Size + + Dim timeEntry As Chilkat.JsonObject = jsonArray.ObjectAt(j) + + If IsDate(timeEntry.StringOf("stamp")) Then + If CDate(timeEntry.StringOf("stamp")) >= CDate(Today()) Then + + + Dim R As DataRow = dt.NewRow + R("statusid") = timeEntry.StringOf("statusid") + R("stamp") = timeEntry.StringOf("stamp") + R("type") = timeEntry.StringOf("type") + dt.Rows.Add(R) + entryExistingToday = True + info &= " " & IIf(timeEntry.StringOf("type") = "in", "+", " - ") & CDate(timeEntry.StringOf("stamp")).ToString("HH:mm:ss") + If jsonArray.Size - 1 = j Then + info &= " Status: " & IIf(timeEntry.StringOf("type") = "in", "Anwesend", "Abwesend") + End If + + End If + End If + j = j + 1 + End While + + + requestDone = True + rest.ClearAllQueryParams() + + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Sub + + Public Function createMA(ByVal mitarbeiter As cMitarbeiter, ByRef info As String, ByRef dgvData As MyDatagridview, Optional ByRef requestDone As Boolean = False) + Try + + rest.ClearAllHeaders() + rest.ClearAllParts() + + Dim timasEmployeeCreated As Boolean = False + + Dim returnText As String = "" + Dim failureText As String = "" + + If Not checkConnectionTImas(failureText) Then + Return timasEmployeeCreated + End If + + + rest.AddHeader("Content-Type", "application/json") + + Dim success As Boolean + Dim json As New Chilkat.JsonObject + success = json.UpdateString("externid", mitarbeiter.mit_id) + success = json.UpdateString("markingColor", "#3acc2d") + success = json.UpdateString("pnr1", mitarbeiter.mit_PersonalNr) + 'success = json.UpdateString("pnr2", "ZZ-3A-Q") + success = json.UpdateString("firstname", mitarbeiter.mit_vname) + success = json.UpdateString("lastname", mitarbeiter.mit_nname) + success = json.UpdateString("gender", IIf(mitarbeiter.mit_geschlecht = "m", "male", "female")) + 'success = json.UpdateInt("card", 42) + 'success = json.UpdateString("info", "Gebäude 2, 1. OG, Büro 54") + 'success = json.UpdateString("clientNumber", "5600-02") + 'success = json.UpdateInt("rfid", 178230359) + success = json.UpdateString("birthday", CDate(mitarbeiter.mit_gebdat).ToString("yyyy-MM-dd")) + success = json.UpdateString("entry", CDate(mitarbeiter.mit_einstiegsdatum).ToString("yyyy-MM-dd")) + success = json.UpdateNull("exit") + success = json.UpdateString("importSign", "AX-034511") + success = json.UpdateString("login", mitarbeiter.mit_AliasAD_Username) + success = json.UpdateBool("loginActive", 0) + success = json.UpdateString("email", mitarbeiter.mit_email) + success = json.UpdateString("street", mitarbeiter.mit_strasse) + success = json.UpdateString("city", mitarbeiter.mit_ort) + success = json.UpdateString("zipcode", mitarbeiter.mit_plz) + success = json.UpdateString("phone1", mitarbeiter.mit_telefonnr & " " & mitarbeiter.mit_durchwahl) + success = json.UpdateString("phone2", mitarbeiter.mit_mobiltel) + success = json.UpdateString("password", "password") + success = json.UpdateBool("resetPassword", 1) + + For Each r In dgvData.Rows + Dim i As Integer = 0 + If r.Cells("set").Value = True Then + success = json.UpdateInt("groups[" & i & "]", r.Cells("id").Value) + End If + + + Next + + Debug.WriteLine(json.Emit()) + + Dim sbRequestBody As New Chilkat.StringBuilder + json.EmitSb(sbRequestBody) + + Dim sbResponseBody As New Chilkat.StringBuilder + success = rest.FullRequestSb("POST", "/rest/web-api/employees", sbRequestBody, sbResponseBody) + If (success <> True) Then + Debug.WriteLine(rest.LastErrorText) + Return timasEmployeeCreated + End If + + + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + info = rest.LastErrorText + Return timasEmployeeCreated + End If + + If (rest.ResponseStatusCode <> 201) Then + Debug.WriteLine(rest.ResponseHeader) + info = rest.ResponseStatusCode & " " & rest.ResponseStatusText + If sbResponseBody.GetAsString <> "" Then + info &= vbNewLine & sbResponseBody.GetAsString + End If + Return timasEmployeeCreated + Else + info = "Mitarbeiter angelegt!" + + Dim jsonResult As New Chilkat.JsonObject + success = jsonResult.LoadSb(sbResponseBody) + jsonResult.Emit() + + info &= "Timas-ID: " & jsonResult.StringOf("id") & vbNewLine + info &= "MA-ID: " & jsonResult.StringOf("externid") & vbNewLine + info &= "Name: " & jsonResult.StringOf("firstname") & " " & jsonResult.StringOf("lastname") + + mitarbeiter.mit_timasId = jsonResult.StringOf("id") + mitarbeiter.SAVE() + timasEmployeeCreated = True + Return timasEmployeeCreated + + End If + + Return timasEmployeeCreated + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Function + + + + Public Sub getInfo(ByVal mitarbeiter As cMitarbeiter, ByRef info As String) + + Dim failureText As String = "" + + 'If Not cbxTimasAngelegt.Checked Then + ' info = "Mitarbeiter nicht im Timas angelegt!" + ' Exit Sub + 'End If + + Try + + If Not checkConnectionTImas(failureText) Then + Exit Sub + End If + + Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & mitarbeiter.mit_timasId) + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + Exit Sub + End If + + If (rest.ResponseStatusCode <> 200) Then + Debug.WriteLine(rest.ResponseHeader) + info = rest.ResponseStatusCode & " " & rest.ResponseStatusText + Exit Sub + End If + + Debug.WriteLine(responseJson) + + + Dim json As New Chilkat.JsonObject + Dim success = json.Load(responseJson) + If (success <> True) Then + Debug.WriteLine(json.LastErrorText) + End If + + Debug.WriteLine(json) + info &= IIf(json.StringOf("entry") <> "", "Startdatum: " & json.StringOf("entry") & vbNewLine, "") + info &= IIf(json.StringOf("externid") <> "", "MA-ID: " & json.StringOf("externid") & vbNewLine, "") + info &= IIf(json.StringOf("pnr1") <> "", "PersonalNr: " & json.StringOf("pnr1") & vbNewLine, "") + info &= IIf(json.StringOf("firstname") <> "", "Vorame: " & json.StringOf("firstname") & vbNewLine, "") + info &= IIf(json.StringOf("lastname") <> "", "Nachname: " & json.StringOf("lastname") & vbNewLine, "") + info &= IIf(json.StringOf("info") <> "", "Info: " & json.StringOf("info") & vbNewLine, "") + info &= IIf(json.StringOf("id") <> "", "Timas-ID: " & json.StringOf("id") & vbNewLine, "") + If json.BoolOf("loginActive") Then + info &= IIf(json.StringOf("login") <> "", "Login: " & vbNewLine & json.StringOf("login") & vbNewLine, "") + info &= IIf(json.StringOf("password") <> "", "PW: " & json.StringOf("password"), "") + End If + + + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub + + Public Sub getGroups(ByRef dt As DataTable) + + Try + + Dim failureText As String = "" + If Not checkConnectionTImas(failureText) Then + Exit Sub + End If + + + dt.Columns.Add("id", GetType(Integer)) + dt.Columns.Add("name", GetType(String)) + dt.Columns.Add("info", GetType(String)) + dt.Columns.Add("set", GetType(Boolean)) + + Dim responseBody As String = rest.FullRequestNoBody("GET", API_STRING & "/rest/web-api/groups3") + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + Exit Sub + End If + + If (rest.ResponseStatusCode <> 200) Then + Debug.WriteLine(rest.ResponseStatusCode & " " & rest.ResponseStatusText) + End If + + + Dim jsonArray As New Chilkat.JsonArray + Dim success As Boolean = jsonArray.Load(responseBody) + If (success <> True) Then + Debug.WriteLine(jsonArray.LastErrorText) + Exit Sub + End If + + + Dim num As Integer = jsonArray.Size + If num = -1 Then + Exit Sub + End If + + + Dim j As Integer = 0 + While j < num + + Dim groups As Chilkat.JsonObject = jsonArray.ObjectAt(j) + + Dim R As DataRow = dt.NewRow + R("id") = groups.IntOf("id") + R("name") = groups.StringOf("name") + R("info") = groups.StringOf("info") + If R("id") = "19" Or R("id") = "129" Then 'Typ Mitarbeiter und Standardgruppe für Mitarbeiter Default true + R("set") = True + Else + R("set") = False + End If + dt.Rows.Add(R) + j = j + 1 + End While + + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Sub + + Public Function setTimeEntry(ByVal mitarbeiter As cMitarbeiter, ByVal timeEntry As DateTime, ByRef info As String, ByRef inout As String) + Dim failureText As String = "" + Dim timeEntryCreated As Boolean = False + + If Not checkConnectionTImas(failureText) Then + Return timeEntryCreated + End If + + If Not mitarbeiter.mit_timasId > 0 Then + info = "Mitarbeiter besitzt keine TImas-Zuordnung" + Return timeEntryCreated + End If + + Dim entryType As String + + Select Case inout + Case "in" + entryType = "KOMMT" + + Case "out" + entryType = "GEHT" + + Case Else + entryType = "falscher ErfassgsTyp: " & inout + info = entryType + Return timeEntryCreated + End Select + + + Dim json As New Chilkat.JsonObject + json.UpdateString("stamp", timeEntry.ToString("yyyy-MM-ddTHH:mm:ss")) + json.UpdateInt("statusnumber", 0) ' + json.UpdateString("type", inout) + json.UpdateString("employeeid", mitarbeiter.mit_timasId) + + Dim sbRequestBody As New Chilkat.StringBuilder + json.EmitSb(sbRequestBody) + + Dim sbResponseBody As New Chilkat.StringBuilder + Dim success = rest.FullRequestSb("POST", "/rest/web-api/bookings", sbRequestBody, sbResponseBody) + If (success <> True) Then + Debug.WriteLine(rest.LastErrorText) + Return timeEntryCreated + End If + + + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + info = rest.LastErrorText + Return timeEntryCreated + End If + + If (rest.ResponseStatusCode <> 200) Then + Debug.WriteLine(rest.ResponseHeader) + info = rest.ResponseStatusCode & " " & rest.ResponseStatusText + If sbResponseBody.GetAsString <> "" Then + info &= vbNewLine & sbResponseBody.GetAsString + End If + Return timeEntryCreated + Else + + info = "Zeiteintrag " & entryType & " angelegt!" + + 'Dim jsonResult As New Chilkat.JsonObject + 'success = jsonResult.LoadSb(sbResponseBody) + 'jsonResult.Emit() + timeEntryCreated = True + + End If + + Return timeEntryCreated + + + End Function + + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 4e682188..1eac02bb 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -573,7 +573,8 @@ UserControl - + + @@ -585,6 +586,7 @@ + diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index 98c9de7b..3e91ef57 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -23,8 +23,8 @@ Public Class cSicherheiten Property gs_warenort As String Property gs_zollsatz As Object Property gs_avisoId As Integer - Property gs_isRundungsdiff As Boolean + Property gs_ReferenzAenderung As Boolean Public hasEntry = False @@ -68,6 +68,7 @@ Public Class cSicherheiten list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_zollsatz", gs_zollsatz)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_avisoId", gs_avisoId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_isRundungsdiff", gs_isRundungsdiff)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ReferenzAenderung", gs_ReferenzAenderung)) Return list End Function