[Bug 7162] New: Factorize code for order cancellation
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Bug #: 7162 Summary: Factorize code for order cancellation Classification: Unclassified Change sponsored?: --- Product: Koha Version: master Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P5 Component: Acquisitions AssignedTo: julian.maurice@biblibre.com ReportedBy: julian.maurice@biblibre.com QAContact: ian.walls@bywatersolutions.com Some code was duplicated, in the following patch all is now in a new file cancelorder.pl. It takes a 'referrer' parameter so it can easily be called from any page of Koha, and then redirect to it when it finish. Confirmation for cancellation is now done in this page (not in javascript). Add possibility to give a reason for cancellation (or other things, this is saved in aqorders.notes) DelOrder is modified to take two new parameters: - delete_biblio: if '1', try to delete biblio - reason: text to add to aqorders.notes (this note isn't show anywhere since there is no place to view cancelled orders, but another patch will add this feature). basket.pl and parcel.pl links to this page. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #1 from Julian Maurice <julian.maurice@biblibre.com> 2011-11-05 07:15:29 UTC --- Created attachment 6219 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6219 Proposed patch -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |7163 -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|P5 |PATCH-Sent Patch Status|--- |Needs Signoff -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |paul.poulain@biblibre.com --- Comment #2 from Paul Poulain <paul.poulain@biblibre.com> 2011-11-05 10:53:18 UTC --- If you want to participate to the upstreaming: * assign the bug to yourself * retrieve the patch(es) on git.biblibre.com * the branch name can be found using git branch -a|grep NNNN Usually, it should be biblibre/customer/ft/MTNNNN For example: remotes/origin/stetienne/ft/MT6522 This patch is in branch number 6539 -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #3 from Paul Poulain <paul.poulain@biblibre.com> 2011-11-05 10:58:38 UTC --- If you want to participate to the upstreaming: * assign the bug to yourself * retrieve the patch(es) on git.biblibre.com * the branch name can be found using git branch -a|grep NNNN Usually, it should be biblibre/customer/ft/MTNNNN For example: remotes/origin/stetienne/ft/MT6522 This patch is in branch number 6845 -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |claire.hernandez@biblibre.c | |om -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Duncan <duncan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |duncan@catalyst.net.nz -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de Patch Status|Needs Signoff |Does not apply --- Comment #4 from Katrin Fischer <katrin.fischer@bsz-bw.de> 2011-12-21 20:47:13 UTC --- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 7162: Factorize code for order cancellation Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Acquisition.pm Auto-merging acqui/addorder.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Failed to merge in the changes. Patch failed at 0001 Bug 7162: Factorize code for order cancellation When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #6219|0 |1 is obsolete| | --- Comment #5 from Julian Maurice <julian.maurice@biblibre.com> 2012-01-02 08:25:10 UTC --- Created attachment 7007 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7007 Rebased patch -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Does not apply |Needs Signoff -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jcamins@cpbibliography.com --- Comment #6 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- What functionality needs to be tested to confirm that this patch works? A test plan would be very useful here. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |stephane.delaye@biblibre.co | |m --- Comment #7 from delaye <stephane.delaye@biblibre.com> --- i apply the patch : when i delete a order since recept sceen i have a message (confirmation) but i can't add a reason for cancellation and the order is deleted not cancelled.... so i don't understand the funtions of this patch -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #8 from delaye <stephane.delaye@biblibre.com> --- when i use the link delete order in the screen parcel.pl i have the erreur 404 and url ../cgi-bin/koha/acqui/cancelorder.pl?ordernumber=13&biblionumber=516&referrer=/cgi-bin/koha/acqui/parcel.pl%3Fsupplierid=%26datereceived=2012-03-12%26invoice= -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |koha@univ-lyon3.fr --- Comment #9 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- On receive, when i choose "delete order", the command is cancelled and i can give a reason and refactoring is OK. But i return on a page where i can't see the other lines to recept. I should be redirect on this URL : ... /acqui/parcel.pl?invoice=9767678976&booksellerid=3&gst=0&datereceived=2012-03-19. On receive, if i choose "delete order and catalog record" after giving the reason for cancellation, there's a software error : Undefined subroutine &C4::Search::SimpleSearch called at /home/koha/src/C4/Items.pm line 2465.(URL :acqui/cancelorder.pl?ordernumber=8&biblionumber=6&del_biblio=1&referrer=/cgi-bin/koha/acqui/parcel.pl%3Fsupplierid=%26datereceived=2012-03-19%26invoice=9767678976) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |7755 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #10 from Julian Maurice <julian.maurice@biblibre.com> --- The "Undefined subroutine" error is not directly related to this patch. I've created another bug to fix it (bug 7755) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Status|Failed QA |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff --- Comment #11 from Julian Maurice <julian.maurice@biblibre.com> --- Bug 7755 has been resolved, so changing status to needs signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #12 from delaye <stephane.delaye@biblibre.com> --- After submit the cancellation i can't return in the basket I am directed in a screen who display this information Receipt summary for [ test ] on 06/04/2012 Invoice number: test Received by: test On: 06/04/2012 Pending orders There are no pending orders. Already received There are no received orders. And when i clik on the button "Finish receiving" i come back in this screen ../cgi-bin/koha/acqui/parcels.pl?booksellerid= eceive shipment from vendor Receive a new shipment 1. Vendor invoice 2. Shipment date: -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7007|0 |1 is obsolete| | --- Comment #13 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 9148 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9148&action=edit Factorize code for order cancellation Corrected patch. This one import C4::Search in cancelorder.pl so that perl does not die with "Undefined subroutine &main::SimpleSearch". This has to be fixed in another way (see Bug 7847) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@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=7162 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #14 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- ok for cancellation and for the reason given for cancellation on any page of receipt (after filter or not). But, - on the page booksellers.pl, in the table, items count and item expected are not updated - when I choose "Delete order and catalog record", in basket.pl, in the table "Cancelled orders", the title is "Deleted bibliographic record, can't find title" : it's a bit confusing and I may need to know wich title is deleted. The first point is blocking according to me -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #15 from Julian Maurice <julian.maurice@biblibre.com> --- First point is introduced by bug 7169, but since this one is closed, I will fix it in this bug. Second point is not a bug, the record is deleted so there is no way to display its title. It is how Koha works. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #16 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 9238 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9238&action=edit Follow-up: Fix booksellers.pl display Basket infos don't take cancelled orders into account anymore. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@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=7162 --- Comment #17 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Julian, perhaps the title could be retrieved from the deletedbiblio table? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=5680 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #18 from Julian Maurice <julian.maurice@biblibre.com> --- (In reply to comment #17)
Hi Julian, perhaps the title could be retrieved from the deletedbiblio table?
As it's the actual behaviour to display "Deleted bibliographic record, can't find title" for deleted biblios, and this patch is not related to this, I think this could be a topic for another bug and this should not block this one to be signed off. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #19 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I disagree here with you in part. I think especially in acq you need to know what you cancelled, not displaying the deleted title really shoudl be fixed. This patch is not easy to test, because you have to run through a lot of test cases to do it right (items checked out, subscriptions, items on another order, item title level holds on the items, etc.). So I think it might be worth adding it. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #20 from Julian Maurice <julian.maurice@biblibre.com> --- (In reply to comment #19)
I think especially in acq you need to know what you cancelled, not displaying the deleted title really shoudl be fixed.
I agree with that. But it is not the purpose of this bug, which is only to remove duplicated code (ok, it also adds the possibility to give a reason for cancellation). It should not block the patch to pass.
This patch is not easy to test, because you have to run through a lot of test cases to do it right (items checked out, subscriptions, items on another order, item title level holds on the items, etc.). So I think it might be worth adding it.
Order cancellation does not imply deletion of biblio record. You can cancel your orders and keep your records. I don't understand how it could make testing easier. I'll add a new bug for your request. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #21 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Ok. I was thinking because there are 2 options fro cancelling, cancel only the order and delete the items, or cancel order and delete the record. So the second option produces the confusing display. But probably you are right about keeping both things separate. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #22 from Julian Maurice <julian.maurice@biblibre.com> --- => Bug 8638 created -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9148|0 |1 is obsolete| | --- Comment #23 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 13224 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13224&action=edit Bug 7162: Factorize code for order cancellation Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9238|0 |1 is obsolete| | --- Comment #24 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 13225 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13225&action=edit Bug 7162: Fix booksellers.pl display Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|PATCH-Sent (DO NOT USE) |P3 Patch complexity|--- |Medium patch -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Corinne BULAC <corinnebulac@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |corinnebulac@gmail.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13224|0 |1 is obsolete| | --- Comment #25 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 16373 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16373&action=edit Bug 7162: Factorize code for order cancellation Some code was duplicated, all is now in cancelorder.pl Added possibility to provide a reason for cancellation (or other things, this is saved in aqorders.notes) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13225|0 |1 is obsolete| | --- Comment #26 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 16374 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16374&action=edit Bug 7162: Fix booksellers.pl display Basket infos don't take cancelled orders into account anymore. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #27 from Julian Maurice <julian.maurice@biblibre.com> --- Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Corinne BULAC <corinnebulac@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #28 from Corinne BULAC <corinnebulac@gmail.com> --- cancel -> ok...but when we click on the link "click ici to return to previous page", we've got this message "Can't use an undefined value as an ARRAY reference at /home/koha/src/acqui/parcel.pl line 160." -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #29 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 16409 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16409&action=edit Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff --- Comment #30 from Julian Maurice <julian.maurice@biblibre.com> --- Corinne, this patch should fix your problem. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #31 from Paul Poulain <paul.poulain@biblibre.com> --- Patch tested with a sandbox, by Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #32 from Paul Poulain <paul.poulain@biblibre.com> --- Created attachment 16457 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16457&action=edit Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #16373|0 |1 is obsolete| | Attachment #16374|0 |1 is obsolete| | Attachment #16409|0 |1 is obsolete| | Attachment #16457|0 |1 is obsolete| | --- Comment #33 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18455 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18455&action=edit Bug 7162: Factorize code for order cancellation Some code was duplicated, all is now in cancelorder.pl Added possibility to provide a reason for cancellation (or other things, this is saved in aqorders.notes) Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #34 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18456 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18456&action=edit Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@biblibre.co | |m --- Comment #35 from Jonathan Druart <jonathan.druart@biblibre.com> --- Rebased patches (the second one is become useless). -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #36 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Starting with some tests and a code review for these patches: 1) There are some problems with those patches pointed out by the QA script: FAIL acqui/addorder.pl OK pod FAIL forbidden patterns forbidden pattern: tab char (line 126) OK valid OK critic FAIL acqui/cancelorder.pl OK pod OK forbidden patterns FAIL valid Use of qw(...) as parentheses is deprecated OK critic 2) cancelorder.pl notes this: +# FIXME: C4::Search is needed by C4::Items::GetAnalyticsCount, which is called +# by C4::Acquisition::DelOrder. But C4::Search is not imported by C4::Items. +# Once this problem is resolved, the following line can be removed. +# See Bug 7847. +use C4::Search; 7847 is now marked resolved, can this line be removed? 3) From looking at the code it seems like you no longer have the choice to delete the bibliographic record or to keep it. 4) Some little typos: canceled -> cancelled occured -> occurred 5) Just a pet peeve of mine: a linked 'here' is not friendly if you are quickly scanning a page for the right link. It's always better to link the words that actually describe what the link will do: <p>Click <a href="[% referrer %]">here</a> to return to previous page</p> Could just be a linked: Return to previous page Or maybe just a 'OK'? 6) A bad one: Please please, don't add untranslatable strings to the database: + if($reason) { + $query .= " + , notes = IF(notes IS NULL, + CONCAT('Cancellation reason: ', ?), + CONCAT(notes, ' - Cancellation reason: ', ?) + ) + "; + } We really need to take care of that in a nicer way or at least not have any hardcoded string in there or have it in the template. It might be worth having an authorized value and a separate field to store cancellation reasons as you might want to look up the reasons in reports in a nice way later on. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #37 from Julian Maurice <julian.maurice@biblibre.com> --- Hi Katrin, Thanks for the review. Before I sumbit the follow-up, a few remarks: 1) I didn't found any "qw" in the patches. 3) What makes you thinking this? This is still possible, there are two links in basket.pl and parcel.pl: "Delete order" and "Delete order and bibliographic record" -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #38 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 19315 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19315&action=edit Bug 7162; Factorize code for order cancellation (QA fixes) * Remove tab characters in acqui/addorder.pl * Remove FIXME in acqui/cancelorder.pl * Fix typos: "canceled" -> "cancelled", "occured" -> "occurred" * Replace "Click here" link by "OK" * Add a column to aqorders to store cancellation reason instead of having it in aqorders.notes, to avoid having untranslatable strings in database -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@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=7162 --- Comment #39 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Julian, I will check if my QA script still gives me that error - I realized a bit later while testing that I didn't have the newest version of it. 3) Sorry, misread the code, all good then. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 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 #40 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 7162: Factorize code for order cancellation Using index info to reconstruct a base tree... M C4/Acquisition.pm M acqui/addorder.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging acqui/addorder.pl CONFLICT (content): Merge conflict in acqui/addorder.pl Auto-merging C4/Acquisition.pm Patch failed at 0001 Bug 7162: Factorize code for order cancellation 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=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18455|0 |1 is obsolete| | --- Comment #41 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 21333 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21333&action=edit [SIGNED-OFF] Bug 7162: Factorize code for order cancellation Some code was duplicated, all is now in cancelorder.pl Added possibility to provide a reason for cancellation (or other things, this is saved in aqorders.notes) Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18456|0 |1 is obsolete| | --- Comment #42 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 21334 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21334&action=edit [SIGNED-OFF] Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19315|0 |1 is obsolete| | --- Comment #43 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 21335 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21335&action=edit Bug 7162; Factorize code for order cancellation (QA fixes) * Remove tab characters in acqui/addorder.pl * Remove FIXME in acqui/cancelorder.pl * Fix typos: "canceled" -> "cancelled", "occured" -> "occurred" * Replace "Click here" link by "OK" * Add a column to aqorders to store cancellation reason instead of having it in aqorders.notes, to avoid having untranslatable strings in database -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #44 from Julian Maurice <julian.maurice@biblibre.com> --- All patches rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- When did the bot| |2013-09-24 last check this| | --- Comment #45 from I'm just a bot <gitbot@bugs.koha-community.org> --- Patch applied cleanly, go forth and signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 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-24 00:00:00 |2013-10-25 last check this| | --- Comment #46 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 7162: Factorize code for order cancellation Using index info to reconstruct a base tree... M C4/Acquisition.pm M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Auto-merging C4/Acquisition.pm CONFLICT (content): Merge conflict in C4/Acquisition.pm Patch failed at 0001 Bug 7162: Factorize code for order cancellation 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=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21333|0 |1 is obsolete| | --- Comment #47 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 22719 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22719&action=edit [SIGNED-OFF] Bug 7162: Factorize code for order cancellation Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21334|0 |1 is obsolete| | --- Comment #48 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 22720 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22720&action=edit [SIGNED-OFF] Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21335|0 |1 is obsolete| | --- Comment #49 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 22721 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22721&action=edit Bug 7162; Factorize code for order cancellation (QA fixes) Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@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=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22719|0 |1 is obsolete| | --- Comment #50 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 24075 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24075&action=edit [SIGNED-OFF] Bug 7162: Factorize code for order cancellation Some code was duplicated, all is now in cancelorder.pl Added possibility to provide a reason for cancellation (or other things, this is saved in aqorders.notes) Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22720|0 |1 is obsolete| | --- Comment #51 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 24076 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24076&action=edit [SIGNED-OFF] Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22721|0 |1 is obsolete| | --- Comment #52 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 24077 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24077&action=edit Bug 7162; Factorize code for order cancellation (QA fixes) * Remove tab characters in acqui/addorder.pl * Remove FIXME in acqui/cancelorder.pl * Fix typos: "canceled" -> "cancelled", "occured" -> "occurred" * Replace "Click here" link by "OK" * Add a column to aqorders to store cancellation reason instead of having it in aqorders.notes, to avoid having untranslatable strings in database -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #53 from Julian Maurice <julian.maurice@biblibre.com> --- Patches rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #54 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 7162: <h1>Something went wrong !</h1>Applying: Bug 7162: Factorize code for order cancellation Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Acquisition.pm CONFLICT (content): Merge conflict in C4/Acquisition.pm Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Failed to merge in the changes. Patch failed at 0001 Bug 7162: Factorize code for order cancellation When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 7162 - Factorize code for order cancellation 24075 - [SIGNED-OFF] Bug 7162: Factorize code for order cancellation 24076 - [SIGNED-OFF] Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl 24077 - Bug 7162; Factorize code for order cancellation (QA fixes) Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/SIGNED-OFF-Bug-7162-Factorize-code-for-order-cance-CAcZ3U.patch . -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #24075|0 |1 is obsolete| | Attachment #24076|0 |1 is obsolete| | Attachment #24077|0 |1 is obsolete| | --- Comment #55 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 26235 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26235&action=edit Bug 7162: Factorize code for order cancellation Some code was duplicated, all is now in cancelorder.pl Added possibility to provide a reason for cancellation (or other things, this is saved in aqorders.notes) Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #56 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 26236 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26236&action=edit Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #57 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 26237 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26237&action=edit Bug 7162; Factorize code for order cancellation (QA fixes) * Remove tab characters in acqui/addorder.pl * Remove FIXME in acqui/cancelorder.pl * Fix typos: "canceled" -> "cancelled", "occured" -> "occurred" * Replace "Click here" link by "OK" * Add a column to aqorders to store cancellation reason instead of having it in aqorders.notes, to avoid having untranslatable strings in database -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 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=7162 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |paola.rossi@cineca.it --- Comment #58 from Paola Rossi <paola.rossi@cineca.it> --- Applying: Bug 7162; Factorize code for order cancellation (QA fixes) 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 7162; Factorize code for order cancellation (QA fixes) So I pass the patch to "Patch doesn't apply" status -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 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=7162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26237|0 |1 is obsolete| | --- Comment #59 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 28353 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=28353&action=edit Bug 7162; Factorize code for order cancellation (QA fixes) * Remove tab characters in acqui/addorder.pl * Remove FIXME in acqui/cancelorder.pl * Fix typos: "canceled" -> "cancelled", "occured" -> "occurred" * Replace "Click here" link by "OK" * Add a column to aqorders to store cancellation reason instead of having it in aqorders.notes, to avoid having untranslatable strings in database -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #60 from Paola Rossi <paola.rossi@cineca.it> --- I apply the patch against 3.15.00.052 I find some tab characters in acqui/addorder.pl (I use cat -T , and grep '\^I'). So I pass the patch to "Failed QA" status. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff --- Comment #61 from Jonathan Druart <jonathan.druart@biblibre.com> --- Tabulations don't block you to test I guess, so you can sign it off and let this check for the QA step. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC|jcamins@cpbibliography.com | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #62 from Paola Rossi <paola.rossi@cineca.it> --- I apply against master 3.17.00.007 Everything's OK. So I pass the patch to "Signed Off" status. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26235|0 |1 is obsolete| | --- Comment #63 from Paola Rossi <paola.rossi@cineca.it> --- Created attachment 28558 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=28558&action=edit Bug 7162: Factorize code for order cancellation -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26236|0 |1 is obsolete| | --- Comment #64 from Paola Rossi <paola.rossi@cineca.it> --- Created attachment 28559 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=28559&action=edit Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #28353|0 |1 is obsolete| | --- Comment #65 from Paola Rossi <paola.rossi@cineca.it> --- Created attachment 28560 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=28560&action=edit Bug 7162 Factorize code for order cancellation (QA fixes) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA QA Contact|koha.sekjal@gmail.com | --- Comment #66 from Jonathan Druart <jonathan.druart@biblibre.com> --- Julian, could you please provide unit tests for C4::Acquisition::DelOrder? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #67 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 28836 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=28836&action=edit Bug 7162: Add unit tests for DelOrder -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact| |katrin.fischer@bsz-bw.de --- Comment #68 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Working on this now... -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #69 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Starting with QA script, unit tests and code review: 1) QA script: FAIL t/db_dependent/Acquisition.t FAIL valid "my" variable $order2 masks earlier declaration in same scope "my" variable $error masks earlier declaration in same scope OK critic OK pod OK forbidden patterns FAIL acqui/cancelorder.pl OK valid FAIL forbidden patterns forbidden pattern: Koha is now under the GPLv3 license (line 8) OK pod OK critic FAIL acqui/addorder.pl OK valid FAIL forbidden patterns forbidden pattern: tab char (line 126) OK pod OK critic 2) Code review a) Not sure here, but should the copyright year be updated? +# Copyright 2011 BibLibre SARL b) Capitalization + <input type="submit" class="approve" value="Yes, Cancel (Y)" accesskey="y" /> + <input type="submit" class="deny" value="No, Don't Cancel (N)" accesskey="n" onclick="window.location='[% referrer %]';return false;" /> Could you please fix in a follow up? I will then try to come back to this as soon as possible. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #70 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 29535 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29535&action=edit Bug 7162: Factorize code for order cancellation (QA fixes) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29535|0 |1 is obsolete| | --- Comment #71 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 29536 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29536&action=edit Bug 7162: Factorize code for order cancellation (QA fixes) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #72 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- This works ok, but I'd like to see a follow up removing the (N) and (Y) as the keyboard shortcuts don't seem to work - other option of course is to make them work :) But, not a blocker. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #73 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Possible enhancements: - Make the cancellation reason searchable - Make it possible to edit the reason later on -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #74 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29661 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29661&action=edit [PASSED QA] Bug 7162: Factorize code for order cancellation Some code was duplicated, all is now in cancelorder.pl Added possibility to provide a reason for cancellation (or other things, this is saved in aqorders.notes) Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> Signed-off-by: Paola Rossi <paola.rossi@cineca.it> 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=7162 --- Comment #75 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29662 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29662&action=edit [PASSED QA] Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> Signed-off-by: Paola Rossi <paola.rossi@cineca.it> 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=7162 --- Comment #76 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29663 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29663&action=edit [PASSED QA] Bug 7162; Factorize code for order cancellation (QA fixes) * Remove tab characters in acqui/addorder.pl * Remove FIXME in acqui/cancelorder.pl * Fix typos: "canceled" -> "cancelled", "occured" -> "occurred" * Replace "Click here" link by "OK" * Add a column to aqorders to store cancellation reason instead of having it in aqorders.notes, to avoid having untranslatable strings in database Signed-off-by: Paola Rossi <paola.rossi@cineca.it> 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=7162 --- Comment #77 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29664 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29664&action=edit [PASSED QA] Bug 7162: Add unit tests for DelOrder 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=7162 --- Comment #78 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29665 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29665&action=edit [PASSED QA] Bug 7162: Factorize code for order cancellation (QA fixes) Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes tests and QA script. Checked cancelling the orders from the basket and from the receive page. Both worked nicely. Cancellation reason is shown on the cancelled order line in the basket. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #28560|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29536|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #28836|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #28558|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #28559|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Failed QA --- Comment #79 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Ah, I am sorry, but the tests are failing. I got the wrong number of tests when I fixed the conflict in that line, but there are also quite a few tests failing. t/db_dependent/Acquisition.t .. Dubious, test returned 8 (wstat 2048, 0x800) Failed 8/91 subtests Test Summary Report ------------------- t/db_dependent/Acquisition.t (Wstat: 2048 Tests: 91 Failed: 8) Failed tests: 17, 19, 22, 24, 28, 30, 34, 36 Non-zero exit status: 8 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #80 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 29698 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29698&action=edit Bug 7162: (follow-up) Add unit tests for DelOrder The unit tests did not take into account the new DB field. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #81 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am going to pass this in order to not risk more conflicts - but there is something small that should be fixed in a follow up on a separate bug. The dialog says (Y) and (N) in the submit buttons, but those keyboard shortcuts don't work and should be removed or made working. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29661|0 |1 is obsolete| | Attachment #29662|0 |1 is obsolete| | Attachment #29663|0 |1 is obsolete| | Attachment #29664|0 |1 is obsolete| | Attachment #29665|0 |1 is obsolete| | Attachment #29698|0 |1 is obsolete| | --- Comment #82 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29889 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29889&action=edit [PASSED QA] Bug 7162: Factorize code for order cancellation Some code was duplicated, all is now in cancelorder.pl Added possibility to provide a reason for cancellation (or other things, this is saved in aqorders.notes) Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Comments on last patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #83 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29890 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29890&action=edit [PASSED QA] Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> Signed-off-by: Paola Rossi <paola.rossi@cineca.it> 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=7162 --- Comment #84 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29891 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29891&action=edit [PASSED QA] Bug 7162; Factorize code for order cancellation (QA fixes) * Remove tab characters in acqui/addorder.pl * Remove FIXME in acqui/cancelorder.pl * Fix typos: "canceled" -> "cancelled", "occured" -> "occurred" * Replace "Click here" link by "OK" * Add a column to aqorders to store cancellation reason instead of having it in aqorders.notes, to avoid having untranslatable strings in database Signed-off-by: Paola Rossi <paola.rossi@cineca.it> 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=7162 --- Comment #85 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29892 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29892&action=edit [PASSED QA] Bug 7162: Add unit tests for DelOrder 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=7162 --- Comment #86 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29893 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29893&action=edit [PASSED QA] Bug 7162: Factorize code for order cancellation (QA fixes) Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes tests and QA script. Checked cancelling the orders from the basket and from the receive page. Both worked nicely. Cancellation reason is shown on the cancelled order line in the basket. 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=7162 --- Comment #87 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29894 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29894&action=edit [PASSED QA] Bug 7162: (follow-up) Add unit tests for DelOrder The unit tests did not take into account the new DB field. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Also all Acquisition related patches. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 --- Comment #88 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 29918 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29918&action=edit Bug 7162: Remove "(Y)" and "(N)" from buttons text -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29918|0 |1 is obsolete| | --- Comment #89 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 29943 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29943&action=edit [PASSED QA] Bug 7162: Remove "(Y)" and "(N)" from buttons text Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Removes keyboard shortcut hints that don't work. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 mathieu saby <mathsabypro@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=10869 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 mathieu saby <mathsabypro@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=10758 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 mathieu saby <mathsabypro@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mathsabypro@gmail.com --- Comment #90 from mathieu saby <mathsabypro@gmail.com> --- Hello I know it has passed QA, but I would like to make some remarks, especially regarding bug 10869. Currently, the 1st parameter passed to DelOrder is the biblionumber of the record. This make the cancelation of an order impossible if the record linked with the order is deleted (and yes, it happens in real life ;-) ). So bug 10869 tries to fix that by inversing the 2 parameters of DelOrder : ordernumber (mandatory), then biblionumber (optional). When bug 7162 is pushed, the logic of bug 10869 should be changed, because we will have 4 parameters : $bibnum, $ordernumber, $delete_biblio, $reason I suppose the best way to make $bibnum optional, as well as $delete_biblio and $reason would be to pass a hashref to DelOrder instead of the 4 separate values? Could you give me your opinion about that? M. Saby -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_3_18_candidate Status|Passed QA |Patch doesn't apply --- Comment #91 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Julian, can you please rebase? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29889|0 |1 is obsolete| | --- Comment #92 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32895 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32895&action=edit [PASSED QA] Bug 7162: Factorize code for order cancellation Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29890|0 |1 is obsolete| | --- Comment #93 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32896 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32896&action=edit [PASSED QA] Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29891|0 |1 is obsolete| | --- Comment #94 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32897 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32897&action=edit [PASSED QA] Bug 7162; Factorize code for order cancellation (QA fixes) Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29892|0 |1 is obsolete| | --- Comment #95 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32898 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32898&action=edit [PASSED QA] Bug 7162: Add unit tests for DelOrder Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29893|0 |1 is obsolete| | --- Comment #96 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32899 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32899&action=edit [PASSED QA] Bug 7162: Factorize code for order cancellation (QA fixes) Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29943|0 |1 is obsolete| | --- Comment #97 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32900 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32900&action=edit [PASSED QA] Bug 7162: Remove "(Y)" and "(N)" from buttons text Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #29894|0 |1 is obsolete| | --- Comment #98 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32902 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32902&action=edit [PASSED QA] Bug 7162: (follow-up) Add unit tests for DelOrder Rebased on master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |tomascohen@gmail.com --- Comment #99 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Patches pushed to master. Thanks Julian and everyone involved in discussing and testing! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Factorize code for order |Factorize code for order |cancellation |cancellation and add field | |for giving a reason -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |13380 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Pushed to Master |RESOLVED -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org