Merge 25.12 to develop

Author: labkey-teamcity

WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java

@@ -1845,16 +1845,19 @@ private void checkGrantAccountsColumns(String linkText)
                 "contact_name",
                 "contact_phone",
                 "contact_email",
+                "institution",
                 "address",
                 "city",
                 "state",
                 "zip",
+                "billing_contact_info",
                 "comments",
                 "po_number",
                 "po_amount",
                 "charge_grant_accounts_id",
                 "uw_fund",
                 "uw_account",
+                "spend_category",
                 "uw_udds",
                 "uw_class_code",
                 "grant_period_end",

wnprc_billing/resources/domain-templates/ehr_billing.template.xml

@@ -44,6 +44,10 @@
                     <dat:rangeURI>string</dat:rangeURI>
                     <dat:scale>50</dat:scale>
                 </dat:column>
+                <dat:column columnName="institution">
+                    <dat:rangeURI>string</dat:rangeURI>
+                    <dat:scale>50</dat:scale>
+                </dat:column>
                 <dat:column columnName="address">
                     <dat:rangeURI>string</dat:rangeURI>
                     <dat:scale>255</dat:scale>
@@ -60,6 +64,10 @@
                     <dat:rangeURI>string</dat:rangeURI>
                     <dat:scale>10</dat:scale>
                 </dat:column>
+                <dat:column columnName="billing_contact_info">
+                    <dat:rangeURI>string</dat:rangeURI>
+                    <dat:scale>10</dat:scale>
+                </dat:column>
                 <dat:column columnName="comments">
                     <dat:rangeURI>string</dat:rangeURI>
                 </dat:column>