When adding an order from a staged file, there is no link "show all funds". All funds are displayed by default. We want to hide inactive funds.
Created attachment 20980 [details] [review] Bug 10875: Add order from a staged file should not display inactive funds When adding an order from a staged file, a link "show all funds" is now added on the top of the page. All inactive funds are hidden by default.
Applying: Bug 10875: Add order from a staged file should not display inactive funds fatal: sha1 information is lacking or useless (acqui/addorderiso2709.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Owen, This patch depends on bug 7180, I suspect you forgot the dependency :)
Applying: Bug 10875: Add order from a staged file should not display inactive funds Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 10875: Add order from a staged file should not display inactive funds The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
(In reply to I'm just a bot from comment #4) Depend on 7180.
Applying: Bug 10875: Add order from a staged file should not display inactive funds Using index info to reconstruct a base tree... M acqui/addorderiso2709.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt Auto-merging acqui/addorderiso2709.pl Patch failed at 0001 Bug 10875: Add order from a staged file should not display inactive funds The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
Created attachment 21640 [details] [review] Bug 10875: Add order from a staged file should not display inactive funds When adding an order from a staged file, a link "show all funds" is now added on the top of the page. All inactive funds are hidden by default.
Applying: Bug 7180: Add UT for C4::Budgets::GetBudgetByCode Using index info to reconstruct a base tree... M t/db_dependent/Budgets.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Budgets.t CONFLICT (content): Merge conflict in t/db_dependent/Budgets.t Patch failed at 0001 Bug 7180: Add UT for C4::Budgets::GetBudgetByCode The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
This bug depends on bug7180 which is in status Needs Signoff but the patches for it do not apply cleanly
This patch applies cleanly on top of bug 7180.
Tried applying it on top of my current branch for 7180, but it wouldn't apply. Please rebase!
*** Bug 10302 has been marked as a duplicate of this bug. ***
Created attachment 27425 [details] [review] Bug 10875: Add order from a staged file should not display inactive funds When adding an order from a staged file, a link "show all funds" is now added on the top of the page. All inactive funds are hidden by default.
Created attachment 27521 [details] [review] Bug 10875: Add order from a staged file should not display inactive funds When adding an order from a staged file, a link "show all funds" is now added on the top of the page. All inactive funds are hidden by default.
Created attachment 27533 [details] [review] [SIGNED-OFF] Bug 10875: Add order from a staged file should not display inactive funds When adding an order from a staged file, a link "show all funds" is now added on the top of the page. All inactive funds are hidden by default. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Hi Jonathan, testing this now, I think I see a small problem: I have one staged file from testing MarcFieldsToOrder, where I have set the fund in my mapping. This works nicely without 10875 and the correct fund is preselected on opening the page. But with this patch it seems not ok - at first it only seemed to reset the fund when I clicked the checkbox on top/next to the funds list, but now it seems always only 'select a fund' shows. I think it would be ok for the Accounting details tab, as people notice there what happens, but for the records list it seems to happen for all orders, even those you already selected a fund for.
Created attachment 27583 [details] [review] Bug 10875: Preselect the fund located in the record It is useless to copy the fund list in a new node. It seems easier to hide/show inactive/active funds. This patch also adds a "(inactive)" marker in the fund list for inactive funds. If the fund located in the record is inactive, it is displayed by default and cannot be hidden.
Katrin, I think this followup will fix your issue. I switched the status back to Signed Off, feel free to ask for a signoff if you think it is needed.
I think this is more of a bug fix then an enhancement as it makes the funds list for staged orders behave like the funds list on neworderempty.
Created attachment 27655 [details] [review] [PASSED QA] Bug 10875: Add order from a staged file should not display inactive funds When adding an order from a staged file, a link "show all funds" is now added on the top of the page. All inactive funds are hidden by default. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Works as described. - Loading the page, a fund needs to be selected. Before the patch the first fund was preselected. - Checking the checkbox, inactive funds show up, but are not visible otherwise. - If the fund is selected from the MARC file, the correct fund will be selected, even if it's inactive.
Created attachment 27656 [details] [review] [PASSED QA] Bug 10875: Preselect the fund located in the record It is useless to copy the fund list in a new node. It seems easier to hide/show inactive/active funds. This patch also adds a "(inactive)" marker in the fund list for inactive funds. If the fund located in the record is inactive, it is displayed by default and cannot be hidden. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Pushed to master. Thanks, Jonathan!