diff --git a/SDL/Creditsafe/usrcntlCreditsafe.vb b/SDL/Creditsafe/usrcntlCreditsafe.vb
index 767ca5cf..163c6318 100644
--- a/SDL/Creditsafe/usrcntlCreditsafe.vb
+++ b/SDL/Creditsafe/usrcntlCreditsafe.vb
@@ -1,8 +1,4 @@
-
-Imports System.Runtime.Serialization
-Imports DocumentFormat.OpenXml.Drawing.Diagrams
-Imports itextsharp.text.pdf
-Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN
Public Class usrcntlCreditsafe
diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb b/SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb
index 4b4f4ad6..10a97f08 100644
--- a/SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb
+++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb
@@ -39,6 +39,8 @@ Partial Class usrcntlVAT_ATEZ
Me.dgvVAT = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.cboLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.lblPagecount = New System.Windows.Forms.Label()
+ Me.CheckVatService1 = New SDL.eu.europa.ec.checkVatService()
+ Me.bcxOnlySetPrice = New System.Windows.Forms.CheckBox()
CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@@ -47,7 +49,7 @@ Partial Class usrcntlVAT_ATEZ
Me.lblUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lblUID.AutoSize = True
Me.lblUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
- Me.lblUID.Location = New System.Drawing.Point(1129, 10)
+ Me.lblUID.Location = New System.Drawing.Point(1239, 10)
Me.lblUID.Name = "lblUID"
Me.lblUID.Size = New System.Drawing.Size(40, 13)
Me.lblUID.TabIndex = 1
@@ -58,7 +60,7 @@ Partial Class usrcntlVAT_ATEZ
'
Me.txtUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtUID.Location = New System.Drawing.Point(1132, 26)
+ Me.txtUID.Location = New System.Drawing.Point(1242, 26)
Me.txtUID.Name = "txtUID"
Me.txtUID.Size = New System.Drawing.Size(134, 23)
Me.txtUID.TabIndex = 3
@@ -71,7 +73,7 @@ Partial Class usrcntlVAT_ATEZ
Me.txtFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
Me.txtFirma.Location = New System.Drawing.Point(73, 27)
Me.txtFirma.Name = "txtFirma"
- Me.txtFirma.Size = New System.Drawing.Size(633, 23)
+ Me.txtFirma.Size = New System.Drawing.Size(743, 23)
Me.txtFirma.TabIndex = 1
Me.txtFirma.Visible = False
'
@@ -112,7 +114,7 @@ Partial Class usrcntlVAT_ATEZ
Me.btnUebernehmen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnUebernehmen.DialogResult = System.Windows.Forms.DialogResult.OK
Me.btnUebernehmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnUebernehmen.Location = New System.Drawing.Point(1244, 359)
+ Me.btnUebernehmen.Location = New System.Drawing.Point(1354, 359)
Me.btnUebernehmen.Name = "btnUebernehmen"
Me.btnUebernehmen.Size = New System.Drawing.Size(136, 41)
Me.btnUebernehmen.TabIndex = 9
@@ -123,7 +125,7 @@ Partial Class usrcntlVAT_ATEZ
'
Me.txtStrasse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtStrasse.Location = New System.Drawing.Point(712, 27)
+ Me.txtStrasse.Location = New System.Drawing.Point(822, 27)
Me.txtStrasse.Name = "txtStrasse"
Me.txtStrasse.Size = New System.Drawing.Size(163, 23)
Me.txtStrasse.TabIndex = 101
@@ -134,7 +136,7 @@ Partial Class usrcntlVAT_ATEZ
Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label1.AutoSize = True
Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
- Me.Label1.Location = New System.Drawing.Point(709, 11)
+ Me.Label1.Location = New System.Drawing.Point(819, 11)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(42, 13)
Me.Label1.TabIndex = 100
@@ -145,7 +147,7 @@ Partial Class usrcntlVAT_ATEZ
'
Me.txtPLZ.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtPLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtPLZ.Location = New System.Drawing.Point(1042, 26)
+ Me.txtPLZ.Location = New System.Drawing.Point(1152, 26)
Me.txtPLZ.Name = "txtPLZ"
Me.txtPLZ.Size = New System.Drawing.Size(84, 23)
Me.txtPLZ.TabIndex = 103
@@ -156,7 +158,7 @@ Partial Class usrcntlVAT_ATEZ
Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label2.AutoSize = True
Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
- Me.Label2.Location = New System.Drawing.Point(1039, 10)
+ Me.Label2.Location = New System.Drawing.Point(1149, 10)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(27, 13)
Me.Label2.TabIndex = 102
@@ -167,7 +169,7 @@ Partial Class usrcntlVAT_ATEZ
'
Me.txtOrt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtOrt.Location = New System.Drawing.Point(881, 26)
+ Me.txtOrt.Location = New System.Drawing.Point(991, 26)
Me.txtOrt.Name = "txtOrt"
Me.txtOrt.Size = New System.Drawing.Size(155, 23)
Me.txtOrt.TabIndex = 105
@@ -178,7 +180,7 @@ Partial Class usrcntlVAT_ATEZ
Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label3.AutoSize = True
Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
- Me.Label3.Location = New System.Drawing.Point(878, 10)
+ Me.Label3.Location = New System.Drawing.Point(988, 10)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(21, 13)
Me.Label3.TabIndex = 104
@@ -201,7 +203,7 @@ Partial Class usrcntlVAT_ATEZ
Me.dgvVAT.ReadOnly = True
Me.dgvVAT.RowHeadersVisible = False
Me.dgvVAT.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
- Me.dgvVAT.Size = New System.Drawing.Size(1368, 297)
+ Me.dgvVAT.Size = New System.Drawing.Size(1478, 297)
Me.dgvVAT.TabIndex = 7
'
'cboLand
@@ -223,18 +225,36 @@ Partial Class usrcntlVAT_ATEZ
Me.lblPagecount.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lblPagecount.AutoSize = True
Me.lblPagecount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
- Me.lblPagecount.Location = New System.Drawing.Point(1268, 10)
+ Me.lblPagecount.Location = New System.Drawing.Point(1378, 10)
Me.lblPagecount.Name = "lblPagecount"
Me.lblPagecount.Size = New System.Drawing.Size(77, 13)
Me.lblPagecount.TabIndex = 106
Me.lblPagecount.Text = "Gesamtseiten: "
'
+ 'CheckVatService1
+ '
+ Me.CheckVatService1.Credentials = Nothing
+ Me.CheckVatService1.Url = "http://ec.europa.eu/taxation_customs/vies/services/checkVatService"
+ Me.CheckVatService1.UseDefaultCredentials = False
+ '
+ 'bcxOnlySetPrice
+ '
+ Me.bcxOnlySetPrice.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.bcxOnlySetPrice.AutoSize = True
+ Me.bcxOnlySetPrice.Location = New System.Drawing.Point(1214, 372)
+ Me.bcxOnlySetPrice.Name = "bcxOnlySetPrice"
+ Me.bcxOnlySetPrice.Size = New System.Drawing.Size(115, 17)
+ Me.bcxOnlySetPrice.TabIndex = 107
+ Me.bcxOnlySetPrice.Text = "nur Beträge setzen"
+ Me.bcxOnlySetPrice.UseVisualStyleBackColor = True
+ '
'usrcntlVAT_ATEZ
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.AutoScroll = True
Me.BackColor = System.Drawing.Color.White
+ Me.Controls.Add(Me.bcxOnlySetPrice)
Me.Controls.Add(Me.lblPagecount)
Me.Controls.Add(Me.txtOrt)
Me.Controls.Add(Me.Label3)
@@ -252,7 +272,7 @@ Partial Class usrcntlVAT_ATEZ
Me.Controls.Add(Me.txtUID)
Me.Controls.Add(Me.lblUID)
Me.Name = "usrcntlVAT_ATEZ"
- Me.Size = New System.Drawing.Size(1398, 403)
+ Me.Size = New System.Drawing.Size(1508, 403)
CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -274,4 +294,6 @@ Partial Class usrcntlVAT_ATEZ
Friend WithEvents txtOrt As TextBox
Friend WithEvents Label3 As Label
Friend WithEvents lblPagecount As Label
+ Friend WithEvents CheckVatService1 As eu.europa.ec.checkVatService
+ Friend WithEvents bcxOnlySetPrice As CheckBox
End Class
diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.resx b/SDL/Creditsafe/usrcntlVAT_ATEZ.resx
index 1af7de15..0c892a28 100644
--- a/SDL/Creditsafe/usrcntlVAT_ATEZ.resx
+++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.resx
@@ -117,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ No newline at end of file
diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb
index 2c3f8e83..4f4c900b 100644
--- a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb
+++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb
@@ -9,6 +9,7 @@ Public Class usrcntlVAT_ATEZ
Public va As VAT
Dim uidDefault As String
Public createCostumer As Boolean = False
+ Public setAmountOnly As Boolean = False
Sub New()
@@ -17,8 +18,6 @@ Public Class usrcntlVAT_ATEZ
End Sub
-
-
Sub New(_UID As String, _name As String, _land As String, _PLZ As String, _Strasse As String, _Ort As String)
InitializeComponent()
@@ -35,8 +34,6 @@ Public Class usrcntlVAT_ATEZ
Private Sub init()
-
-
'cboLand.changeItem(land)
'initDataTable()
btnUebernehmen.Enabled = False
@@ -56,6 +53,7 @@ Public Class usrcntlVAT_ATEZ
End If
+ bcxOnlySetPrice.Checked = setAmountOnly
End Sub
@@ -70,6 +68,8 @@ Public Class usrcntlVAT_ATEZ
Dim pageCpunterCheck = 0
+
+
lblPagecount.Text &= dgvVAT.Rows(0).Cells("total_pages").Value
With dgvVAT
diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb
index b6e3cc7d..f3ff2c8c 100644
--- a/SDL/Fakturierung/frmAbrechnungsMaske.vb
+++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb
@@ -1,4 +1,5 @@
Imports System.IO
+Imports com.sun.org.apache.xalan.internal.xsltc.compiler.util
Imports Microsoft.Office.Interop
Public Class frmAbrechnungsMaske
@@ -201,7 +202,7 @@ Public Class frmAbrechnungsMaske
' sqlstr &= " SELECT FilialenNr, AbfertigungsNr, UnterNr, Firma_ID, Status, Sammelrechnung, Sachbearbeiter, SteuerpflichtigerGesamtbetrag, SteuerfreierGesamtbetrag, RechnungsNr, RechnungsDatum, DruckDatumZeit, Buchungsjahr, RK_ID"
sqlstr &= " SELECT " & reNrSQL & " FilialenNr, AbfertigungsNr, cast(FilialenNr as varchar) + ' ' + cast(AbfertigungsNr as varchar) as PosNr,UnterNr, Firma_ID,Rechnungsausgang.Sammelrechnung as Art, [RechnungsName 1] as Rechnungsempfänger, (isnull(SteuerpflichtigerGesamtbetrag,0) + isnull(SteuerfreierGesamtbetrag,0)) as Betrag, RK_ID,RechnungsLandKz,RechnungsKundenNr"
- sqlstr &= ",(CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' WHEN Rechnungsdruck=5 THEN 'MAIL+KOPIE' ELSE '-' END) as Rechnungsdruck "
+ sqlstr &= ",(CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' WHEN Rechnungsdruck=5 THEN 'MAIL+KOPIE' ELSE '-' END) as Rechnungsdruck, isnull(BelegartenKz, '') as BelegartenKz "
sqlstr &= " FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=Rechnungsausgang.RechnungsKundenNr"
sqlstr &= " WHERE 1=1 "
@@ -219,25 +220,42 @@ Public Class frmAbrechnungsMaske
.Columns("Firma_ID").Visible = False
.Columns("RechnungsLandKz").Visible = False
.Columns("RechnungsKundenNr").Visible = False
+ .Columns("BelegartenKz").Visible = False
.Columns("PosNr").HeaderText = "Pos-Nr."
If cbx.Checked Then .Columns("ReNr").HeaderText = "ReNr."
.Columns("UnterNr").Width = 35
- .Columns("Art").Width = 30
- .Columns("Betrag").Width = 100
- .Columns("Rechnungsempfänger").MinimumWidth = 150
- .Columns("Rechnungsempfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+ .Columns("Art").Width = 30
+ .Columns("Betrag").Width = 100
+ .Columns("Rechnungsempfänger").MinimumWidth = 150
+ .Columns("Rechnungsempfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+
+ If Not cbxGutschriftenAnVerag.Checked Then
+ .Columns("Rechnungsdruck").Width = 60
+ .Columns("Rechnungsdruck").HeaderText = "Rg.Art"
+ .Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+ End If
+
+
+ .Columns("Betrag").DefaultCellStyle.Format = "C2"
+ End If
+
+ If cboFirma._value <> "" AndAlso cboFirma._value = "19" Then
+
+ For Each r In .Rows
+
+ If r.Cells("Betrag").Value IsNot DBNull.Value AndAlso IsNumeric(r.Cells("Betrag").Value) Then
+ Select Case r.Cells("BelegartenKz").Value.ToString
+ Case "AR" : If r.Cells("Betrag").Value < 0 Then r.DefaultCellStyle.ForeColor = Color.Red
+ Case "AG" : If r.Cells("Betrag").Value > 0 Then r.DefaultCellStyle.ForeColor = Color.Red
+ End Select
- If Not cbxGutschriftenAnVerag.Checked Then
- .Columns("Rechnungsdruck").Width = 60
- .Columns("Rechnungsdruck").HeaderText = "Rg.Art"
- .Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
End If
+ Next
- .Columns("Betrag").DefaultCellStyle.Format = "C2"
- End If
+ End If
End With
End Sub
diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index 40e1e192..e36cddcc 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -1026,7 +1026,7 @@ Public Class frmMDM_USTVAntrag
USTV_POS.UStVPo_ReDat = r.Item("rmc_reDatum")
USTV_POS.UStVPo_ReNr = r.Item("rmc_reNr").ToString
USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
- 'USTV_POS.UStVPo_daId = r.Item("rmc_daId")
+ USTV_POS.UStVPo_daId = r.Item("rmc_daId")
If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
USTV_POS.UStVPo_daId_loeschbar = False
Else
@@ -1041,7 +1041,10 @@ Public Class frmMDM_USTVAntrag
Dim leist As String = "RMC Service GmbH"
- If USTV_POS.UStVPo_ReNr.ToString.ToLower.StartsWith("fit") Then leist = "Con.Tir Scar"
+ If USTV_POS.UStVPo_ReNr.ToString.ToLower.StartsWith("fit") Then
+ leist = "Con.Tir Scar"
+ USTV_POS.UStVPo_Leistungsbezeichnung = "Maut"
+ End If
Dim leistender As New cUStVLeistender(leist & " " & Antrag_LandKz, Antrag_LandKz)
If leistender.UStV_LeistenderId < 1 Then
@@ -1427,10 +1430,6 @@ Public Class frmMDM_USTVAntrag
USTV_POS.UStVPo_Leistungsbezeichnung = "Maut/Diesel"
USTV_POS.UStVPo_Schnittstelle = True
-
-
-
-
If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then
@@ -1473,11 +1472,6 @@ Public Class frmMDM_USTVAntrag
End If
-
-
-
-
-
Dim leistenderName As String = r.Cells("seller_name").Value
Dim leistenderUID As String = r.Cells("seller_VAT_id").Value
Dim leistender As New cUStVLeistender(leistenderUID, True)
@@ -3674,13 +3668,15 @@ Public Class frmMDM_USTVAntrag
Select Case spracheRechnung
Case "DE" : Attachmens_Bez = "Lief.-Rechn" : Attachmens_Bez_POS = "POS-Liste"
- Case "EN", "TR" : Attachmens_Bez = "Supplier Invoice(s)" : Attachmens_Bez_POS = "Item List"
- Case "RO" : Attachmens_Bez = "Factura furnizorului" : Attachmens_Bez_POS = "Lista articolelor"
+ Case "EN", "TR" : Attachmens_Bez = "Supplier-Invoice(s)" : Attachmens_Bez_POS = "Item-List"
+ Case "RO" : Attachmens_Bez = "Factura-furnizorului" : Attachmens_Bez_POS = "Lista-articolelor"
End Select
Dim path As String = PDFInvoicesPath(posID)
Dim fileInfo As New FileInfo(path)
- If path <> "" Then Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez & fileInfo.Extension)
+ If path <> "" Then
+ Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez & fileInfo.Extension)
+ End If
If vbYes = MsgBox("Möchten Sie die Positionsliste an die Mail hinzufügen?", vbYesNoCancel) Then
@@ -3691,7 +3687,9 @@ Public Class frmMDM_USTVAntrag
Dim pathPosList As String = generatePOSListe(spedBuch, posID, False)
If pathPosList <> "" Then
Dim fileInfoPos As New FileInfo(pathPosList)
- If pathPosList <> "" Then Mail.Attachments.Add(pathPosList, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez_POS & fileInfoPos.Extension)
+ If pathPosList <> "" Then
+ Mail.Attachments.Add(pathPosList, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez_POS & fileInfoPos.Extension)
+ End If
End If
End If
@@ -3710,6 +3708,10 @@ Public Class frmMDM_USTVAntrag
Mail.CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an")
Mail.BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an")
+ If Mail.To = "" Then
+ Mail.To &= IIf(AD.E_Mail IsNot Nothing, AD.E_Mail, "")
+ End If
+
Mail.Display()
Me.Cursor = Cursors.Default
Catch ex As Exception
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
index d62f6ab9..6a7512a9 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
@@ -633,7 +633,15 @@ Public Class ustCntlUSTV_AntragPosition
cnS_KIUPLOAD.Hide()
Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
- If UStV_POS.UStVPo_daId < 1 Then Exit Sub
+ 'If UStV_POS.UStVPo_daId Is Nothing AndAlso UStV_POS.UStVPo_USteuerbetragEUR = 0.01 AndAlso UStV_POS.UStVPo_SchnittstellenNr = 7 Then
+ ' UStV_POS.UStVPo_daId = sql.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & UStV_POS.UStVPo_ReDat & "' and rmc_reNr='" & UStV_POS.UStVPo_ReNr & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1)
+ 'End If
+
+
+ If UStV_POS.UStVPo_daId < 1 Then
+ MsgBox("kein Dokument hinterlegt!")
+ Exit Sub
+ End If
If item IsNot Nothing Then
@@ -653,9 +661,10 @@ Public Class ustCntlUSTV_AntragPosition
MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
Exit Sub
Else
- 'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
+ 'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
'document_type = vat_invoice or receipt
+
If API.setJsonVAT(item.Name, UStV_POS.UStVPo_daId) Then
resp = API.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt, item.Name)
@@ -668,15 +677,21 @@ Public Class ustCntlUSTV_AntragPosition
f.usrcntlVAT_ATEZ1.btnUebernehmen.Enabled = UStV_POS.UStVPo_daId_loeschbar 'NUR ÜBERNEHMEN WENN LÖSCHBAR!
f.usrcntlVAT_ATEZ1.initDGV(dt)
f.usrcntlVAT_ATEZ1.setColorIndgv()
+ f.usrcntlVAT_ATEZ1.setAmountOnly = IIf(UStV_POS.UStVPo_SchnittstellenNr = 7, True, False)
+
If f.ShowDialog = DialogResult.OK Then
- txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date
- txtRgNr.Text = f.usrcntlVAT_ATEZ1.va.invoice_id
- txtStrasse.Text = f.usrcntlVAT_ATEZ1.va.seller_address_street
- txtOrt.Text = f.usrcntlVAT_ATEZ1.va.seller_address_city
- txtLand.Text = f.usrcntlVAT_ATEZ1.va.seller_address_country
- txtPLZ.Text = f.usrcntlVAT_ATEZ1.va.seller_address_postcode
- sbLeistender._value = f.usrcntlVAT_ATEZ1.va.seller_name
+
+ If Not f.usrcntlVAT_ATEZ1.setAmountOnly Then
+ txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date
+ txtRgNr.Text = f.usrcntlVAT_ATEZ1.va.invoice_id
+ txtStrasse.Text = f.usrcntlVAT_ATEZ1.va.seller_address_street
+ txtOrt.Text = f.usrcntlVAT_ATEZ1.va.seller_address_city
+ txtLand.Text = f.usrcntlVAT_ATEZ1.va.seller_address_country
+ txtPLZ.Text = f.usrcntlVAT_ATEZ1.va.seller_address_postcode
+ sbLeistender._value = f.usrcntlVAT_ATEZ1.va.seller_name
+ End If
+
If IsNumeric(f.usrcntlVAT_ATEZ1.va.total_VAT_amount) AndAlso f.usrcntlVAT_ATEZ1.va.total_VAT_amount <> 0 AndAlso f.usrcntlVAT_ATEZ1.va.currency <> "" Then
Dim antr As New cUSTVAntrag(UStV_POS.UStVAn_ID)
@@ -684,46 +699,54 @@ Public Class ustCntlUSTV_AntragPosition
If f.usrcntlVAT_ATEZ1.va.currency = antr.UStVAn_Währungscode Then
Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
If antr.UStVAn_Währungscode = "EUR" Then
- UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
'If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then
' USTV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(r.Cells("total_VAT_amount").Value, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2)
' USTV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(USTV_POS.UStVPo_USteuerbetrag) / CDbl(USTV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
'Else
- UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
UStV_POS.UStVPo_Umrechnungskurs = 1
'End If
+ UStV_POS.SAVE()
Else
- UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+ UStV_POS.SAVE()
End If
+
+
Else
'2. Antragswährung <> Belegswährung (EUR zu FREMD und FREMD zu EUR)
If antr.UStVAn_Währungscode = "EUR" Then
Dim kurs As New cEZB_Waehrungskurse(f.usrcntlVAT_ATEZ1.va.currency)
If f.usrcntlVAT_ATEZ1.va.currency <> "EUR" Then
- UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+ UStV_POS.SAVE()
ElseIf f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then
UStV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
UStV_POS.UStVPo_USteuerbetragEUR = UStV_POS.UStVPo_USteuerbetrag
UStV_POS.UStVPo_Umrechnungskurs = 1
+ UStV_POS.SAVE()
End If
Else
'2.1 Antragswährung <> Belegswährung (FREMD zu FREMD)
If f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then
- UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
UStV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+ UStV_POS.SAVE()
Else
UStV_POS.UStVPo_USteuerbetrag = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, antr.UStVAn_Währungscode)
Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+ UStV_POS.SAVE()
End If
@@ -735,7 +758,6 @@ Public Class ustCntlUSTV_AntragPosition
End If
-
End If
End If
diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb
index ad6c467f..faafd0b1 100644
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -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, 836)
+ Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 799)
Me.dgvUmsaetze.TabIndex = 182
'
'Label13
@@ -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(-1361, 18)
+ Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-2813, 18)
Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern"
Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52)
Me.btnFirmendatenFormularSpeichern.TabIndex = 17
@@ -2724,7 +2724,7 @@ Partial Class frmKundenblatt
'
Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
- Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
+ Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
Me.cntxtCntxtMDM.Text = "cntxtMDM"
'
diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb
index dc198a55..f67d89e3 100644
--- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb
+++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb
@@ -418,7 +418,7 @@ Partial Class usrcntlFakturierung
Me.Label11.Name = "Label11"
Me.Label11.Size = New System.Drawing.Size(440, 17)
Me.Label11.TabIndex = 125
- Me.Label11.Text = "6. Fixe Taxe 20€ (bei Belegsumme < 500) berechnen"
+ Me.Label11.Text = "6. Fixe Taxe 441 (bei Belegsumme < 500) berechnen"
'
'PictureBox6
'
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb
index bcc2dd4e..241f0ced 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb
@@ -143,6 +143,7 @@ Public Class cDY_Zollanmeldungen_Import
Property UST_ID_Fiskalvertreter As Object = Nothing
Property Shipmentnummer As Object = Nothing
Property Importstatus As Object = Nothing
+ Property Importdate As Object = Nothing
Public hasEntry = False
@@ -297,6 +298,7 @@ Public Class cDY_Zollanmeldungen_Import
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UST_ID_Fiskalvertreter", UST_ID_Fiskalvertreter))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Shipmentnummer", Shipmentnummer))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importstatus", Importstatus))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importdate", Importdate))
Return list
End Function
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
index 22da1c8d..dd9a7d3c 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
@@ -2,6 +2,7 @@
Imports System.Reflection
Imports System.Windows.Forms
Imports com.sun.org.apache.xpath.internal.operations
+Imports com.sun.source.tree
'Imports DocumentFormat.OpenXml.Drawing.Charts
'Imports DocumentFormat.OpenXml.Spreadsheet
@@ -525,38 +526,48 @@ Public Class cRechnungsausgang
End If
End If
- End If
+ End If
- If dgv Is Nothing Then
- errMsg = "ERROR: Keine Positionen angegeben!" : Return False
- ElseIf dgv.Rows.Count = 0 Then
- errMsg = "ERROR: Keine Positionen angegeben!" : Return False
- Else
- If dgv.Rows.Count > 1 Then
- 'Prüfung für doppelte Positionen mit PK: Bezeichnung und LeistungNr!
- Dim dt As New DataTable
- dt.Columns.Add("name", GetType(String))
+ If dgv Is Nothing Then
+ errMsg = "ERROR: Keine Positionen angegeben!" : Return False
+ ElseIf dgv.Rows.Count = 0 Then
+ errMsg = "ERROR: Keine Positionen angegeben!" : Return False
+ Else
+ If dgv.Rows.Count > 1 Then
+ 'Prüfung für doppelte Positionen mit PK: Bezeichnung und LeistungNr!
+ Dim dt As New DataTable
+ dt.Columns.Add("name", GetType(String))
- For Each row As DataGridViewRow In dgv.Rows
- Dim R As DataRow = dt.NewRow
- R("name") = row.Cells(0).Value
- dt.Rows.Add(R)
- Next
- Dim dv As New DataView(dt)
- Dim distinct As DataTable = dv.ToTable(True, New String() {"name"})
-
- If distinct.Rows.Count <> dt.Rows.Count Then
- errMsg = "ERROR: Doppelte Positionen vorhanden!" : Return False
- End If
+ For Each row As DataGridViewRow In dgv.Rows
+ Dim R As DataRow = dt.NewRow
+ R("name") = row.Cells(0).Value
+ dt.Rows.Add(R)
+ Next
+ Dim dv As New DataView(dt)
+ Dim distinct As DataTable = dv.ToTable(True, New String() {"name"})
+ If distinct.Rows.Count <> dt.Rows.Count Then
+ errMsg = "ERROR: Doppelte Positionen vorhanden!" : Return False
End If
+
End If
+ End If
+
+
+ If FIRMA.Firma_ID = 19 Then
+
+ Select Case Me.BelegartenKz
+ Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
+ Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) > 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
+ End Select
+ End If
- 'checkFirmen
- Return True
+ 'checkFirmen
+
+ Return True
End Function
Public Function SAVE_POSITIONEN(RK_ID) As Boolean