Skip to content
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

23.11 fb finance update for reversals #1162

Merged
merged 4 commits into from
Oct 30, 2024
Merged

23.11 fb finance update for reversals #1162

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b9de75
This is an update of the ReverseCharge to Add the option to change de…
jonesgaohsu Oct 25, 2024
15035b6
New Revision still issues caused at Line 433 additional, posting so L…
jonesgaohsu Oct 25, 2024
4cc11b3
Latest Change is now functional in Dev Instance pushing to Prime sand…
jonesgaohsu Oct 29, 2024
7917db8
Latest Change is now functional in Dev Instance pushing to Prime sand…
jonesgaohsu Oct 30, 2024
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
48 changes: 47 additions & 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 @@ -2,6 +2,8 @@
* Copyright (c) 2013 LabKey Corporation
*
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
* Modified jonesga October 30, 2024
* **Per Finance Issue Tracker 11380 added debit Aklias add function to allow change of debit alias when no center project is associated
*/
Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
extend: 'Ext.window.Window',
Expand Down Expand Up @@ -299,6 +301,35 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
}
}]
});
//debit alias
//Added b y Gary 2024-10-25 Finance issue 11380
items.push({
xtype: 'checkbox',
boxLabel: 'Change Debit Alias',
itemId: 'doChangedebitAlias',
listeners: {
change: function(field, val){
field.up('panel').down('#debitPanel').setVisible(val);
}
}
},{
xtype: 'panel',
itemId: 'debitPanel',
hidden: true,
defaults: {
border: false,
style: 'margin-left: 20px;'
},
items: [{
xtype: 'textfield',
itemId: 'newDebitAliasField',
width: 400,
labelWidth: 150,
fieldLabel: 'Debit Alias',
displayField: 'newDebitalias',
valueField: 'NewDebitalias'
}]
});

//credit alias
items.push({
Expand Down Expand Up @@ -396,6 +427,12 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
return;

}
//added as part of Finance 11380 update by Gary
//this issues is causing error
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;
}

if (this.down('#doChangeCreditAlias').getValue() && !this.down('#creditAliasField').getValue()){
Ext4.Msg.alert('Error', 'You have checked that you want to alter the credit alias, but did not supply the new alias. Either enter an alias or uncheck the field');
Expand Down Expand Up @@ -444,14 +481,23 @@ Ext4.define('ONPRC_Billing.window.ReverseChargeWindow', {
var creditAliasField = this.down('#creditAliasField');
var unitCostField = this.down('#unitCostField');




if (this.down('#doChangeProject').getValue()){
toApply.project = this.down('#projectField').getValue();
toApply.debitedaccount = this.down('#debitAliasField').getValue();
if (toApply.debitedaccount){
toApply.debitedaccount = Ext4.String.trim(toApply.debitedaccount);
}
}

//Added by Gary as part of 11380 update
if (this.down('#doChangedebitAlias').getValue()){
toApply.debitedaccount = this.down('#newDebitAliasField').getValue();
if (toApply.debitedaccount){
toApply.debitedaccount = Ext4.String.trim(toApply.debitedaccount);
}
}
if (this.down('#doChangeCreditAlias').getValue()){
toApply.creditedaccount = this.down('#creditAliasField').getValue();
if (toApply.creditedaccount){
Expand Down