diff --git a/SDL/Fakturierung/frmFaktEmail.Designer.vb b/SDL/Fakturierung/frmFaktEmail.Designer.vb index 914a811b..3b2704c5 100644 --- a/SDL/Fakturierung/frmFaktEmail.Designer.vb +++ b/SDL/Fakturierung/frmFaktEmail.Designer.vb @@ -86,6 +86,7 @@ Partial Class frmFaktEmail Me.cbxMDMReKopie = New System.Windows.Forms.CheckBox() Me.cbxMDMAnh = New System.Windows.Forms.CheckBox() Me.Button6 = New System.Windows.Forms.Button() + Me.cbxVZ = New System.Windows.Forms.CheckBox() CType(Me.dgvEmailBCC, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvEmailCC, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).BeginInit() @@ -137,7 +138,7 @@ Partial Class frmFaktEmail 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(12, 169) + Me.Label2.Location = New System.Drawing.Point(12, 164) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(31, 13) Me.Label2.TabIndex = 7 @@ -733,12 +734,23 @@ Partial Class frmFaktEmail Me.Button6.UseVisualStyleBackColor = True Me.Button6.Visible = False ' + 'cbxVZ + ' + Me.cbxVZ.AutoSize = True + Me.cbxVZ.Location = New System.Drawing.Point(18, 181) + Me.cbxVZ.Name = "cbxVZ" + Me.cbxVZ.Size = New System.Drawing.Size(40, 17) + Me.cbxVZ.TabIndex = 98 + Me.cbxVZ.Text = "VZ" + Me.cbxVZ.UseVisualStyleBackColor = True + ' 'frmFaktEmail ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke Me.ClientSize = New System.Drawing.Size(750, 850) + Me.Controls.Add(Me.cbxVZ) Me.Controls.Add(Me.Button6) Me.Controls.Add(Me.cbxMDMAnh) Me.Controls.Add(Me.cbxMDMReKopie) @@ -852,4 +864,5 @@ Partial Class frmFaktEmail Friend WithEvents cbxMDMReKopie As CheckBox Friend WithEvents cbxMDMAnh As CheckBox Friend WithEvents Button6 As Button + Friend WithEvents cbxVZ As CheckBox End Class diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 77011bb3..ea1875f2 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -357,7 +357,7 @@ Public Class frmFaktEmail Else Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim listOfTextconserven As cTextkonserve_LIST = New cTextkonserve_LIST(1, "", Firma_ID) + Dim listOfTextconserven As cTextkonserve_LIST = New cTextkonserve_LIST(IIf(cbxVZ.Checked, 7, 1), "", Firma_ID) Dim mailText As String = "" Dim spracheRechnung As String = "EN" 'Defaultsprache @@ -1370,6 +1370,21 @@ Public Class frmFaktEmail Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click setMailText(KdNr, "RO") End Sub + + Private Sub cbxVZ_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVZ.CheckedChanged + If KdNr > 0 Then + If SR Then + + Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr) + setMailText(KdNr, AD.LandKz) + + Else + If RECHNUNG IsNot Nothing Then setMailText(KdNr, RECHNUNG.RechnungsLandKz) + + End If + End If + + End Sub End Class diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index f17087df..fbd36690 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -324,7 +324,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1356) + Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1390) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -334,7 +334,7 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1638, 1350) + Me.Panel4.Size = New System.Drawing.Size(1638, 1384) Me.Panel4.TabIndex = 0 ' 'UsrcntlKundeBearbeitenFull1 @@ -344,7 +344,7 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1350) + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1384) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' 'tbcntrMain @@ -364,7 +364,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1402) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1419) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -405,7 +405,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1373) + Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1390) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -486,7 +486,7 @@ Partial Class frmKundenblatt Me.TabControl1.Location = New System.Drawing.Point(8, 582) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(718, 785) + Me.TabControl1.Size = New System.Drawing.Size(718, 802) Me.TabControl1.TabIndex = 186 ' 'TabPage1 @@ -498,7 +498,7 @@ Partial Class frmKundenblatt Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(710, 759) + Me.TabPage1.Size = New System.Drawing.Size(710, 776) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True @@ -557,7 +557,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 724) + Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 741) Me.dgvOffenePosten.TabIndex = 175 ' 'Label10 @@ -590,7 +590,7 @@ Partial Class frmKundenblatt Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(710, 742) + Me.TabPage2.Size = New System.Drawing.Size(710, 776) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -635,7 +635,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 717) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 751) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -683,7 +683,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 742) + Me.TabPage3.Size = New System.Drawing.Size(710, 776) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -739,7 +739,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 719) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 753) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -1100,7 +1100,7 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1329) + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1346) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -1154,7 +1154,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1644, 1356) + Me.tbZoll.Size = New System.Drawing.Size(1644, 1390) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1166,7 +1166,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1350) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1384) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1174,7 +1174,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1324) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1358) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1185,7 +1185,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1644, 1356) + Me.tbMdm.Size = New System.Drawing.Size(1644, 1390) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1204,7 +1204,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1350) + Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1384) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1216,7 +1216,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1630, 1324) + Me.tbSDL.Size = New System.Drawing.Size(1630, 1358) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1258,7 +1258,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1128) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1162) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1363,7 +1363,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 1178) + Me.Panel5.Location = New System.Drawing.Point(3, 1212) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1624, 143) Me.Panel5.TabIndex = 177 @@ -2249,7 +2249,7 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1644, 1356) + Me.tbOfferte.Size = New System.Drawing.Size(1644, 1390) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True @@ -2261,7 +2261,7 @@ Partial Class frmKundenblatt Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1356) + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1390) Me.UsrCntlOfferte1.TabIndex = 0 ' 'tbUSTV @@ -2269,7 +2269,7 @@ Partial Class frmKundenblatt Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1644, 1356) + Me.tbUSTV.Size = New System.Drawing.Size(1644, 1390) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2283,7 +2283,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1356) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1390) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2296,7 +2296,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1330) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1364) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2419,7 +2419,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 1373) + Me.tbFIBU.Size = New System.Drawing.Size(1644, 1390) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -2446,7 +2446,7 @@ Partial Class frmKundenblatt ' Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(1514, 18) + Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-1390, 18) Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) Me.btnFirmendatenFormularSpeichern.TabIndex = 17 @@ -2478,7 +2478,7 @@ Partial Class frmKundenblatt Me.tbRechnungen.Controls.Add(Me.MyPanel1) Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1373) + Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1390) Me.tbRechnungen.TabIndex = 14 Me.tbRechnungen.Text = "Rechnungen" Me.tbRechnungen.UseVisualStyleBackColor = True @@ -2497,7 +2497,7 @@ Partial Class frmKundenblatt Me.dgvRg.ReadOnly = True Me.dgvRg.RowHeadersVisible = False Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 1313) + Me.dgvRg.Size = New System.Drawing.Size(1644, 1330) Me.dgvRg.TabIndex = 3 ' 'MyPanel1 @@ -2892,7 +2892,7 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1595, 1531) + Me.ClientSize = New System.Drawing.Size(1595, 1548) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 69026718..7211e266 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2370,5 +2370,6 @@ Public Class frmKundenblatt dgvRg.RELOAD() End Sub + End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 55fd8a4c..d7665415 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -2425,8 +2425,7 @@ Public Class frmMDMDatenverarbetiung WHERE Offertenpositionen.KundenNr='" & KdNr & "' and tblUTAImportNew.Rechnungsdatum = '" & DateTimePicker2.Text & "' ) as qryUTA_Fakturierungspositionen WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0)) - order by LicencePlateNumber, [Card Type] - " + order by LicencePlateNumber, [Card Type]" ' sqlstr &= " group by plose_ProduktCode" ' sqlstr &= " order by plp_Land, plose_DatumTransaktion" @@ -3626,12 +3625,6 @@ Public Class frmMDMDatenverarbetiung POS.Anzahl = 1 ' POS.BGebLeistungsNr = BGebLeistungsNr - - If POS.LeistungsNr = 441 Then - MsgBox("") - End If - - RG.POSITIONEN.Add(POS) End If diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 879d9259..4623b299 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1,11 +1,5 @@ Imports System.Data.SqlClient -Imports System.DirectoryServices.ActiveDirectory Imports System.IO -Imports com.sun.org.apache.bcel.internal.generic -Imports com.sun.org.glassfish.external.statistics.annotations -Imports com.sun.tools.internal.ws.wsdl.framework -Imports java.awt.geom -Imports javax.print.attribute.standard Imports Microsoft.Office.Interop.Outlook Imports Microsoft.VisualBasic.FileIO Imports VERAG_PROG_ALLGEMEIN diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 1d32d337..ee4e99c4 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -301,11 +301,11 @@ Public Class cIDS Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode " & IIf(PARAM <> "" AndAlso VALUE <> "", " AND " & PARAM & "=" & VALUE, "") & " AND isnull(charged,0) = 0 ") + Return (" UPDATE [tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode " & IIf(PARAM <> "" AndAlso VALUE <> "", " AND " & PARAM & "=" & VALUE, "") & " AND isnull(charged,0) = 0 ") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -321,7 +321,7 @@ Public Class cIDS Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "]," + str &= "[" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next @@ -544,31 +544,31 @@ Public Class cIDS Using cmd As New SqlCommand("SELECT tblIDSTransactionsNew.KdNrVERAG as Kundennummer, - ISNULL(tblIDSTransactionsNew.OBONumber],ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) AS Rechnungsnummer, - tblIDSTransactionsNew.YearMonthDay] AS Rechnungsdatum, - SUM(tblIDSTransactionsNew.VATAmount]) AS Steuerbetrag + ISNULL(tblIDSTransactionsNew.[OBONumber],ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) AS Rechnungsnummer, + tblIDSTransactionsNew.[YearMonthDay] AS Rechnungsdatum, + SUM(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag FROM tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder - ON tblIDSTransactionsNew.OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode WHERE - tblIDSTransactionsNew.YearMonthDay] BETWEEN @von AND @bis + tblIDSTransactionsNew.[YearMonthDay] BETWEEN @von AND @bis AND tblIDSTransactionsNew.KdNrVERAG = @AdressenNr - AND tbl_IDS_Länder.Lieferland_ISO2] = @LandKZ - AND tblIDSTransactionsNew.VATAmount] <> 0 + AND tbl_IDS_Länder.[Lieferland_ISO2] = @LandKZ + AND tblIDSTransactionsNew.[VATAmount] <> 0 " & IIf(Archiv, " ", " AND isnull(UStVAn_ID,0) = 0 ") & " GROUP BY tblIDSTransactionsNew.KdNrVERAG, - tblIDSTransactionsNew.YearMonthDay], - ISNULL(tblIDSTransactionsNew.OBONumber], - ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) + tblIDSTransactionsNew.[YearMonthDay], + ISNULL(tblIDSTransactionsNew.[OBONumber], + ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) ORDER BY tblIDSTransactionsNew.KdNrVERAG, - tblIDSTransactionsNew.YearMonthDay], - ISNULL(tblIDSTransactionsNew.OBONumber], - ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber]));", conn) + tblIDSTransactionsNew.[YearMonthDay], + ISNULL(tblIDSTransactionsNew.[OBONumber], + ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber]));", conn) cmd.Parameters.AddWithValue("@LandKZ", LandKZ) cmd.Parameters.AddWithValue("@von", von) @@ -607,11 +607,11 @@ Public Class cIDS Return SQL.doSQLVarList("update tblIDSTransactionsNew set UStVAn_ID = @UStVAn_ID FROM tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder - ON tblIDSTransactionsNew.OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode WHERE - tblIDSTransactionsNew.YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.OBONumber], ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) = @reNr + tblIDSTransactionsNew.[YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) = @reNr AND tblIDSTransactionsNew.KdNrVERAG = @ids_kdNr - AND tbl_IDS_Länder.Lieferland_ISO2] = @country", "FMZOLL",, list) + AND tbl_IDS_Länder.[Lieferland_ISO2] = @country", "FMZOLL",, list) Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -624,7 +624,7 @@ Public Class cIDS Shared apiSettingsloaded As Boolean = False Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String - Return SQL.getValueTxtBySql("SELECT TOP 1 Param_value] FROM tblPartnersystem_Paramter] WHERE Param_system='IDS' AND Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(False)) + Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='IDS' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(False)) End Function Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean @@ -770,11 +770,11 @@ Public Class cIDSInvoice Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblIDSInvoicesNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber") + Return (" UPDATE [tblIDSInvoicesNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -788,7 +788,7 @@ Public Class cIDSInvoice Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "]," + str &= "[" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next @@ -1005,11 +1005,11 @@ Public Class cIDSInvoiceSplittedByCountry Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblIDSInvoicesNewSplittedByCountry] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber AND Country=@Country") + Return (" UPDATE [tblIDSInvoicesNewSplittedByCountry] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber AND Country=@Country") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -1023,7 +1023,7 @@ Public Class cIDSInvoiceSplittedByCountry Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "]," + str &= "[" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next