http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 --- Comment #1 from Matthias Meusburger <matthias.meusburger@biblibre.com> --- Created attachment 10197 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10197&action=edit Proposed patch -- 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=8230 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff Version|rel_3_8 |master Assignee|shinoy.m@osslabs.biz |matthias.meusburger@biblibr | |e.com -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |ASSIGNED CC| |chris@bigballofwax.co.nz --- Comment #3 from Chris Cormack <chris@bigballofwax.co.nz> --- Applying: Bug 7294:Additional patch to show the ordered status in catalogue page fatal: sha1 information is lacking or useless (acqui/addorder.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=8230 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply -- You are receiving this mail because: You are watching all bug changes.

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #10197|0 |1 is obsolete| | --- Comment #4 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 17651 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17651&action=edit Bug 8230: Display acquisition details on the catalogue detail page This patch adds a new tab "Acquitition details" on the catalogue detail page. It provides a list of order made for this biblio. New system preference: AcquisitionDetails: Hide/Show the new tab Test plan: 1/ Apply the patch. 2/ Select the "placing an order" value for the AcqCreateItem pref. 3/ Create a new order with X items. 4/ Go on the catalogue detail page for the selected biblio. 5/ Click on the "Acquisition details" tab and check that your order is displayed. Itemnumbers are present in the last column. Check that links are not broken. 6/ Close your basket. 7/ Status become "Ordered" 8/ Receive X-1 items. 9/ Come back on the catalogue detail page. There are 2 orders: 1 complete and 1 partial. The complete one has a receive date. 10/ Receive the last item. 11/ Now you have 2 orders with a complete status. 12/ Cancel the last receipt. 13/ You have 1 ordered and 1 complete (2 items). 14/ Cancel the first receipt. 15/ You have 1 ordered (3 items). 16/ Delete your order 17/ You have 1 deleted order. 18/ Switch the AcqCreateItem pref to "receiving an order" 19/ Do again steps 3 to 17. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |kyle.m.hall@gmail.com -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dcook@prosentient.com.au --- Comment #7 from David Cook <dcook@prosentient.com.au> --- (In reply to Jonathan Druart from comment #6)

Kyle, this patch depends on bug 5336. Tested, it applies correctly. Switch back to NSO.

Do we need to wait for bug 5336 to be pushed before testing/signing off this one? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 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 #9 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 8230: Display acquisition details on the catalogue detail page Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8230: Display acquisition details on the catalogue detail page 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=8230 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17651|0 |1 is obsolete| | --- Comment #10 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21199 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21199&action=edit Bug 8230: Display acquisition details on the catalogue detail page This patch adds a new tab "Acquitition details" on the catalogue detail page. It provides a list of order made for this biblio. New system preference: AcquisitionDetails: Hide/Show the new tab Test plan: 1/ Apply the patch. 2/ Select the "placing an order" value for the AcqCreateItem pref. 3/ Create a new order with X items. 4/ Go on the catalogue detail page for the selected biblio. 5/ Click on the "Acquisition details" tab and check that your order is displayed. Itemnumbers are present in the last column. Check that links are not broken. 6/ Close your basket. 7/ Status become "Ordered" 8/ Receive X-1 items. 9/ Come back on the catalogue detail page. There are 2 orders: 1 complete and 1 partial. The complete one has a receive date. 10/ Receive the last item. 11/ Now you have 2 orders with a complete status. 12/ Cancel the last receipt. 13/ You have 1 ordered and 1 complete (2 items). 14/ Cancel the first receipt. 15/ You have 1 ordered (3 items). 16/ Delete your order 17/ You have 1 deleted order. 18/ Switch the AcqCreateItem pref to "receiving an order" 19/ Do again steps 3 to 17. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |paola.rossi@cineca.it --- Comment #12 from Paola Rossi <paola.rossi@cineca.it> --- Applying: Bug 8230: Display acquisition details on the catalogue detail page fatal: sha1 information is lacking or useless (C4/Acquisition.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8230: Display acquisition details on the catalogue detail page So I don't sign off the patch, and pass it to "failed QA". -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 --- Comment #14 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Paola Rossi from comment #13)

I've applied all the patches for bug 5336 before applying this one. Applying of this patch is OK too. Where is the "Acquisition details" tab (point 5 of the test plan)? I can't see it.

Paola, On a biblio detail page. There are some tabs (like 'Holdings', 'Descriptions', 'Subscriptions', 'Images'). The 'Acquisition details' tab is between 'Subscriptions' and 'Images'. -- You are receiving this mail because: You are watching all bug changes.

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 --- Comment #17 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Paola Rossi from comment #15) Hi Paola, thanks for testing. Yes, there is a bug. The original code had changed in bug 5336. The followup should be display the order status. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 --- Comment #19 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Paola Rossi from comment #18)

Thanks, Jonathan, now I can see the order's status in the 'Acquisition details' tab on the biblio detail page, as described. The various statuses are shown as required, except "Deleted" which is not shown at all.

Yes, sorry. I mixed "deleted" and "cancelled". New patch is coming.

There is a bug in ACQ and so the test is not very easy to do. I open two windows, one on CAT and one on ACQ. When I'm going to test the /14 step and select the required function as it has been prepared by the /12 step, an error appears. [I did the /14 step by the way of the invoices list, instead].

What is your error ? I got DBD::mysql::st execute failed: Duplicate entry '23173' for key 'PRIMARY' at /home/koha/src/C4/Items.pm line 2301. Could you confirm it is the same error ? I will try to have a look tomorrow. It seems link to bug 10984.

Moreover, IMO the "partial" status, as described in the plan, is similar to the "ordered" one.

No, "ordered" is used for orders without items received. "partial" is set for orders with items already received. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22047|0 |1 is obsolete| | --- Comment #20 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22326 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22326&action=edit Bug 8230: Followup Bug 5336: Change numbers with understandable codes for orderstatus -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21199|0 |1 is obsolete| | Attachment #22326|0 |1 is obsolete| | --- Comment #21 from Paola Rossi <paola.rossi@cineca.it> --- Created attachment 22524 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22524&action=edit Show the ordered status in catalogue page I apply the patches today against master 3.13.00.032 I sign off the patches. Tha orders' advanced search works well but, selecting "cancelled" Order status, it finds no cancelled order. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 --- Comment #22 from Jonathan Druart <jonathan.druart@biblibre.com> --- Paola, it seems you didn't attach the right patches. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21199|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21199|0 |1 is obsolete| | --- Comment #23 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22544 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22544&action=edit Bug 8230: Display acquisition details on the catalogue detail page This patch adds a new tab "Acquitition details" on the catalogue detail page. It provides a list of order made for this biblio. New system preference: AcquisitionDetails: Hide/Show the new tab Test plan: 1/ Apply the patch. 2/ Select the "placing an order" value for the AcqCreateItem pref. 3/ Create a new order with X items. 4/ Go on the catalogue detail page for the selected biblio. 5/ Click on the "Acquisition details" tab and check that your order is displayed. Itemnumbers are present in the last column. Check that links are not broken. 6/ Close your basket. 7/ Status become "Ordered" 8/ Receive X-1 items. 9/ Come back on the catalogue detail page. There are 2 orders: 1 complete and 1 partial. The complete one has a receive date. 10/ Receive the last item. 11/ Now you have 2 orders with a complete status. 12/ Cancel the last receipt. 13/ You have 1 ordered and 1 complete (2 items). 14/ Cancel the first receipt. 15/ You have 1 ordered (3 items). 16/ Delete your order 17/ You have 1 deleted order. 18/ Switch the AcqCreateItem pref to "receiving an order" 19/ Do again steps 3 to 17. Signed-off-by: Paola Rossi <paola.rossi@cineca.it> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 --- Comment #26 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to mathieu saby from comment #25)

It's working well, except that the "status" column is always blank.

It works for me. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22544|0 |1 is obsolete| | --- Comment #28 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 23545 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23545&action=edit Bug 8230: Display acquisition details on the catalogue detail page This patch adds a new tab "Acquitition details" on the catalogue detail page. It provides a list of order made for this biblio. New system preference: AcquisitionDetails: Hide/Show the new tab Test plan: 1/ Apply the patch. 2/ Select the "placing an order" value for the AcqCreateItem pref. 3/ Create a new order with X items. 4/ Go on the catalogue detail page for the selected biblio. 5/ Click on the "Acquisition details" tab and check that your order is displayed. Itemnumbers are present in the last column. Check that links are not broken. 6/ Close your basket. 7/ Status become "Ordered" 8/ Receive X-1 items. 9/ Come back on the catalogue detail page. There are 2 orders: 1 complete and 1 partial. The complete one has a receive date. 10/ Receive the last item. 11/ Now you have 2 orders with a complete status. 12/ Cancel the last receipt. 13/ You have 1 ordered and 1 complete (2 items). 14/ Cancel the first receipt. 15/ You have 1 ordered (3 items). 16/ Delete your order 17/ You have 1 deleted order. 18/ Switch the AcqCreateItem pref to "receiving an order" 19/ Do again steps 3 to 17. Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA CC| |kyle@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |gmcharlt@gmail.com --- Comment #31 from Galen Charlton <gmcharlt@gmail.com> --- Pushed to master, along with some follow-ups. Thanks, Jonathan! The most important follow-up repairs a regression where the main patch made it impossible to do an advanced order search for cancelled orders. -- You are receiving this mail because: You are watching all bug changes.

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Fridolin SOMERS <fridolyn.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |Pushed to Stable --- Comment #33 from Fridolin SOMERS <fridolyn.somers@biblibre.com> --- Patches pushed to 3.14.x, will be in 3.14.2 (creates version 3.14.01.002) -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Fridolin SOMERS <fridolyn.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |11435 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de --- Comment #36 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hm not sure if this should go in stable versions as it is a new feature. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Stable |ASSIGNED --- Comment #38 from Galen Charlton <gmcharlt@gmail.com> --- (In reply to Fridolin SOMERS from comment #33)

Patches pushed to 3.14.x, will be in 3.14.2 (creates version 3.14.01.002)

I request that you revert this from the 3.14.x branch immediately. By long tradition, the maintenance releases are not supposed to receive enhancements except for the most trivial ones. In this case, the enhancement is not so trivial, and as comments 30 and 32 indicate, there is agreement between me and the patch submitter that some more work is needed prior to the release of 3.16. To put it one way: if the feature is not quite ready for 3.16, it's definitely not ready for 3.14.2. Marking as in discussion. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tomascohen@gmail.com --- Comment #39 from Tomás Cohen Arazi <tomascohen@gmail.com> --- (In reply to Galen Charlton from comment #38)

(In reply to Fridolin SOMERS from comment #33)

...

Patches pushed to 3.14.x, will be in 3.14.2 (creates version 3.14.01.002)

I request that you revert this from the 3.14.x branch immediately. By long tradition, the maintenance releases are not supposed to receive enhancements except for the most trivial ones.

In this case, the enhancement is not so trivial, and as comments 30 and 32 indicate, there is agreement between me and the patch submitter that some more work is needed prior to the release of 3.16. To put it one way: if the feature is not quite ready for 3.16, it's definitely not ready for 3.14.2.

Marking as in discussion.

I agree that even when it is the Release Maintainer call whether to cherry-pick and enhancement or not, in this case it can be harmfull as more work is needed for this to be production-ready. At least, a consecquence might be holding the next maintainance release until the missing patches are actually commited. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 --- Comment #41 from Fridolin SOMERS <fridolyn.somers@biblibre.com> --- (In reply to Galen Charlton from comment #38)

(In reply to Fridolin SOMERS from comment #33)

...

Patches pushed to 3.14.x, will be in 3.14.2 (creates version 3.14.01.002)

I request that you revert this from the 3.14.x branch immediately. By long tradition, the maintenance releases are not supposed to receive enhancements except for the most trivial ones.

Ok, I'll revert. I'm sorry, this bug looked trivial for me. In my opinion, it should then be a "new feature". -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 --- Comment #43 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Thx Fridolin, I think it's safer that way. We have used "new feature" mostly for really big things in the past, this might be in a bit of a grey zone. It is an enhancement for the acq module, but at the same time a feature that didn't exist before - I would be fine with changing the importance. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8230 Zeno Tajoli <z.tajoli@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Passed QA CC| |z.tajoli@cineca.it -- You are receiving this mail because: You are watching all bug changes.