Merge 24.11 to 25.1

Author: labkey-teamcity

EHR_App/src/org/labkey/ehr_app/EHR_AppModule.java

@@ -53,13 +53,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 24.000;
-    }
-
-    @Override
-    public boolean hasScripts()
-    {
-        return true;
+        return 25.000;
     }
 
     @Override
@@ -81,7 +75,7 @@ protected void registerSchemas()
         DefaultSchema.registerProvider(EHR_AppSchema.NAME, new DefaultSchema.SchemaProvider(this)
         {
             @Override
-            public @Nullable QuerySchema createSchema(DefaultSchema schema, Module module)
+            public @NotNull QuerySchema createSchema(DefaultSchema schema, Module module)
             {
                 return new EHR_AppUserSchema(EHR_AppSchema.NAME, null, schema.getUser(), schema.getContainer(), EHR_AppSchema.getInstance().getSchema());
             }

EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java

@@ -18,7 +18,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.ehr_purchasing.EHR_PurchasingDomainKind;
 import org.labkey.api.exp.property.PropertyService;
@@ -46,7 +45,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 24.000;
+        return 25.000;
     }
 
     @Override
@@ -85,13 +84,6 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)
         });
     }
 
-    @Override
-    @NotNull
-    public Collection<String> getSummary(Container c)
-    {
-        return Collections.emptyList();
-    }
-
     @Override
     @NotNull
     public Set<String> getSchemaNames()

ehr/src/org/labkey/ehr/EHRModule.java

@@ -133,13 +133,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 24.005;
-    }
-
-    @Override
-    public boolean hasScripts()
-    {
-        return true;
+        return 25.000;
     }
 
     @Override

ehr/test/src/org/labkey/test/pages/ehr/EHRLookupPage.java

@@ -14,6 +14,7 @@ public class EHRLookupPage extends LabKeyPage<EHRLookupPage.ElementCache>
     public EHRLookupPage(WebDriverWrapper driver)
     {
         super(driver);
+        waitForPage();
     }
     public void waitForPage()
     {

ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java

@@ -63,7 +63,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 24.001;
+        return 25.000;
     }
 
     @Override
@@ -120,13 +120,6 @@ public void userDeletedFromSite(User user)
         });
     }
 
-    @Override
-    @NotNull
-    public Collection<String> getSummary(Container c)
-    {
-        return Collections.emptyList();
-    }
-
     @Override
     @NotNull
     public Set<String> getSchemaNames()