When closing a budget, the fund code is missing from the table showing the number of unreceived orders for each fund.
To test: - Create a budget and fund - Order anything, leave basket open or not, but don't receive - Duplicate your existing budget - Close the first budget in order to move the pending orders - Verify the fund code is not showing in the table
This change makes the code appear, but it might need more work ad I think the intention probably was to show indentation for child funds: - <td>[% budget.budget_code_indent | html %]</td> + <td>[% budget.budget_code | html %]</td>
It seems that budget_code_indent has been added to this template by commit a12e96e938c9203e5fb98d7ab74e77d0b22f34ba Bug 12164: Move the budget period clone logic into C4::Budgets Pushed on Jul 24 2014 but dropped by commit 32bd54a7cadcf90be797afa1a8e9f1bf83c6ee57 Bug 11714 - GetBudgetHierarchy needs optimization Pushed on Oct 31 2014 They certainly overlapped during the SO+QA process I think your patch is correct.
Created attachment 105294 [details] [review] Bug 25499: Fix fund code column when closing a budget When closing a budget the fund code column in the table is always empty. This is due to a TT variable not being correct. To test: - Create a budget and fund - Order anything, leave basket open or not, but don't receive - Duplicate your existing budget - Close the first budget in order to move the pending orders - Verify the fund code is not showing in the table - Apply patch and reload the patch - Verify fund codes are now showing correctly Bonus: Changes the column heading Fund id to Fund ID.
Thx for reviewing and digging, Jonathan!
Created attachment 106636 [details] [review] Bug 25499: Fix fund code column when closing a budget When closing a budget the fund code column in the table is always empty. This is due to a TT variable not being correct. To test: - Create a budget and fund - Order anything, leave basket open or not, but don't receive - Duplicate your existing budget - Close the first budget in order to move the pending orders - Verify the fund code is not showing in the table - Apply patch and reload the patch - Verify fund codes are now showing correctly Bonus: Changes the column heading Fund id to Fund ID. Signed-off-by: Abbey Holt <aholt@dubuque.lib.ia.us>
Thanks a lot, Abbey!
It worked great!
Created attachment 107494 [details] [review] Bug 25499: Fix fund code column when closing a budget When closing a budget the fund code column in the table is always empty. This is due to a TT variable not being correct. To test: - Create a budget and fund - Order anything, leave basket open or not, but don't receive - Duplicate your existing budget - Close the first budget in order to move the pending orders - Verify the fund code is not showing in the table - Apply patch and reload the patch - Verify fund codes are now showing correctly Bonus: Changes the column heading Fund id to Fund ID. Signed-off-by: Abbey Holt <aholt@dubuque.lib.ia.us> Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
Pushed to master for 20.11, thanks to everybody involved!
backported to 20.05.x for 20.05.03
backported to 19.11.x for 19.11.09
Not backported to oldoldstable (19.05.x). Feel free to ask if it's needed.