http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 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 the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |claire.hernandez@biblibre.c | |om AssignedTo|henridamien@koha-fr.org |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 the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |7169 -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Status|Pushed to Master |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|7168 | -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|7583 | -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #2 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 11603 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11603&action=edit Bug 5336:Order search (search and UI enhancements) You can now search orders by - order status - branchcode - budget New authorised value 'ORDRSTATUS' is created with following values: 0 => New 1 => Requested 2 => Partial 3 => Complete 4 => Deleted New field aqorders.parent_ordernumber is added (which is mainly used by others enhancement). It allows to know the main(=parent) order for an order (if an order is partially received, Koha creates another order. But it is the same order. We want to know this information). To test: Search and check if results are consistent in histsearch.pl /!\ the search by branchcode is not available now. We have to wait the Bug 7294. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Comment on attachment 11603 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11603 Bug 5336:Order search (search and UI enhancements) I was thinking, maybe ordered would be better then requested? Not sure here, I think we use requested for orders and suggestions, but ordered in acq. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #5 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 11792 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11792&action=edit Bug 5336: Replace IFNULL with COALESCE -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mathieu.saby@univ-rennes2.f | |r --- Comment #6 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Patch does not apply. Could you rebase it please? M. Saby Applying: Bug 5336:Order search (search and UI enhancements) Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/de-DE/optional/auth_val.sql CONFLICT (content): Merge conflict in installer/data/mysql/de-DE/optional/auth_val.sql Auto-merging acqui/histsearch.pl CONFLICT (content): Merge conflict in acqui/histsearch.pl Auto-merging C4/Acquisition.pm CONFLICT (content): Merge conflict in C4/Acquisition.pm Failed to merge in the changes. Patch failed at 0001 Bug 5336:Order search (search and UI enhancements) 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". -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 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 the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #8 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Still a conflit : CONFLICT (content): Merge conflict in installer/data/mysql/en/optional/auth_val.sql Auto-merging installer/data/mysql/de-DE/optional/auth_val.sql CONFLICT (content): Merge conflict in installer/data/mysql/de-DE/optional/auth_val.sql Failed to merge in the changes. M. Saby -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|3.4 |master -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #11 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Same error in sandbox n°3 : CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Failed to merge in the changes. Patch failed at 0001 Bug 5336:Order search (search and UI enhancements) 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". Bug 5336 - Acq history search M. Saby -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 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 the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #14 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- - In search results, the name of the budget and the branchcode for each line does not show up => I cannot check if the search by budget/branchcode is working well. Could you add these informations ? I think I found a problem concerning Order status : - create 1 basket with 2 order lines (one book ordered in 1 items, on a fund A, the other in 2 items, on a fund B) - search for the 2 titles => they should have status "New", => OK - search for the orders with status "New" => the list should contain the 2 titles => OK - close the basket, create a basketgroup with it - search for the 2 titles => they should have status "Ordered" => Error : The 2 lines still have status "New" Before testing with 2 lines, I tested with 1 line in my basket, and it seemed to be good... M. Saby Rennes 2 University -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

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

- In search results, the name of the budget and the branchcode for each line does not show up => I cannot check if the search by budget/branchcode is working well. Could you add these informations ?

Done

I think I found a problem concerning Order status

Yes! Good catch! (In reply to comment #15)

I have a question - why introduce a new authorized value if the values are pretty much hardcoded? Or am I mistaken? If they were from the templates instead, the status would be translatable using po files.

It is an very old development. I think the goal was to be more flexible but I don't think it is really useful. The following patch hardcodes these values in the template. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #18 from Jonathan Druart <jonathan.druart@biblibre.com> --- REMEMBER: You must have the field aqorders.branchcode in your DB (created by Bug 7294). -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #20 from Jonathan Druart <jonathan.druart@biblibre.com> --- Unfortunately yes. The search by branches needed the aqorders.branchcode. Now I display the branch name in all cases and the join is made on this field. If it does not exist, mysql will raise an error. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #22 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- BZ 7294 has been signed off and should be soon in master. So I'm going to test 5336 again with BZ 7294 applied first. M. Saby -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #14213|0 |1 is obsolete| | --- Comment #24 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 16013 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16013&action=edit Bug 5336:Order search (search and UI enhancements) You can now search orders by - order status - branchcode - budget New field aqorders.orderstatus, it can contains following values: 0 => New 1 => Ordered 2 => Partial 3 => Complete 4 => Deleted New field aqorders.parent_ordernumber is added (which is mainly used by others enhancement). It allows to know the main(=parent) order for an order (if an order is partially received, Koha creates another order. But it is the same order. We want to know this information). To test: Search and check if results are consistent in histsearch.pl -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #25 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- By the way, applying 7294 does not update the database. Pbm in updatedatabase.pl (3.09.XXX should be 3.11.XXX) M. Saby -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #27 from Jonathan Druart <jonathan.druart@biblibre.com> --- This patch should be apply on top of bug 7294 -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #16013|0 |1 is obsolete| | --- Comment #28 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 17612 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17612&action=edit Bug 5336:Order search (search and UI enhancements) You can now search orders by - order status - fund New field aqorders.orderstatus, it can contains following values: 0 => New 1 => Ordered 2 => Partial 3 => Complete 4 => Deleted To test: Search and check if results are consistent in histsearch.pl -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17612|0 |1 is obsolete| | --- Comment #30 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 17613 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17613&action=edit Bug 5336:Order search (search and UI enhancements) You can now search orders by - order status - fund New field aqorders.orderstatus, it can contains following values: 0 => New 1 => Ordered 2 => Partial 3 => Complete 4 => Deleted To test: Search and check if results are consistent in histsearch.pl -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

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

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

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #34 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 17649 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17649&action=edit Bug 5336: Late orders search: don't display deleted order. Test plan: Check that deleted orders are not listed in the late orders search results. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #36 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- My first tests are good, but in search results, you add an column for ordernumber in the html table. Ordernumber is already present in the table on 1st column. So I suppose you wanted to display funds, and not ordernumber ? M. Saby -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

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

My first tests are good, but in search results, you add an column for ordernumber in the html table. Ordernumber is already present in the table on 1st column. So I suppose you wanted to display funds, and not ordernumber ?

M. Saby

Mathieu, In fact the first column is the parent order number, not the order number. I agree with you, it is not clear. The fund column is already added by the first patch. A patch is coming... -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #40 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Sorry, patch does not apply : CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt CONFLICT (content): Merge conflict in C4/Acquisition.pm M. Saby -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #42 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18412 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18412&action=edit Bug 5336: Late orders search: don't display deleted order. Test plan: Check that deleted orders are not listed in the late orders search results. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #44 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18414 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18414&action=edit Bug 5336: Add unit tests for 3 acq routines Unit tests In C4::Acquisition for: - CloseBasket - ReopenBasket - GetBiblioCountByBasketno -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #45 from Paul Poulain <paul.poulain@biblibre.com> --- Patch tested with a sandbox, by Cedric Vita <cedric.vita@dracenie.com> -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18411|0 |1 is obsolete| | Attachment #18412|0 |1 is obsolete| | Attachment #18413|0 |1 is obsolete| | Attachment #18414|0 |1 is obsolete| | Attachment #18496|0 |1 is obsolete| | --- Comment #47 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18497 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18497&action=edit Bug 5336:Order search (search and UI enhancements) You can now search orders by - order status - fund New field aqorders.orderstatus, it can contains following values: 0 => New 1 => Ordered 2 => Partial 3 => Complete 4 => Deleted To test: Search and check if results are consistent in histsearch.pl Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #49 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18499 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18499&action=edit Bug 5336: Merge parent ordernumber and ordernumber columns Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #51 from Jonathan Druart <jonathan.druart@biblibre.com> --- Last 4 patches are signoff patch for Cédric Vita. Thanks Cédric! -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18497|0 |1 is obsolete| | Attachment #18498|0 |1 is obsolete| | Attachment #18499|0 |1 is obsolete| | Attachment #18500|0 |1 is obsolete| | --- Comment #53 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19317 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19317&action=edit Bug 5336:Order search (search and UI enhancements) You can now search orders by - order status - fund New field aqorders.orderstatus, it can contains following values: 0 => New 1 => Ordered 2 => Partial 3 => Complete 4 => Deleted To test: Search and check if results are consistent in histsearch.pl Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #55 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19319 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19319&action=edit Bug 5336: Merge parent ordernumber and ordernumber columns Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #57 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19321 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19321&action=edit Bug 5336: QA followup - fix capitalization - fix update database message -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #59 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, I think we both got the wrong bug number for 2)? :) Julian removed the internalnotes column now, so I think removing it now and readding the correct code later would be good. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #61 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Right, was confusing it with the other acq related patch with cancellationreason. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #62 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Started QA on this. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #64 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I have gone through the code again and I am going to start testing in the interface soon, Especially partial orders. I wonder if the update condition in the updatedatabase can work, as we split the orders for partial receives. I also have been thinking about the status field, I see some advantages and disadvantages of doing it this way. The arguments I can think of right now are: contra: we have another field to maintan where we have to make sure the value is set correctly at all times depending on actions and changing values in other fields. It also adds a bit more complexity to migrations as the status have to be mapped correctly. pro: It will be easy to do SQL reports on aqorders based on the new status fields because you won't have to join tables and figure out the exact conditions. I am a bit torn here, so leaving this as notes while I continue testing. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #66 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Jonathan, could you take a look at the my comments before I proceed here? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #68 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Katrin Fischer from comment #66)

Jonathan, could you take a look at the my comments before I proceed here?

Done in the last patch. You have to remove the columns (ALTER TABLE aqorders DROP COLUMN orderstatus;) and execute the updatedatabase entry. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19317|0 |1 is obsolete| | --- Comment #70 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20894 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20894&action=edit Bug 5336:Order search (search and UI enhancements) You can now search orders by - order status - fund New field aqorders.orderstatus, it can contains following values: 0 => New 1 => Ordered 2 => Partial 3 => Complete 4 => Deleted To test: Search and check if results are consistent in histsearch.pl Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19319|0 |1 is obsolete| | --- Comment #72 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20896 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20896&action=edit Bug 5336: Merge parent ordernumber and ordernumber columns Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19321|0 |1 is obsolete| | --- Comment #74 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20898 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20898&action=edit Bug 5336: QA followup - fix capitalization - fix update database message -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #76 from Jonathan Druart <jonathan.druart@biblibre.com> --- Rebased patches! -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Pierre Angot <tredok.pierre@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tredok.pierre@gmail.com --- Comment #77 from Pierre Angot <tredok.pierre@gmail.com> --- Hi ! We are interrested by this patch and by 8230 :) Did someone do the QA for this one ? Is it possible do have this patch for 3.10 and 3.12 ? Do we need to make other tests ? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #79 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- I understand Katrin, but it's sad, because this feature has apparently been developped in 2011, and I first tested it one year ago... Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #81 from Pierre Angot <tredok.pierre@gmail.com> --- Thank's for your answers ^^ -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #83 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Well, Pierre or anyone else :) -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #85 from Pierre Angot <tredok.pierre@gmail.com> --- Ok. I'll test this afternoon ^^ -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #87 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Any hints appreciated... the logs are clean. I am not seeing what I am doing wrong. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 sandboxes@biblibre.com <sandboxes@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |sandboxes@biblibre.com --- Comment #89 from sandboxes@biblibre.com <sandboxes@biblibre.com> --- Patch tested with a sandbox, by Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 sandboxes@biblibre.com <sandboxes@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20895|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=5336 sandboxes@biblibre.com <sandboxes@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20897|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=5336 sandboxes@biblibre.com <sandboxes@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20899|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=5336 --- Comment #91 from sandboxes@biblibre.com <sandboxes@biblibre.com> --- Created attachment 21690 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21690&action=edit Bug 5336: Late orders search: don't display deleted order. Test plan: Check that deleted orders are not listed in the late orders search results. Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #93 from sandboxes@biblibre.com <sandboxes@biblibre.com> --- Created attachment 21692 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21692&action=edit Bug 5336: Add unit tests for 3 acq routines Unit tests In C4::Acquisition for: - CloseBasket - ReopenBasket - GetBiblioCountByBasketno Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #95 from sandboxes@biblibre.com <sandboxes@biblibre.com> --- Created attachment 21694 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21694&action=edit Bug 5336: Change numbers with understandable codes for orderstatus This patch uses understandable codes instead of magical numbers for the aqorders.orderstatus field. + execute sql queries in unit tests into a transaction. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #97 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Pierre, thanks :) What I am trying to do is check the update procedure - but I am still stuck with receiving orders. I will try again tonight to see what's going wrong in my installation. It puzzles me quite a bit! Have you tested with AcqCreateItems "on order"? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #99 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 21696 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21696&action=edit ... and no pending orders -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #101 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Testing with that too - it's just I am missing all pending orders... until I get that working I can't really continue to test. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #103 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I will investigate the code and the database tonight - another idea I have is permissions - are you superlibrarian? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #105 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Thx - but I really need to figure out what's wrong with my installation :) I am never testing with superlibrarian, because our users don't get this permission and I want to make sure it works right for them. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #107 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21697 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21697&action=edit Bug 5336: FIX: partial status was not correctly set An order (o1) is considered as partially received if (at least) another order (o2) has the o1.ordernumber == o2.parent_ordernumber and the quantity received is < to the quantity (to receive). -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #109 from Pierre Angot <tredok.pierre@gmail.com> --- Do you have check permission order_manage and order_receive ? Here, I give the 2 permissions. I think I've maybe missed something. Did this patch do a modification in receive shipment ? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #111 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, thx for the follow-up - I remember from reading the code I had a feeling there might be a problem for the partial receives. Give me a chance to fix my installation and I will continue testing this. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #113 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, I am pretty impressed with this :) But there are some issues, that need fixing: 1) Database update - I end up with too many partials. My test cases: - New orders, basket still open NOT OK Expected: new, Result: partial - Ordered orders, basket and basketgroup closed NOT OK Expected: ordered, Result: partial - Partially received orders OK Expected: partial/complete, Result: partial/complete - Received orders OK: Expected: complete, Result: complete - Cancelled orders * cancelled from open basket before order OK: Expected: cancelled, Result: cancelled * cancelled from closed basket before receive OK: Expected: cancelled, Result: cancelled I have saved my 'pre-updatedatabase' and can repeat the test anytime you have a follow up. 2) Testing search functionality a) Order search - result list Order search shows a new column, I think it would be a bit better if the status there was singular instead of plural - new order, partially received order etc. - maybe we could even leave out the 'order'? (minor) The column seems a bit lost in the middle, not sure where it would make more sense (just saying) b) Order search - advanced search form The advanced search form now shows a new filter: Order status All new status can be searched. - an "empty" search will find all but cancelled orders - searching for cancelled orders works correctly and shows results Search works correctly, no regressions found. When a search gives no results, there is no message. Also, all filters and fields are cleared so you can't modify or check you previous search (minor) 3) Testing setting of status after applying the patch a) Create a new order with 2 items - status is new. OK b) Close the basket - status is ordered. OK c) Receive both items - status is completed. OK d) Undo receipt - status is ordered. OK e) Receive only 1 item - order is split up into 2 orders: - status is partial OK - status is completed OK f) Undo receipt of received item - order is combined into 1 again - status is ordered OK! g) Receive only 1 item again - status ordered/partial. h) Delete order. - status is completed - status is cancelled OK! i) Undo receipt of 1 item again. Refresh page. Error message is shown: Cannot cancel receipt. Possible reasons : The order line you trying to cancel was created from a partial receipt of another order line which is already received. Try to cancel this one first and retry. The order line you trying to cancel was created from a partial receipt of another order line which has been deleted. Cancellation is not possible. BUT: The receipt is undon, you are left with an order line with 2 items, a cancellation date and the status ordered. Because of the cancellation date the order is not visible in pending orders. Summary: The database update is not quite right yet and there is an edge case where you are left with the wrong status. Also singulars in the orders search result page would be nice. Hope you can take another look - I like this. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #115 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21708 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21708&action=edit Bug 5336: Multiple QA fixes - add a message if the search returns no result - keep selected values if the search returns no result (for fund and order status) - remove plurals in order status - move the order status column in the search results table -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #117 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I can't test before tonight - so if you could confirm it's also on master I would be ok with that. Could you go ahead and file the new bug? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #119 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, I wanted to come back to this but see you have set Failed QA still - is it because of the edge case? I think we could deal with that as a separate bug, as the behaviour is buggy on master as well. - If that is the only problem remaining. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Passed QA -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #121 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 21752 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21752&action=edit [PASSED QA] Bug 5336: Late orders search: don't display deleted order. Test plan: Check that deleted orders are not listed in the late orders search results. Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #123 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 21754 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21754&action=edit [PASSED QA] Bug 5336: Add unit tests for 3 acq routines Unit tests In C4::Acquisition for: - CloseBasket - ReopenBasket - GetBiblioCountByBasketno Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #125 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 21756 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21756&action=edit [PASSED QA] Bug 5336: Change numbers with understandable codes for orderstatus This patch uses understandable codes instead of magical numbers for the aqorders.orderstatus field. + execute sql queries in unit tests into a transaction. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #127 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 21758 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21758&action=edit [PASSED QA] Bug 5336: Multiple QA fixes - add a message if the search returns no result - keep selected values if the search returns no result (for fund and order status) - remove plurals in order status - move the order status column in the search results table Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. New tests also pass: t/db_dependent/Acquisition/close_reopen_basket.t 1) Database update - I end up with too many partials. My test cases: - New orders, basket still open OK Expected: new, Result: partial - Ordered orders, basket and basketgroup closed OK Expected: ordered, Result: partial - Partially received orders OK Expected: partial/complete, Result: partial/complete - Received orders OK: Expected: complete, Result: complete - Cancelled orders * cancelled from open basket before order OK: Expected: cancelled, Result: cancelled * cancelled from closed basket before receive OK: Expected: cancelled, Result: cancelled All aqorders where updated with the correct status. I have saved my 'pre-updatedatabase' and can repeat the test anytime you have a follow up. 2) Testing search functionality a) Order search - result list Order search shows a new column, I think it would be a bit better if the status there was singular instead of plural - new order, partially received order etc. - maybe we could even leave out the 'order'? (minor) The column seems a bit lost in the middle, not sure where it would make more sense (just saying) b) Order search - advanced search form The advanced search form now shows a new filter: Order status All new status can be searched. - an "empty" search will find all but cancelled orders - searching for cancelled orders works correctly and shows results Search works correctly, no regressions found. If no result is found a message is shown. All search input is kept, so you can modify your search terms easily. 3) Testing setting of status after applying the patch a) Create a new order with 2 items - status is new. OK b) Close the basket - status is ordered. OK c) Receive both items - status is completed. OK d) Undo receipt - status is ordered. OK e) Receive only 1 item - order is split up into 2 orders: - status is partial OK - status is completed OK f) Undo receipt of received item - order is combined into 1 again - status is ordered OK! g) Receive only 1 item again - status ordered/partial. h) Delete order. - status is completed - status is cancelled OK! i) Undo receipt of 1 item again. Refresh page. This results in the following behaviour, that has been reported as bug 10984. After refreshing the page follow message is shown: Cannot cancel receipt. Possible reasons : - The order line you trying to cancel was created from a partial receipt of another order line which is already received. Try to cancel this one first and retry. - The order line you trying to cancel was created from a partial receipt of another order line which has been deleted. Cancellation is not possible. BUT: The receipt is undone, but you are left with a line with 2 items, a cancellation date and the status ordered. Because of the cancellation date the order is not visible in pending orders. The status is correct - so I feel this should not stop this patch. -- You are receiving this mail because: You are watching all bug changes.

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #130 from Pierre Angot <tredok.pierre@gmail.com> --- Yeah ! Now, we are waiting for pushing. I can start to test 8230 ^^ -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |gmcharlt@gmail.com --- Comment #132 from Galen Charlton <gmcharlt@gmail.com> --- Pushed to master, along with some follow-ups. The most significant one I believe resolves the concern Katrin had about too many orders ending up in the partial status when 'ordered' or 'new' would have been better. I'd appreciate review of that in case that particular follow-up needs to be modified. Thanks, Jonathan! -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336 --- Comment #134 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Galen Charlton from comment #132)

Pushed to master, along with some follow-ups. The most significant one I believe resolves the concern Katrin had about too many orders ending up in the partial status when 'ordered' or 'new' would have been better. I'd appreciate review of that in case that particular follow-up needs to be modified.

I agree with your followups. Thanks! -- You are receiving this mail because: You are watching all bug changes.

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