From 869379e17fc983680fd827a20ed2c7613157f428 Mon Sep 17 00:00:00 2001 From: ivanszabo Date: Tue, 21 Jul 2020 13:26:30 +0200 Subject: [PATCH] =?UTF-8?q?SZ=C3=81MLA=202.0=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/NAV/NAV_Online_VC.cs | 82 +++++++++++-------- .../Model.DesignedDiffs.Localization.hu.xafml | 3 + .../Model.DesignedDiffs.xafml | 5 +- .../GeneralObjects/GeneralStocks/Units.vb | 15 ++++ .../Model.DesignedDiffs.Localization.hu.xafml | 5 ++ Nuvolar.Module/My Project/AssemblyInfo.vb | 2 +- Nuvolar.Win.Lite/app.config | 2 +- 7 files changed, 76 insertions(+), 38 deletions(-) diff --git a/Nuvolar.Module.CSharp/Controllers/NAV/NAV_Online_VC.cs b/Nuvolar.Module.CSharp/Controllers/NAV/NAV_Online_VC.cs index 5c6382c..3bac139 100644 --- a/Nuvolar.Module.CSharp/Controllers/NAV/NAV_Online_VC.cs +++ b/Nuvolar.Module.CSharp/Controllers/NAV/NAV_Online_VC.cs @@ -8,8 +8,20 @@ using Nuvolar.Module.StaticClass; namespace Nuvolar.Module.Controllers { + /// + /// NAV Online + /// public partial class NAV_Online_VC : ViewController { + const string _softwareId = "000000000000000N01"; + const string _softwareName = "Nuvolar ERP System"; + const string _softwareOperation = "ONLINE_SERVICE"; + const string _softwareMainVersion = "17.2.3"; + const string _softwareDevName = "Szabó Iván E.V. kisadózó"; + const string _softwareDevContact = "http:\\www.nuvolar.hu"; + const string _softwareDevCountryCode = "HU"; + const string _softwareDevTaxNumber = "67076295"; + public NAV_Online_VC() { InitializeComponent(); @@ -52,14 +64,14 @@ namespace Nuvolar.Module.Controllers { customersfrom = _CustomersFrom.Oid.ToString(), taxPayer = _Customers.VATNumber.Substring(0, 8), - softwareId = "123456789123456789", - softwareName = "3C ERP System", - softwareOperation = "ONLINE_SERVICE", - softwareMainVersion = "17.2.3", - softwareDevName = "3C Távközlési Kft.", - softwareDevContact = "http:\\3ctelecom.hu", - softwareDevCountryCode = "HU", - softwareDevTaxNumber = "10644209-2-43" + softwareId = _softwareId, + softwareName = _softwareName, + softwareOperation = _softwareOperation, + softwareMainVersion = _softwareMainVersion, + softwareDevName = _softwareDevName, + softwareDevContact = _softwareDevContact, + softwareDevCountryCode = _softwareDevCountryCode, + softwareDevTaxNumber = _softwareDevTaxNumber }; RestAPI.ExecuteRootePOST("onlineinvoice/querytaxpayer", true, JsonConvert.SerializeObject(_postData)); @@ -105,10 +117,10 @@ namespace Nuvolar.Module.Controllers { XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace; InvoiceHeader _InvoiceHeader = View.SelectedObjects[0] as InvoiceHeader; - this.NAV_manageInvoice(_InvoiceHeader,_ocur); + this.NAV_manageInvoice(_InvoiceHeader, _ocur); (View as ListView).CollectionSource.Reload(); } - private void NAV_manageInvoice(InvoiceHeader _InvoiceHeader,XPObjectSpace _ocur) + private void NAV_manageInvoice(InvoiceHeader _InvoiceHeader, XPObjectSpace _ocur) { string _operation = "CREATE"; @@ -122,14 +134,14 @@ namespace Nuvolar.Module.Controllers customersfrom = _InvoiceHeader.CustomersFrom.Oid.ToString(), operation = _operation, technicalAnnulment = false, - softwareId = "123456789123456789", - softwareName = "3C ERP System", - softwareOperation = "ONLINE_SERVICE", - softwareMainVersion = "17.2.3", - softwareDevName = "3C Távközlési Kft.", - softwareDevContact = "http:\\3ctelecom.hu", - softwareDevCountryCode = "HU", - softwareDevTaxNumber = "10644209-2-43" + softwareId = _softwareId, + softwareName = _softwareName, + softwareOperation = _softwareOperation, + softwareMainVersion = _softwareMainVersion, + softwareDevName = _softwareDevName, + softwareDevContact = _softwareDevContact, + softwareDevCountryCode = _softwareDevCountryCode, + softwareDevTaxNumber = _softwareDevTaxNumber }; @@ -174,14 +186,14 @@ namespace Nuvolar.Module.Controllers documentnumber = _InvoiceHeader.DocumentNumber, customersfrom = _InvoiceHeader.CustomersFrom.Oid.ToString(), transactionId = _InvoiceHeader.NAV_transactionId, - softwareId = "123456789123456789", - softwareName = "3C ERP System", - softwareOperation = "ONLINE_SERVICE", - softwareMainVersion = "17.2.3", - softwareDevName = "3C Távközlési Kft.", - softwareDevContact = "http:\\3ctelecom.hu", - softwareDevCountryCode = "HU", - softwareDevTaxNumber = "10644209-2-43" + softwareId = _softwareId, + softwareName = _softwareName, + softwareOperation = _softwareOperation, + softwareMainVersion = _softwareMainVersion, + softwareDevName = _softwareDevName, + softwareDevContact = _softwareDevContact, + softwareDevCountryCode = _softwareDevCountryCode, + softwareDevTaxNumber = _softwareDevTaxNumber }; @@ -206,7 +218,7 @@ namespace Nuvolar.Module.Controllers } if (_ResultJSON.processingResults.processingResult.businessValidationMessages != null) { - Application.ShowViewStrategy.ShowMessage(_ResultJSON.processingResults.processingResult.businessValidationMessages.message.ToString(), + Application.ShowViewStrategy.ShowMessage(_ResultJSON.processingResults.processingResult.businessValidationMessages.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); @@ -232,14 +244,14 @@ namespace Nuvolar.Module.Controllers { invoiceNumber = _InvoiceHeader.DocumentNumber, customersfrom = _InvoiceHeader.CustomersFrom.Oid.ToString(), - softwareId = "123456789123456789", - softwareName = "3C ERP System", - softwareOperation = "ONLINE_SERVICE", - softwareMainVersion = "17.2.3", - softwareDevName = "3C Távközlési Kft.", - softwareDevContact = "http:\\3ctelecom.hu", - softwareDevCountryCode = "HU", - softwareDevTaxNumber = "10644209-2-43" + softwareId = _softwareId, + softwareName = _softwareName, + softwareOperation = _softwareOperation, + softwareMainVersion = _softwareMainVersion, + softwareDevName = _softwareDevName, + softwareDevContact = _softwareDevContact, + softwareDevCountryCode = _softwareDevCountryCode, + softwareDevTaxNumber = _softwareDevTaxNumber }; diff --git a/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml index 836fd99..5153b39 100644 --- a/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml +++ b/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml @@ -5,6 +5,9 @@ + + + diff --git a/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml b/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml index ce43b74..f071713 100644 --- a/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml +++ b/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml @@ -1,5 +1,5 @@  - + @@ -7,6 +7,9 @@ + + + diff --git a/Nuvolar.Module/BusinessObjects/GeneralObjects/GeneralStocks/Units.vb b/Nuvolar.Module/BusinessObjects/GeneralObjects/GeneralStocks/Units.vb index 81dbf8c..d81824a 100644 --- a/Nuvolar.Module/BusinessObjects/GeneralObjects/GeneralStocks/Units.vb +++ b/Nuvolar.Module/BusinessObjects/GeneralObjects/GeneralStocks/Units.vb @@ -18,6 +18,7 @@ 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 +66,20 @@ Public Class Units SetPropertyValue("DefaultForBusinnes", _DefaultForBusinnes, value) End Set End Property + + ''' + ''' NAV mennyiségi egység megfeleltetés + ''' + ''' + Property ShortName_NAV As String + Get + Return _ShortName_NAV + + End Get + Set(ByVal value As String) + SetPropertyValue("ShortName_NAV", _ShortName_NAV, value) + End Set + End Property End Class diff --git a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml index 0ea835a..673310f 100644 --- a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml +++ b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml @@ -2675,6 +2675,8 @@ + + @@ -4637,6 +4639,9 @@ + + + diff --git a/Nuvolar.Module/My Project/AssemblyInfo.vb b/Nuvolar.Module/My Project/AssemblyInfo.vb index 9a9613e..d9d32fb 100644 --- a/Nuvolar.Module/My Project/AssemblyInfo.vb +++ b/Nuvolar.Module/My Project/AssemblyInfo.vb @@ -28,5 +28,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/Nuvolar.Win.Lite/app.config b/Nuvolar.Win.Lite/app.config index 2801e07..d8f517b 100644 --- a/Nuvolar.Win.Lite/app.config +++ b/Nuvolar.Win.Lite/app.config @@ -9,7 +9,7 @@ - +