[Bug 23767] New: Spent and Ordered total values don't include child
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Bug ID: 23767 Summary: Spent and Ordered total values don't include child Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: major Priority: P5 - low Component: Acquisitions Assignee: koha-bugs@lists.koha-community.org Reporter: nick@bywatersolutions.com QA Contact: testopia@bugs.koha-community.org -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Spent and Ordered total |Spent and Ordered total |values don't include child |values don't include child | |funds on acqui-home --- Comment #1 from Nick Clemens <nick@bywatersolutions.com> --- To recreate: 1 - Have three funds, two parents and one child 2 - Open a basket and add an order to each fund 3 - View acqui-home.pl 4 - Note that ordered values are only added from the two parent funds 5 - Complete these orders (close basket, receive) 6 - Note the spent only includes parent funds 7 - Place three more orders, one from each fund 8 - Now you can see both spent and ordered are incorrect -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #2 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 93828 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93828&action=edit Bug 23767: Include child funds in total spent and ordered on acqui-home To test: 1 - Have three funds, two parents and one child 2 - Open a basket and add an order to each fund 3 - View acqui-home.pl 4 - Note that ordered values are only added from the two parent funds 5 - Complete these orders (close basket, receive) 6 - Note the spent only includes parent funds 7 - Place three more orders, one from each fund 8 - Now you can see both spent and ordered are incorrect 9 - Apply patch 10 - Reload, all should add correctly -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |12987 Assignee|koha-bugs@lists.koha-commun |nick@bywatersolutions.com |ity.org | CC| |jonathan.druart@bugs.koha-c | |ommunity.org, | |katrin.fischer@bsz-bw.de, | |martin.renvoize@ptfs-europe | |.com Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12987 [Bug 12987] Update table footer with the visible rows -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #3 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Hi Nick, There is definitely something wrong on this screen but I am wondering if we should not fix something else as well. First, do you remember why you linked this bug with bug 12987? I do not understand why they are directly in relation. Then, take a look at those screenshots: https://snipboard.io/grClq9.jpg https://snipboard.io/EqYWxU.jpg The first one is acqui-home, second is aqbudgets. Cell fund11/Ordered => on one screen we display the ordered value for the fund, on the other one we sum the fund and the child funds. What do you think? Should not we fix that as well on the same bug report? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #4 from Nick Clemens <nick@bywatersolutions.com> --- (In reply to Jonathan Druart from comment #3)
First, do you remember why you linked this bug with bug 12987? I do not understand why they are directly in relation.
As far as I can tell, that bug changed footer_column_sum to only add columns with a span with class total_amount. Prior to this I think the entire column was summed.
Then, take a look at those screenshots: https://snipboard.io/grClq9.jpg https://snipboard.io/EqYWxU.jpg The first one is acqui-home, second is aqbudgets. Cell fund11/Ordered => on one screen we display the ordered value for the fund, on the other one we sum the fund and the child funds.
What do you think? Should not we fix that as well on the same bug report?
I find it easier in Acq to handle on thing at a time - and I don't think I see the problem in your screen shot. Base-level ordered is just from fund 11, Total ordered is fund 11 plus fund 111 (adult plus children) so the total ordered is correct. The total is different on the two screens because one totals two budgets and the other only one -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |severine.queune@bulac.fr --- Comment #5 from Séverine Queune <severine.queune@bulac.fr> --- Hi Nick, I think the issue also concerns the "Total available" amount. I attach a screenshot with the patch applied, you can see the child amounts are not ignores in the last sum. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #6 from Séverine Queune <severine.queune@bulac.fr> --- Created attachment 94811 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=94811&action=edit Total available sum incorrect -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_19_11_candidate -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |andrew@bywatersolutions.com --- Comment #7 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- *** Bug 22329 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 rkuiper@roundrocktexas.gov changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rkuiper@roundrocktexas.gov -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93828|0 |1 is obsolete| | --- Comment #8 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 95334 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95334&action=edit Bug 23767: Include child funds in total spent and ordered on acqui-home To test: 1 - Have three funds, two parents and one child 2 - Open a basket and add an order to each fund 3 - View acqui-home.pl 4 - Note that ordered values are only added from the two parent funds 5 - Complete these orders (close basket, receive) 6 - Note the spent only includes parent funds 7 - Place three more orders, one from each fund 8 - Now you can see both spent and ordered are incorrect 9 - Apply patch 10 - Reload, all should add correctly Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #9 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 95335 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95335&action=edit Bug 23767: (QA follow-up) Same treatment for available -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #10 from Séverine Queune <severine.queune@bulac.fr> --- Hi Martin, Something is still bothering me with the 'total available'. To me, this total should add the 'total available' for parent funds, and the remove the 'ordered' and 'spent' for child funds. Without the patch, the child amount for 'ordered' and 'spent' are ignored. With the patch, the child 'total available' is added to the global total. Not sure to be enough, so you can find here the I got with the patch (problem with the last amount : I've got 10000€ in excess): PAR1 Parent 1 10 000,00 100,00 0,00 9 900,00 CHILD1 Child 1 5 000,00 0,00 10,00 4 990,00 CHILD2 Child 2 5 000,00 1,00 0,00 4 999,00 PAR2 Parent 2 10 000,00 0,00 0,00 10 000,00 Total 20 000,00 101,00 10,00 29 889,00 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|rel_19_11_candidate |rel_20_05_target -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|major |normal -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #95334|0 |1 is obsolete| | --- Comment #11 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 95840 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95840&action=edit Bug 23767: Include child funds in total spent and ordered on acqui-home To test: 1 - Have three funds, two parents and one child 2 - Open a basket and add an order to each fund 3 - View acqui-home.pl 4 - Note that ordered values are only added from the two parent funds 5 - Complete these orders (close basket, receive) 6 - Note the spent only includes parent funds 7 - Place three more orders, one from each fund 8 - Now you can see both spent and ordered are incorrect 9 - Apply patch 10 - Reload, all should add correctly Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #12 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 95841 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95841&action=edit Bug 23767: Don't calculate 'Total available' The acqui-home page is meant to be a simple view of the budgets. For details you should lok at aqbudgets.pl ( i.e. click on a budget) The total available column isn't easy to calculate - it depends on child funds - trying to calculate what a top level fund has left depends on the values of the child funds. When searching the table and limiting rows you lose the values form the children. On acqbudgets.pl we solve this with the Base-level/Total available columns, and we don't total base-level on that page at all. 'Total available' on acqui-home equals the 'Base level' on the other page. Removing a recalculated total is the simplest answer here, otherwise we must add complexity to this view. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #13 from Séverine Queune <severine.queune@bulac.fr> --- Sorry Nick :( M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt Failed to merge in the changes. Patch failed at 0001 Bug 23767: Don't calculate 'Total available' -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #95335|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #14 from Nick Clemens <nick@bywatersolutions.com> --- Sorry, forgot to obsolete a patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #95840|0 |1 is obsolete| | --- Comment #15 from Séverine Queune <severine.queune@bulac.fr> --- Created attachment 95987 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95987&action=edit Bug 23767: Include child funds in total spent and ordered on acqui-home To test: 1 - Have three funds, two parents and one child 2 - Open a basket and add an order to each fund 3 - View acqui-home.pl 4 - Note that ordered values are only added from the two parent funds 5 - Complete these orders (close basket, receive) 6 - Note the spent only includes parent funds 7 - Place three more orders, one from each fund 8 - Now you can see both spent and ordered are incorrect 9 - Apply patch 10 - Reload, all should add correctly Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #95841|0 |1 is obsolete| | --- Comment #16 from Séverine Queune <severine.queune@bulac.fr> --- Created attachment 95988 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95988&action=edit Bug 23767: Don't calculate 'Total available' The acqui-home page is meant to be a simple view of the budgets. For details you should lok at aqbudgets.pl ( i.e. click on a budget) The total available column isn't easy to calculate - it depends on child funds - trying to calculate what a top level fund has left depends on the values of the child funds. When searching the table and limiting rows you lose the values form the children. On acqbudgets.pl we solve this with the Base-level/Total available columns, and we don't total base-level on that page at all. 'Total available' on acqui-home equals the 'Base level' on the other page. Removing a recalculated total is the simplest answer here, otherwise we must add complexity to this view. Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Barbara Johnson <barbara.johnson@bedfordtx.gov> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |barbara.johnson@bedfordtx.g | |ov -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #17 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am not totally persuaded by the removal of the 'Total available' column as it works well for libraries not using sub funds (we always recommend not to use them, tbh) and it removes valuable information for them.
When searching the table and limiting rows you lose the values form the children I am not sure how this column is different in this regard to the others that we display the total amount for now?
Basically our main problem is the way that the fund hierarchy works. While we can divide the funds in sub funds, we can spent on all levels. And the parent fund has the full amount to spend (including what's in the sub funds), instead of only the remaining amount (total - sub funds). At the moment, when you look at the "Totel spend" on the budget page, it will include the spent values of the sub funds. But on the acq hope page, it won't. Same for ordered. I believe, as the columns appear to be the same, this is quite confusing. If the funds are collapsed, it might look like nothing was spent - even tho the child funds might be almost out of means and the total shows an amount. I believe we should fix this the other direction - make it match the 'Total' columns on the budgets page by adding the spent and ordered from the sub funds to the parent funds. If we do that, I imagine calculating the totals also should get easier as well? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #18 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Not switching status... I think I could be persuaded with the first patch as a bug fix that is universal (for now), but I still believe there are fundamental issues left. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #19 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 98618 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=98618&action=edit With patch applied The 2 in total is correct, but it's not visible/clear where it's coming from. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=16126 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |In Discussion --- Comment #20 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I've now found 16126 and would love if both could be merged/moved forward together. Both sadly lack the total amount, although it's available on the budget page. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|rel_20_05_candidate |rel_20_11_target -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Benjamin Daeuber <bdaeuber@cityoffargo.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bdaeuber@cityoffargo.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=26878 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|rel_20_11_target | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Niamh Walker-Headon <Niamh.WalkerHeadon@hse.ie> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |Niamh.WalkerHeadon@hse.ie -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #95988|0 |1 is obsolete| | --- Comment #21 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 116258 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116258&action=edit Bug 23767: Total children only if parents not visible This patch changes the way to calculate the footer. It adds the budget and parent ids to the cell as custom data elements. When totaling we grab a list of all the rows we are showing - if a row has a parent and the parent is showing then we skip adding its value to the total. As the function is used on both acqui-home and aqbudgets I adjusted both templates To test: 1 - Follow the test plan on previous patch 2 - Try filtering the table so you see only the child funds 3 - Confirm the totals show the child alone when it is visible 4 - Confirm the child total is excluded when the parent is visible -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #95987|0 |1 is obsolete| | --- Comment #22 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- Created attachment 116284 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116284&action=edit Bug 23767: Include child funds in total spent and ordered on acqui-home To test: 1 - Have three funds, two parents and one child 2 - Open a basket and add an order to each fund 3 - View acqui-home.pl 4 - Note that ordered values are only added from the two parent funds 5 - Complete these orders (close basket, receive) 6 - Note the spent only includes parent funds 7 - Place three more orders, one from each fund 8 - Now you can see both spent and ordered are incorrect 9 - Apply patch 10 - Reload, all should add correctly Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116258|0 |1 is obsolete| | --- Comment #23 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- Created attachment 116285 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116285&action=edit Bug 23767: Total children only if parents not visible This patch changes the way to calculate the footer. It adds the budget and parent ids to the cell as custom data elements. When totaling we grab a list of all the rows we are showing - if a row has a parent and the parent is showing then we skip adding its value to the total. As the function is used on both acqui-home and aqbudgets I adjusted both templates To test: 1 - Follow the test plan on previous patch 2 - Try filtering the table so you see only the child funds 3 - Confirm the totals show the child alone when it is visible 4 - Confirm the child total is excluded when the parent is visible Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116284|0 |1 is obsolete| | --- Comment #24 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116701 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116701&action=edit Bug 23767: Include child funds in total spent and ordered on acqui-home To test: 1 - Have three funds, two parents and one child 2 - Open a basket and add an order to each fund 3 - View acqui-home.pl 4 - Note that ordered values are only added from the two parent funds 5 - Complete these orders (close basket, receive) 6 - Note the spent only includes parent funds 7 - Place three more orders, one from each fund 8 - Now you can see both spent and ordered are incorrect 9 - Apply patch 10 - Reload, all should add correctly Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116285|0 |1 is obsolete| | --- Comment #25 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116702 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116702&action=edit Bug 23767: Total children only if parents not visible This patch changes the way to calculate the footer. It adds the budget and parent ids to the cell as custom data elements. When totaling we grab a list of all the rows we are showing - if a row has a parent and the parent is showing then we skip adding its value to the total. As the function is used on both acqui-home and aqbudgets I adjusted both templates To test: 1 - Follow the test plan on previous patch 2 - Try filtering the table so you see only the child funds 3 - Confirm the totals show the child alone when it is visible 4 - Confirm the child total is excluded when the parent is visible Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #26 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- This took me a while to get my head back into the game.. all appears to be correct now to me and the QA scripts etc are passing. Passing QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Ray Delahunty <r.delahunty@arts.ac.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |r.delahunty@arts.ac.uk -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to master Version(s)| |21.05.00 released in| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 --- Comment #27 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Pushed to master for 21.05, thanks to everybody involved! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)|21.05.00 |21.05.00,20.11.03 released in| | Status|Pushed to master |Pushed to stable CC| |fridolin.somers@biblibre.co | |m --- Comment #28 from Fridolin Somers <fridolin.somers@biblibre.com> --- Pushed to 20.11.x for 20.11.03 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)|21.05.00,20.11.03 |21.05.00,20.11.03,20.05.09 released in| | Status|Pushed to stable |Pushed to oldstable --- Comment #29 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- Pushed to 20.05.x for 20.05.09 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Pushed to oldstable |RESOLVED CC| |victor@tuxayo.net --- Comment #30 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Not backported to oldoldstable (19.11.x). Feel free to ask if it's needed. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |28223 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28223 [Bug 28223] Total for budgets is incorrect when child funds have negative values -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29287 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29287 [Bug 29287] Display of funds on acquisitions home is not consistent with display on funds page -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23767 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |francois.charbonnier@inlibr | |o.com --- Comment #31 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- *** Bug 16126 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org