ONLINE INVOICE VOL 3

2018-07-26 09:16:10 +02:00
parent 6ce0c4c9eb
commit e9e50058c5
16 changed files with 316 additions and 48 deletions
@@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuvolar.Module.Win.CSharp",
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "momoERP.Win", "momoERP.Win.HA\momoERP.Win.vbproj", "{A9F2E08E-24F7-49C8-8D5D-400704699B80}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuvolar.Base", "Nuvolar.Base\Nuvolar.Base.csproj", "{C30AB16A-036D-4237-8725-853B44F3767D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -305,6 +307,46 @@ Global
 		{A9F2E08E-24F7-49C8-8D5D-400704699B80}.Release|x64.Build.0 = Release|x64
 		{A9F2E08E-24F7-49C8-8D5D-400704699B80}.Release|x86.ActiveCfg = Release|Any CPU
 		{A9F2E08E-24F7-49C8-8D5D-400704699B80}.Release|x86.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Debug|x64.Build.0 = Debug|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Debug|x86.Build.0 = Debug|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.EasyTest|Any CPU.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.EasyTest|Any CPU.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.EasyTest|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.EasyTest|Mixed Platforms.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.EasyTest|x64.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.EasyTest|x64.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.EasyTest|x86.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.EasyTest|x86.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.R64|Any CPU.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.R64|Any CPU.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.R64|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.R64|Mixed Platforms.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.R64|x64.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.R64|x64.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.R64|x86.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.R64|x86.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release 64bit|Any CPU.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release 64bit|Any CPU.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release 64bit|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release 64bit|Mixed Platforms.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release 64bit|x64.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release 64bit|x64.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release 64bit|x86.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release 64bit|x86.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release|x64.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release|x64.Build.0 = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release|x86.ActiveCfg = Release|Any CPU
+		{C30AB16A-036D-4237-8725-853B44F3767D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C30AB16A-036D-4237-8725-853B44F3767D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Nuvolar.Base</RootNamespace>
+    <AssemblyName>Nuvolar.Base</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="RESTApi.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Nuvolar.Base")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Nuvolar.Base")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c30ab16a-036d-4237-8725-853b44f3767d")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nuvolar.Base
+{
+    public class RESTApi
+    {
+    }
+}
@@ -183,6 +183,18 @@ namespace Nuvolar.Module.Controllers
                {
                    _ocur.Session.ExecuteNonQuery(string.Format("UPDATE InvoiceHeader set NAV_InvoiceStatus='{0}',NAV_queryDate=NOW() WHERE Oid = '{1}'",
                        _ResultJSON.processingResults.processingResult.invoiceStatus.ToString(), _InvoiceHeader.Oid.ToString()));
+                    //_ResultJSON.processingResults.processingResult.technicalValidationMessages[0].message.ToString()
+
+                    if (_ResultJSON.processingResults.processingResult.technicalValidationMessages != null)
+                    {
+                        Application.ShowViewStrategy.ShowMessage(_ResultJSON.processingResults.processingResult.technicalValidationMessages[0].message.ToString(),
+                            InformationType.Error, 10000, InformationPosition.Bottom);
+                    }
+                    if (_ResultJSON.processingResults.processingResult.businessValidationMessages != null)
+                    {
+                        Application.ShowViewStrategy.ShowMessage(_ResultJSON.processingResults.processingResult.businessValidationMessages.message.ToString(),
+                            InformationType.Error, 10000, InformationPosition.Bottom);
+                    }
                    Application.ShowViewStrategy.ShowMessage("A számla státusz lekérdezése megtörtént !", InformationType.Success, 2000, InformationPosition.Bottom);
                }
                if (_ResultJSON.status.ToString() == "ERROR")
@@ -11,14 +11,14 @@ Imports DevExpress.Persistent.Validation
 Imports DevExpress.ExpressApp.ConditionalAppearance

 'CreditNoteRows
-<DefaultClassOptions()> _
-<NavigationItem(False)> _
-<CreatableItem(False)> _
-<Appearance("InvoiceCreditNoteHeader - Disable UserCreated all time", AppearanceItemType.ViewItem, "1=1", TargetItems:="UserCreated", Enabled:=False)> _
-<Appearance("InvoiceCreditNoteHeader - Disable ObjectCreated all time", AppearanceItemType.ViewItem, "1=1", TargetItems:="ObjectCreated", Enabled:=False)> _
-<Appearance("InvoiceCreditNoteHeader - Disable CustomersFrom when not empty", AppearanceItemType.ViewItem, "IsNull(CustomersFrom)=False", TargetItems:="CustomersFrom", Enabled:=False)> _
-<Appearance("InvoiceCreditNoteHeader - Disable Customers when not empty", AppearanceItemType.ViewItem, "IsNull(Customers)=False", TargetItems:="Customers", Enabled:=False)> _
-<Appearance("InvoiceCreditNoteHeader - Hide Item2 when IsNewObject", AppearanceItemType.LayoutItem, "IsNull(ObjectCreated) Or IsNull(UserCreated)", TargetItems:="Item2", visibility:=Editors.ViewItemVisibility.Hide)> _
+<DefaultClassOptions()>
+<NavigationItem(False)>
+<CreatableItem(False)>
+<Appearance("InvoiceCreditNoteHeader - Disable UserCreated all time", AppearanceItemType.ViewItem, "1=1", TargetItems:="UserCreated", Enabled:=False)>
+<Appearance("InvoiceCreditNoteHeader - Disable ObjectCreated all time", AppearanceItemType.ViewItem, "1=1", TargetItems:="ObjectCreated", Enabled:=False)>
+<Appearance("InvoiceCreditNoteHeader - Disable CustomersFrom when not empty", AppearanceItemType.ViewItem, "IsNull(CustomersFrom)=False", TargetItems:="CustomersFrom", Enabled:=False)>
+<Appearance("InvoiceCreditNoteHeader - Disable Customers when not empty", AppearanceItemType.ViewItem, "IsNull(Customers)=False", TargetItems:="Customers", Enabled:=False)>
+<Appearance("InvoiceCreditNoteHeader - Hide Item2 when IsNewObject", AppearanceItemType.LayoutItem, "IsNull(ObjectCreated) Or IsNull(UserCreated)", TargetItems:="Item2", Visibility:=Editors.ViewItemVisibility.Hide)>
 Public Class InvoiceCreditNoteHeader
    Inherits BaseObject

@@ -32,13 +32,16 @@ Public Class InvoiceCreditNoteHeader
    Private _PaymentOption As PaymentOption
    Private _DatePayment As Date
    Private _Description As String
+    Private _CurrencyRate As Double
+    Private _CurrencyName As CurrencyName

    Public Sub New(ByVal session As Session)
        MyBase.New(session)
    End Sub
    Public Overrides Sub AfterConstruction()
        MyBase.AfterConstruction()
-        DateExecution = GetSQLTime(Session)
+        'DateExecution = GetSQLTime(Session)
+        CurrencyRate = 1
    End Sub
    Protected Overrides Sub OnSaving()
        MyBase.OnSaving()
@@ -48,7 +51,7 @@ Public Class InvoiceCreditNoteHeader
        End If
    End Sub

-    <RuleRequiredField("InvoiceCreditNoteHeader - CustomersFrom", DefaultContexts.Save)> _
+    <RuleRequiredField("InvoiceCreditNoteHeader - CustomersFrom", DefaultContexts.Save)>
    Property CustomersFrom As CustomersFrom
        Get
            Return _CustomersFrom
@@ -57,7 +60,7 @@ Public Class InvoiceCreditNoteHeader
            SetPropertyValue("CustomersFrom", _CustomersFrom, value)
        End Set
    End Property
-    <RuleRequiredField("InvoiceCreditNoteHeader - Customers", DefaultContexts.Save)> _
+    <RuleRequiredField("InvoiceCreditNoteHeader - Customers", DefaultContexts.Save)>
    Property Customers As Customers
        Get
            Return _Customers
@@ -94,6 +97,22 @@ Public Class InvoiceCreditNoteHeader
        End Get
        Set(value As Date)
            SetPropertyValue("DateExecution", _DateExecution, value)
+            If Session.IsObjectsLoading = False AndAlso Session.IsObjectsSaving = False Then
+                '// MNB árfolyam lekérése
+                Dim _CurrencyRate_Collection As XPCollection(Of CurrencyRate) = New XPCollection(Of CurrencyRate)(Session, CriteriaOperator.Parse("CurrencyName=? and IsMNB=True and GetDate(DateValid)<=?", CurrencyName, DateExecution.Date))
+                _CurrencyRate_Collection.Sorting.Add(New SortProperty("DateValid", DB.SortingDirection.Descending))
+                If _CurrencyRate_Collection.Count > 0 Then
+                    For Each _CurrencyRateX In _CurrencyRate_Collection
+                        If _CurrencyRateX.DateValid.Date = _DateExecution.Date Then
+                            CurrencyRate = _CurrencyRateX.RateAverage
+                            Exit For
+                        End If
+                        Exit For
+                    Next
+                Else
+                    Throw New Exception("*Nincs beállítva sem a pénzeszköz árfolyama sem az MNB árfolyama !")
+                End If
+            End If
        End Set
    End Property
    Property ObjectCreated As Date
@@ -112,7 +131,7 @@ Public Class InvoiceCreditNoteHeader
            SetPropertyValue("UserCreated", _UserCreated, value)
        End Set
    End Property
-    <RuleRequiredField("InvoiceCreditNoteHeader - PaymentOption", DefaultContexts.Save)> _
+    <RuleRequiredField("InvoiceCreditNoteHeader - PaymentOption", DefaultContexts.Save)>
    Property PaymentOption As PaymentOption
        Get
            Return _PaymentOption
@@ -131,7 +150,7 @@ Public Class InvoiceCreditNoteHeader
            SetPropertyValue("DatePayment", _DatePayment, value)
        End Set
    End Property
-    <Size(-1)> _
+    <Size(-1)>
    Property Description As String
        Get
            Return _Description
@@ -140,10 +159,33 @@ Public Class InvoiceCreditNoteHeader
            SetPropertyValue("Description", _Description, value)
        End Set
    End Property
-
+    ''' <summary>
+    ''' Árfolyam, amivel számolja !!!
+    ''' </summary>
+    ''' <returns></returns>
+    Property CurrencyRate As Double
+        Get
+            Return _CurrencyRate
+        End Get
+        Set(value As Double)
+            SetPropertyValue("CurrencyRate", _CurrencyRate, value)
+        End Set
+    End Property
+    ''' <summary>
+    ''' DEVIZA
+    ''' </summary>
+    ''' <returns></returns>
+    Property CurrencyName As CurrencyName
+        Get
+            Return _CurrencyName
+        End Get
+        Set(value As CurrencyName)
+            SetPropertyValue("CurrencyName", _CurrencyName, value)
+        End Set
+    End Property
    '--==ReadOnly==--
-    <VisibleInListView(False)> _
-    <Association("InvoiceCreditNoteHeader-InvoiceCreditNoteRows", GetType(InvoiceCreditNoteRows))> _
+    <VisibleInListView(False)>
+    <Association("InvoiceCreditNoteHeader-InvoiceCreditNoteRows", GetType(InvoiceCreditNoteRows))>
    ReadOnly Property InvoiceCreditNoteRows As XPCollection(Of InvoiceCreditNoteRows)
        Get
            Return GetCollection(Of InvoiceCreditNoteRows)("InvoiceCreditNoteRows")
@@ -120,6 +120,11 @@ Public Class InvoiceCreditNote_VC
        End If

    End Sub
+    ''' <summary>
+    ''' Jóváíró számla véglegesítése ÁRFOLYAM !!!
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
    Private Sub aInvoiceCreditNoteHeader_Finalize_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aInvoiceCreditNoteHeader_Finalize.Execute
        Dim _onew As Xpo.XPObjectSpace = Application.CreateObjectSpace
        Dim _uow_lock As New UnitOfWork(_onew.Session.DataLayer)
@@ -213,7 +218,7 @@ Public Class InvoiceCreditNote_VC
                            _InvoiceHeader_Credited_Collection.Add(_InvoiceHeader_Credited)

                            'Számlasorok beszúrása
-                            Dim _InvoiceCreditNoteRows_Collection As New XPCollection(Of InvoiceCreditNoteRows)(_ocur.Session, CriteriaOperator.Parse("InvoiceCreditNoteHeader=? AND FromInvoiceRows.OrderInRows.OrderInHeader.OrderInParameters=?", _
+                            Dim _InvoiceCreditNoteRows_Collection As New XPCollection(Of InvoiceCreditNoteRows)(_ocur.Session, CriteriaOperator.Parse("InvoiceCreditNoteHeader=? AND FromInvoiceRows.OrderInRows.OrderInHeader.OrderInParameters=?",
                                                                                                                                                      _InvoiceCreditNoteHeader, _OrderInParameters))

                            If _InvoiceCreditNoteRows_Collection.Count > 0 Then
@@ -227,7 +232,15 @@ Public Class InvoiceCreditNote_VC
                                        .DiscountPriceDEV = 0
                                        .DiscountPriceHUF = 0
                                        .ListPriceDEV = _InvoiceCreditNoteRows.PriceDEV
+
+                                        If _InvoiceCreditNoteHeader.CurrencyName.ShortName <> "HUF" Then
+                                            'A teljesítési naphoz kapcsolódó DEVIZAÁRFOLYAMMAL újraszámolás
+                                            .ListPriceHUF = Math.Round(.ListPriceDEV * _InvoiceCreditNoteHeader.CurrencyRate, 0, MidpointRounding.AwayFromZero)
+                                        Else
                                            .ListPriceHUF = _InvoiceCreditNoteRows.PriceHUF
+                                        End If
+
+
                                        .QTT = _InvoiceCreditNoteRows.QTT * (-1)
                                        .QualityOption = _InvoiceCreditNoteRows.FromInvoiceRows.QualityOption
                                        .ShortName = _InvoiceCreditNoteRows.FromInvoiceRows.ShortName
@@ -272,7 +285,7 @@ Public Class InvoiceCreditNote_VC
                                        .WeightMode = _InvoiceCreditNoteRows.FromInvoiceRows.DeliveryNoteOutRows.StorageOutRowsInRows.StorageInRows.WeightMode
                                    End If

-                                    Dim _StorageComputed As StorageComputed = _ocur.FindObject(Of StorageComputed)(CriteriaOperator.Parse("Products=? and Storage=?", _
+                                    Dim _StorageComputed As StorageComputed = _ocur.FindObject(Of StorageComputed)(CriteriaOperator.Parse("Products=? and Storage=?",
                                                                                                                            .Products, _StorageInHeader.Storage))

                                    If _StorageComputed Is Nothing Then
@@ -381,10 +394,10 @@ Public Class InvoiceCreditNote_VC
            .Saved_CustomersFrom_VATNumber = _InvoiceHeader.CustomersFrom.VATNumber.ToString
            .Saved_CustomersFrom_VATNumberEU = _InvoiceHeader.CustomersFrom.VATNumberEU.ToString

-            .Saved_CustomersFrom_Bank_ShortName = _InvoiceHeader.BankInformation.FullBankAccount.ToString
-            .Saved_CustomersFrom_Bank_IBAN = _InvoiceHeader.BankInformation.IBAN.ToString
-            .Saved_CustomersFrom_Bank_SWIFT = _InvoiceHeader.BankInformation.SWIFT.ToString
-            .Saved_CustomersFrom_Bank_AccountNumber = _InvoiceHeader.BankInformation.AccountNumber.ToString
+            .Saved_CustomersFrom_Bank_ShortName = _InvoiceHeader.Saved_CustomersFrom_Bank_ShortName
+            .Saved_CustomersFrom_Bank_IBAN = _InvoiceHeader.Saved_CustomersFrom_Bank_IBAN
+            .Saved_CustomersFrom_Bank_SWIFT = _InvoiceHeader.Saved_CustomersFrom_Bank_SWIFT
+            .Saved_CustomersFrom_Bank_AccountNumber = _InvoiceHeader.Saved_CustomersFrom_Bank_AccountNumber
        End With

 CheckError:
@@ -22,7 +22,7 @@ Public Class InvoiceVC
    Inherits DevExpress.ExpressApp.ViewController
    Public Event InitWork(ByVal _Minimum As Long, ByVal _Step As Long, ByVal _Maximum As Long)
    Public Event DoWork()
-    Public Event FinalWork
+    Public Event FinalWork()

    Public Sub New()
        MyBase.New()
@@ -355,7 +355,7 @@ Public Class InvoiceVC
                        If Not String.IsNullOrEmpty(_InvoiceHeader.UserCreated.Email) Then
                            _MailMessage.To.Clear()
                            _MailMessage.To.Add(_InvoiceHeader.UserCreated.Email)
-                            _MailMessage.Body = String.Format("Ön {0} számmal új számlát véglegesített a(z) {1} ügyfél részére.", _
+                            _MailMessage.Body = String.Format("Ön {0} számmal új számlát véglegesített a(z) {1} ügyfél részére.",
                                                              _InvoiceHeader.DocumentNumber, _InvoiceHeader.Customers.FullName)

                            _SmtpClient.Send(_MailMessage)
@@ -474,8 +474,8 @@ Public Class InvoiceVC

        _CS.BeginUpdateCriteria()
        _CS.Criteria.Clear()
-        _CS.Criteria("First") = CriteriaOperator.Parse("Contracts.ContractTemplate.PartnerType=0 AND Contracts.CustomersFrom=? AND Contracts.Customers=? AND DateExecution=? and InvoiceRows=?", _
-                                                       _InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers, _
+        _CS.Criteria("First") = CriteriaOperator.Parse("Contracts.ContractTemplate.PartnerType=0 AND Contracts.CustomersFrom=? AND Contracts.Customers=? AND DateExecution=? and InvoiceRows=?",
+                                                       _InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers,
                                                       _InvoiceHeader.DateExecution, Nothing)
        _CS.EndUpdateCriteria()

@@ -740,6 +740,18 @@ Public Class InvoiceVC
        _p_InvoiceHeader.RecalculateInvoice(_p_InvoiceHeader, _ocur)
        _ocur.CommitChanges()

+        If _p_InvoiceHeader.TotalVATHUF >= 100000 And
+            _p_InvoiceHeader.DateCreated >= #2018-07-01# And
+            _p_InvoiceHeader.NAV_InvoiceStatus <> "DONE" And
+            _p_InvoiceHeader.IsEditable = False And
+            _p_InvoiceHeader.IsProforma = False And
+            String.IsNullOrEmpty(_p_InvoiceHeader.DocumentNumber) = False Then
+            'Számla NAV feladása
+
+
+
+        End If
+

        Dim _uow_pci As New UnitOfWork(_ocur.Session.DataLayer)
        GLFunctions.ReconfigurePCI(_uow_pci, _p_InvoiceHeader.CustomersFrom, _p_InvoiceHeader.Customers, 0, _p_InvoiceHeader.ConnectInfo)
@@ -1278,9 +1290,9 @@ CheckError:
        Dim _CS_Description As New CollectionSource(_onew, GetType(InvoiceHeader_DescriptionChanger_PopUp))

        Dim _InvoiceHeader_xpquery = New XPQuery(Of InvoiceHeader)(_ocur.Session)
-        Dim query = From _InvoiceHeader In _InvoiceHeader_xpquery _
-                    Where _InvoiceHeader.Description IsNot Nothing _
-        Group _InvoiceHeader By _InvoiceHeader.Description Into g = Group _
+        Dim query = From _InvoiceHeader In _InvoiceHeader_xpquery
+                    Where _InvoiceHeader.Description IsNot Nothing
+                    Group _InvoiceHeader By _InvoiceHeader.Description Into g = Group
                    Select New With {Key .Description = Description}
        For Each item In query
            _InvoiceHeader_DescriptionChanger_PopUp = _onew.CreateObject(Of InvoiceHeader_DescriptionChanger_PopUp)()
@@ -1433,7 +1445,7 @@ CheckError:
                End If
            Next
            _ocur.CommitChanges()
-            RaiseEvent FinalWork
+            RaiseEvent FinalWork()
        Else
            Throw New Exception("*Nincs egy kijelölt sor sem!")
        End If
@@ -1560,9 +1572,9 @@ CheckError:
        Dim _CS_Description As New CollectionSource(_onew, GetType(InvoiceHeader_DescriptionChanger_PopUp))

        Dim _InvoiceHeader_xpquery = New XPQuery(Of InvoiceHeader)(_ocur.Session)
-        Dim query = From _InvoiceHeader In _InvoiceHeader_xpquery _
-                    Where _InvoiceHeader.DescriptionHeader IsNot Nothing _
-        Group _InvoiceHeader By _InvoiceHeader.DescriptionHeader Into g = Group _
+        Dim query = From _InvoiceHeader In _InvoiceHeader_xpquery
+                    Where _InvoiceHeader.DescriptionHeader IsNot Nothing
+                    Group _InvoiceHeader By _InvoiceHeader.DescriptionHeader Into g = Group
                    Select New With {Key .DescriptionHeader = DescriptionHeader}
        For Each item In query
            _InvoiceHeader_DescriptionChanger_PopUp = _onew.CreateObject(Of InvoiceHeader_DescriptionChanger_PopUp)()
@@ -1592,7 +1604,7 @@ CheckError:
                GLFunctions.ReconfigurePCI(_uow, _InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers, 0, _InvoiceHeader.ConnectInfo)
            End If
        Next
-        RaiseEvent FinalWork
+        RaiseEvent FinalWork()

        Frame.GetController(Of RefreshController).RefreshAction.DoExecute()
    End Sub
@@ -1602,8 +1614,8 @@ CheckError:
        Dim _ocur As Xpo.XPObjectSpace = TryCast(View.ObjectSpace, Xpo.XPObjectSpace)
        Dim _InvoiceHeader As InvoiceHeader = TryCast(View.SelectedObjects(0), InvoiceHeader)

-        ViewPDCI.ViewPDCIDetail(_onew, Application, e, _InvoiceHeader.CustomersFrom, _
-                          _InvoiceHeader.Customers, ePartnerType.eReceivables, _
+        ViewPDCI.ViewPDCIDetail(_onew, Application, e, _InvoiceHeader.CustomersFrom,
+                          _InvoiceHeader.Customers, ePartnerType.eReceivables,
                          _InvoiceHeader.ConnectInfo)
    End Sub

@@ -1723,6 +1735,8 @@ CheckError:
            .Customers = _onew.GetObject(_InvoiceHeader.Customers)
            .PaymentOption = _onew.GetObject(_InvoiceHeader.PaymentOption)
            .Description = _onew.GetObject(_InvoiceHeader.DescriptionHeader)
+            .CurrencyName = _onew.GetObject(_InvoiceHeader.CurrencyName)
+            .DateExecution = _InvoiceHeader.DateExecution
        End With

        e.ShowViewParameters.CreatedView = Application.CreateDetailView(_onew, "InvoiceCreditNoteHeader_DetailView", True, _InvoiceCreditNoteHeader)
@@ -1850,7 +1864,8 @@ CheckError:
        Catch ex As Exception
            MsgBox(ex.Message, MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, String.Format(CaptionHelper.GetLocalizedText("Exceptions\NuvolarExceptions", "MsgBoxCheckItAgain")))
        Finally
-            RaiseEvent FinalWork
+            RaiseEvent FinalWork()
+
            If _NOEmail.Count > 0 Then
                Dim _ErrorMessage As String = "A következő számlák küldése nem lehetséges:" + vbNewLine

@@ -1885,7 +1900,7 @@ CheckError:
        Next
        _uow.CommitChanges()
        _ocur.CommitChanges()
-        RaiseEvent FinalWork
+        RaiseEvent FinalWork()
    End Sub


@@ -495,7 +495,6 @@
      <Action Id="aProductsBarcodeGenerator" Caption="Vonalkód generálása cikkszámhoz" />
      <Action Id="aProductsDocumentations_ChangeGroup" Caption="Csoportos módosítás" />
      <Action Id="aProductsDocumentations_OpenProductGroupFolder" Caption="Termékcsoport mappa megnyitás" />
-      <Action Id="aProductsGant_UpdateProductsGantRows" Caption="Gant adatok frissítése" />
      <Action Id="aProductsGroups_CreateBusinessDirectory" Caption="Dokumentum tárhely létrehozása" />
      <Action Id="aProductVariableFinder" Caption="Változat keresés" />
      <Action Id="aProjectAddRow" Caption="Új sor" />
@@ -11389,6 +11388,7 @@
      <Variants>
        <Variant Id="@Active" Caption="Aktív ügyfelek" />
        <Variant Id="@Delete" Caption="Törölt ügyfelek" />
+        <Variant Id="@Customers_ListView_NAV" Caption="Ügyfelek (NAV)" />
      </Variants>
    </ListView>
    <ListView Id="CustomersFileAttachment_ListView">
@@ -448,7 +448,6 @@
      <Action Id="aProductsBarcodeGenerator" ImageName="pda2_preferences" />
      <Action Id="aProductsDocumentations_ChangeGroup" ImageName="Action_EditModel" />
      <Action Id="aProductsDocumentations_OpenProductGroupFolder" ImageName="briefcase2_document" />
-      <Action Id="aProductsGant_UpdateProductsGantRows" ImageName="row_refresh_before" />
      <Action Id="aProductsGroups_CreateBusinessDirectory" ImageName="server_document" />
      <Action Id="aProductVariableFinder" ImageName="ProductFinder" />
      <Action Id="aProjectAddRow" ImageName="table_add" />
@@ -11166,6 +11165,7 @@
      <Variants IsNewNode="True">
        <Variant Id="@Active" Index="0" ViewID="Customers_ListView" IsNewNode="True" />
        <Variant Id="@Delete" ViewID="Customers_ListView_Deleted" Index="1" IsNewNode="True" />
+        <Variant Id="@Customers_ListView_NAV" ViewID="Customers_ListView_NAV" IsNewNode="True" />
      </Variants>
    </ListView>
    <ListView Id="Customers_ListView_Deleted" ClassName="Nuvolar.Module.Customers" Criteria="IsNull(GCRecord)=False" DataAccessMode="Client" IsNewNode="True">
@@ -11186,6 +11186,30 @@
        <ColumnInfo Id="CustomerNumber" PropertyName="CustomerNumber" Index="1" Width="70" IsNewNode="True" />
      </Columns>
    </ListView>
+    <ListView Id="Customers_ListView_NAV" ClassName="Nuvolar.Module.Customers" AllowNew="False" AllowDelete="False" IsListViewProcess="True" Criteria="StartsWith([Address1.Country.ShortName], 'HU')" IsNewNode="True">
+      <Columns IsNewNode="True">
+        <ColumnInfo Id="Email" PropertyName="Email" View="" Width="70" Index="-1" IsNewNode="True" />
+        <ColumnInfo Id="Profile" PropertyName="Profile" View="" Width="70" Index="-1" IsNewNode="True" />
+        <ColumnInfo Id="WebSite" PropertyName="WebSite" View="" Width="70" Index="-1" IsNewNode="True" />
+        <ColumnInfo Id="CustomerNumber" PropertyName="CustomerNumber" View="" Width="99" Index="0" IsNewNode="True" />
+        <ColumnInfo Id="FullName" PropertyName="FullName" View="" Width="80" SortIndex="0" SortOrder="Ascending" Index="1" IsNewNode="True" />
+        <ColumnInfo Id="Address1.Country" PropertyName="Address1.Country" Index="2" Width="108" IsNewNode="True" />
+        <ColumnInfo Id="Address1.ZipPostal" PropertyName="Address1.ZipPostal" Index="3" Width="108" IsNewNode="True" />
+        <ColumnInfo Id="Address1.City" PropertyName="Address1.City" Index="4" Width="84" IsNewNode="True" />
+        <ColumnInfo Id="Address1.Street" PropertyName="Address1.Street" Index="5" Width="95" IsNewNode="True" />
+        <ColumnInfo Id="Address1.District" PropertyName="Address1.District" Index="6" Width="98" IsNewNode="True" />
+        <ColumnInfo Id="Address1.TypeOfStreet" PropertyName="Address1.TypeOfStreet" Index="7" Width="131" IsNewNode="True" />
+        <ColumnInfo Id="Address1.NameOfStreet" PropertyName="Address1.NameOfStreet" Index="8" Width="134" IsNewNode="True" />
+        <ColumnInfo Id="Address1.NumberOfStreet" PropertyName="Address1.NumberOfStreet" Index="9" Width="144" IsNewNode="True" />
+        <ColumnInfo Id="Address1.Building" PropertyName="Address1.Building" Index="10" Width="101" IsNewNode="True" />
+        <ColumnInfo Id="Address1.StairCase" PropertyName="Address1.StairCase" Index="11" Width="111" IsNewNode="True" />
+        <ColumnInfo Id="Address1.NumberOfDoor" PropertyName="Address1.NumberOfDoor" Index="12" Width="137" IsNewNode="True" />
+        <ColumnInfo Id="VATNumber" PropertyName="VATNumber" Index="13" Width="72" IsNewNode="True" />
+        <ColumnInfo Id="NAV_queryTaxpayer" PropertyName="NAV_queryTaxpayer" Index="14" Width="120" IsNewNode="True" />
+        <ColumnInfo Id="NAV_valid" PropertyName="NAV_valid" Index="15" Width="68" IsNewNode="True" />
+        <ColumnInfo Id="NAV_queryDate" PropertyName="NAV_queryDate" Index="16" Width="97" IsNewNode="True" />
+      </Columns>
+    </ListView>
    <ListView Id="Customers_ListView_Qualification" ClassName="Nuvolar.Module.Customers" AllowNew="False" AllowDelete="False" IsListViewProcess="False" IsNewNode="True">
      <Columns IsNewNode="True">
        <ColumnInfo Id="CustomerNumber" PropertyName="CustomerNumber" View="" Width="70" Index="0" IsNewNode="True" />
@@ -2683,6 +2683,14 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
+    <None Include="UnusableNodes_hu.xml">
+      <DependentUpon>Model.DesignedDiffs.xafml</DependentUpon>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="UnusableNodes1.xml">
+      <DependentUpon>Model.DesignedDiffs.xafml</DependentUpon>
+      <SubType>Designer</SubType>
+    </None>
    <None Include="UnusableNodes.xml">
      <DependentUpon>Model.DesignedDiffs.xafml</DependentUpon>
      <SubType>Designer</SubType>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application>
+  <ActionDesign Id="ActionDesign">
+    <Actions Id="Actions">
+      <Action Id="aProductsGant_UpdateProductsGantRows" ImageName="row_refresh_before" />
+    </Actions>
+  </ActionDesign>
+</Application>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application>
+  <ActionDesign Id="ActionDesign">
+    <Actions Id="Actions">
+      <Action Id="aProductsGant_UpdateProductsGantRows" Caption="Gant adatok frissítése" />
+    </Actions>
+  </ActionDesign>
+</Application>
@@ -4,7 +4,7 @@
    <add key="Modules" value="" />
    <add key="NewVersionServer" value="" />
    <add key="EnableDiagnosticActions" value="False" />
-    <add key="Languages" value="en;hu" />
+    <add key="Languages" value="hu;en" />
    <add key="ClientSettingsProvider.ServiceUri" value="" />
    <add key="Uri" value="http://emango.com:88/api/" />
    <add key="GeocodeAPIKey" value="AIzaSyD4RgVEapyYNlAgjemLgtbpOEVC2p2yXY4" />
@@ -7,7 +7,7 @@
    <add key="Modules" value="" />
    <add key="NewVersionServer" value="" />
    <add key="EnableDiagnosticActions" value="False" />
-    <add key="Languages" value="en;hu" />
+    <add key="Languages" value="hu;en" />
    <add key="ClientSettingsProvider.ServiceUri" value="" />
    <add key="Uri" value="http://momonline.com:88/api/" />
    <add key="GeocodeAPIKey" value="AIzaSyD4RgVEapyYNlAgjemLgtbpOEVC2p2yXY4" />
@@ -4,7 +4,7 @@
    <add key="Modules" value="" />
    <add key="NewVersionServer" value="" />
    <add key="EnableDiagnosticActions" value="False" />
-    <add key="Languages" value="en;hu" />
+    <add key="Languages" value="hu;en" />
    <add key="ClientSettingsProvider.ServiceUri" value="" />
    <add key="Uri" value="http://emango.com:88/api/" />
    <add key="GeocodeAPIKey" value="AIzaSyD4RgVEapyYNlAgjemLgtbpOEVC2p2yXY4" />