diff --git a/JUSTWIN.sln b/JUSTWIN.sln index 0424178..5c05e78 100644 --- a/JUSTWIN.sln +++ b/JUSTWIN.sln @@ -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 diff --git a/Nuvolar.Base/Nuvolar.Base.csproj b/Nuvolar.Base/Nuvolar.Base.csproj new file mode 100644 index 0000000..082bd56 --- /dev/null +++ b/Nuvolar.Base/Nuvolar.Base.csproj @@ -0,0 +1,48 @@ + + + + + Debug + AnyCPU + {C30AB16A-036D-4237-8725-853B44F3767D} + Library + Properties + Nuvolar.Base + Nuvolar.Base + v4.6.1 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + x86 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Nuvolar.Base/Properties/AssemblyInfo.cs b/Nuvolar.Base/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..c401541 --- /dev/null +++ b/Nuvolar.Base/Properties/AssemblyInfo.cs @@ -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")] diff --git a/Nuvolar.Base/RESTApi.cs b/Nuvolar.Base/RESTApi.cs new file mode 100644 index 0000000..fd78e2e --- /dev/null +++ b/Nuvolar.Base/RESTApi.cs @@ -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 + { + } +} diff --git a/Nuvolar.Module.CSharp/Controllers/NAV_Online_VC.cs b/Nuvolar.Module.CSharp/Controllers/NAV_Online_VC.cs index 355fdd6..78d339a 100644 --- a/Nuvolar.Module.CSharp/Controllers/NAV_Online_VC.cs +++ b/Nuvolar.Module.CSharp/Controllers/NAV_Online_VC.cs @@ -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") diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNoteHeader.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNoteHeader.vb index 6b163a9..42c8b1b 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNoteHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNoteHeader.vb @@ -11,14 +11,14 @@ Imports DevExpress.Persistent.Validation Imports DevExpress.ExpressApp.ConditionalAppearance 'CreditNoteRows - _ - _ - _ - _ - _ - _ - _ - _ + + + + + + + + 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 - _ + Property CustomersFrom As CustomersFrom Get Return _CustomersFrom @@ -57,7 +60,7 @@ Public Class InvoiceCreditNoteHeader SetPropertyValue("CustomersFrom", _CustomersFrom, value) End Set End Property - _ + 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 - _ + Property PaymentOption As PaymentOption Get Return _PaymentOption @@ -131,7 +150,7 @@ Public Class InvoiceCreditNoteHeader SetPropertyValue("DatePayment", _DatePayment, value) End Set End Property - _ + Property Description As String Get Return _Description @@ -140,10 +159,33 @@ Public Class InvoiceCreditNoteHeader SetPropertyValue("Description", _Description, value) End Set End Property - + ''' + ''' Árfolyam, amivel számolja !!! + ''' + ''' + Property CurrencyRate As Double + Get + Return _CurrencyRate + End Get + Set(value As Double) + SetPropertyValue("CurrencyRate", _CurrencyRate, value) + End Set + End Property + ''' + ''' DEVIZA + ''' + ''' + Property CurrencyName As CurrencyName + Get + Return _CurrencyName + End Get + Set(value As CurrencyName) + SetPropertyValue("CurrencyName", _CurrencyName, value) + End Set + End Property '--==ReadOnly==-- - _ - _ + + ReadOnly Property InvoiceCreditNoteRows As XPCollection(Of InvoiceCreditNoteRows) Get Return GetCollection(Of InvoiceCreditNoteRows)("InvoiceCreditNoteRows") diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNote_VC.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNote_VC.vb index 442a586..a8d6b8f 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNote_VC.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNote_VC.vb @@ -120,6 +120,11 @@ Public Class InvoiceCreditNote_VC End If End Sub + ''' + ''' Jóváíró számla véglegesítése ÁRFOLYAM !!! + ''' + ''' + ''' 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) @@ -177,7 +182,7 @@ Public Class InvoiceCreditNote_VC .DatePayment = _InvoiceCreditNoteHeader.DatePayment .PaymentOption = _InvoiceCreditNoteHeader.PaymentOption .ShipmentOption = _OrderInParameters.ShipmentOption - .CurrencyName = _OrderInParameters.CurrencyName + .CurrencyName = _OrderInParameters.CurrencyName If .PaymentOption.PayMode <> ePayMode.InCash Then .BankInformation = _OrderInParameters.BankInformation End If @@ -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 - .ListPriceHUF = _InvoiceCreditNoteRows.PriceHUF + + 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: diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceVC.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceVC.vb index 2b3e1f7..8427a21e 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceVC.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceVC.vb @@ -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,10 +1290,10 @@ 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 _ - Select New With {Key .Description = Description} + 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)() _InvoiceHeader_DescriptionChanger_PopUp.Description = item.Description @@ -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,10 +1572,10 @@ 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 _ - Select New With {Key .DescriptionHeader = DescriptionHeader} + 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)() _InvoiceHeader_DescriptionChanger_PopUp.Description = item.DescriptionHeader @@ -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,10 +1900,10 @@ CheckError: Next _uow.CommitChanges() _ocur.CommitChanges() - RaiseEvent FinalWork + RaiseEvent FinalWork() End Sub - + Private Sub aGeneratePDFandSendDefaultMailClient_Invoice_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aGeneratePDFandSendDefaultMailClient_Invoice.Execute End Sub diff --git a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml index 387ea30..0ea835a 100644 --- a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml +++ b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml @@ -495,7 +495,6 @@ - @@ -11389,6 +11388,7 @@ + diff --git a/Nuvolar.Module/Model.DesignedDiffs.xafml b/Nuvolar.Module/Model.DesignedDiffs.xafml index cbfb550..1b57a3c 100644 --- a/Nuvolar.Module/Model.DesignedDiffs.xafml +++ b/Nuvolar.Module/Model.DesignedDiffs.xafml @@ -448,7 +448,6 @@ - @@ -11166,6 +11165,7 @@ + @@ -11186,6 +11186,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Nuvolar.Module/Nuvolar.Module.vbproj b/Nuvolar.Module/Nuvolar.Module.vbproj index feb99ad..67618f7 100644 --- a/Nuvolar.Module/Nuvolar.Module.vbproj +++ b/Nuvolar.Module/Nuvolar.Module.vbproj @@ -2683,6 +2683,14 @@ + + Model.DesignedDiffs.xafml + Designer + + + Model.DesignedDiffs.xafml + Designer + Model.DesignedDiffs.xafml Designer diff --git a/Nuvolar.Module/UnusableNodes1.xml b/Nuvolar.Module/UnusableNodes1.xml new file mode 100644 index 0000000..b559bee --- /dev/null +++ b/Nuvolar.Module/UnusableNodes1.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Nuvolar.Module/UnusableNodes_hu.xml b/Nuvolar.Module/UnusableNodes_hu.xml new file mode 100644 index 0000000..d641c87 --- /dev/null +++ b/Nuvolar.Module/UnusableNodes_hu.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Nuvolar.WIN.Company/app.config b/Nuvolar.WIN.Company/app.config index 44581d7..e0feb9a 100644 --- a/Nuvolar.WIN.Company/app.config +++ b/Nuvolar.WIN.Company/app.config @@ -4,7 +4,7 @@ - + diff --git a/Nuvolar.Win.Lite/app.config b/Nuvolar.Win.Lite/app.config index 48f5054..4c17c8c 100644 --- a/Nuvolar.Win.Lite/app.config +++ b/Nuvolar.Win.Lite/app.config @@ -7,7 +7,7 @@ - + diff --git a/momoERP.Win.HA/app.config b/momoERP.Win.HA/app.config index 44581d7..e0feb9a 100644 --- a/momoERP.Win.HA/app.config +++ b/momoERP.Win.HA/app.config @@ -4,7 +4,7 @@ - +