Rebase Develop

SISBusiness.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceHeader.vb

@@ -146,6 +146,7 @@ Public Class InvoiceHeader
     Private _NAV_transactionId As String
     Private _NAV_InvoiceStatus As String
     Private _NAV_queryDate As DateTime
+    Private _NAV_statusInfo As String
 
     '-- Nonpersistent objektumok a számla sor rögzítéséhez
     Private _row_CustomsTariffs As CustomsTariffs 'ITJ, SZJ, Vámtarifaszám stb.
@@ -1094,7 +1095,19 @@ Public Class InvoiceHeader
             SetPropertyValue("NAV_queryDate", _NAV_queryDate, value)
         End Set
     End Property
-
+    ''' <summary>
+    ''' Utolsó státusz info ...
+    ''' </summary>
+    ''' <returns></returns>
+    <Size(255)>
+    Property NAV_statusInfo As String
+        Get
+            Return _NAV_statusInfo
+        End Get
+        Set(value As String)
+            SetPropertyValue(NameOf(NAV_statusInfo), _NAV_statusInfo, value)
+        End Set
+    End Property
     '-- Nonpersistent property-k a számla sor rögzítéséhez
     <NonPersistent()>
     <VisibleInListView(False)>

SISBusiness.Module/BusinessObjects/GeneralObjects/Customers/Customers.vb

@@ -25,6 +25,7 @@ Public Class Customers
     Private _CustomerNumber As String = "" 'Ügyfél azonosítója
     Private _VATNumber As String 'Adószám (belföldi)
     Private _VATNumberEU As String 'EU adószám
+    Private _VATNumberOther As String '-- Egyéb adószám (3. országbeli)
     Private _CustomersGLParameters As CustomersGLParameters 'Ügyfél főkönyvi kategária
     Private _CustomersNG As CustomersNG 'Ügyfél sorszám generátor
     Private _Pricing As Pricing 'Árképzés ha vevő az ügyfél
@@ -92,6 +93,8 @@ Public Class Customers
     Private _NAV_queryTaxpayer As String
     Private _NAV_valid As Boolean
     Private _NAV_queryDate As DateTime
+    Private _ExportMode As eExportMode '-- Belföldi, küldöldi, EU belfüldi ÁFA stb.
+    Private _IsPrivatePerson As Boolean '-- Magánszemély
 
     Public Sub New(ByVal session As Session)
         MyBase.New(session)
@@ -178,7 +181,7 @@ Public Class Customers
             SetPropertyValue("VATNumber", _VATNumber, value)
         End Set
     End Property
-    <RuleUniqueValue("Customers-VATNumberEU", DefaultContexts.Save, skipnulloremptyvalues:=True)> _
+    <RuleUniqueValue("Customers-VATNumberEU", DefaultContexts.Save, skipnulloremptyvalues:=True)>
     Property VATNumberEU As String
         Get
             Return _VATNumberEU
@@ -187,6 +190,19 @@ Public Class Customers
             SetPropertyValue("VATNumberEU", _VATNumberEU, value)
         End Set
     End Property
+    ''' <summary>
+    ''' Adószám 3. országbeli
+    ''' </summary>
+    ''' <returns></returns>
+    <RuleRequiredField("Customers-VATNumberOther-Require", DefaultContexts.Save, TargetCriteria:="ExportMode IN (1,3) AND IsPrivatePerson<>True")>
+    Property VATNumberOther As String
+        Get
+            Return _VATNumberOther
+        End Get
+        Set(ByVal value As String)
+            SetPropertyValue("VATNumberOther", _VATNumberOther, value)
+        End Set
+    End Property
     <RuleRequiredField("Customers-CustomersGLParameters", DefaultContexts.Save)> _
     <VisibleInDetailView(False)> _
     <VisibleInListView(False)> _
@@ -687,6 +703,30 @@ Public Class Customers
             SetPropertyValue("NAV_queryDate", _NAV_queryDate, value)
         End Set
     End Property
+    ''' <summary>
+    ''' Export mód
+    ''' </summary>
+    ''' <returns></returns>
+    Public Property ExportMode As eExportMode
+        Get
+            Return _ExportMode
+        End Get
+        Set(value As eExportMode)
+            SetPropertyValue(NameOf(ExportMode), _ExportMode, value)
+        End Set
+    End Property
+    ''' <summary>
+    ''' Magánszemély ?
+    ''' </summary>
+    ''' <returns></returns>
+    Public Property IsPrivatePerson As Boolean
+        Get
+            Return _IsPrivatePerson
+        End Get
+        Set(value As Boolean)
+            SetPropertyValue("IsPrivatePerson", _IsPrivatePerson, value)
+        End Set
+    End Property
     '-----ReadOnly---------------
     Overloads ReadOnly Property IsDeleted As Boolean
         Get

SISBusiness.Module/BusinessObjects/GeneralObjects/Customers/CustomersFrom.vb

@@ -35,6 +35,7 @@ Public Class CustomersFrom '-- Ezek azok a cégek akik használják a programot
     Private _NAV_xmlSignkey As String
     Private _NAV_password As String
     Private _NAV_exchangeKey As String
+    Private _NAV_NumberGenerator As NumberGenerator
 
     Public Overrides Sub AfterConstruction()
         MyBase.AfterConstruction()
@@ -169,6 +170,18 @@ Public Class CustomersFrom '-- Ezek azok a cégek akik használják a programot
             SetPropertyValue("NAV_exchangeKey", _NAV_exchangeKey, value)
         End Set
     End Property
+    ''' <summary>
+    ''' NAV RequestID numbergeneratora
+    ''' </summary>
+    ''' <returns></returns>
+    Property NAV_NumberGenerator As NumberGenerator
+        Get
+            Return _NAV_NumberGenerator
+        End Get
+        Set(value As NumberGenerator)
+            SetPropertyValue(NameOf(NAV_NumberGenerator), _NAV_NumberGenerator, value)
+        End Set
+    End Property
     ReadOnly Property DefaultCustomerBankAccounts As CustomerBankAccounts
         Get
             Dim _CustomerBankAccounts As CustomerBankAccounts = Nothing

SISBusiness.Module/BusinessObjects/GeneralObjects/GeneralStocks/Units.vb

@@ -9,8 +9,9 @@ Imports DevExpress.Persistent.Base
 Imports DevExpress.Persistent.BaseImpl
 Imports DevExpress.Persistent.Validation
 
-<DefaultClassOptions()> _
-<NavigationItem("GeneralStock")> _
+<DefaultClassOptions()>
+<NavigationItem("GeneralStock")>
+<RuleCriteria("Units - ShortName_NAV", DefaultContexts.Save, "ShortName_NAV IN ('PIECE', 'KILOGRAM', 'TON', 'KWH', 'DAY', 'HOUR', 'MINUTE', 'MONTH', 'LITER', 'KILOMETER', 'CUBIC_METER', 'METER', 'LINEAR_METER', 'CARTON', 'PACK', 'OWN')", SkipNullOrEmptyValues:=True)>
 Public Class Units
     Inherits BaseObject
     Private _ShortName As String
@@ -18,6 +19,8 @@ Public Class Units
     Private _Shortname_De As String
     Private _Description As String
     Private _DefaultForBusinnes As Boolean = False
+    Private _ShortName_NAV As String
+
     Public Sub New(ByVal session As Session)
         MyBase.New(session)
     End Sub
@@ -65,6 +68,18 @@ Public Class Units
             SetPropertyValue("DefaultForBusinnes", _DefaultForBusinnes, value)
         End Set
     End Property
+    ''' <summary>
+    ''' NAV számla feladáshoz
+    ''' </summary>
+    ''' <returns></returns>
+    Property ShortName_NAV As String
+        Get
+            Return _ShortName_NAV
+        End Get
+        Set(value As String)
+            SetPropertyValue(NameOf(ShortName_NAV), _ShortName_NAV, value)
+        End Set
+    End Property
 End Class
 
 

SISBusiness.Module/BusinessObjects/GeneralObjects/NumberGenerator.vb

@@ -43,7 +43,7 @@ Public Class NumberGenerator
     Private _CurrentDay As Boolean
     Private _CurrentDayFormat As String
 
-    Public Function GetNewNumber(ByVal NGO As NumberGenerator, Optional ByVal _YearString As String = "", Optional _MonthString As String = "")
+    Public Function GetNewNumber(ByVal NGO As NumberGenerator, Optional ByVal _YearString As String = "", Optional _MonthString As String = "") As String
         Dim _NGSemafor As NumberGeneratorSemafor
 
         If _YearString = "" Or _YearString Is Nothing Then