Bugfix AMBAR

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -3992,21 +3992,23 @@ Nächste_Textzeile_lesen:
             kdFirmaAuftraggeber.KdData_ADRESSEN = kundeVeragAdr
             kdFirmaAuftraggeber.KdData_KUNDE_ERW = kundeVeragErw
             RECHNUNG.Rechnung_an = cboRechnungAn._value
+
             cboRechnungAn.changeItem("3")
 
+            cboSteuerschlüssel.changeItem(If(kdFirmaAuftraggeber.KdData_KUNDE.Steuerschlüssel, ""))
+
             kdFirmaRechnungAn.KdNr = veragKunde
 
             przBerechneRAPos("")
             loadFormRGPosInOfferte()
             initDGVRechnungenPositionen()
-            cboFiliale.Focus()
-
             cboFiliale.Focus()
             saveMe()
 
             RECHNUNG.OffertenNr = 1
 
-            Dim REM_POS_GU As New List(Of VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen)
+            Dim REM_POS_TMP As New List(Of VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen)
+
 
             For Each POS In RECHNUNG_TMP.POSITIONEN
                 POS.RK_ID = RECHNUNG.RK_ID
@@ -4029,9 +4031,11 @@ Nächste_Textzeile_lesen:
                             End If
                         Next
                 End Select
+                initSteuerbetraege(RECHNUNG, POS)
             Next
 
             RECHNUNG.POSITIONEN.Clear()
+
             przRefreshDGV_Positionen()
 
             RECHNUNG.SAVE_POSITIONEN(RECHNUNG.RK_ID)

SDL/USTV/frmMDM_USTVAntrag.Designer.vb

@@ -32,6 +32,7 @@ Partial Class frmMDM_USTVAntrag
         Me.Button1 = New System.Windows.Forms.Button()
         Me.lblPLOSE_EintrageVerarbetiet = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.lblKdNr = New System.Windows.Forms.Label()
         Me.Panel9 = New System.Windows.Forms.Panel()
         Me.lblLand = New System.Windows.Forms.Label()
@@ -73,7 +74,8 @@ Partial Class frmMDM_USTVAntrag
         Me.Button3 = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnRMCEinarbeiten = New System.Windows.Forms.Button()
+        Me.lblRMCeingearbeitet = New System.Windows.Forms.Label()
         Me.Panel3.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.Panel9.SuspendLayout()
@@ -92,6 +94,8 @@ Partial Class frmMDM_USTVAntrag
         '
         Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
         Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel3.Controls.Add(Me.lblRMCeingearbeitet)
+        Me.Panel3.Controls.Add(Me.btnRMCEinarbeiten)
         Me.Panel3.Controls.Add(Me.btnMail)
         Me.Panel3.Controls.Add(Me.Button14)
         Me.Panel3.Controls.Add(Me.cbxArchivierteEintracheNochmalsEinarbetien)
@@ -108,7 +112,7 @@ Partial Class frmMDM_USTVAntrag
         Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnMail.ForeColor = System.Drawing.Color.Black
         Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnMail.Location = New System.Drawing.Point(271, 30)
+        Me.btnMail.Location = New System.Drawing.Point(1095, 30)
         Me.btnMail.Name = "btnMail"
         Me.btnMail.Size = New System.Drawing.Size(75, 39)
         Me.btnMail.TabIndex = 26
@@ -124,7 +128,7 @@ Partial Class frmMDM_USTVAntrag
         Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button14.Location = New System.Drawing.Point(12, 29)
         Me.Button14.Name = "Button14"
-        Me.Button14.Size = New System.Drawing.Size(234, 38)
+        Me.Button14.Size = New System.Drawing.Size(168, 38)
         Me.Button14.TabIndex = 1
         Me.Button14.Text = "PLOSE übernehmen"
         Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -136,9 +140,9 @@ Partial Class frmMDM_USTVAntrag
         Me.cbxArchivierteEintracheNochmalsEinarbetien.ForeColor = System.Drawing.Color.Black
         Me.cbxArchivierteEintracheNochmalsEinarbetien.Location = New System.Drawing.Point(12, 8)
         Me.cbxArchivierteEintracheNochmalsEinarbetien.Name = "cbxArchivierteEintracheNochmalsEinarbetien"
-        Me.cbxArchivierteEintracheNochmalsEinarbetien.Size = New System.Drawing.Size(227, 17)
+        Me.cbxArchivierteEintracheNochmalsEinarbetien.Size = New System.Drawing.Size(203, 17)
         Me.cbxArchivierteEintracheNochmalsEinarbetien.TabIndex = 0
-        Me.cbxArchivierteEintracheNochmalsEinarbetien.Text = "Archivierte Einträche nochmals einarbeiten"
+        Me.cbxArchivierteEintracheNochmalsEinarbetien.Text = "archiv. Einträge nochmals einarbeiten"
         Me.cbxArchivierteEintracheNochmalsEinarbetien.UseVisualStyleBackColor = True
         '
         'Button1
@@ -157,7 +161,7 @@ Partial Class frmMDM_USTVAntrag
         'lblPLOSE_EintrageVerarbetiet
         '
         Me.lblPLOSE_EintrageVerarbetiet.ForeColor = System.Drawing.Color.Black
-        Me.lblPLOSE_EintrageVerarbetiet.Location = New System.Drawing.Point(78, 69)
+        Me.lblPLOSE_EintrageVerarbetiet.Location = New System.Drawing.Point(12, 70)
         Me.lblPLOSE_EintrageVerarbetiet.Name = "lblPLOSE_EintrageVerarbetiet"
         Me.lblPLOSE_EintrageVerarbetiet.Size = New System.Drawing.Size(168, 19)
         Me.lblPLOSE_EintrageVerarbetiet.TabIndex = 3
@@ -187,6 +191,20 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel1.Size = New System.Drawing.Size(1454, 177)
         Me.Panel1.TabIndex = 0
         '
+        'cboAntragArt
+        '
+        Me.cboAntragArt._allowedValuesFreiText = Nothing
+        Me.cboAntragArt._allowFreiText = False
+        Me.cboAntragArt._value = ""
+        Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.cboAntragArt.FormattingEnabled = True
+        Me.cboAntragArt.Location = New System.Drawing.Point(83, 10)
+        Me.cboAntragArt.Name = "cboAntragArt"
+        Me.cboAntragArt.Size = New System.Drawing.Size(191, 28)
+        Me.cboAntragArt.TabIndex = 21
+        Me.cboAntragArt.Text = "USTV-Antrag"
+        '
         'lblKdNr
         '
         Me.lblKdNr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -743,19 +761,31 @@ Partial Class frmMDM_USTVAntrag
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
         '
-        'cboAntragArt
+        'btnRMCEinarbeiten
         '
-        Me.cboAntragArt._allowedValuesFreiText = Nothing
+        Me.btnRMCEinarbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.cboAntragArt._allowFreiText = False
+        Me.btnRMCEinarbeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
-        Me.cboAntragArt._value = ""
+        Me.btnRMCEinarbeiten.ForeColor = System.Drawing.Color.Black
-        Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.btnRMCEinarbeiten.Image = Global.SDL.My.Resources.Resources.plus
-        Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.btnRMCEinarbeiten.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.cboAntragArt.FormattingEnabled = True
+        Me.btnRMCEinarbeiten.Location = New System.Drawing.Point(198, 29)
-        Me.cboAntragArt.Location = New System.Drawing.Point(83, 10)
+        Me.btnRMCEinarbeiten.Name = "btnRMCEinarbeiten"
-        Me.cboAntragArt.Name = "cboAntragArt"
+        Me.btnRMCEinarbeiten.Size = New System.Drawing.Size(168, 38)
-        Me.cboAntragArt.Size = New System.Drawing.Size(191, 28)
+        Me.btnRMCEinarbeiten.TabIndex = 27
-        Me.cboAntragArt.TabIndex = 21
+        Me.btnRMCEinarbeiten.Text = "RMC übernehmen"
-        Me.cboAntragArt.Text = "USTV-Antrag"
+        Me.btnRMCEinarbeiten.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnRMCEinarbeiten.UseVisualStyleBackColor = True
+        '
+        'lblRMCeingearbeitet
+        '
+        Me.lblRMCeingearbeitet.ForeColor = System.Drawing.Color.Black
+        Me.lblRMCeingearbeitet.Location = New System.Drawing.Point(198, 70)
+        Me.lblRMCeingearbeitet.Name = "lblRMCeingearbeitet"
+        Me.lblRMCeingearbeitet.Size = New System.Drawing.Size(168, 19)
+        Me.lblRMCeingearbeitet.TabIndex = 28
+        Me.lblRMCeingearbeitet.Text = "alle Einträge verarbeitet"
+        Me.lblRMCeingearbeitet.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblRMCeingearbeitet.Visible = False
         '
         'frmMDM_USTVAntrag
         '
@@ -842,4 +872,6 @@ Partial Class frmMDM_USTVAntrag
     Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
     Friend WithEvents btnMail As Button
     Friend WithEvents cboAntragArt As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents btnRMCEinarbeiten As Button
+    Friend WithEvents lblRMCeingearbeitet As Label
 End Class

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -575,6 +575,10 @@ Public Class frmMDM_USTVAntrag
 
 
 
+    End Sub
+
+    Private Sub btnRMCEinarbeiten_Click(sender As Object, e As EventArgs) Handles btnRMCEinarbeiten.Click
+
     End Sub
 
 

VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb

@@ -14,11 +14,19 @@ Public Class cRMC
     Property rmc_reNr As Object = Nothing
     Property rmc_betragNetto As Object = Nothing
     Property rmc_betragBrutto As Object = Nothing
+    Property rmc_betragMWST As Object = Nothing
     Property rmc_waehrung As Object = Nothing
     Property rmc_euroBrutto As Object = Nothing
     Property rmc_file As Object = Nothing
+    Property rmc_fileNr As Object = Nothing
     Property rmc_importDatum As DateTime = Now
     Property rmc_version As Object = Nothing
+    Property rmc_pdfFileName As Object = Nothing
+    Property rmc_daId As Object = Nothing
+    Property rmc_archiviertDatum As Boolean = False
+    Property rmc_archiv As Object = Nothing
+    Property rmc_fibuNr As Boolean = False
+    Property rmc_sammelReNr As Object = Nothing
 
     Public hasEntry = False
 
@@ -47,8 +55,16 @@ Public Class cRMC
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_waehrung", rmc_waehrung))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_euroBrutto", rmc_euroBrutto))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_file", rmc_file))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_fileNr", rmc_fileNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_importDatum", rmc_importDatum))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_version", rmc_version))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_pdfFileName", rmc_pdfFileName))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_daId", rmc_daId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_archiv", rmc_archiv))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_archiviertDatum", rmc_archiviertDatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_fibuNr", rmc_fibuNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_sammelReNr", rmc_sammelReNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_betragMWST", rmc_betragMWST))
 
 
         Return list
@@ -149,7 +165,7 @@ Public Class cRMC
 
     Dim Dateiname = ""
 
-    Public Function initImportPfade() As Boolean
+    Public Function initImportPfade(programName As String) As Boolean
 
 
         ERROR_PFAD = cRMC.Paramter.GET_PARAM_ByName("ERROR_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
@@ -160,7 +176,7 @@ Public Class cRMC
 
         If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD)
 
-        Return Paramter.getFTPConenction(API_STRING, API, "RMC")
+        Return Paramter.getFTPConenction(API_STRING, API, programName)
 
     End Function