Skip to content

Update from Original Fix by Raymond for Source display in invoiced Items #1578

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

Open
jonesgaohsu wants to merge 2 commits into
base: release25.7-SNAPSHOT
Choose a base branch
from
+72 −32
Open

Update from Original Fix by Raymond for Source display in invoiced Items #1578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bda25a4
Update from Original Fix by Raymond for Source display in invoiced Items
jonesgaohsu Dec 16, 2025
cfeb889
Update to Allow Reversal to show transaction number in window instead…
jonesgaohsu Jan 12, 2026
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
15 changes: 13 additions & 2 deletions onprc_billing/resources/queries/onprc_billing/miscCharges.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<fkDbSchema>core</fkDbSchema>
<fkTable>qcstate</fkTable>
<fkColumnName>rowid</fkColumnName>
</fk>
</fk>
</column>
<column columnName="chargetype">
<columnTitle>Charge Unit</columnTitle>
Expand All @@ -27,6 +27,17 @@
<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>
Expand All @@ -39,4 +50,4 @@
</table>
</tables>
</metadata>
</query>
</query>
78 changes: 53 additions & 25 deletions onprc_billing/resources/queries/onprc_billing/miscCharges/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<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>
9 changes: 5 additions & 4 deletions onprc_billing/resources/schemas/onprc_billing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> <!--Changed to allow Transaction number to display-->
</fk>
</column>
<column columnName="chargeCategory">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -1641,4 +1642,4 @@

</columns>
</table>
</tables>
</tables>
2 changes: 1 addition & 1 deletion onprc_billing/resources/web/onprc_billing/window/ReverseChargeWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,4 +681,4 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
}
});
}
});
});