diff --git a/3rdprtylibs/chilkat/64bit/ChilkatDotNet4.dll b/3rdprtylibs/chilkat/64bit/ChilkatDotNet4.dll index 48ded9b..4ee6db3 100644 Binary files a/3rdprtylibs/chilkat/64bit/ChilkatDotNet4.dll and b/3rdprtylibs/chilkat/64bit/ChilkatDotNet4.dll differ diff --git a/3rdprtylibs/chilkat/ChilkatDotNet4.dll b/3rdprtylibs/chilkat/ChilkatDotNet4.dll index cb19d09..3dc44c0 100644 Binary files a/3rdprtylibs/chilkat/ChilkatDotNet4.dll and b/3rdprtylibs/chilkat/ChilkatDotNet4.dll differ diff --git a/source/WinFormApp/AssemblyInfo.cs b/source/WinFormApp/AssemblyInfo.cs index 79d52fa..b93348d 100644 --- a/source/WinFormApp/AssemblyInfo.cs +++ b/source/WinFormApp/AssemblyInfo.cs @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; [assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] //[assembly: log4net.Config.XmlConfigurator(Watch=true)] [assembly: ComVisibleAttribute(false)] -[assembly: AssemblyFileVersionAttribute("7.6.8.0")] +[assembly: AssemblyFileVersionAttribute("7.6.14.0")] diff --git a/source/WinFormApp/Form1.cs b/source/WinFormApp/Form1.cs index a8d9dce..c9d5f86 100644 --- a/source/WinFormApp/Form1.cs +++ b/source/WinFormApp/Form1.cs @@ -1842,10 +1842,10 @@ namespace AyaNova #if(DEBUG) dlg = new Login("manager", "letmein"); #else - if(AyaBizUtils.Trial) - dlg = new Login("manager","letmein"); - else - dlg = new Login("",""); + if (AyaBizUtils.Trial) + dlg = new Login("manager", "letmein"); + else + dlg = new Login("", ""); #endif dlg.ShowDialog(this); bDoLogin = dlg.LoggingIn; @@ -3917,7 +3917,8 @@ namespace AyaNova timer1.Stop(); //Check if we are running as a standalone firebird database, - //if so then we need to do the notification and PM processing ourselves + //if so then we need to do the notification and PM processing ourselves + if (AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection) { //case 1039 //log.Debug("Re-generate (PM & Notifications)"); @@ -3955,8 +3956,8 @@ namespace AyaNova //testing interval (30 seconds) timer1.Interval = 30000; #else - //5 minutes - timer1.Interval=300000; + //5 minutes + timer1.Interval = 300000; #endif @@ -4257,7 +4258,7 @@ namespace AyaNova { //DBManager.FireBirdRecomputeStatistics(); - #region Generate huge tracts o' data + #region Generate huge tracts o' data //Random rand=new Random(); //Guid gTestSecurityGroupID = new Guid("{EA613C39-38F0-470E-9B76-ABB9B05C5F3A}"); @@ -4582,7 +4583,7 @@ namespace AyaNova #endregion generate huge tracts o' data - #region ayascript to update and close selected workorders + #region ayascript to update and close selected workorders //System.Collections.Generic.List l= new System.Collections.Generic.List(); // l.Add(new Guid("c9d07183-89d6-4dc0-bacb-e46a6c7a1b9a")); // l.Add(new Guid("d3eea5a5-6181-4484-afc6-20279aa9670d")); @@ -4638,7 +4639,7 @@ namespace AyaNova #endregion - #region ayascript to updated selected workorders + #region ayascript to updated selected workorders ////============== START OF SCRIPT ========================= @@ -4819,7 +4820,7 @@ namespace AyaNova //ctrl-alt-g for GRID FILTER CRITERIA - #region gen workorders COMMENTED OUT + #region gen workorders COMMENTED OUT //============================================================================== //Workorders @@ -4976,7 +4977,7 @@ namespace AyaNova #endregion - #region Import utility COMMENTED OUT + #region Import utility COMMENTED OUT ////============================================================================== @@ -5148,7 +5149,7 @@ namespace AyaNova #endregion import util - #region Close selected workorders by criteria COMMENTED OUT + #region Close selected workorders by criteria COMMENTED OUT ////**** CLOSE SELECTED WORKORDERS THAT MATCH THE FOLLOWING ****** ////Change these values as required @@ -5283,7 +5284,7 @@ namespace AyaNova //MessageBox.Show("Finished, " + workordersClosed.ToString() + " workorders were closed and saved"); #endregion - #region Generator on demand COMMENTED OUT + #region Generator on demand COMMENTED OUT //try //{ // AyaBizUtils.TG = true; @@ -5305,7 +5306,7 @@ namespace AyaNova //} #endregion generator on demand - #region Generate serialized inventory for a single part COMMENTED OUT + #region Generate serialized inventory for a single part COMMENTED OUT //Random rand = new Random(); //int snCount = 0; ////get all active warehouses without exception @@ -5340,7 +5341,7 @@ namespace AyaNova #endregion generate serialized inventory - #region delete a bunch of clients + #region delete a bunch of clients //StringBuilder sbRet = new StringBuilder(); diff --git a/source/bizobjects/AyaLib/AssemblyInfo.cs b/source/bizobjects/AyaLib/AssemblyInfo.cs index a7a23b4..b771ff7 100644 --- a/source/bizobjects/AyaLib/AssemblyInfo.cs +++ b/source/bizobjects/AyaLib/AssemblyInfo.cs @@ -64,4 +64,4 @@ using System.Security.Permissions; // Configure log4net using the .config file //[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] //[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )] -[assembly: AssemblyFileVersionAttribute("7.6.12.0")] +[assembly: AssemblyFileVersionAttribute("7.6.14.0")] diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs index 4d5762d..18b5fab 100644 --- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs +++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs @@ -45,11 +45,13 @@ namespace GZTW.AyaNova.BLL if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS) mailman.StartTLS = true; + mailman.SmtpUsername = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPAccount; mailman.SmtpPassword = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPPassword; //case 1382 //if can't use smtp server then log and conditionally abort + //## NOTE: this operation sets up what tls level is being used etc if (!mailman.SmtpNoop()) { //case 1608 @@ -166,6 +168,9 @@ namespace GZTW.AyaNova.BLL // Send mail. bool success; success = mailman.SendEmail(email); +#if(DEBUG) + NotifyDeliveryLog.LogSMTPDeliveryMessage("POST TLS version: " + mailman.TlsVersion); +#endif if (success) { NotifyDeliveryLog.LogClientDelivery(n.ClientID, true, ""); diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenSMSMessageDelivery.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenSMSMessageDelivery.cs index 67cd7e6..da3d6f2 100644 --- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenSMSMessageDelivery.cs +++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenSMSMessageDelivery.cs @@ -37,6 +37,8 @@ namespace GZTW.AyaNova.BLL if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS) mailman.StartTLS = true; + + mailman.SmtpUsername=Login; mailman.SmtpPassword=Password;