Skip to content

[bot] Merge 25.12 to develop #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 4 commits into from
Dec 17, 2025
Merged

[bot] Merge 25.12 to develop #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25cfda4
Test failure fix related to query validation during folder import (#907)
labkey-bpatel Dec 9, 2025
e0aa7f9
Merge 25.7 to 25.11
labkey-teamcity Dec 15, 2025
3e9cbcc
Merge 25.11 to 25.12
labkey-teamcity Dec 16, 2025
7060a9c
Merge 25.12 to develop
labkey-teamcity Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions wnprc_billing/resources/domain-templates/ehr_billing.template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading