Rebase Develop

This commit is contained in:
2021-04-07 11:23:42 +02:00
parent 8a700d7162
commit 11a8d4b6af
67 changed files with 608 additions and 429 deletions
@@ -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