neu

VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb

@@ -101,6 +101,7 @@ Public Class cRechnungsausgang
     Property AvisoID As Object = Nothing
     Property KdAuftragsNr As Object = Nothing
     Property Handling As Object = Nothing
+    Property VorschauID As Object = Nothing
 
 
 
@@ -238,6 +239,7 @@ Public Class cRechnungsausgang
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AvisoID", AvisoID))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KdAuftragsNr", KdAuftragsNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Handling", Handling))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VorschauID", VorschauID))
 
         Return list
     End Function
@@ -441,11 +443,20 @@ Public Class cRechnungsausgang
     End Function
 
     Public Function isReverseChargeSumme() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+        'Wenn selbes Land --> Kein Reversecharge
+        Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID)
+        '  MsgBox(RechnungsLandKz & " - " & FIRMA.Firma_LandKz)
+        If RechnungsLandKz = FIRMA.Firma_LandKz Then
+            Return False
+        End If
+
         Dim sqlstr = "   SELECT SUM(POS.SteuerfreierBetrag) AS ReverseChargeSumme "
         sqlstr &= "  FROM   Rechnungsausgang  as RA INNER JOIN RechnungsausgangPositionen as POS ON RA.RK_ID = POS.RK_ID INNER JOIN Leistungen ON POS.LeistungsNr = Leistungen.LeistungsNr INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] AS LD ON RA.RechnungsUstIdKz = LD.LandKz"
         sqlstr &= "  WHERE RA.rk_id='" & Me.RK_ID & "' AND LD.ReverseCharge = 1 AND Leistungen.ReverseCharge = 1"
 
-        Return If(SQL.getValueTxtBySql(sqlstr, "FMZOLL",,, Nothing) Is Nothing, False, True)
+        'MsgBox(SQL.getValueTxtBySql(sqlstr, "FMZOLL",,, 0))
+
+        Return If(SQL.getValueTxtBySql(sqlstr, "FMZOLL",,, 0) = 0, False, True)
     End Function
 
     Public Function setSPEDBUCH_FAKTURIERT(Optional wert As Boolean = True) As Boolean 'obj As Object, tablename As String, where As String) As Boolean