Merge 23.9 to develop

Author: labkey-teamcity

ehr/resources/web/ehr/form/field/AnimalField.js

@@ -18,6 +18,11 @@ Ext4.define('EHR.form.field.AnimalField.js', {
         this.on('change', function(field, val, oldVal){
             this.fireEvent('animalchange', val);
         }, this, {buffer: 200});
+
+        // Verify one more time when the field loses focus as change handler can be a little flaky
+        this.on('blur', function(field){
+            this.fireEvent('animalchange', field.value);
+        }, this);
     },
 
     //NOTE: modules can override this method to enfore alternate rules

ehr_billing/api-src/org/labkey/api/ehr_billing/pipeline/BillingPipelineJobProcess.java

@@ -36,6 +36,7 @@ public class BillingPipelineJobProcess
     private boolean _useEHRContainer = false;
     private boolean _isMiscCharges = false;
     private TableInfo _miscChargesTableInfo;
+    private Map<String,Object> _params;
 
     /**
      *
@@ -139,9 +140,17 @@ public void setMiscCharges(boolean miscCharges, TableInfo tableInfo)
 
     public Map<String, Object> getQueryParams(BillingPipelineJobSupport support)
     {
-        Map<String, Object> params = new HashMap<>();
-        params.put("StartDate", support.getStartDate());
-        params.put("EndDate", support.getEndDate());
-        return params;
+        if (_params == null)
+            _params = new HashMap<>();
+        _params.put("StartDate", support.getStartDate());
+        _params.put("EndDate", support.getEndDate());
+        return _params;
+    }
+
+    public void addQueryParam(String name, Object value)
+    {
+        if (_params == null)
+            _params = new HashMap<>();
+        _params.put(name, value);
     }
 }

ehr_billing/api-src/org/labkey/api/ehr_billing/pipeline/InvoicedItemsProcessingService.java

@@ -96,4 +96,6 @@ default Pair<String,String> verifyBillingRunPeriod(User user, Container containe
     }
 
     default void processBillingRerun(String newInvoiceId, String newInvoiceRowId, Date billingStartDate, Date billingRunEndDate, int nextTransactionNumber, User user, Container container, Logger logger) {}
+
+    default void setBillingStartDate(Date billingStartDate) {}
 }

ehr_billing/src/org/labkey/ehr_billing/pipeline/BillingTask.java

@@ -149,6 +149,7 @@ public RecordedActionSet run() throws PipelineJobException
         {
             getOrCreateInvoiceRunRecord();
             loadTransactionNumber();
+            processingService.setBillingStartDate(getSupport().getStartDate());
 
             if (null != _previousInvoice)
             {