From 228752e3f00572ef0de0cfe3018d7fdfcd806153 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 27 Jul 2021 17:23:19 +0000
Subject: [PATCH]

---
 server/AyaNova/models/GlobalBizSettings.cs | 2 +-
 server/AyaNova/util/AySchema.cs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/AyaNova/models/GlobalBizSettings.cs b/server/AyaNova/models/GlobalBizSettings.cs
index 60252d7f..0bb20836 100644
--- a/server/AyaNova/models/GlobalBizSettings.cs
+++ b/server/AyaNova/models/GlobalBizSettings.cs
@@ -40,7 +40,7 @@ namespace AyaNova.Models
         [Required]
         public TimeSpan WorkOrderCompleteByAge { get; set; } = TimeSpan.Zero;//was workorderclosebyage
 
-        public bool AllowScheduleConflicts { get; set; }
+        public bool AllowScheduleConflicts { get; set; } = true;
         
 
 
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 3bc5a373..7f1e64cf 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -252,7 +252,7 @@ namespace AyaNova.Util
                 await ExecQueryAsync("CREATE TABLE aglobalbizsettings (id INTEGER NOT NULL PRIMARY KEY, "
                                      + "searchcasesensitiveonly BOOL DEFAULT FALSE, "
                                      + "useinventory BOOL DEFAULT TRUE, "
-                                     + "allowscheduleconflicts BOOL DEFAULT FALSE, "
+                                     + "allowscheduleconflicts BOOL DEFAULT TRUE, "
                                      + "workordercompletebyage  INTERVAL NOT NULL DEFAULT '00:00:00', "
                                      + "workordertraveldefaultminutes INTEGER NOT NULL DEFAULT 0, "
                                      + "worklaborscheduledefaultminutes INTEGER NOT NULL DEFAULT 0, "