http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|kyle.m.hall@gmail.com |srdjan@catalyst.net.nz -- 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.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> 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.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 Brendan Gallagher <brendan@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |brendan@bywatersolutions.co | |m --- Comment #3 from Brendan Gallagher <brendan@bywatersolutions.com> 2011-07-21 00:26:25 UTC --- kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt Is not found. The patch needs to be updated for the .tt version. -- 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.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|rel_3_4 |rel_3_6 Change sponsored?|--- |Sponsored -- 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.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #5 from Paul Poulain <paul.poulain@biblibre.com> 2012-02-17 14:39:09 UTC --- The script devel/misc/testbugzillapatches.pl has detected that this bug does not apply anymore, so i'm marking this bug as "does not apply". The script is supposed to handle conflicts related to updatedatabase, but no other cases of merge conflict. So the conflict may be trivial to fix. If it happens that the patch attached does apply cleanly, please send me an email, there's something wrong in the script. It's possible, as it's a recent script. If the patch applies does not apply as I think, please rebase and resubmit, thanks -- 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=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7799|0 |1 is obsolete| | --- Comment #7 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 9576 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9576&action=edit patch -- 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=5911 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |kyle.m.hall@gmail.com --- Comment #8 from Kyle M Hall <kyle.m.hall@gmail.com> --- The new system preference UseTransportCostMatrix does not seem to be added to any of the system preference tabs. Also, wouldn't it be more understandable if the values want from say 0 to 100 rather than 0 to 1? You could just multiply the internal values by 100 for presentation, and divide presentation values by 100 for storage. I would also suggest changing 'No xfr' to 'Disable'. It's only one character longer and may be less confusing, especially for translators. A testing plan would also be helpful. -- 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=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9576|0 |1 is obsolete| | --- Comment #10 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 9600 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9600&action=edit p There's no actual reason for normalising costs to 1, so I've removed that. It is up to the libraries to ave them in particular range (0 to 1 or 100 or 1000). Toggle checkbox updates system preference. I left it out from the sysprefs screen for the reason not to have it in two places. I can put it there as well if you wish, but it makes sense to me to have it on that screen. Re test plan, my understanding was that Bywater would provide test plans for all holds rewrite work. I can provide you with a plan, but then we would be doing the same tests. -- 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=5911 --- Comment #12 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Then I'll move it to the sysprefs. Can you please tell me where exactly is that link so I can pinch it? -- 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=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9600|0 |1 is obsolete| | --- Comment #14 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 9626 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9626&action=edit patch -- 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=5911 Melia Meggs <melia@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |melia@bywatersolutions.com --- Comment #15 from Melia Meggs <melia@bywatersolutions.com> --- I am not sure I understand well enough the complexities of home branch, holding branch, patron's branch, pickup branch, etc., but here is my attempt at a test plan. Community members (Ian in particular), please let me know if this sounds like the right idea. First test: 1. Go to Administration > Sys Prefs. Turn on the Transport Cost Matrix. Turn off AutomaticItemReturn. (Turning off AutomaticItemReturn means that we're going to be looking at holding branch, not home branch.) 2. Go to the "new administrative page that serves to manage the relative costs of transporting an item between branches." (I don't know where to find this page or what it looks like.) 3. Enter a numeric value for each branch (from 0 to 100). This numeric value indicates the "cost" of transporting an item from that branch to every other branch. Example: from Branch B to A - 1 from Branch C to A - 2 from Branch D to A - 2 4. Place four holds on next available item with pickup Branch A. Choose a title that has two items with current holding branch as Branch A. 5. Since the item is already there, the first hold should be filled by Branch A. 6. Since Branch A has another copy of the item, the second hold should also be filled by Branch A. 7. Since Branch A has no more copies of the item, the third hold should be filled by Branch B because it has the least cost of transport. 8. If Branch B has another copy of the item, the fourth should also be filled by Branch B. If Branch B has no more copies of the item, the fourth hold should be filled by either Branch C or D (random choice because they have equal cost of transport). ------------------- Second test: 1. Place four holds on next available item with pickup Branch A. Choose a title that has NO items with current holding branch of Branch A but one item with current holding branch of Branch B. 2. Since Branch A has no copies of this item, the first hold should be filled by Branch B because it has the least cost of transport. 3. If Branch B has no more copies of the item, the second, third and fourth holds should be filled by Branches C and D (in random order because they have equal cost of transport - how do we test if random?) ------------------- Third test: 1. Turn on AutomaticItemReturn sys pref. This means items will automatically be transferred back to their home branch when returned, so holding branch doesn't matter any more. 2. Place four holds on next available item with pickup Branch A. Choose a title that has 1 item with Branch A as home branch. 3. The first hold should be filled by Branch A. 4. Since Branch A has no more copies of the item, the second hold should be filled by Branch B. 5. If Branch B has another copy of the item, the third hold should be filled by Branch B. If Branch B has no more copies of the item, the fourth hold should be filled by either Branch C or D (random choice). ------------------- Fourth test: 1. Go back to the "new administrative page that serves to manage the relative costs of transporting an item between branches." Use the toggle to block all transport from Branch B to any other branch. (This means no items will ever be transferred from Branch B.) 2. Place four holds on next available item with pickup Branch A. Choose a title that has one item with Branch A as home branch and one item with Branch B as home branch. 3. The first hold should be filled by Branch A. 4. The second, third and fourth holds should be filled by Branches C and D (random choice). We are skipping over the item at Branch B because it cannot be transferred to Branch A for pickup (i.e. that item at Branch B can only ever fill holds with pickup branch as Branch B). -------------------- This is way, way complicated, but what we've got here is a situation in which the behavior of the system depends upon rules that are indicated by the numeric values in a matrix. Can't a computer test this better than I can? I believe we need automated testing (unit tests, at least). I would be happy to provide a sample matrix if you could include the data in the unit test which covers the code. -- 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=5911 --- Comment #17 from Melia Meggs <melia@bywatersolutions.com> --- Sorry, one more question - are we supposed to be testing holds queue jump here as well? Or is that separate? -- 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=5911 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #19 from Kyle M Hall <kyle.m.hall@gmail.com> --- It looks like your automated test is failing in 2 places. 1..15 ok 1 - use C4::Reserves; ok 2 - use C4::HoldsQueue; ok 3 - take from homebranch (don't use cost matrix) pick up branch ok 4 - take from homebranch (don't use cost matrix) holding branch ok 5 - take from homebranch ( use cost matrix) pick up branch ok 6 - take from homebranch ( use cost matrix) holding branch ok 7 - take from holdingbranch (don't use cost matrix) pick up branch not ok 8 - take from holdingbranch (don't use cost matrix) holding branch # Failed test 'take from holdingbranch (don't use cost matrix) holding branch' # at t/db_dependent/HoldsQueue.t line 149. # got: 'CPL' # expected: 'MPL' # Wrong pick-up/hold: $VAR1 = 'MPL'; # $VAR2 = 'MPL'; # $VAR3 = [ # { # 'priority' => '1', # 'reservenotes' => undef, # 'reservedate' => '2012-05-20', # 'suspend_until' => undef, # 'expirationdate' => undef, # 'found' => undef, # 'reminderdate' => undef, # 'timestamp' => '2012-05-21 11:03:12', # 'biblionumber' => '5', # 'borrowernumber' => '19', # 'notificationdate' => undef, # 'branchcode' => 'MPL', # 'itemnumber' => undef, # 'constrainttype' => '', # 'lowestPriority' => '0', # 'suspend' => '0', # 'waitingdate' => undef, # 'cancellationdate' => undef # } # ]; # $VAR4 = [ # { # 'itemnumber' => '117', # 'biblionumber' => '5', # 'source_branchcode' => 'CPL', # 'borrowernumber' => '19', # 'item_level_request' => '0' # } # ]; # $VAR5 = [ # { # 'pickbranch' => 'MPL', # 'firstname' => 'Henry', # 'itemnumber' => '117', # 'itemcallnumber' => undef, # 'reservedate' => '2012-05-20', # 'barcode' => '463975280138', # 'phone' => '(212) 555-1212', # 'item_level_request' => '0', # 'surname' => 'Acevedo', # 'holdingbranch' => 'CPL', # 'biblionumber' => '5', # 'notes' => undef, # 'cardnumber' => '23529000035676', # 'title' => 'Test Holds Queue XXX', # 'borrowernumber' => '19' # } # ]; ok 9 - take from holdingbranch ( use cost matrix) pick up branch not ok 10 - take from holdingbranch ( use cost matrix) holding branch # Failed test 'take from holdingbranch ( use cost matrix) holding branch' # at t/db_dependent/HoldsQueue.t line 149. # got: 'UPL' # expected: 'MPL' # Wrong pick-up/hold: $VAR1 = 'MPL'; # $VAR2 = 'MPL'; # $VAR3 = [ # { # 'priority' => '1', # 'reservenotes' => undef, # 'reservedate' => '2012-05-20', # 'suspend_until' => undef, # 'expirationdate' => undef, # 'found' => undef, # 'reminderdate' => undef, # 'timestamp' => '2012-05-21 11:03:12', # 'biblionumber' => '5', # 'borrowernumber' => '19', # 'notificationdate' => undef, # 'branchcode' => 'MPL', # 'itemnumber' => undef, # 'constrainttype' => '', # 'lowestPriority' => '0', # 'suspend' => '0', # 'waitingdate' => undef, # 'cancellationdate' => undef # } # ]; # $VAR4 = [ # { # 'itemnumber' => '114', # 'biblionumber' => '5', # 'source_branchcode' => 'UPL', # 'borrowernumber' => '19', # 'item_level_request' => '0' # } # ]; # $VAR5 = [ # { # 'pickbranch' => 'MPL', # 'firstname' => 'Henry', # 'itemnumber' => '114', # 'itemcallnumber' => undef, # 'reservedate' => '2012-05-20', # 'barcode' => '463975280135', # 'phone' => '(212) 555-1212', # 'item_level_request' => '0', # 'surname' => 'Acevedo', # 'holdingbranch' => 'UPL', # 'biblionumber' => '5', # 'notes' => undef, # 'cardnumber' => '23529000035676', # 'title' => 'Test Holds Queue XXX', # 'borrowernumber' => '19' # } # ]; ok 11 - take from lowest cost branch (don't use cost matrix) pick up branch ok 12 - take from lowest cost branch (don't use cost matrix) holding branch ok 13 - take from lowest cost branch ( use cost matrix) pick up branch ok 14 - take from lowest cost branch ( use cost matrix) holding branch ok 15 - GetHoldsQueueItems # Looks like you failed 2 tests of 15. -- 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=5911 --- Comment #21 from Kyle M Hall <kyle.m.hall@gmail.com> --- (In reply to comment #20)

This is most inconvenient, because it passes here. Can you please tell me how you run it?

Just 'perl t/db_dependent/HoldsQueue.t' I apologize if I am doing this wrong. I have done unit testing with perl in a long time, and even then not much. -- 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=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> 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=5911 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- 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=5911 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA CC| |paul.poulain@biblibre.com --- Comment #25 from Paul Poulain <paul.poulain@biblibre.com> --- QA comments: * perlcritic problem: C4/HoldsQueue.pm: Don't modify $_ in list functions at line 571, column 27. See page 114 of PBP. (Severity: 5) * why is this code in this patch? +sub _flush_preferences { + %sysprefs = (); +} * we're supposed not to add anything to C4::, but use Koha:: instead. You're creating HoldsQueue.pm. As we haven't defined a clear organization for Koha::, I can't say where this code should be, it's probably fair to have it in C4. Plus I don't want Koha:: be filled with C4:: like scripts, so won't reject the patch for this reason The line: # XXX GetHoldsQueueItems() does not support $itemtypeslimit! should be # FIXME GetHoldsQueueItems() does not support $itemtypeslimit! Just a question, not related to QA: if the syspref is OFF, how are things sorted ? as before ? (if yes, good point you've set the value to 0 by default, it means there won't be any change for users) -- 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=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff --- Comment #27 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- (In reply to comment #25)

QA comments: * perlcritic problem: C4/HoldsQueue.pm: Don't modify $_ in list functions at line 571, column 27. See page 114 of PBP. (Severity: 5)

perlcritic can be such a pain...

* why is this code in this patch? +sub _flush_preferences { + %sysprefs = (); +}

It is a poor man's sysprefs flush as per the comment above the code: # FIXME: running this under mod_perl will require a means of # flushing the caching mechanism I did not want to remove the comment because: a) this solution was created in anger, so may not fit all b) I did not address mod_perl/plack/ any other persistant env, just needed a way to change sysprefs for the test

* we're supposed not to add anything to C4::, but use Koha:: instead. You're creating HoldsQueue.pm. As we haven't defined a clear organization for Koha::, I can't say where this code should be, it's probably fair to have it in C4. Plus I don't want Koha:: be filled with C4:: like scripts, so won't reject the patch for this reason

When I started this, I did not even know of Koha namespace. Now I know, but not sure how to put things there :)

The line: # XXX GetHoldsQueueItems() does not support $itemtypeslimit!

should be # FIXME GetHoldsQueueItems() does not support $itemtypeslimit!

I was not sure if that needs addressing, just wanted to add a note. I can change this if required.

Just a question, not related to QA: if the syspref is OFF, how are things sorted ? as before ? (if yes, good point you've set the value to 0 by default, it means there won't be any change for users)

Yes, if off it behaves as before. Default is 0. t/db_dependent/HoldsQueue.t tests both cases. -- 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=5911 --- Comment #29 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- First one is OK as is, other one needs sign-off and then both need qa together I suppose. -- 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=5911 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- 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=5911 --- Comment #32 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 10733 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10733&action=edit bug_5911: removed duplicate _flush_preferences(), and replaced with clear_syspref_cache() -- 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=5911 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|PATCH-Sent (DO NOT USE) |P3 CC| |mtj@kohaaloha.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=5911 --- Comment #34 from Mason James <mtj@kohaaloha.com> --- (In reply to comment #33)

Created attachment 10882 [details] Bug 5911 - Transport Cost Matrix

i rebased this patch off master 39701b866676845e86cec0e1d5ca40a6b159288a -- 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=5911 --- Comment #36 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 10919 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10919&action=edit bug_5911: Make tt_valid.t happy -- 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=5911 --- Comment #37 from Paul Poulain <paul.poulain@biblibre.com> --- Created attachment 11075 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11075&action=edit bug_5911: Make tt_valid.t happy Signed-off-by: Paul Poulain <paul.poulain@biblibre.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=5911 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- 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=5911 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|rel_3_6 |master --- Comment #39 from Paul Poulain <paul.poulain@biblibre.com> --- I tried to test this new feature, but can't make it work: When I reach the page /cgi-bin/koha/admin/transport-cost-matrix.pl I just get red cells, and the documentation says: "Red cells signify no transfer allowed" One comment : if cell is red, I should not be able to enter a value isn't it ? I can, but it's not saved when I click on "Save". Is it the intended behaviour ? (Sounds strange) I tried to get rid of the red cells, but couldn't. * the UseBranchTransferLimits doesn't change anything (I tried with both possible status) * Even if limits are enabled, I have added most transfer limits as enabled on /cgi-bin/koha/admin/branch_transfer_limits.pl, but everything is still red More explanations welcomed... -- 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=5911 --- Comment #41 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 11095 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11095&action=edit bug_5911: Javascript and error messages corrections -- 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=5911 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Patch doesn't apply CC| |kyle@bywatersolutions.com --- Comment #43 from Kyle M Hall <kyle@bywatersolutions.com> --- Applying: Bug 5911 - Transport Cost Matrix error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt:53 error: koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt: patch does not apply Patch failed at 0001 Bug 5911 - Transport Cost Matrix -- 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=5911 --- Comment #45 from Kyle M Hall <kyle@bywatersolutions.com> ---

So it went fine here. can you please tell me how you tried to apply it?

I used 'git qa 5911' which is the same as 'git fetch origin && git checkout origin/master -b bug5911-qa && git bz apply 5911' -- 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=5911 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #47 from Chris Cormack <chris@bigballofwax.co.nz> --- (In reply to comment #45)

...

So it went fine here. can you please tell me how you tried to apply it?

I used 'git qa 5911' which is the same as 'git fetch origin && git checkout origin/master -b bug5911-qa && git bz apply 5911'

And does your git bz do a 3 way merge, if not it will report these errors. When a 3 way merge will either merge cleanly, or actually tell you where the error is. What I do is git bz apply, if it fails it leaves the patch in /tmp git am --abort To clean out the apply in process git am -iu3 /tmp/path_to_patch (git bz will tell you this path) Then if it results in conflicts (which this one doesnt, it merges cleanly) It will tell you the conflicts and you can paste that in. However what has occured here, is that srdjan forgot to obsolete the old patches, so you were trying to apply ones that are now out of date in and in the wrong order. git bz doesn't understand stuff like that. Ill tidy up the attachments, and then you should be good to go. -- 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=5911 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11140|0 |1 is obsolete| | --- Comment #49 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 11144 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11144&action=edit bug_5911: Transport Cost Matrix Create transport_cost table, added UseTransportCostMatrix syspref. transport_cost table contains branch to branch transfer costs. These are used for filling inter-branch hold transfers. Moved GetHoldsQueueItems() from .pl to HoldsQueue.pm Signed-off-by: Kyle M Hall <kyle@bywatersolutions.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=5911 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA CC| |m.de.rooy@rijksmuseum.nl --- Comment #50 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- QA Comment: Larger patch with greater potential impact :) Have looked at the code only; depend on signoff for test. Code looks good to me. Although some vital code moved from pl to pm and has been changed, it seems that not using the matrix will not change current behavior. Passed QA -- 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=5911 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11144|0 |1 is obsolete| | --- Comment #51 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 11777 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11777&action=edit Patch for bug 5911 Conflict resolved for updatedatabase -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 --- Comment #53 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 11820 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11820&action=edit bug_5911 follow-up: removed debug() calls and ;; -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11777|0 |1 is obsolete| | Attachment #11820|0 |1 is obsolete| | --- Comment #55 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 11971 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11971&action=edit bug_5911: Transport Cost Matrix Create transport_cost table, added UseTransportCostMatrix syspref. transport_cost table contains branch to branch transfer costs. These are used for filling inter-branch hold transfers. Moved GetHoldsQueueItems() from .pl to HoldsQueue.pm Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed for QA |Passed QA --- Comment #57 from Paul Poulain <paul.poulain@biblibre.com> --- I mark passed QA, and will do as extensive tests as possible in the next days, before pushing -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 --- Comment #59 from Chris Cormack <chris@bigballofwax.co.nz> --- DBD::mysql::db do failed: Can't create table 'koha.transport_cost' (errno: 150) at ./installer/data/mysql/updatedatabase.pl line 5703. (150 is foreign key constraints) This might be specific to the jenkins machine, but just noting why it didnt update properly -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com --- Comment #61 from Nicole C. Engard <nengard@gmail.com> --- (In reply to comment #60)

I believe this patch actually does cause a regression - the hold queue report now selects items based only on the homebranch, and never for holding branch.

Will file a new bug.

I didn't see a bug from you Liz, but Kyle has patched this here: http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9922 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5911 --- Comment #62 from Liz Rea <liz@catalyst.net.nz> --- Thanks Nicole, it was my weekend and I just didn't get to it. :) -- You are receiving this mail because: You are watching all bug changes.