From bda25a4b6101494fa903fbc7923f413d9c6bd4b0 Mon Sep 17 00:00:00 2001
From: Gary Jones <jonesga@ohsu.edu>
Date: Tue, 16 Dec 2025 10:13:11 -0700
Subject: [PATCH] Update from Original Fix by Raymond for Source display in
 invoiced Items

---
 .../onprc_billing/miscCharges/.qview.xml      | 78 +++++++++++++------
 .../resources/schemas/onprc_billing.xml       |  9 ++-
 .../window/ReverseChargeWindow.js             | 22 +++---
 3 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/onprc_billing/resources/queries/onprc_billing/miscCharges/.qview.xml b/onprc_billing/resources/queries/onprc_billing/miscCharges/.qview.xml
index e7b28cb59..716dbf1d6 100644
--- a/onprc_billing/resources/queries/onprc_billing/miscCharges/.qview.xml
+++ b/onprc_billing/resources/queries/onprc_billing/miscCharges/.qview.xml
@@ -1,25 +1,53 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
-    <columns>
-        <column name="Id"/>
-        <column name="date"/>
-        <column name="billingDate"/>
-        <column name="project"/>
-        <column name="debitedaccount"/>
-        <column name="debitedaccount/investigatorName"/>
-        <column name="chargetype"/>
-        <column name="creditedaccount"/>
-        <column name="chargeId"/>
-        <column name="unitcost"/>
-        <column name="quantity"/>
-        <column name="chargecategory"/>
-        <column name="comment"/>
-        <column name="invoiceId"/>
-        <column name="createdby"/>
-        <column name="taskid"/>
-        <column name="qcstate"/>
-    </columns>
-    <sorts>
-        <sort column="date" descending="true"/>
-        <sort column="Id"/>
-    </sorts>
-</customView>
\ No newline at end of file
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="miscCharges" tableDbType="TABLE">
+                <columns>
+                    <!--NOTE: for some reason this FK is not respected when added in the schema XML-->
+                    <column columnName="Id">
+                        <fk>
+                            <fkDbSchema>study</fkDbSchema>
+                            <fkTable>Animal</fkTable>
+                            <fkColumnName>Id</fkColumnName>
+                        </fk>
+                    </column>
+                    <column columnName="QCState">
+                        <fk>
+                            <fkDbSchema>core</fkDbSchema>
+                            <fkTable>qcstate</fkTable>
+                            <fkColumnName>rowid</fkColumnName>
+                        </fk>
+                    </column>
+                    <column columnName="chargetype">
+                        <columnTitle>Charge Unit</columnTitle>
+                        <fk>
+                            <fkDbSchema>onprc_billing_public</fkDbSchema>
+                            <fkTable>chargeUnits</fkTable>
+                            <fkColumnName>chargetype</fkColumnName>
+                            <fkDisplayColumnName useRawValue="true"/>
+                        </fk>
+                    </column>
+                    <column columnName="sourceInvoicedItem">
+                        <columnTitle>Source Transaction</columnTitle>
+                        <isHidden>false</isHidden>
+                        <fk>
+                            <fkFolderPath>/ONPRC/Admin/Finance</fkFolderPath>
+                            <fkDbSchema>onprc_billing</fkDbSchema>
+                            <fkTable>invoicedItems</fkTable>
+                            <fkColumnName>objectid</fkColumnName>
+                            <fkDisplayColumnName>transactionNumber</fkDisplayColumnName>
+                        </fk>
+                    </column>
+                    <column columnName="chargecategory">
+                        <fk>
+                            <fkDbSchema>onprc_billing</fkDbSchema>
+                            <fkTable>miscChargesType</fkTable>
+                            <fkColumnName>category</fkColumnName>
+                            <fkDisplayColumnName useRawValue="true"/>
+                        </fk>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
diff --git a/onprc_billing/resources/schemas/onprc_billing.xml b/onprc_billing/resources/schemas/onprc_billing.xml
index 2bb09f73b..5b9a0badb 100644
--- a/onprc_billing/resources/schemas/onprc_billing.xml
+++ b/onprc_billing/resources/schemas/onprc_billing.xml
@@ -419,10 +419,11 @@
                 <columnTitle>Source Transaction</columnTitle>
                 <isHidden>true</isHidden>
                 <fk>
+                    <fkFolderPath>/ONPRC/Admin/Finance</fkFolderPath>
                     <fkDbSchema>onprc_billing</fkDbSchema>
                     <fkTable>invoicedItems</fkTable>
                     <fkColumnName>objectid</fkColumnName>
-                    <fkDisplayColumnName>rowid</fkDisplayColumnName>
+                    <fkDisplayColumnName>transactionNumber</fkDisplayColumnName>
                 </fk>
             </column>
             <column columnName="chargeCategory">
@@ -1152,11 +1153,11 @@
             </column>
             <column columnName="grantNumber">
                 <columnTitle>OGA Grant Number</columnTitle>
-               
+
             </column>
             <column columnName="agencyAwardNumber">
                 <columnTitle>Agency Award Number</columnTitle>
-               
+
             </column>
             <column columnName="investigatorId">
                 <columnTitle>Investigator</columnTitle>
@@ -1641,4 +1642,4 @@
 
         </columns>
     </table>
-</tables>
\ No newline at end of file
+</tables>
diff --git a/onprc_billing/resources/web/onprc_billing/window/ReverseChargeWindow.js b/onprc_billing/resources/web/onprc_billing/window/ReverseChargeWindow.js
index fb7058865..289bdf417 100644
--- a/onprc_billing/resources/web/onprc_billing/window/ReverseChargeWindow.js
+++ b/onprc_billing/resources/web/onprc_billing/window/ReverseChargeWindow.js
@@ -49,7 +49,7 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
             },
             items: [{
                 html: 'This helper allows you to make adjustments and reversals.  Once you select the type of adjustment, look below to see an explanation of the items it will create.<br><br>' +
-                'NOTE: You have selected ' + this.checked.length + ' items to be reversed or adjusted.  These are based on the rows you checked on the previous grid.',
+                        'NOTE: You have selected ' + this.checked.length + ' items to be reversed or adjusted.  These are based on the rows you checked on the previous grid.',
                 style: 'padding-bottom: 10px;'
             },{
                 xtype: 'radiogroup',
@@ -192,13 +192,13 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
 
             items.push({
                 html: 'This will reverse the original charges and create adjustments based on your selections below.  ' +
-                    '<ul>' +
-                    '<li>All transactions will use the date selected below, as opposed to the original transaction date.</li>' +
-                    '<li>The reversal will use the aliases used on the original transaction.  This does not check whether the aliases are still valid.</li>' +
-                    '<li>If you choose to change the project, the project/alias selected will be used on the adjustment.  If you leave this blank, the original project/alias will be used</li>' +
-                    '<li>If you select an alternate credit alias, this will be used on all adjustments.  Otherwise the original credit alias will be used.' +
-                    '<li>Note: you can leave any or all of these fields blank and create the adjustment.  You will have the opportunity to view the adjustment form, which allows you to independently edit any of these values there as well.</li>' +
-                    '</ul>',
+                        '<ul>' +
+                        '<li>All transactions will use the date selected below, as opposed to the original transaction date.</li>' +
+                        '<li>The reversal will use the aliases used on the original transaction.  This does not check whether the aliases are still valid.</li>' +
+                        '<li>If you choose to change the project, the project/alias selected will be used on the adjustment.  If you leave this blank, the original project/alias will be used</li>' +
+                        '<li>If you select an alternate credit alias, this will be used on all adjustments.  Otherwise the original credit alias will be used.' +
+                        '<li>Note: you can leave any or all of these fields blank and create the adjustment.  You will have the opportunity to view the adjustment form, which allows you to independently edit any of these values there as well.</li>' +
+                        '</ul>',
                 style: 'padding-bottom: 10px;'
             },{
                 xtype: 'datefield',
@@ -429,7 +429,7 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
             }
             //added as part of Finance 11380 update by Gary
             //this issues is causing error
-           if (this.down('#doChangedebitAlias').getValue() && !this.down('#newDebitAliasField').getValue()){
+            if (this.down('#doChangedebitAlias').getValue() && !this.down('#newDebitAliasField').getValue()){
                 Ext4.Msg.alert('Error', 'You have checked that you want to alter the debit alias, but did not supply the new alias.  Either enter an alias or uncheck the field');
                 return;
             }
@@ -491,7 +491,7 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
                     toApply.debitedaccount = Ext4.String.trim(toApply.debitedaccount);
                 }
             }
-           //Added by Gary as part of 11380 update
+            //Added by Gary as part of 11380 update
             if (this.down('#doChangedebitAlias').getValue()){
                 toApply.debitedaccount = this.down('#newDebitAliasField').getValue();
                 if (toApply.debitedaccount){
@@ -681,4 +681,4 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
             }
         });
     }
-});
\ No newline at end of file
+});