From 995746762877116e6500ebd8a0a675def754fc20 Mon Sep 17 00:00:00 2001
From: jonesgaohsu <jonesga@ohsu.edu>
Date: Mon, 27 Jul 2026 09:17:43 -0700
Subject: [PATCH 1/4] New xml for Linked schema for Art Core Finance Invoicxed
 items

---
 .../onprc_billing_public_artcore.template.xml | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 onprc_billing/resources/schemas/onprc_billing_public_artcore.template.xml

diff --git a/onprc_billing/resources/schemas/onprc_billing_public_artcore.template.xml b/onprc_billing/resources/schemas/onprc_billing_public_artcore.template.xml
new file mode 100644
index 000000000..42833d0d3
--- /dev/null
+++ b/onprc_billing/resources/schemas/onprc_billing_public_artcore.template.xml
@@ -0,0 +1,71 @@
+
+<templateSchema sourceSchemaName="onprc_billing" xmlns="http://labkey.org/data/xml/externalSchema" xmlns:cv="http://labkey.org/data/xml/queryCustomView">
+    <tables>
+        <tableName>publicInvoiceRuns</tableName>
+        <tableName>publicInvoicedItems</tableName>
+        <tableName>chargeableItems</tableName>
+        <tableName>fiscalAuthorities</tableName>
+        <tableName>aliases</tableName>
+        <tableName>grants</tableName>
+        <tableName>grantProjects</tableName>
+        <tableName>chargeRates</tableName>
+        <tableName>chargeRateExemptions</tableName>
+        <tableName>projectMultipliers</tableName>
+        <tableName>creditAccount</tableName>
+        <tableName>aliasTypes</tableName>
+        <tableName>chargeUnits</tableName>
+        <tableName>chargeUnitAccounts</tableName>
+        <tableName>projectAccountHistory</tableName>
+        <tableName>procedureFeeDefinition</tableName>
+    </tables>
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="publicInvoiceRuns" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Invoice Runs</tableTitle>
+            </table>
+            <table tableName="publicInvoicedItems" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Invoiced Items</tableTitle>
+                <filters>
+                    <filter column="Category"
+                        operator="eq"
+                        value="ARTCode" />
+                    <filter column="date"
+                            operator = "dategte"
+                            value="2022-01-01"/>
+                </filters>
+            </table>
+            <table tableName="chargeableItems" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Chargeable Items</tableTitle>
+            </table>
+            <table tableName="fiscalAuthorities" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Fiscal Authorities</tableTitle>
+            </table>
+            <table tableName="aliases" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Aliases</tableTitle>
+            </table>
+
+
+            <table tableName="chargeRates" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Charge Rates</tableTitle>
+            </table>
+            <table tableName="chargeRateExemptions" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Exemptions to Default Rates</tableTitle>
+            </table>
+            <table tableName="creditAccount" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Aliases Receiving Credits For Each Charge</tableTitle>
+            </table>
+            <table tableName="chargeUnits" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Charge Units</tableTitle>
+            </table>
+        </tables>
+    </metadata>
+</templateSchema>
\ No newline at end of file

From a9faacc420620b8cdf7b196251bd8a3d59f19aca Mon Sep 17 00:00:00 2001
From: jonesgaohsu <jonesga@ohsu.edu>
Date: Mon, 27 Jul 2026 14:17:04 -0700
Subject: [PATCH 2/4] New xml for Linked schema for Art Core Finance Invoicxed
 items

---
 .../onprc_billing_public_artcore.template.xml | 71 -------------------
 .../pf_publicFinanceArtCore.template.xml      | 38 ++++++++++
 2 files changed, 38 insertions(+), 71 deletions(-)
 delete mode 100644 onprc_billing/resources/schemas/onprc_billing_public_artcore.template.xml
 create mode 100644 onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml

diff --git a/onprc_billing/resources/schemas/onprc_billing_public_artcore.template.xml b/onprc_billing/resources/schemas/onprc_billing_public_artcore.template.xml
deleted file mode 100644
index 42833d0d3..000000000
--- a/onprc_billing/resources/schemas/onprc_billing_public_artcore.template.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<templateSchema sourceSchemaName="onprc_billing" xmlns="http://labkey.org/data/xml/externalSchema" xmlns:cv="http://labkey.org/data/xml/queryCustomView">
-    <tables>
-        <tableName>publicInvoiceRuns</tableName>
-        <tableName>publicInvoicedItems</tableName>
-        <tableName>chargeableItems</tableName>
-        <tableName>fiscalAuthorities</tableName>
-        <tableName>aliases</tableName>
-        <tableName>grants</tableName>
-        <tableName>grantProjects</tableName>
-        <tableName>chargeRates</tableName>
-        <tableName>chargeRateExemptions</tableName>
-        <tableName>projectMultipliers</tableName>
-        <tableName>creditAccount</tableName>
-        <tableName>aliasTypes</tableName>
-        <tableName>chargeUnits</tableName>
-        <tableName>chargeUnitAccounts</tableName>
-        <tableName>projectAccountHistory</tableName>
-        <tableName>procedureFeeDefinition</tableName>
-    </tables>
-    <metadata>
-        <tables xmlns="http://labkey.org/data/xml">
-            <table tableName="publicInvoiceRuns" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Invoice Runs</tableTitle>
-            </table>
-            <table tableName="publicInvoicedItems" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Invoiced Items</tableTitle>
-                <filters>
-                    <filter column="Category"
-                        operator="eq"
-                        value="ARTCode" />
-                    <filter column="date"
-                            operator = "dategte"
-                            value="2022-01-01"/>
-                </filters>
-            </table>
-            <table tableName="chargeableItems" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Chargeable Items</tableTitle>
-            </table>
-            <table tableName="fiscalAuthorities" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Fiscal Authorities</tableTitle>
-            </table>
-            <table tableName="aliases" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Aliases</tableTitle>
-            </table>
-
-
-            <table tableName="chargeRates" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Charge Rates</tableTitle>
-            </table>
-            <table tableName="chargeRateExemptions" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Exemptions to Default Rates</tableTitle>
-            </table>
-            <table tableName="creditAccount" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Aliases Receiving Credits For Each Charge</tableTitle>
-            </table>
-            <table tableName="chargeUnits" tableDbType="NOT_IN_DB">
-                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Charge Units</tableTitle>
-            </table>
-        </tables>
-    </metadata>
-</templateSchema>
\ No newline at end of file
diff --git a/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml b/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml
new file mode 100644
index 000000000..1a8e93a78
--- /dev/null
+++ b/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml
@@ -0,0 +1,38 @@
+
+<templateSchema sourceSchemaName="onprc_billing" xmlns="http://labkey.org/data/xml/externalSchema" xmlns:cv="http://labkey.org/data/xml/queryCustomView">
+    <tables>
+        <tableName>aliases</tableName>
+        <tableName>dataAccess</tableName>
+        <tableName>projectAccountHistory</tableName>
+        <tableName>publicInvoicedItems</tableName>
+    </tables>
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="aliases" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Aliases</tableTitle>
+            </table>
+            <table tableName="dataAccess" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Data Access</tableTitle>
+            </table>
+            <table tableName="publicInvoicedItems" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Invoiced Items</tableTitle>
+               <!-- <filters>
+                    <filter column="Category"
+                            operator="eq"
+                            value="ART Core" />
+                    <filter column="date"
+                            operator = "dategte"
+                            value="2022-01-01"/>
+                </filters>-->
+            </table>
+
+            <table tableName="projectAccountHistory" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
+                <tableTitle>Project Account History</tableTitle>
+            </table>
+        </tables>
+    </metadata>
+</templateSchema>
\ No newline at end of file

From 7c38de0c6d614f56b73f8fb0c3802cf90ab86e2d Mon Sep 17 00:00:00 2001
From: jonesgaohsu <jonesga@ohsu.edu>
Date: Tue, 28 Jul 2026 08:44:49 -0700
Subject: [PATCH 3/4] Update of Linked Schema as filter was needed

---
 .../resources/schemas/pf_publicFinanceArtCore.template.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml b/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml
index 1a8e93a78..b1e1f395f 100644
--- a/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml
+++ b/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml
@@ -19,7 +19,7 @@
             <table tableName="publicInvoicedItems" tableDbType="NOT_IN_DB">
                 <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Invoiced Items</tableTitle>
-               <!-- <filters>
+                <filters>
                     <filter column="Category"
                             operator="eq"
                             value="ART Core" />

From d942cf8debdb80228b5891c2dbc8c1574e1fd768 Mon Sep 17 00:00:00 2001
From: jonesgaohsu <jonesga@ohsu.edu>
Date: Tue, 28 Jul 2026 12:06:10 -0700
Subject: [PATCH 4/4] =Modification to remove filter in xml and approach as
 view

---
 .../schemas/pf_publicFinanceArtCore.template.xml         | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml b/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml
index b1e1f395f..7570965f4 100644
--- a/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml
+++ b/onprc_billing/resources/schemas/pf_publicFinanceArtCore.template.xml
@@ -19,14 +19,7 @@
             <table tableName="publicInvoicedItems" tableDbType="NOT_IN_DB">
                 <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Invoiced Items</tableTitle>
-                <filters>
-                    <filter column="Category"
-                            operator="eq"
-                            value="ART Core" />
-                    <filter column="date"
-                            operator = "dategte"
-                            value="2022-01-01"/>
-                </filters>-->
+
             </table>
 
             <table tableName="projectAccountHistory" tableDbType="NOT_IN_DB">