Merge remote-tracking branch 'ORIGIN/release26.3-SNAPSHOT' into 26.3_fb_lovcombo_timeofday_1266

Author: labkey-martyp

wnprc_billing/resources/queries/wnprc_billing/perDiemFeeRates.sql

@@ -58,4 +58,5 @@
     (CAST(pdt.adate AS DATE) <= cr1.enddate OR cr1.enddate IS NULL))
   LEFT JOIN ehr_billing.chargeableItems ci1 ON ci1.rowid = cr1.chargeId) pdr
   WHERE (pdr.item = 'Per diems' AND pdr.project.projectType IS NULL) --Excluding research projects from reduce perDiem
-     OR (pdr.item = 'Special Animal Per Diem' AND pdr.project.projectType = 'Marmoset U24')  --Only assigning reduce perDiem to U24 projects
+     OR (pdr.item = 'Special Animal Per Diem' AND pdr.project.projectType = 'Marmoset U24')  --Only assigning reduce perDiem to U24 projects
+     OR (pdr.item = 'BSL3 Per diems' AND pdr.project.projectType = 'BSL3')

wnprc_billing/src/org/labkey/wnprc_billing/table/WNPRC_BillingCustomizer.java

@@ -80,6 +80,8 @@ private void customizeChargeableItems(AbstractTableInfo ti)
                     " THEN 'Yes'" +
                     " WHEN " +  ExprColumn.STR_TABLE_ALIAS + ".name  = 'Special Animal Per Diem'" +
                     " THEN 'Yes'" +
+                    " WHEN " +  ExprColumn.STR_TABLE_ALIAS + ".name  = 'BSL3 Per diems'" +
+                    " THEN 'Yes'" +
                     " ELSE ''" +
                     " END)" +
                     ")";