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 1 commit into
base: release25.7-SNAPSHOT
Choose a base branch
from
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
1 commit
Select commit
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
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>
</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>
22 changes: 11 additions & 11 deletions 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 @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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){
Expand Down Expand Up @@ -681,4 +681,4 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
}
});
}
});
});