http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Depends on| |7180 Assignee|koha-bugs@lists.koha-commun |jonathan.druart@biblibre.co |ity.org |m -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 --- Comment #1 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20980 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20980&action=edit 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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #2 from Owen Leonard <oleonard@myacpl.org> --- 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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |gitbot@bugs.koha-community. | |org --- Comment #4 from I'm just a bot <gitbot@bugs.koha-community.org> --- 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". -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply When did the bot| |2013-09-29 last check this| | --- Comment #6 from I'm just a bot <gitbot@bugs.koha-community.org> --- 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". -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20980|0 |1 is obsolete| | --- Comment #7 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21640 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21640&action=edit 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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 --- Comment #9 from I'm just a bot <gitbot@bugs.koha-community.org> --- This bug depends on bug7180 which is in status Needs Signoff but the patches for it do not apply cleanly -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=10302 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com --- Comment #12 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- *** Bug 10302 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #16 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 --- Comment #17 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27583 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27583&action=edit 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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 --- Comment #19 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27533|0 |1 is obsolete| | Attachment #27583|0 |1 is obsolete| | --- Comment #20 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 27655 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27655&action=edit [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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_3_16_candidate -- You are receiving this mail because: You are watching all bug changes.