diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb index 00c12ce1..4c27ce77 100644 --- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb +++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb @@ -45,6 +45,7 @@ Partial Class usrcntlFakturierung Me.Button18 = New System.Windows.Forms.Button() Me.Label44 = New System.Windows.Forms.Label() Me.GBSammelrechnung = New System.Windows.Forms.GroupBox() + Me.Button1 = New System.Windows.Forms.Button() Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.PictureBox4 = New System.Windows.Forms.PictureBox() @@ -75,7 +76,6 @@ Partial Class usrcntlFakturierung Me.Label63 = New System.Windows.Forms.Label() Me.Label45 = New System.Windows.Forms.Label() Me.Button14 = New System.Windows.Forms.Button() - Me.Button1 = New System.Windows.Forms.Button() Me.GroupBox1.SuspendLayout() Me.GBMautberichte.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -341,11 +341,22 @@ Partial Class usrcntlFakturierung Me.GBSammelrechnung.TabIndex = 14 Me.GBSammelrechnung.TabStop = False ' + 'Button1 + ' + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button1.Location = New System.Drawing.Point(10, 12) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(121, 49) + Me.Button1.TabIndex = 106 + Me.Button1.Text = "Mautanh. prüfen" + Me.Button1.UseVisualStyleBackColor = True + ' 'PictureBox6 ' Me.PictureBox6.BackgroundImage = CType(resources.GetObject("PictureBox6.BackgroundImage"), System.Drawing.Image) Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox6.Location = New System.Drawing.Point(232, 151) + Me.PictureBox6.Location = New System.Drawing.Point(151, 172) Me.PictureBox6.Name = "PictureBox6" Me.PictureBox6.Size = New System.Drawing.Size(14, 14) Me.PictureBox6.TabIndex = 105 @@ -356,7 +367,7 @@ Partial Class usrcntlFakturierung ' Me.PictureBox5.BackgroundImage = CType(resources.GetObject("PictureBox5.BackgroundImage"), System.Drawing.Image) Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox5.Location = New System.Drawing.Point(232, 134) + Me.PictureBox5.Location = New System.Drawing.Point(151, 155) Me.PictureBox5.Name = "PictureBox5" Me.PictureBox5.Size = New System.Drawing.Size(14, 14) Me.PictureBox5.TabIndex = 104 @@ -367,7 +378,7 @@ Partial Class usrcntlFakturierung ' Me.PictureBox4.BackgroundImage = CType(resources.GetObject("PictureBox4.BackgroundImage"), System.Drawing.Image) Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox4.Location = New System.Drawing.Point(232, 117) + Me.PictureBox4.Location = New System.Drawing.Point(151, 138) Me.PictureBox4.Name = "PictureBox4" Me.PictureBox4.Size = New System.Drawing.Size(14, 14) Me.PictureBox4.TabIndex = 103 @@ -378,7 +389,7 @@ Partial Class usrcntlFakturierung ' Me.PictureBox3.BackgroundImage = CType(resources.GetObject("PictureBox3.BackgroundImage"), System.Drawing.Image) Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox3.Location = New System.Drawing.Point(232, 100) + Me.PictureBox3.Location = New System.Drawing.Point(151, 121) Me.PictureBox3.Name = "PictureBox3" Me.PictureBox3.Size = New System.Drawing.Size(14, 14) Me.PictureBox3.TabIndex = 102 @@ -389,7 +400,7 @@ Partial Class usrcntlFakturierung ' Me.PictureBox2.BackgroundImage = CType(resources.GetObject("PictureBox2.BackgroundImage"), System.Drawing.Image) Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox2.Location = New System.Drawing.Point(232, 83) + Me.PictureBox2.Location = New System.Drawing.Point(151, 104) Me.PictureBox2.Name = "PictureBox2" Me.PictureBox2.Size = New System.Drawing.Size(14, 14) Me.PictureBox2.TabIndex = 101 @@ -400,7 +411,7 @@ Partial Class usrcntlFakturierung ' Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.ok Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox1.Location = New System.Drawing.Point(232, 69) + Me.PictureBox1.Location = New System.Drawing.Point(151, 90) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(14, 14) Me.PictureBox1.TabIndex = 95 @@ -409,7 +420,7 @@ Partial Class usrcntlFakturierung ' 'Label4 ' - Me.Label4.Location = New System.Drawing.Point(252, 134) + Me.Label4.Location = New System.Drawing.Point(171, 155) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(440, 17) Me.Label4.TabIndex = 100 @@ -420,7 +431,7 @@ Partial Class usrcntlFakturierung Me.cbxVorschau.AutoSize = True Me.cbxVorschau.Checked = True Me.cbxVorschau.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxVorschau.Location = New System.Drawing.Point(329, 256) + Me.cbxVorschau.Location = New System.Drawing.Point(329, 262) Me.cbxVorschau.Name = "cbxVorschau" Me.cbxVorschau.Size = New System.Drawing.Size(109, 17) Me.cbxVorschau.TabIndex = 48 @@ -432,7 +443,7 @@ Partial Class usrcntlFakturierung Me.cbxAbfVerbotdrucken.AutoSize = True Me.cbxAbfVerbotdrucken.Checked = True Me.cbxAbfVerbotdrucken.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxAbfVerbotdrucken.Location = New System.Drawing.Point(166, 256) + Me.cbxAbfVerbotdrucken.Location = New System.Drawing.Point(166, 262) Me.cbxAbfVerbotdrucken.Name = "cbxAbfVerbotdrucken" Me.cbxAbfVerbotdrucken.Size = New System.Drawing.Size(157, 17) Me.cbxAbfVerbotdrucken.TabIndex = 47 @@ -444,7 +455,7 @@ Partial Class usrcntlFakturierung Me.cbxRechnungsjournaldrucken.AutoSize = True Me.cbxRechnungsjournaldrucken.Checked = True Me.cbxRechnungsjournaldrucken.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxRechnungsjournaldrucken.Location = New System.Drawing.Point(6, 256) + Me.cbxRechnungsjournaldrucken.Location = New System.Drawing.Point(6, 262) Me.cbxRechnungsjournaldrucken.Name = "cbxRechnungsjournaldrucken" Me.cbxRechnungsjournaldrucken.Size = New System.Drawing.Size(154, 17) Me.cbxRechnungsjournaldrucken.TabIndex = 46 @@ -464,7 +475,7 @@ Partial Class usrcntlFakturierung ' 'Label72 ' - Me.Label72.Location = New System.Drawing.Point(96, 280) + Me.Label72.Location = New System.Drawing.Point(96, 286) Me.Label72.Name = "Label72" Me.Label72.Size = New System.Drawing.Size(589, 19) Me.Label72.TabIndex = 42 @@ -490,7 +501,7 @@ Partial Class usrcntlFakturierung Me.KdSearchBox3.KdNr = "-1" Me.KdSearchBox3.kdNrField = Nothing Me.KdSearchBox3.KdNrNullInt = Nothing - Me.KdSearchBox3.Location = New System.Drawing.Point(87, 302) + Me.KdSearchBox3.Location = New System.Drawing.Point(87, 308) Me.KdSearchBox3.Name = "KdSearchBox3" Me.KdSearchBox3.nurAktive = True Me.KdSearchBox3.searchActive = True @@ -502,7 +513,7 @@ Partial Class usrcntlFakturierung 'rbkunde ' Me.rbkunde.AutoSize = True - Me.rbkunde.Location = New System.Drawing.Point(9, 303) + Me.rbkunde.Location = New System.Drawing.Point(9, 309) Me.rbkunde.Name = "rbkunde" Me.rbkunde.Size = New System.Drawing.Size(59, 17) Me.rbkunde.TabIndex = 40 @@ -513,7 +524,7 @@ Partial Class usrcntlFakturierung ' Me.rbAlleKunden.AutoSize = True Me.rbAlleKunden.Checked = True - Me.rbAlleKunden.Location = New System.Drawing.Point(9, 280) + Me.rbAlleKunden.Location = New System.Drawing.Point(9, 286) Me.rbAlleKunden.Name = "rbAlleKunden" Me.rbAlleKunden.Size = New System.Drawing.Size(81, 17) Me.rbAlleKunden.TabIndex = 39 @@ -525,7 +536,7 @@ Partial Class usrcntlFakturierung ' Me.txtPloseAnh_Einarbeitung.BackColor = System.Drawing.Color.White Me.txtPloseAnh_Einarbeitung.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtPloseAnh_Einarbeitung.Location = New System.Drawing.Point(209, 212) + Me.txtPloseAnh_Einarbeitung.Location = New System.Drawing.Point(209, 218) Me.txtPloseAnh_Einarbeitung.Name = "txtPloseAnh_Einarbeitung" Me.txtPloseAnh_Einarbeitung.Size = New System.Drawing.Size(106, 13) Me.txtPloseAnh_Einarbeitung.TabIndex = 38 @@ -533,7 +544,7 @@ Partial Class usrcntlFakturierung 'Label71 ' Me.Label71.AutoSize = True - Me.Label71.Location = New System.Drawing.Point(144, 212) + Me.Label71.Location = New System.Drawing.Point(144, 218) Me.Label71.Name = "Label71" Me.Label71.Size = New System.Drawing.Size(56, 13) Me.Label71.TabIndex = 35 @@ -541,14 +552,14 @@ Partial Class usrcntlFakturierung ' 'pbPloseAnh_Proz ' - Me.pbPloseAnh_Proz.Location = New System.Drawing.Point(147, 183) + Me.pbPloseAnh_Proz.Location = New System.Drawing.Point(147, 189) Me.pbPloseAnh_Proz.Name = "pbPloseAnh_Proz" Me.pbPloseAnh_Proz.Size = New System.Drawing.Size(283, 23) Me.pbPloseAnh_Proz.TabIndex = 36 ' 'lblPloseAnh_Proz ' - Me.lblPloseAnh_Proz.Location = New System.Drawing.Point(361, 212) + Me.lblPloseAnh_Proz.Location = New System.Drawing.Point(361, 218) Me.lblPloseAnh_Proz.Name = "lblPloseAnh_Proz" Me.lblPloseAnh_Proz.Size = New System.Drawing.Size(69, 13) Me.lblPloseAnh_Proz.TabIndex = 37 @@ -559,7 +570,7 @@ Partial Class usrcntlFakturierung ' Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button19.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button19.Location = New System.Drawing.Point(10, 183) + Me.Button19.Location = New System.Drawing.Point(10, 163) Me.Button19.Name = "Button19" Me.Button19.Size = New System.Drawing.Size(121, 49) Me.Button19.TabIndex = 32 @@ -568,7 +579,7 @@ Partial Class usrcntlFakturierung ' 'Label70 ' - Me.Label70.Location = New System.Drawing.Point(252, 151) + Me.Label70.Location = New System.Drawing.Point(171, 172) Me.Label70.Name = "Label70" Me.Label70.Size = New System.Drawing.Size(429, 14) Me.Label70.TabIndex = 30 @@ -613,7 +624,7 @@ Partial Class usrcntlFakturierung ' 'Label65 ' - Me.Label65.Location = New System.Drawing.Point(252, 117) + Me.Label65.Location = New System.Drawing.Point(171, 138) Me.Label65.Name = "Label65" Me.Label65.Size = New System.Drawing.Size(440, 17) Me.Label65.TabIndex = 8 @@ -621,7 +632,7 @@ Partial Class usrcntlFakturierung ' 'Label64 ' - Me.Label64.Location = New System.Drawing.Point(252, 100) + Me.Label64.Location = New System.Drawing.Point(171, 121) Me.Label64.Name = "Label64" Me.Label64.Size = New System.Drawing.Size(440, 17) Me.Label64.TabIndex = 7 @@ -629,7 +640,7 @@ Partial Class usrcntlFakturierung ' 'Label63 ' - Me.Label63.Location = New System.Drawing.Point(252, 83) + Me.Label63.Location = New System.Drawing.Point(171, 104) Me.Label63.Name = "Label63" Me.Label63.Size = New System.Drawing.Size(440, 17) Me.Label63.TabIndex = 6 @@ -638,7 +649,7 @@ Partial Class usrcntlFakturierung ' 'Label45 ' - Me.Label45.Location = New System.Drawing.Point(252, 66) + Me.Label45.Location = New System.Drawing.Point(171, 87) Me.Label45.Name = "Label45" Me.Label45.Size = New System.Drawing.Size(224, 17) Me.Label45.TabIndex = 5 @@ -648,24 +659,13 @@ Partial Class usrcntlFakturierung ' Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button14.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button14.Location = New System.Drawing.Point(10, 85) + Me.Button14.Location = New System.Drawing.Point(10, 90) Me.Button14.Name = "Button14" Me.Button14.Size = New System.Drawing.Size(121, 49) Me.Button14.TabIndex = 4 Me.Button14.Text = "Rechnungspos. berechnen" Me.Button14.UseVisualStyleBackColor = True ' - 'Button1 - ' - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button1.Location = New System.Drawing.Point(10, 12) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(121, 49) - Me.Button1.TabIndex = 106 - Me.Button1.Text = "Mautanh. prüfen" - Me.Button1.UseVisualStyleBackColor = True - ' 'usrcntlFakturierung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 29671e46..c240c7ca 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -221,7 +221,7 @@ Public Class usrcntlFakturierung '410 Set qdf = dbs.CreateQueryDef("") - ok = SQL.doSQL("update [Rechnungsausgang] set Sachbearbeiter='" & Sachbearbeiter & "' where Sammelrechnung=6 and Firma_ID=19 and UPPER([Sachbearbeiter])<>'" & Sachbearbeiter & "' and Abfertigungsdatum = '" & dtRechnungsdatum.Value & "'", "FMZOLL") + ok = SQL.doSQL("update [Rechnungsausgang] set Sachbearbeiter='" & Sachbearbeiter & "' where Sammelrechnung=6 and Firma_ID=19 and [Status] = 0 and UPPER([Sachbearbeiter])<>'" & Sachbearbeiter & "' and Abfertigungsdatum = '" & dtRechnungsdatum.Value & "'", "FMZOLL") showPic(ok, PictureBox1) 'If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Exit Sub @@ -959,10 +959,10 @@ Public Class usrcntlFakturierung - Dim SQLStringGruppierteSammelrechnung = "SELECT [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status] - FROM Rechnungsausgang + Dim SQLStringGruppierteSammelrechnung = "SELECT [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status], RechnungsKundenNr, Adressen.LandKz + FROM Rechnungsausgang INNER JOIN Adressen on AdressenNr = RechnungsKundenNr WHERE [Status] = 2 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "' and RechnungsNr is not null " & IIf(kdnr > 0, " AND RechnungsKundenNr = " & kdnr, "") & " - group by [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status] + group by [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status], RechnungsKundenNr, Adressen.LandKz ORDER BY [Firma_ID], [Status], RechnungsNr" Dim dtSelectedSammelrechnungen As DataTable = (New SQL).loadDgvBySql(SQLStringGruppierteSammelrechnung, "FMZOLL") @@ -977,21 +977,26 @@ Public Class usrcntlFakturierung For Each rowRE In dtSelectedSammelrechnungen.Rows - Dim path = "" + Dim path = "" + If nurNICHTEUKunden Then + Dim isEU As Boolean = True + isEU = (New SQL).getValueTxtBySql("select MitgliedslandEU from Währungstabelle where landkz = '" & rowRE("Adressen.LandKz") & "'", "FMZOLL",) + If Not isEU Then cFakturierung.doSAMMELRechnungsDruck_Abschnitt(rowRE("RechnungsNr"), rowRE("Firma_ID"), rowRE("Buchungsjahr"), rowRE("DruckDatumZeit"), "", True, True, 7, path,, , , , , , , ) + + Else cFakturierung.doSAMMELRechnungsDruck_Abschnitt(rowRE("RechnungsNr"), rowRE("Firma_ID"), rowRE("Buchungsjahr"), rowRE("DruckDatumZeit"), "", True, True, 7, path,, , , , , , , ) - If path <> "" Then - If nurNICHTEUKunden Then - 'TODO-> nur nicht EU-Kunden zu Path - listPDFs.Add(path) - Else - listPDFs.Add(path) - End If + If path <> "" Then + listPDFs.Add(path) + + + End If End If + If True Then 'cnt Mod 10 = 0 Then txtPloseAnh_Einarbeitung.Text = cnt & " / " & dtSelectedSammelrechnungen.Rows.Count Dim proz As Double = (cnt / dtSelectedSammelrechnungen.Rows.Count) * 100 @@ -1527,4 +1532,37 @@ Public Class usrcntlFakturierung MsgBox("Anzahl CSV-Anhänge: " & rechnungenMitGesamtmautanhantCSV & vbNewLine & "Anzahl PDF-Anhänge: " & rechnungenMitGesamtmautanhantPDF) End Sub + + Private Sub dtRechnungsdatum_ValueChanged(sender As Object, e As EventArgs) Handles dtRechnungsdatum.ValueChanged + Dim sammelrechnung0vorhanden As Boolean = True + sammelrechnung0vorhanden = checkIfStatus0Sammelrechnugnenvorhanden(cboSachbearbeiter._value, CDate(dtRechnungsdatum.Text)) + + Button14.Enabled = sammelrechnung0vorhanden + Button19.Enabled = sammelrechnung0vorhanden + Button20.Enabled = sammelrechnung0vorhanden + + + End Sub + + + Private Function checkIfStatus0Sammelrechnugnenvorhanden(Sachbearbeiter As String, rechnungsdatum As Date) As Boolean + + + Dim rechnungenMitStatus0 As Integer = CInt((New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) From Rechnungsausgang + Where [Status] = 0 And [Sammelrechnung] = 6 And UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'", "FMZOLL",, 0)) + + Return rechnungenMitStatus0 > 0 + + End Function + + Private Sub cboSachbearbeiter_RightToLeftChanged(sender As Object, e As EventArgs) Handles cboSachbearbeiter.RightToLeftChanged + Dim sammelrechnung0vorhanden As Boolean = True + sammelrechnung0vorhanden = checkIfStatus0Sammelrechnugnenvorhanden(cboSachbearbeiter._value, CDate(dtRechnungsdatum.Text)) + + Button19.Enabled = sammelrechnung0vorhanden + Button14.Enabled = sammelrechnung0vorhanden + Button20.Enabled = sammelrechnung0vorhanden + + + End Sub End Class