When invoice adjustments were added they were made to populate spent.pl and ordered.pl, however, they are not taken into account on aqui-home.pl or aqbudgets.pl They must be added in to GetBudgetHierarchy
Created attachment 84900 [details] [review] WIP Add Invoice Adjustments to GetBudgetHierarchy Seems to work but lots of debug code and test are incomplete. I think I made assumptions about how GetBudgetHierarchy takes a budget_period_id that are wrong
Created attachment 86532 [details] [review] Bug 22296: Add Invoice Adjustments to GetBudgetHierarchy To test: 1 - prove -v t/db_dependent/Budgets.t 2 - Create some invoices on a single budget Invoice 1: add a non-encumbered adjustment for 1 add an encumbered adjustment 2 leave open Invoice 2: add a non-encumbered adjustment for 4 add an encumbered adjustment for 8 3 - View acq home page, should see 2 order and 12 spent for the budget 4 - View the spent and ordered pages, they should show the correct amounts 5 - Add more orders etc and confirm things total correctly
Hi Nick, Testing on our sandbox I'm seeing a problem in that after adding the initial adjustment, every time you subsequently click Update Adjustments it changes the Fund that you want to debit or credit back to No Fund. This means I can't really test properly as I can't add a 2nd adjustment line without it changing the Fund to No Fund! Do you need any more info? many thanks Janet
(In reply to Janet McGowan from comment #3) > Hi Nick, > Testing on our sandbox I'm seeing a problem in that after adding the initial > adjustment, every time you subsequently click Update Adjustments it changes > the Fund that you want to debit or credit back to No Fund. > This means I can't really test properly as I can't add a 2nd adjustment line > without it changing the Fund to No Fund! > Do you need any more info? > many thanks > Janet Looks like I missed updating one variable on the dependent bug 22498 - new patch attached there
On our sandbox I've tested 22498 and 22296 together following the test plan for 22296 and all work together successfully. N.B As well as positive amounts I've also tested using minus sign on amounts to apply credits to a fund and this also works.
Created attachment 86568 [details] [review] Bug 22296: Add Invoice Adjustments to GetBudgetHierarchy To test: 1 - prove -v t/db_dependent/Budgets.t 2 - Create some invoices on a single budget Invoice 1: add a non-encumbered adjustment for 1 add an encumbered adjustment 2 leave open Invoice 2: add a non-encumbered adjustment for 4 add an encumbered adjustment for 8 3 - View acq home page, should see 2 order and 12 spent for the budget 4 - View the spent and ordered pages, they should show the correct amounts 5 - Add more orders etc and confirm things total correctly https://bugs.koha-community.org/show_bug.cgi?id=22296 Signed-off-by: Janet McGowan <janet.mcgowan@ptfs-europe.com>
Just doing the honours of uploading Janets signed patch for her.. sandboxes don't like signing of dependants.
Created attachment 86596 [details] [review] Bug 22296: Add Invoice Adjustments to GetBudgetHierarchy To test: 1 - prove -v t/db_dependent/Budgets.t 2 - Create some invoices on a single budget Invoice 1: add a non-encumbered adjustment for 1 add an encumbered adjustment 2 leave open Invoice 2: add a non-encumbered adjustment for 4 add an encumbered adjustment for 8 3 - View acq home page, should see 2 order and 12 spent for the budget 4 - View the spent and ordered pages, they should show the correct amounts 5 - Add more orders etc and confirm things total correctly https://bugs.koha-community.org/show_bug.cgi?id=22296 Signed-off-by: Janet McGowan <janet.mcgowan@ptfs-europe.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Awesome work all! Pushed to master for 19.05
missing dependency, won't back port to 18.05.x series
Pushed to 18.11.x for 18.11.04.. seems I forgot to update bugzilla at the time.