From afb22dd266f480235c3d6a6fd97f72b017953b2c Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 22 Aug 2018 21:59:07 +0000
Subject: [PATCH] case 3646

---
 source/WBI/ReportView.aspx.cs                 | 10 ++++-----
 source/WinFormApp/Form1.cs                    | 22 ++++++++++---------
 source/WinFormApp/GlobalxForm.cs              |  6 +++--
 .../GZTW.AyaNova.BLL/ReportGenerator.cs       |  3 ++-
 .../AyaLib/GZTW.AyaNova.BLL/Workorder.cs      | 16 ++++++++------
 5 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/source/WBI/ReportView.aspx.cs b/source/WBI/ReportView.aspx.cs
index 4711adf..aa13b97 100644
--- a/source/WBI/ReportView.aspx.cs
+++ b/source/WBI/ReportView.aspx.cs
@@ -75,11 +75,11 @@ public partial class ReportView : BaseThemePage
 
 
 
-
-        if (AyaBizUtils.Trial)
-        {
-            WatermarkReport(x, true);
-        }
+        //case 3646 removed
+        //if (AyaBizUtils.Trial)
+        //{
+        //    WatermarkReport(x, true);
+        //}
 
         //pass it to the viewer component
         this.ReportViewer1.Report = x;
diff --git a/source/WinFormApp/Form1.cs b/source/WinFormApp/Form1.cs
index 9d39fb0..0ee0bdd 100644
--- a/source/WinFormApp/Form1.cs
+++ b/source/WinFormApp/Form1.cs
@@ -2711,17 +2711,19 @@ namespace AyaNova
             sub.SharedProps.Visible = !bHideSub;
 
             Infragistics.Win.UltraWinToolbars.PopupMenuTool tbHelp = (Infragistics.Win.UltraWinToolbars.PopupMenuTool)ultraToolbarsManager1.Toolbars["LT:UI.Toolbar.MainMenuBar"].Tools["LT:UI.Menu.Help"];
-            //case 1356
-            if ((AyaBizUtils.RequestedTrial || AyaBizUtils.Trial) && AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection)
-            {
-                tbHelp.Tools["LITE"].SharedProps.Visible = true;
-                if (AyaBizUtils.Lite)
-                    tbHelp.Tools["LITE"].SharedProps.Caption = "Trial: Switch to regular AyaNova";
-                else
-                    tbHelp.Tools["LITE"].SharedProps.Caption = "Trial: Switch to AyaNova Lite";
 
-            }
-            else
+            //case 3646 removed
+            ////case 1356
+            //if ((AyaBizUtils.RequestedTrial || AyaBizUtils.Trial) && AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection)
+            //{
+            //    tbHelp.Tools["LITE"].SharedProps.Visible = true;
+            //    if (AyaBizUtils.Lite)
+            //        tbHelp.Tools["LITE"].SharedProps.Caption = "Trial: Switch to regular AyaNova";
+            //    else
+            //        tbHelp.Tools["LITE"].SharedProps.Caption = "Trial: Switch to AyaNova Lite";
+
+            //}
+            //else
                 tbHelp.Tools["LITE"].SharedProps.Visible = false;
 
             //case 1306
diff --git a/source/WinFormApp/GlobalxForm.cs b/source/WinFormApp/GlobalxForm.cs
index d0e1eec..d88115f 100644
--- a/source/WinFormApp/GlobalxForm.cs
+++ b/source/WinFormApp/GlobalxForm.cs
@@ -208,8 +208,10 @@ namespace AyaNova
                 case "LT:Admin.Label.EraseDatabase":    // ButtonTool
                     if (AyaBizUtils.Trial)
                     {
-                        MessageBox.Show("This feature requires a license.\r\nTrial databases can not be erased.");
-                        return;
+                        //case 3646 changed this block
+                        MessageBox.Show("Erasing a trial database can make it harder to evaluate AyaNova.\r\nPlease be sure you are familiar with AyaNova first.");                        
+                        //MessageBox.Show("This feature requires a license.\r\nTrial databases can not be erased.");
+                        //return;
                     }
                     if (!AyaBizUtils.Lite && !User.IsAdmin)
                     {
diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/ReportGenerator.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/ReportGenerator.cs
index 28b2cdb..efc00dd 100644
--- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/ReportGenerator.cs
+++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/ReportGenerator.cs
@@ -57,7 +57,8 @@ namespace GZTW.AyaNova.BLL
                 }
             }
 
-            if (AyaBizUtils.Trial) WatermarkReport(x);
+            //case 3646 removed
+           // if (AyaBizUtils.Trial) WatermarkReport(x);
 
             MemoryStream ms = new MemoryStream();
             x.ExportToPdf(ms);
diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs
index 79f0e0b..ff7bee9 100644
--- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs
+++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs
@@ -3020,14 +3020,16 @@ namespace GZTW.AyaNova.BLL
 
 			if(AyaBizUtils.IsGenerator || c.mRights > SecurityLevelTypes.ReadOnly)			
 			{
-				//Count the workorders if it's a trial, sb no more than 30
-				if(AyaBizUtils.Trial)
-				{
-				
-					if(WorkorderCountFetcher.GetItem()>29)
-						throw new TrialException(LocalizedTextTable.GetLocalizedTextDirect("Error.Trial.Restricted"));
 
-				}
+                //case 3646 removed this block
+                ////Count the workorders if it's a trial, sb no more than 30
+                //if(AyaBizUtils.Trial)
+                //{
+				
+                //    if(WorkorderCountFetcher.GetItem()>29)
+                //        throw new TrialException(LocalizedTextTable.GetLocalizedTextDirect("Error.Trial.Restricted"));
+
+                //}
 
 				//c = new Workorder();
 				c.WorkorderType=WorkorderType;