From 11a8d4b6af719d8a553802377d1458d427a391b9 Mon Sep 17 00:00:00 2001 From: ivanszabo Date: Wed, 7 Apr 2021 11:23:42 +0200 Subject: [PATCH] Rebase Develop --- .gitignore | 1 + .vs/WIN/v15/.suo | Bin 2245120 -> 2253312 bytes BuildClean.cmd | 9 ++ .../Controllers/NAV/NAV_Online_VC.cs | 101 ++++++------ .../Model.DesignedDiffs.Localization.hu.xafml | 22 +++ .../Model.DesignedDiffs.xafml | 130 +++++++++++++-- .../Properties/AssemblyInfo.cs | 2 +- .../SISBusiness.Module.CSharp.csproj | 80 +++++++++- SISBusiness.Module.CSharp/packages.config | 3 +- .../My Project/Application.Designer.vb | 2 +- .../My Project/Resources.Designer.vb | 4 +- .../My Project/Settings.Designer.vb | 6 +- .../SISBusiness.Module.Win.vbproj | 4 +- SISBusiness.Module.Win/app.config | 8 +- SISBusiness.Module.Win/packages.config | 6 +- .../Invoice/InvoiceHeader.vb | 15 +- .../GeneralObjects/Customers/Customers.vb | 42 ++++- .../GeneralObjects/Customers/CustomersFrom.vb | 13 ++ .../GeneralObjects/GeneralStocks/Units.vb | 19 ++- .../GeneralObjects/NumberGenerator.vb | 2 +- .../Model.DesignedDiffs.Localization.hu.xafml | 1 - SISBusiness.Module/Model.DesignedDiffs.xafml | 47 +++--- .../My Project/Application.Designer.vb | 2 +- SISBusiness.Module/My Project/AssemblyInfo.vb | 2 +- .../My Project/Resources.Designer.vb | 4 +- .../My Project/Settings.Designer.vb | 6 +- SISBusiness.Module/My Project/licenses.licx | 2 + SISBusiness.Module/SISBusiness.Module.vbproj | 9 +- ...rvice.GetCurrenciesResponseBody.datasource | 2 +- ...ce.GetCurrencyUnitsResponseBody.datasource | 2 +- ...urrentExchangeRatesResponseBody.datasource | 2 +- ...ice.GetDateIntervalResponseBody.datasource | 2 +- ...ce.GetExchangeRatesResponseBody.datasource | 2 +- ...lyamService.GetInfoResponseBody.datasource | 2 +- SISBusiness.Module/app.config | 8 +- SISBusiness.RabbitMQ.Console/App.config | 35 ++-- .../My Project/Application.Designer.vb | 2 +- .../My Project/Resources.Designer.vb | 4 +- .../My Project/Settings.Designer.vb | 6 +- .../SISBusiness.Win.Company.vbproj | 4 +- SISBusiness.WIN.Company/app.config | 24 ++- SISBusiness.WIN.Company/packages.config | 4 +- .../My Project/Application.Designer.vb | 2 +- .../My Project/Resources.Designer.vb | 4 +- .../My Project/Settings.Designer.vb | 6 +- .../SISBusiness.Win.Company.PH.vbproj | 4 +- .../MNBArfolyamService/Reference.vb | 150 ++---------------- SISBusiness.Win.Company.PH/app.config | 22 ++- SISBusiness.Win.Company.PH/packages.config | 4 +- .../My Project/Application.Designer.vb | 2 +- .../My Project/Resources.Designer.vb | 4 +- .../My Project/Settings.Designer.vb | 6 +- .../SISBusiness.Win.Demo.vbproj | 4 +- .../MNBArfolyamService/Reference.vb | 2 +- SISBusiness.Win.Demo/app.config | 32 ++-- SISBusiness.Win.Demo/packages.config | 2 +- .../My Project/Application.Designer.vb | 2 +- .../My Project/Resources.Designer.vb | 4 +- .../My Project/Settings.Designer.vb | 6 +- SISBusiness.Win/SISBusiness.Win.vbproj | 4 +- SISBusiness.Win/app.config | 29 ++-- SISBusiness.Win/packages.config | 2 +- SISService/My Project/Application.Designer.vb | 2 +- SISService/My Project/Resources.Designer.vb | 25 +-- SISService/My Project/Settings.Designer.vb | 52 +++--- SISService/SISService.vbproj | 6 +- SISService/app.config | 20 +-- 67 files changed, 608 insertions(+), 429 deletions(-) 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 0203055f2c158bee6aa26a13ac7e35557c95110d..e018b6db556b356898ce1c20aa77bc186471f733 100644 GIT binary patch delta 60949 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 delta 31057 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 WU|XI7bNgV?731F_8S&tPMgI?@S-6P+ 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 @@ - + - +