fremdrechnungen

SDL/mdm/usrcntlFremdrechnungen.vb

@@ -424,6 +424,7 @@ Public Class usrcntlFremdrechnungen
             End If
 
             '4.	Rechnungen der Länder, in denen der Kunde selber MWST beantragt
+            If dtKundeMWST IsNot Nothing Then
                 If land <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then
                     Dim counter = 0
                     Dim landBez As String = ""
@@ -434,6 +435,8 @@ Public Class usrcntlFremdrechnungen
                     Next
                     SQLWhere &= " OR " & land & " in (" & landBez & ")"
                 End If
+            End If
+
             SQLWhere &= ")"
 
 
@@ -546,6 +549,12 @@ Public Class usrcntlFremdrechnungen
                 SQLWhere &= ")"
             End If
         End If
+
+        If dtKundeMWST Is Nothing AndAlso dtKundeMWSTTemp Is Nothing Then
+            SQLWhere &= ")"
+        End If
+
+
         Return SQLWhere
 
     End Function
@@ -1435,10 +1444,10 @@ Public Class usrcntlFremdrechnungen
                     If Not SplitContainer1.Panel2Collapsed Then
 
                         Select Case aktLieferant
-                            Case "IDS" : initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value)
+                            Case "IDS" : initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value,, dgvLFRechnung.SelectedRows(0).Cells("AdressenNr").Value)
                             Case "ALLE"
                                 If dgvLFRechnung.Columns.Contains("Lieferant") AndAlso dgvLFRechnung.SelectedRows(0).Cells("Lieferant").Value = "IDS" Then
-                                    initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value)
+                                    initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value,, dgvLFRechnung.SelectedRows(0).Cells("AdressenNr").Value)
                                 Else
                                     dgvDetails.Visible = False
                                 End If
@@ -1469,6 +1478,15 @@ Public Class usrcntlFremdrechnungen
 
     Private Function initDGVRechnungsdetails(rechnugnsID As Integer, Optional setDatatable As Boolean = False, Optional KundenNr_Input As Integer = -1, Optional dtKundeMWSTTemp As DataTable = Nothing) As DataTable
 
+
+
+        If dtKundeMWSTTemp Is Nothing AndAlso KundenNr_Input > 0 Then
+            dtKundeMWSTTemp = (New SQL).loadDgvBySql("select LandKz from tblKundenMWST where KdNr = " & KundenNr_Input, "FMZOLL")
+        End If
+
+
+
+
         Dim sql = "  select [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,
                             cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden,[Country] as Land  
                             FROM [VERAG].[dbo].[tblIDSInvoicesNewSplittedByCountry] WHERE [TotalInvoiceId] = " & rechnugnsID & setSQLDetailWhere(aktLieferant, "Country",  , KundenNr_Input, dtKundeMWSTTemp)