diff --git a/.gitignore b/.gitignore
index a800075..edea240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
/SISBusiness.Win/obj/Debug
/SISBusiness.Module.Web/obj/R64/SISBusiness.Module.Web.vbprojAssemblyReference.cache
*.cache
+/.vs/WIN_ALL/v15/Server/sqlite3
diff --git a/.vs/WIN/v15/.suo b/.vs/WIN/v15/.suo
index 0203055..e018b6d 100644
Binary files a/.vs/WIN/v15/.suo and b/.vs/WIN/v15/.suo differ
diff --git a/BuildClean.cmd b/BuildClean.cmd
index 9b07f9a..3efa4f7 100644
--- a/BuildClean.cmd
+++ b/BuildClean.cmd
@@ -1,4 +1,13 @@
msbuild WIN.sln /t:Clean /p:Configuration=R64
msbuild WIN.sln /t:Clean /p:Configuration=Debug
msbuild WIN.sln /t:Clean /p:Configuration=Release
+
+msbuild WEB_SUPPORT.sln /t:Clean /p:Configuration=R64
+msbuild WEB_SUPPORT.sln /t:Clean /p:Configuration=Debug
+msbuild WEB_SUPPORT.sln /t:Clean /p:Configuration=Release
+
+msbuild WEB_SUBCONTRACTOR.sln /t:Clean /p:Configuration=R64
+msbuild WEB_SUBCONTRACTOR.sln /t:Clean /p:Configuration=Debug
+msbuild WEB_SUBCONTRACTOR.sln /t:Clean /p:Configuration=Release
+
pause
\ No newline at end of file
diff --git a/SISBusiness.Module.CSharp/Controllers/NAV/NAV_Online_VC.cs b/SISBusiness.Module.CSharp/Controllers/NAV/NAV_Online_VC.cs
index 9a18d2a..8856258 100644
--- a/SISBusiness.Module.CSharp/Controllers/NAV/NAV_Online_VC.cs
+++ b/SISBusiness.Module.CSharp/Controllers/NAV/NAV_Online_VC.cs
@@ -4,6 +4,7 @@ using DevExpress.ExpressApp.Actions;
using DevExpress.ExpressApp.Xpo;
using DevExpress.Persistent.Base;
using Newtonsoft.Json;
+using SISBusiness.Module.NAV;
using SISBusiness.Module.StaticClass;
namespace SISBusiness.Module.Controllers
@@ -90,61 +91,67 @@ namespace SISBusiness.Module.Controllers
{
XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace;
InvoiceHeader _InvoiceHeader = View.SelectedObjects[0] as InvoiceHeader;
- string _operation = "CREATE";
- if (_InvoiceHeader.IsStorno)
- {
- _operation = "STORNO";
- }
- var _postData = new
- {
- documentnumber = _InvoiceHeader.DocumentNumber,
- 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"
+ OnlineInvoiceHelper _OnlineInvoiceHelper = new OnlineInvoiceHelper(_ocur.Session);
+ _OnlineInvoiceHelper.manageInvoice(_ocur, _InvoiceHeader, Application);
- };
+ //XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace;
+ //InvoiceHeader _InvoiceHeader = View.SelectedObjects[0] as InvoiceHeader;
+ //string _operation = "CREATE";
- RestAPI.ExecuteRootePOST("onlineinvoice/manageinvoice", true, JsonConvert.SerializeObject(_postData));
- var _StatusCode = RestAPI.StatusCode;
- var _StatusDescription = RestAPI.StatusMessage;
+ //if (_InvoiceHeader.IsStorno)
+ //{
+ // _operation = "STORNO";
+ //}
+ //var _postData = new
+ //{
+ // documentnumber = _InvoiceHeader.DocumentNumber,
+ // 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"
- Tracing.Tracer.LogText(_StatusCode.ToString());
- Tracing.Tracer.LogText(_StatusDescription.ToString());
+ //};
- if (_StatusCode == 200)
- {
- dynamic _ResultJSON = JsonConvert.DeserializeObject(_StatusDescription);
+ //RestAPI.ExecuteRootePOST("onlineinvoice/manageinvoice", true, JsonConvert.SerializeObject(_postData));
+ //var _StatusCode = RestAPI.StatusCode;
+ //var _StatusDescription = RestAPI.StatusMessage;
- if (_ResultJSON.status.ToString() == "OK")
- {
- _ocur.Session.ExecuteNonQuery(string.Format("UPDATE InvoiceHeader set NAV_transactionID='{0}' WHERE Oid = '{1}'", _ResultJSON.transactionId["0"].ToString(), _InvoiceHeader.Oid.ToString()));
+ //Tracing.Tracer.LogText(_StatusCode.ToString());
+ //Tracing.Tracer.LogText(_StatusDescription.ToString());
- Application.ShowViewStrategy.ShowMessage("A számla beküldése megtörtént !", InformationType.Success, 2000, InformationPosition.Bottom);
- }
- if (_ResultJSON.status.ToString() == "ERROR")
- {
- string _ERROR = "A számla beküldése nem történt meg !";
- _ERROR += " [" + _ResultJSON.ToString() + "]";
- Application.ShowViewStrategy.ShowMessage(_ERROR, InformationType.Error, 5000, InformationPosition.Bottom);
- }
- }
- else
- {
- string _ERROR = "A számla beküldése nem történt meg !";
- _ERROR += " [" + _StatusDescription + "]";
- Application.ShowViewStrategy.ShowMessage(_ERROR, InformationType.Error, 5000, InformationPosition.Bottom);
- }
+ //if (_StatusCode == 200)
+ //{
+ // dynamic _ResultJSON = JsonConvert.DeserializeObject(_StatusDescription);
- (View as ListView).CollectionSource.Reload();
+ // if (_ResultJSON.status.ToString() == "OK")
+ // {
+ // _ocur.Session.ExecuteNonQuery(string.Format("UPDATE InvoiceHeader set NAV_transactionID='{0}' WHERE Oid = '{1}'", _ResultJSON.transactionId["0"].ToString(), _InvoiceHeader.Oid.ToString()));
+
+ // Application.ShowViewStrategy.ShowMessage("A számla beküldése megtörtént !", InformationType.Success, 2000, InformationPosition.Bottom);
+ // }
+ // if (_ResultJSON.status.ToString() == "ERROR")
+ // {
+ // string _ERROR = "A számla beküldése nem történt meg !";
+ // _ERROR += " [" + _ResultJSON.ToString() + "]";
+ // Application.ShowViewStrategy.ShowMessage(_ERROR, InformationType.Error, 5000, InformationPosition.Bottom);
+ // }
+ //}
+ //else
+ //{
+ // string _ERROR = "A számla beküldése nem történt meg !";
+ // _ERROR += " [" + _StatusDescription + "]";
+ // Application.ShowViewStrategy.ShowMessage(_ERROR, InformationType.Error, 5000, InformationPosition.Bottom);
+ //}
+
+ //(View as ListView).CollectionSource.Reload();
}
private void aNAV_queryInvoiceStatus_Execute(object sender, SimpleActionExecuteEventArgs e)
diff --git a/SISBusiness.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml b/SISBusiness.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml
index f5e4a78..9284a0c 100644
--- a/SISBusiness.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml
+++ b/SISBusiness.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml
@@ -16,6 +16,12 @@
+
+
+
+
+
+
@@ -44,6 +50,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SISBusiness.Module.CSharp/Model.DesignedDiffs.xafml b/SISBusiness.Module.CSharp/Model.DesignedDiffs.xafml
index ecbdefd..e2ee953 100644
--- a/SISBusiness.Module.CSharp/Model.DesignedDiffs.xafml
+++ b/SISBusiness.Module.CSharp/Model.DesignedDiffs.xafml
@@ -110,6 +110,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -142,16 +254,16 @@
-
+
-
+
-
+
@@ -162,10 +274,9 @@
-
-
+
@@ -182,10 +293,11 @@
-
-
-
-
+
+
+
+
+
diff --git a/SISBusiness.Module.CSharp/Properties/AssemblyInfo.cs b/SISBusiness.Module.CSharp/Properties/AssemblyInfo.cs
index 65180e0..41c0a9f 100644
--- a/SISBusiness.Module.CSharp/Properties/AssemblyInfo.cs
+++ b/SISBusiness.Module.CSharp/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("15.2.5.1001")]
+[assembly: AssemblyVersion("17.2.3.1002")]
diff --git a/SISBusiness.Module.CSharp/SISBusiness.Module.CSharp.csproj b/SISBusiness.Module.CSharp/SISBusiness.Module.CSharp.csproj
index f64cc4e..5887a5e 100644
--- a/SISBusiness.Module.CSharp/SISBusiness.Module.CSharp.csproj
+++ b/SISBusiness.Module.CSharp/SISBusiness.Module.CSharp.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -15,7 +15,7 @@
3.5
- v4.0
+ v4.6.1
publish\
true
@@ -45,6 +45,7 @@
DEBUG;TRACE
prompt
4
+ false
none
@@ -53,8 +54,12 @@
TRACE
prompt
4
+ false
+
+ ..\packages\BouncyCastle.NetCore.1.8.8\lib\net20\BouncyCastle.Crypto.dll
+
False
@@ -251,6 +256,8 @@
Module.cs
+
+
@@ -295,6 +302,7 @@
Model.DesignedDiffs.xafml
Designer
+
@@ -331,6 +339,74 @@
Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Model.DesignedDiffs.xafml
+ Designer
+
+
+
+
+
+
+
+
- SISBusiness.Module.MNBArfolyamService.GetCurrenciesResponseBody, Service References.MNBArfolyamService.Reference.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ SISBusiness.Module.MNBArfolyamService.GetCurrenciesResponseBody, Service References.MNBArfolyamService.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetCurrencyUnitsResponseBody.datasource b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetCurrencyUnitsResponseBody.datasource
index a43e7e6..0838fc9 100644
--- a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetCurrencyUnitsResponseBody.datasource
+++ b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetCurrencyUnitsResponseBody.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
- SISBusiness.Module.MNBArfolyamService.GetCurrencyUnitsResponseBody, Service References.MNBArfolyamService.Reference.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ SISBusiness.Module.MNBArfolyamService.GetCurrencyUnitsResponseBody, Service References.MNBArfolyamService.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetCurrentExchangeRatesResponseBody.datasource b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetCurrentExchangeRatesResponseBody.datasource
index 561401d..b9d43f7 100644
--- a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetCurrentExchangeRatesResponseBody.datasource
+++ b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetCurrentExchangeRatesResponseBody.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
- SISBusiness.Module.MNBArfolyamService.GetCurrentExchangeRatesResponseBody, Service References.MNBArfolyamService.Reference.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ SISBusiness.Module.MNBArfolyamService.GetCurrentExchangeRatesResponseBody, Service References.MNBArfolyamService.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetDateIntervalResponseBody.datasource b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetDateIntervalResponseBody.datasource
index 3d12fe8..ff4c37c 100644
--- a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetDateIntervalResponseBody.datasource
+++ b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetDateIntervalResponseBody.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
- SISBusiness.Module.MNBArfolyamService.GetDateIntervalResponseBody, Service References.MNBArfolyamService.Reference.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ SISBusiness.Module.MNBArfolyamService.GetDateIntervalResponseBody, Service References.MNBArfolyamService.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetExchangeRatesResponseBody.datasource b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetExchangeRatesResponseBody.datasource
index d7ddca4..908aa69 100644
--- a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetExchangeRatesResponseBody.datasource
+++ b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetExchangeRatesResponseBody.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
- SISBusiness.Module.MNBArfolyamService.GetExchangeRatesResponseBody, Service References.MNBArfolyamService.Reference.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ SISBusiness.Module.MNBArfolyamService.GetExchangeRatesResponseBody, Service References.MNBArfolyamService.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetInfoResponseBody.datasource b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetInfoResponseBody.datasource
index 52eb6c0..4b1c1fa 100644
--- a/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetInfoResponseBody.datasource
+++ b/SISBusiness.Module/Service References/MNBArfolyamService/SISBusiness.Module.MNBArfolyamService.GetInfoResponseBody.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
- SISBusiness.Module.MNBArfolyamService.GetInfoResponseBody, Service References.MNBArfolyamService.Reference.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ SISBusiness.Module.MNBArfolyamService.GetInfoResponseBody, Service References.MNBArfolyamService.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/SISBusiness.Module/app.config b/SISBusiness.Module/app.config
index 2adbd42..e71f347 100644
--- a/SISBusiness.Module/app.config
+++ b/SISBusiness.Module/app.config
@@ -26,19 +26,17 @@
-
+
-
+
-
+
diff --git a/SISBusiness.RabbitMQ.Console/App.config b/SISBusiness.RabbitMQ.Console/App.config
index 7ebe7f5..7d815f2 100644
--- a/SISBusiness.RabbitMQ.Console/App.config
+++ b/SISBusiness.RabbitMQ.Console/App.config
@@ -7,28 +7,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SISBusiness.WIN.Company/My Project/Application.Designer.vb b/SISBusiness.WIN.Company/My Project/Application.Designer.vb
index 71cab15..88dd01c 100644
--- a/SISBusiness.WIN.Company/My Project/Application.Designer.vb
+++ b/SISBusiness.WIN.Company/My Project/Application.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
'
' This code was generated by a tool.
-' Runtime Version:4.0.30319.17929
+' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
diff --git a/SISBusiness.WIN.Company/My Project/Resources.Designer.vb b/SISBusiness.WIN.Company/My Project/Resources.Designer.vb
index fe40c65..32e20c5 100644
--- a/SISBusiness.WIN.Company/My Project/Resources.Designer.vb
+++ b/SISBusiness.WIN.Company/My Project/Resources.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
'
' This code was generated by a tool.
-' Runtime Version:4.0.30319.17929
+' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -22,7 +22,7 @@ Namespace My.Resources
'''
''' A strongly-typed resource class, for looking up localized strings, etc.
'''
- _
diff --git a/SISBusiness.WIN.Company/My Project/Settings.Designer.vb b/SISBusiness.WIN.Company/My Project/Settings.Designer.vb
index 11af349..c43390f 100644
--- a/SISBusiness.WIN.Company/My Project/Settings.Designer.vb
+++ b/SISBusiness.WIN.Company/My Project/Settings.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
'
' This code was generated by a tool.
-' Runtime Version:4.0.30319.17929
+' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
_
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -29,7 +29,7 @@ Namespace My
Private Shared addedHandlerLockObject As New Object
_
- Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+ Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
If My.Application.SaveMySettingsOnExit Then
My.Settings.Save()
End If
diff --git a/SISBusiness.WIN.Company/SISBusiness.Win.Company.vbproj b/SISBusiness.WIN.Company/SISBusiness.Win.Company.vbproj
index 54f2e93..725103e 100644
--- a/SISBusiness.WIN.Company/SISBusiness.Win.Company.vbproj
+++ b/SISBusiness.WIN.Company/SISBusiness.Win.Company.vbproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -20,7 +20,7 @@
SAK
SAK
SAK
- v4.0
+ v4.6.1
4.0
diff --git a/SISBusiness.WIN.Company/app.config b/SISBusiness.WIN.Company/app.config
index 7616528..46f98f0 100644
--- a/SISBusiness.WIN.Company/app.config
+++ b/SISBusiness.WIN.Company/app.config
@@ -7,20 +7,20 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -21,9 +21,9 @@
-
+
-
+
-
+
@@ -25,9 +24,9 @@
-
+
-
+