http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #1 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Created attachment 21951 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21951&action=edit PATCH] Bug 11027 : Add a column for basketgroups in late orders table and improve other columns To apply ON TOP of bug bug 7298 This patch makes 4 changes in late orders page : - adding a new column for basketgroup, displaying the name and number of the basketgroup - displaying the name of the basket as well as its number - displaying fund in a separate column to make sorting easier, and renaming it from "budget" to "fund" (the confusion can be found elsewhere in Koha...) - displaying branch in a separate column to make sorting easier (this column could be improved later, by getting branch from basketgroup if there is one) For that, in Aquisition.pm, I made some changes to GetLateOrders : - 3 new columns in SELECT, 1 new join - cosmetic : rename "closedate" to "aqbasket.closedate" in 4 occurences : it will be usefull later, because I am envisonning an other patch that will create a "closedate" column in basketgroup table, and I don't want MySQL to crash because of ambiguous column. To test : 1. display the list of late orders of your instanc. 2. You should have 3 new columns for basketgroups, fund and branch 3. In basketgroup column you should have "name of basket group (number)" 4. In basket column you should have "name of basket (number)" -- 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=11027 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|koha-bugs@lists.koha-commun |mathieu.saby@univ-rennes2.f |ity.org |r -- 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=11027 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |7298 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #3 from I'm just a bot <gitbot@bugs.koha-community.org> --- This bug depends on bug7298 which is in status Passed QA 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=11027 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21951|0 |1 is obsolete| | --- Comment #5 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Created attachment 23659 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23659&action=edit [PATCH] Bug 11027 : Add a column for basketgroups in late orders table and improve other columns -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #7 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- My patch does not take into account the permission for managing groups... -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #8 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Created attachment 23762 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23762&action=edit [PATCH 2/2] Bug 11027 - Create a link only if user have required permissions With this followup, a user without order_manage permission won't be able to cick on a basket and a user without group_manage permission won't be able to click on a basketgroup Note that the issue for basket is present in current master. So it deserves a separate bugfix (as bug 11027 is an ENH) -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtompset@hotmail.com --- Comment #9 from M. Tompsett <mtompset@hotmail.com> --- With bootstrap being the default, could we get the equivalent bootstrap tweaks in this too? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #23762|0 |1 is obsolete| | Attachment #24850|0 |1 is obsolete| | --- Comment #12 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 24851 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24851&action=edit [SIGNED OFF] Bug 11027 : Add a column for basketgroups in late orders table and improve other columns This patch makes 4 changes in late orders page : - adding a new column for basketgroup, displaying the name and number of the basketgroup - displaying the name of the basket as well as its number, with a hyperlink to this basketgroup - displaying fund in a separate column to make sorting easier, and renaming it from "budget" to "fund" (the confusion can be found elsewhere in Koha...) - displaying branch in a separate column to make sorting easier (this column could be improved later, by getting branch from basketgroup if there is one) For that, in Aquisition.pm, I made some changes to GetLateOrders : - 3 new columns in SELECT - 1 new join To test : 1. Display the list of late orders of your instance. 2. Check you have 3 new columns for basketgroups, fund and branch 3. In basketgroup column you should have "name of basket group (number)" 4. In basket column you should have "name of basket (number)" 5. Check the links for basketgroups. They should send you to the page displaying information for each basketgroup (without possibiliy of editing them if they are closed) Signed-off-by: Mark Tompsett <mtompset@hotmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #14 from M. Tompsett <mtompset@hotmail.com> --- REVISED TEST PLAN ----------------- 0) Back up DB if you want to restore it later. Also, apply patch. :) 1) Log into staff client as superlibrarian 2) Click Acquisitions 3) Click the Search button in the Manage orders section 4) Click + New basket for any one of the vendors 5) Type a Basket name and click Save 6) Click a link in the Add order to basket -- I used suggestions, since we have 9. -- don't forget to click "Add Item" and choose a Fund before "Save" 7) Click Change button beside Branch dropdown to set up the branch. -- I don't know why this seems necessary, but I couldn't get it to work otherwise. 8) Click Close the basket 9) Check Attach this basket to a new basket group with the same name 10) Click Yes, close (Y) 11) Click Late orders -- the order just made should be listed. -- both the Basket and Basket group columns should be links 12) Add a patron with the following permissions: - check staff access - check acquisition - then uncheck group_manage - then uncheck order_manage Make sure to match the branch to the superlibrarian's branch, because that is what the entered late order uses as its branch. 13) log out of the staff client 14) log into the staff client with the new user -- you'll get an "Error: You do not have permission to access this page" 15) paste and correct the url: http://YOUR_SITE/cgi-bin/koha/acqui/acqui-home.pl 16) Click Late orders -- the orders listed will not have links in Basket and Basket group columns. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #16 from mathieu saby <mathsabypro@gmail.com> --- Created attachment 24991 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24991&action=edit [PATCH] Bug 11027 (QA) : hide link if no basketgroup and use real branch name This patch is a answer to remarks made by QA: - if there is no basketgroup for an order, the basketgroup column in lastorders.pl is now blank (instead of parentheses) - the name of the branch is used instead of its code in the branch column To test: check late orders, included and not included into basketgroup -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #17 from mathieu saby <mathsabypro@gmail.com> --- Katrin, I think you should be fine with the last patch. Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #20 from M. Tompsett <mtompset@hotmail.com> --- *** Bug 11434 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=11027 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #24851|0 |1 is obsolete| | Attachment #24852|0 |1 is obsolete| | Attachment #24993|0 |1 is obsolete| | --- Comment #21 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 25012 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=25012&action=edit [PASSED QA] Bug 11027 : Add a column for basketgroups in late orders table and improve other columns This patch makes 4 changes in late orders page : - adding a new column for basketgroup, displaying the name and number of the basketgroup - displaying the name of the basket as well as its number, with a hyperlink to this basketgroup - displaying fund in a separate column to make sorting easier, and renaming it from "budget" to "fund" (the confusion can be found elsewhere in Koha...) - displaying branch in a separate column to make sorting easier (this column could be improved later, by getting branch from basketgroup if there is one) For that, in Aquisition.pm, I made some changes to GetLateOrders: - 3 new columns in SELECT - 1 new join To test : 1. Display the list of late orders of your instance. 2. Check you have 3 new columns for basketgroups, fund and branch 3. In basketgroup column you should have "name of basket group (number)" 4. In basket column you should have "name of basket (number)" 5. Check the links for basketgroups. They should send you to the page displaying information for each basketgroup (without possibiliy of editing them if they are closed) Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Patches pass QA script and all tests. Works as described. Also checked sorting and orders which are not in a basketgroup display correctly. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 --- Comment #23 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 25014 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=25014&action=edit [PASSED QA] Bug 11027 (QA) : hide link if no basketgroup and use real branch name This patch is a answer to remarks made by QA: - if there is no basketgroup for an order, the basketgroup column in lastorders.pl is now blank (instead of parentheses) - the name of the branch is used instead of its code in the branch column To test: check late orders, included and not included into basketgroup Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 Marjorie Barry-Vila <marjorie.barry-vila@ccsr.qc.ca> changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |7942 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11027 Fridolin SOMERS <fridolyn.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED CC| |fridolyn.somers@biblibre.co | |m Resolution|--- |FIXED --- Comment #25 from Fridolin SOMERS <fridolyn.somers@biblibre.com> --- I choose to not apply to 3.14.x so I set as resolved. -- You are receiving this mail because: You are watching all bug changes.