Koha › Administration › Transport Cost Matrix

[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]
Due date
Title
Item type
[% ELSE %]
[% END %] @@ -474,7 +452,7 @@ function validate1(date) {
[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]
[% END %][% END %][% issueloo.itemtype_description %]
[% issueloo.issuedate %]
[% issueloo.issuingbranchname %]
[% issueloo.itemcallnumber %]
[% issueloo.charge %]
[% issueloo.replacementprice %]
Due date
Title
Item type
[% relissueloo.itemcallnumber %]
[% relissueloo.charge %]
[% relissueloo.replacementprice %]
[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])
Amount
You currently owe fines and charges amounting to:
[% BORROWER_INF.amountoutstanding %]
Amount
You currently owe fines and charges amounting to:
[% BORROWER_INF.amountoutstanding %]
Amount
You have a credit of:
[% BORROWER_INF.amountoutstanding %]
Holds waiting
Title
Hold date
Pick up library
- [% WAITIN.waiting_title %] - - [% WAITIN.author %] -
[% WAITIN.reservedate | $KohaDates %]
[% IF ( WAITIN.atdestination ) %]Waiting at [% WAITIN.branch %] - [% ELSE %] - In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %] - [% END %]
[% issues_count %] Item(s) checked out
Title
Due
Item type
@@ -259,27 +197,88 @@ $.tablesorter.addParser({
Amount
You currently owe fines and charges amounting to:
[% BORROWER_INF.amountoutstanding %]
Amount
You currently owe fines and charges amounting to:
[% BORROWER_INF.amountoutstanding %]
Amount
You have a credit of:
[% BORROWER_INF.amountoutstanding %]
Holds waiting
Title
Hold date
Pick up library
+ [% WAITIN.waiting_title %] + + [% WAITIN.author %] +
[% WAITIN.reservedate | $KohaDates %]
[% IF ( WAITIN.atdestination ) %]Waiting at [% WAITIN.branch %] + [% ELSE %] + In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %] + [% END %]
Overdues ([% overdues_count %] total)
Address
Properties
Printer
[% branche.branchip %]
+ [% branche.branchprintername %] +
Edit
[% loo.printername %]
[% loo.printqueue %]
[% loo.printtype %]
Edit Delete
References: Message-ID: <1336965548-2782-1-git-send-email-srdjan@catalyst.net.nz> --- C4/Members.pm | 1 - C4/Print.pm | 43 ++++++---------------------------- circ/circulation.pl | 6 ++++- t/db_dependent/lib/KohaTest/Print.pm | 2 +- 4 files changed, 13 insertions(+), 39 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index 6161ac9..693e0ba 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -997,7 +997,6 @@ sub GetPendingIssues { # must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance # FIXME: namespace collision: each table has "timestamp" fields. Which one is "timestamp" ? # FIXME: circ/ciculation.pl tries to sort by timestamp! - # FIXME: C4::Print::printslip tries to sort by timestamp! # FIXME: namespace collision: other collisions possible. # FIXME: most of this data isn't really being used by callers. my $query = diff --git a/C4/Print.pm b/C4/Print.pm index c0b37c8..9f622a4 100644 --- a/C4/Print.pm +++ b/C4/Print.pm @@ -28,7 +28,7 @@ BEGIN { $VERSION = 3.01; require Exporter; @ISA = qw(Exporter); - @EXPORT = qw(&printslip); + @EXPORT = qw(&NetworkPrint); } =head1 NAME @@ -45,45 +45,16 @@ The functions in this module handle sending text to a printer. =head1 FUNCTIONS -=cut - -=for comment - my $slip = <<"EOF"; -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Date: $todaysdate; - -ITEM RESERVED: -$itemdata->{'title'} ($itemdata->{'author'}) -barcode: $itemdata->{'barcode'} - -COLLECT AT: $branchname - -BORROWER: -$bordata->{'surname'}, $bordata->{'firstname'} -card number: $bordata->{'cardnumber'} -Phone: $bordata->{'phone'} -$bordata->{'streetaddress'} -$bordata->{'suburb'} -$bordata->{'town'} -$bordata->{'emailaddress'} +=head2 NetworkPrint + &NetworkPrint($text) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -EOF -=cut - -=head2 printslip - - &printslip($slip) - -print a slip for the given $borrowernumber and $branchcode +Queue some text for printing on the selected branch printer =cut -sub printslip ($) { - my ($slip) = @_; - - return unless ( C4::Context->boolean_preference('printcirculationslips') ); +sub NetworkPrint { + my ($text) = @_; # FIXME - It'd be nifty if this could generate pretty PostScript. @@ -112,7 +83,7 @@ sub printslip ($) { # print $queue; #open (FILE,">/tmp/$file"); - print PRINTER $slip; + print PRINTER $text; print PRINTER "\r\n" x 7 ; close PRINTER; diff --git a/circ/circulation.pl b/circ/circulation.pl index bcbcb6f..c89abff 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -25,6 +25,7 @@ use strict; use warnings; use CGI; use C4::Output; +use C4::Print; use C4::Auth qw/:DEFAULT get_session/; use C4::Dates qw/format_date/; use C4::Branch; # GetBranches @@ -172,7 +173,10 @@ if ( $barcode eq '' && $query->param('charges') eq 'yes' ) { } if ( $print eq 'yes' && $borrowernumber ne '' ) { - PrintIssueSlip($session->param('branch') || $branch, $borrowernumber); + if ( C4::Context->boolean_preference('printcirculationslips') ) { + my $letter = IssueSlip($branch, $borrowernumber, "QUICK"); + NetworkPrint($letter->{content}); + } $query->param( 'borrowernumber', '' ); $borrowernumber = ''; } diff --git a/t/db_dependent/lib/KohaTest/Print.pm b/t/db_dependent/lib/KohaTest/Print.pm index d35ab34..f720fee 100644 --- a/t/db_dependent/lib/KohaTest/Print.pm +++ b/t/db_dependent/lib/KohaTest/Print.pm @@ -12,7 +12,7 @@ sub testing_class { 'C4::Print' }; sub methods : Test( 1 ) { my $self = shift; - my @methods = qw( printslip ); + my @methods = qw( NetworkPrint ); can_ok( $self->testing_class, @methods ); } -- 1.7.9.5 From serhijdubyk at gmail.com Mon May 14 22:29:18 2012 From: serhijdubyk at gmail.com (=?UTF-8?q?Serhij=20Dubyk=20=7B=D0=A1=D0=B5=D1=80=D0=B3=D1=96=D0=B9=20=D0=94=D1=83=D0=B1=D0=B8=D0=BA=7D?=) Date: Mon, 14 May 2012 23:29:18 +0300 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Preservation transparency of png-images cover. Message-ID: <1337027358-32111-1-git-send-email-serhijdubyk@gmail.com> From: Serhij Dubyk {???????????? ??= =?UTF-8?q??????????} Signed-off-by: Serhij Dubyk {???????????? ??????????} --- C4/Images.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/C4/Images.pm b/C4/Images.pm index 8afc8fa..3a8a383 100644 --- a/C4/Images.pm +++ b/C4/Images.pm @@ -187,10 +187,14 @@ sub _scale_image { and warn "Reducing image by " . ( $percent_reduce * 100 ) . "\% or to $width_reduce pix X $height_reduce pix"; - my $newimage = GD::Image->new( $width_reduce, $height_reduce, 1 ) - ; #'1' creates true color image... + my $newimage = GD::Image->new( $width_reduce, $height_reduce, 1 ); #'1' creates true color image... + #my $newimage = $image->clone; + $newimage->alphaBlending(0); + $newimage->saveAlpha(1); + #$newimage->transparent( $image->transparent() ); $newimage->copyResampled( $image, 0, 0, 0, 0, $width_reduce, $height_reduce, $width, $height ); + #$newimage->transparent( $image->transparent() ); return $newimage; } else { -- 1.7.10 From srdjan at catalyst.net.nz Tue May 15 02:20:34 2012 From: srdjan at catalyst.net.nz (Srdjan) Date: Tue, 15 May 2012 12:20:34 +1200 Subject: [Koha-patches] [PATCH] bug_5911: Transport Cost Matrix In-Reply-To: References: Message-ID: <1337041234-13490-1-git-send-email-srdjan@catalyst.net.nz> Create transport_cost table, added UseTransportCostMatrix syspref. transport_cost table contains normalised branch to branch transfer costs. These are used for fulilling inter-branch hold transfers. Moved GetHoldsQueueItems() from .pl to HoldsQueue.pm --- C4/Context.pm | 3 + C4/HoldsQueue.pm | 630 ++++++++++++++++++++ admin/systempreferences.pl | 1 + admin/transport-cost-matrix.pl | 122 ++++ circ/view_holdsqueue.pl | 34 +- installer/data/mysql/kohastructure.sql | 17 + installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 20 + .../prog/en/modules/admin/admin-home.tt | 2 + .../prog/en/modules/admin/transport-cost-matrix.tt | 126 ++++ misc/cronjobs/holds/build_holds_queue.pl | 382 +----------- t/db_dependent/HoldsQueue.t | 161 +++++ 12 files changed, 1087 insertions(+), 412 deletions(-) create mode 100755 C4/HoldsQueue.pm create mode 100755 admin/transport-cost-matrix.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt create mode 100755 t/db_dependent/HoldsQueue.t diff --git a/C4/Context.pm b/C4/Context.pm index 67d31ee..6643c1d 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -523,6 +523,9 @@ with this method. # flushing the caching mechanism. my %sysprefs; +sub _flush_preferences { + %sysprefs = (); +} sub preference { my $self = shift; diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm new file mode 100755 index 0000000..5ed122f --- /dev/null +++ b/C4/HoldsQueue.pm @@ -0,0 +1,630 @@ +package C4::HoldsQueue; + +# Copyright 2011 Catalyst IT +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# FIXME: expand perldoc, explain intended logic + +use strict; +use warnings; + +use C4::Context; +use C4::Search; +use C4::Items; +use C4::Branch; +use C4::Circulation; +use C4::Members; +use C4::Biblio; +use C4::Dates qw/format_date/; + +use List::Util qw(shuffle); +use Data::Dumper; + +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); +BEGIN { + $VERSION = 3.03; + require Exporter; + @ISA = qw(Exporter); + @EXPORT_OK = qw( + &CreateQueue + &GetHoldsQueueItems + + &SetUseTransportCostMatrix + &TransportCostMatrix + &UpdateTransportCostMatrix + ); +} + +# XXX This is not safe in a persistant environment +my $dbh = C4::Context->dbh; + +=head1 FUNCTIONS + +=head2 SetUseTransportCostMatrix + + SetUseTransportCostMatrix($true_false); + +Updates UseTransportCostMatrix syspref + +=cut + +sub SetUseTransportCostMatrix { + my ($bool) = @_; + + $dbh->do("UPDATE systempreferences SET value=? WHERE variable='UseTransportCostMatrix'", undef, $bool ? '1' : '0'); +} + +=head2 TransportCostMatrix + + TransportCostMatrix(); + +Returns Transport Cost Matrix as a hashref => => cost + +=cut + +sub TransportCostMatrix { + my $transport_costs = $dbh->selectall_arrayref("SELECT * FROM transport_cost",{ Slice => {} }); + + my %transport_cost_matrix; + foreach (@$transport_costs) { + my $from = $_->{frombranch}; + my $to = $_->{tobranch}; + my $cost = $_->{cost}; + my $disabled = $_->{disable_transfer}; + $transport_cost_matrix{$to}{$from} = { cost => $cost, disable_transfer => $disabled }; + } + return \%transport_cost_matrix; +} + +=head2 UpdateTransportCostMatrix + + UpdateTransportCostMatrix($records); + +Updates full Transport Cost Matrix table. $records is an arrayref of records. +Records: { frombranch =>
, tobranch => , cost => , disable_transfer => <0,1> }
+
+=cut
+
+sub UpdateTransportCostMatrix {
+    my ($records) = @_;
+
+    my $sth = $dbh->prepare("INSERT INTO transport_cost (frombranch, tobranch, cost, disable_transfer) VALUES (?, ?, ?, ?)");
+                 
+    $dbh->do("TRUNCATE TABLE transport_cost");
+    foreach (@$records) {
+        my $cost = $_->{cost};
+        my $from = $_->{frombranch};
+        my $to = $_->{tobranch};
+        if ( !defined ($cost) || ($cost !~ m/0(\.[0.9]*)?|1(.0*)?/o) ) {
+            warn  "Invalid $from -> $to cost $cost - nust be a decimal number in 0 to 1 range, forcing to 1";
+            $cost = 1;
+        }
+        $sth->execute( $from, $to, $cost, $_->{disable_transfer} ? 1 : 0 );
+    }
+}
+
+=head2 GetHoldsQueueItems
+
+  GetHoldsQueueItems($branch);
+
+Returns hold queue for a holding branch. If branch is omitted, then whole queue is returned
+
+=cut
+
+sub GetHoldsQueueItems {
+    my ($branchlimit) = @_;
+
+    my @bind_params = ();
+    my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
+                  FROM tmp_holdsqueue
+                       JOIN biblio      USING (biblionumber)
+                  LEFT JOIN biblioitems USING (biblionumber)
+                  LEFT JOIN items       USING (  itemnumber)
+                /;
+    if ($branchlimit) {
+        $query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
+        push @bind_params, $branchlimit;
+    }
+    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@bind_params);
+    my $items = [];
+    while ( my $row = $sth->fetchrow_hashref ){
+        $row->{reservedate} = format_date($row->{reservedate});
+        my $record = GetMarcBiblio($row->{biblionumber});
+        if ($record){
+            $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
+            $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
+            $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
+        }
+        push @$items, $row;
+    }
+    return $items;
+}
+
+=head2 CreateQueue
+
+  CreateQueue();
+
+Top level function that turns reserves into tmp_holdsqueue and hold_fill_targets.
+
+=cut
+
+sub CreateQueue {
+
+    $dbh->do("DELETE FROM tmp_holdsqueue");  # clear the old table for new info
+    $dbh->do("DELETE FROM hold_fill_targets");
+
+    my $total_bibs            = 0;
+    my $total_requests        = 0;
+    my $total_available_items = 0;
+    my $num_items_mapped      = 0;
+
+    my $branches_to_use;
+    my $transport_cost_matrix;
+    my $use_transport_cost_matrix = C4::Context->preference("UseTransportCostMatrix");
+    if ($use_transport_cost_matrix) {
+        debug( "Using cost matrix" );
+        $transport_cost_matrix = TransportCostMatrix();
+        unless (keys %$transport_cost_matrix) {
+            warn "UseTransportCostMatrix set to yes, but matrix not populated";
+            undef $transport_cost_matrix;
+        }
+    }
+    unless ($transport_cost_matrix) {
+        debug( "Not using cost matrix" );
+        $branches_to_use = load_branches_to_pull_from();
+    }
+
+    my $bibs_with_pending_requests = GetBibsWithPendingHoldRequests();
+    debug( "bibs_with_pending_requests: ".Dumper($bibs_with_pending_requests) );
+
+    foreach my $biblionumber (@$bibs_with_pending_requests) {
+        $total_bibs++;
+        my $hold_requests   = GetPendingHoldRequestsForBib($biblionumber);
+        my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, $branches_to_use);
+        $total_requests        += scalar(@$hold_requests);
+        $total_available_items += scalar(@$available_items);
+
+        my $item_map = MapItemsToHoldRequests($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix);
+        $item_map  or next;
+        my $item_map_size = scalar(keys %$item_map)
+        or next;;
+
+        $num_items_mapped += $item_map_size;
+        CreatePicklistFromItemMap($item_map);
+        AddToHoldTargetMap($item_map);
+        if (($item_map_size < scalar(@$hold_requests  )) and
+            ($item_map_size < scalar(@$available_items))) {
+            # DOUBLE CHECK, but this is probably OK - unfilled item-level requests
+            # FIXME
+            #warn "unfilled requests for $biblionumber";
+            #warn Dumper($hold_requests), Dumper($available_items), Dumper($item_map);
+        }
+    }
+}
+
+=head2 GetBibsWithPendingHoldRequests
+
+  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
+
+Return an arrayref of the biblionumbers of all bibs
+that have one or more unfilled hold requests.
+
+=cut
+
+sub GetBibsWithPendingHoldRequests {
+    my $dbh = C4::Context->dbh;
+
+    my $bib_query = "SELECT DISTINCT biblionumber
+                     FROM reserves
+                     WHERE found IS NULL
+                     AND priority > 0
+                     AND reservedate <= CURRENT_DATE()";
+    my $sth = $dbh->prepare($bib_query);
+
+    $sth->execute();
+    my $biblionumbers = $sth->fetchall_arrayref();
+
+    return [ map { $_->[0] } @$biblionumbers ];
+}
+
+=head2 GetPendingHoldRequestsForBib
+
+  my $requests = GetPendingHoldRequestsForBib($biblionumber);
+
+Returns an arrayref of hashrefs to pending, unfilled hold requests
+on the bib identified by $biblionumber.  The following keys
+are present in each hashref:
+
+    biblionumber
+    borrowernumber
+    itemnumber
+    priority
+    branchcode
+    reservedate
+    reservenotes
+    borrowerbranch
+
+The arrayref is sorted in order of increasing priority.
+
+=cut
+
+sub GetPendingHoldRequestsForBib {
+    my $biblionumber = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode, 
+                                reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
+                         FROM reserves
+                         JOIN borrowers USING (borrowernumber)
+                         WHERE biblionumber = ?
+                         AND found IS NULL
+                         AND priority > 0
+                         AND reservedate <= CURRENT_DATE()
+                         ORDER BY priority";
+    my $sth = $dbh->prepare($request_query);
+    $sth->execute($biblionumber);
+
+    my $requests = $sth->fetchall_arrayref({});
+    return $requests;
+
+}
+
+=head2 GetItemsAvailableToFillHoldRequestsForBib
+
+  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, $branches_ar);
+
+Returns an arrayref of items available to fill hold requests
+for the bib identified by C<$biblionumber>.  An item is available
+to fill a hold request if and only if:
+
+    * it is not on loan
+    * it is not withdrawn
+    * it is not marked notforloan
+    * it is not currently in transit
+    * it is not lost
+    * it is not sitting on the hold shelf
+
+=cut
+
+sub GetItemsAvailableToFillHoldRequestsForBib {
+    my ($biblionumber, $branches_to_use) = @_;
+
+    my $dbh = C4::Context->dbh;
+    my $items_query = "SELECT itemnumber, homebranch, holdingbranch, itemtypes.itemtype AS itype
+                       FROM items ";
+
+    if (C4::Context->preference('item-level_itypes')) {
+        $items_query .=   "LEFT JOIN itemtypes ON (itemtypes.itemtype = items.itype) ";
+    } else {
+        $items_query .=   "JOIN biblioitems USING (biblioitemnumber)
+                           LEFT JOIN itemtypes USING (itemtype) ";
+    }
+    $items_query .=   "WHERE items.notforloan = 0
+                       AND holdingbranch IS NOT NULL
+                       AND itemlost = 0
+                       AND wthdrawn = 0
+                       AND items.onloan IS NULL
+                       AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0)
+                       AND itemnumber NOT IN (
+                           SELECT itemnumber
+                           FROM reserves
+                           WHERE biblionumber = ?
+                           AND itemnumber IS NOT NULL
+                           AND (found IS NOT NULL OR priority = 0)
+                        )
+                       AND items.biblionumber = ?";
+    $items_query .=  " AND damaged = 0 "
+      unless C4::Context->preference('AllowHoldsOnDamagedItems');
+
+    my @params = ($biblionumber, $biblionumber);
+    if ($branches_to_use && @$branches_to_use) {
+        $items_query .= " AND holdingbranch IN (" . join (",", map { "?" } @$branches_to_use) . ")";
+        push @params, @$branches_to_use;
+    }
+    my $sth = $dbh->prepare($items_query);
+    $sth->execute(@params);
+
+    my $items = $sth->fetchall_arrayref({});
+    $items = [ grep { my @transfers = GetTransfers($_->{itemnumber}); $#transfers == -1; } @$items ]; 
+    map { my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype}); $_->{holdallowed} = $rule->{holdallowed}; $rule->{holdallowed} != 0 } @$items;
+    return [ grep { $_->{holdallowed} != 0 } @$items ];
+}
+
+=head2 MapItemsToHoldRequests
+
+  MapItemsToHoldRequests($hold_requests, $available_items, $branches, $transport_cost_matrix)
+
+=cut
+
+sub MapItemsToHoldRequests {
+    my ($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix) = @_;
+
+    # handle trival cases
+    return unless scalar(@$hold_requests) > 0;
+    return unless scalar(@$available_items) > 0;
+
+    debug( "MapItemsToHoldRequests() for ".Dumper($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix) );
+    my $automatic_return = C4::Context->preference("AutomaticItemReturn");
+
+    # identify item-level requests
+    my %specific_items_requested = map { $_->{itemnumber} => 1 } 
+                                   grep { defined($_->{itemnumber}) }
+                                   @$hold_requests;
+
+    # group available items by itemnumber
+    my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
+
+    # items already allocated
+    my %allocated_items = ();
+
+    # map of items to hold requests
+    my %item_map = ();
+ 
+    # figure out which item-level requests can be filled    
+    my $num_items_remaining = scalar(@$available_items);
+    foreach my $request (@$hold_requests) {
+        last if $num_items_remaining == 0;
+
+        # is this an item-level request?
+        if (defined($request->{itemnumber})) {
+            # fill it if possible; if not skip it
+            if (exists $items_by_itemnumber{$request->{itemnumber}} and
+                not exists $allocated_items{$request->{itemnumber}}) {
+                $item_map{$request->{itemnumber}} = { 
+                    borrowernumber => $request->{borrowernumber},
+                    biblionumber => $request->{biblionumber},
+                    holdingbranch =>  $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
+                    pickup_branch => $request->{branchcode} || $request->{borrowerbranch},
+                    item_level => 1,
+                    reservedate => $request->{reservedate},
+                    reservenotes => $request->{reservenotes},
+                };
+                $allocated_items{$request->{itemnumber}}++;
+                $num_items_remaining--;
+            }
+        } else {
+            # it's title-level request that will take up one item
+            $num_items_remaining--;
+        }
+    }
+
+    # group available items by branch
+    my %items_by_branch = ();
+    foreach my $item (@$available_items) {
+        next unless $item->{holdallowed};
+
+        push @{ $items_by_branch{  $automatic_return ? $item->{homebranch}
+                                                     : $item->{holdingbranch} } }, $item
+          unless exists $allocated_items{ $item->{itemnumber} };
+    }
+    return unless keys %items_by_branch;
+
+    # now handle the title-level requests
+    $num_items_remaining = scalar(@$available_items) - scalar(keys %allocated_items); 
+    my $pull_branches;
+    foreach my $request (@$hold_requests) {
+        last if $num_items_remaining == 0;
+        next if defined($request->{itemnumber}); # already handled these
+
+        # look for local match first
+        my $pickup_branch = $request->{branchcode} || $request->{borrowerbranch};
+        my ($itemnumber, $holdingbranch);
+
+        my $holding_branch_items = $automatic_return ? undef : $items_by_branch{$pickup_branch};
+        if ( $holding_branch_items ) {
+            foreach my $item (@$holding_branch_items) {
+                if ( $request->{borrowerbranch} eq $item->{homebranch} ) {
+                    $itemnumber = $item->{itemnumber};
+                    last;
+                }
+            }
+            $holdingbranch = $pickup_branch;
+            $itemnumber ||= $holding_branch_items->[0]->{itemnumber};
+        }
+        elsif ($transport_cost_matrix) {
+            $pull_branches = [keys %items_by_branch];
+            $holdingbranch = least_cost_branch( $pickup_branch, $pull_branches, $transport_cost_matrix );
+            if ( $holdingbranch ) {
+
+                my $holding_branch_items = $items_by_branch{$holdingbranch};
+                foreach my $item (@$holding_branch_items) {
+                    next if $request->{borrowerbranch} ne $item->{homebranch};
+
+                    $itemnumber = $item->{itemnumber};
+                    last;
+                }
+                $itemnumber ||= $holding_branch_items->[0]->{itemnumber};
+            }
+            else {
+                warn "No transport costs for $pickup_branch";
+            }
+        }
+
+        unless ($itemnumber) {
+            # not found yet, fall back to basics
+            if ($branches_to_use) {
+                $pull_branches = $branches_to_use;
+            } else {
+                $pull_branches = [keys %items_by_branch];
+            }
+            PULL_BRANCHES:
+            foreach my $branch (@$pull_branches) {
+                my $holding_branch_items = $items_by_branch{$branch}
+                  or next;
+
+                $holdingbranch ||= $branch;
+                foreach my $item (@$holding_branch_items) {
+                    next if $pickup_branch ne $item->{homebranch};
+
+                    $itemnumber = $item->{itemnumber};
+                    $holdingbranch = $branch;
+                    last PULL_BRANCHES;
+                }
+            }
+            $itemnumber ||= $items_by_branch{$holdingbranch}->[0]->{itemnumber}
+              if $holdingbranch;
+        }
+
+        if ($itemnumber) {
+            my $holding_branch_items = $items_by_branch{$holdingbranch}
+              or die "Have $itemnumber, $holdingbranch, but no items!";
+            @$holding_branch_items = grep { $_->{itemnumber} != $itemnumber } @$holding_branch_items;
+            delete $items_by_branch{$holdingbranch} unless @$holding_branch_items;
+
+            $item_map{$itemnumber} = {
+                borrowernumber => $request->{borrowernumber},
+                biblionumber => $request->{biblionumber},
+                holdingbranch => $holdingbranch,
+                pickup_branch => $pickup_branch,
+                item_level => 0,
+                reservedate => $request->{reservedate},
+                reservenotes => $request->{reservenotes},
+            };
+            $num_items_remaining--; 
+        }
+    }
+    return \%item_map;
+}
+
+=head2 CreatePickListFromItemMap 
+
+=cut
+
+sub CreatePicklistFromItemMap {
+    my $item_map = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $sth_load=$dbh->prepare("
+        INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
+                                    cardnumber,reservedate,title, itemcallnumber,
+                                    holdingbranch,pickbranch,notes, item_level_request)
+        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+    ");
+
+    foreach my $itemnumber  (sort keys %$item_map) {
+        my $mapped_item = $item_map->{$itemnumber};
+        my $biblionumber = $mapped_item->{biblionumber}; 
+        my $borrowernumber = $mapped_item->{borrowernumber}; 
+        my $pickbranch = $mapped_item->{pickup_branch};
+        my $holdingbranch = $mapped_item->{holdingbranch};
+        my $reservedate = $mapped_item->{reservedate};
+        my $reservenotes = $mapped_item->{reservenotes};
+        my $item_level = $mapped_item->{item_level};
+
+        my $item = GetItem($itemnumber);
+        my $barcode = $item->{barcode};
+        my $itemcallnumber = $item->{itemcallnumber};
+
+        my $borrower = GetMember('borrowernumber'=>$borrowernumber);
+        my $cardnumber = $borrower->{'cardnumber'};
+        my $surname = $borrower->{'surname'};
+        my $firstname = $borrower->{'firstname'};
+        my $phone = $borrower->{'phone'};
+   
+        my $bib = GetBiblioData($biblionumber);
+        my $title = $bib->{title}; 
+
+        $sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
+                           $cardnumber, $reservedate, $title, $itemcallnumber,
+                           $holdingbranch, $pickbranch, $reservenotes, $item_level);
+    }
+}
+
+=head2 AddToHoldTargetMap
+
+=cut
+
+sub AddToHoldTargetMap {
+    my $item_map = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $insert_sql = q(
+        INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request)
+                               VALUES (?, ?, ?, ?, ?)
+    );
+    my $sth_insert = $dbh->prepare($insert_sql);
+
+    foreach my $itemnumber (keys %$item_map) {
+        my $mapped_item = $item_map->{$itemnumber};
+        $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber,
+                             $mapped_item->{holdingbranch}, $mapped_item->{item_level});
+    }
+}
+
+# Helper functions, not part of any interface
+
+sub debug {
+#   warn @_;
+}
+
+sub load_branches_to_pull_from {
+    my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight")
+      or return;
+
+    my @branches_to_use = map { s/^\s+//; s/\s+$//; $_; } split /,/, $static_branch_list;
+
+    @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
+
+    return \@branches_to_use;
+}
+
+sub least_cost_branch {
+
+    #$from - arrayref
+    my ($to, $from, $transport_cost_matrix) = @_;
+
+# Nothing really spectacular: supply to branch, a list of potential from branches
+# and find the minimum from - to value from the transport_cost_matrix
+    return $from->[0] if @$from == 1;
+
+    my ($least_cost, @branch);
+    foreach (@$from) {
+        my $cell = $transport_cost_matrix->{$to}{$_};
+        next if $cell->{disable_transfer};
+
+        my $cost = $cell->{cost};
+
+        unless (defined $least_cost) {
+            $least_cost = $cost;
+            push @branch, $_;
+            next;
+        }
+
+        next if $cost > $least_cost;
+
+        if ($cost == $least_cost) {
+            push @branch, $_;
+            next;
+        }
+
+        @branch = ($_);
+        $least_cost = $cost;
+    }
+
+    return $branch[0];
+
+    # XXX return a random @branch with minimum cost instead of the first one;
+    # return $branch[0] if @branch == 1;
+}
+
+
+1;
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 5e3848d..cf46e22 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -203,6 +203,7 @@ $tabsysprefs{DisplayClearScreenButton}       = "Circulation";
 $tabsysprefs{AllowAllMessageDeletion}        = "Circulation";
 $tabsysprefs{OverdueNoticeBcc}               = "Circulation";
 $tabsysprefs{OverduesBlockCirc}              = "Circulation";
+$tabsysprefs{UseTransportCostMatrix}         = "Circulation";
 
 
 # Staff Client
diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl
new file mode 100755
index 0000000..08865c2
--- /dev/null
+++ b/admin/transport-cost-matrix.pl
@@ -0,0 +1,122 @@
+#!/usr/bin/perl
+# Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+use CGI;
+use C4::Context;
+use C4::Output;
+use C4::Auth;
+use C4::Koha;
+use C4::Debug;
+use C4::Branch; # GetBranches
+use C4::HoldsQueue qw(TransportCostMatrix UpdateTransportCostMatrix SetUseTransportCostMatrix);
+
+use Data::Dumper;
+
+my $input = new CGI;
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "admin/transport-cost-matrix.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {parameters => 1},
+                            debug => 1,
+                            });
+
+my $update = $input->param('op') eq 'set-cost-matrix';
+my $use_transport_cost_matrix = $input->param('UseTransportCostMatrix') || 0;
+
+my ($cost_matrix, $have_matrix);
+unless ($update) {
+    $cost_matrix = TransportCostMatrix();
+    $have_matrix = keys %$cost_matrix if $cost_matrix;
+    $use_transport_cost_matrix = C4::Context->preference("UseTransportCostMatrix");
+}
+
+my $branches = GetBranches();
+my @branchloop = map { code => $_,
+                       name => $branches->{$_}->{'branchname'} },
+                 sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
+                 keys %$branches;
+my (@branchfromloop, @cost, @errors);
+foreach my $branchfrom ( @branchloop ) {
+    my $fromcode = $branchfrom->{code};
+
+    my %from_row = ( code => $fromcode, name => $branchfrom->{name} );
+    foreach my $branchto ( @branchloop ) {
+        my $tocode = $branchto->{code};
+
+        my %from_to_input_def = ( code => $tocode, name => $branchto->{name} );
+        push @{ $from_row{branchtoloop} }, \%from_to_input_def;
+
+        if ($fromcode eq $tocode) {
+            $from_to_input_def{skip} = 1;
+            next;
+        }
+
+        (my $from_to = "${fromcode}_${tocode}") =~ s/\W//go;
+         $from_to_input_def{id} = $from_to;
+        my $input_name   = "cost_$from_to";
+        my $disable_name = "disable_$from_to";
+
+        if ($update) {
+            $from_to_input_def{disabled} = 1 if $input->param($disable_name);
+            my $value = $from_to_input_def{value} = $input->param($input_name);
+            push @errors, "Invalid value for $from_row{name} -> $from_to_input_def{name}"
+              unless $value >= 0.0 && $value <= 1.0;
+        }
+        else {
+            if ($have_matrix) {
+                if ( my $cell = $cost_matrix->{$tocode}{$fromcode} ) {
+                    $from_to_input_def{value} = $cell->{cost};
+                    $from_to_input_def{disabled} = 1 if $cell->{disable_transfer};
+                }
+            } else {
+                $from_to_input_def{value} = 0.5;
+            }
+        }
+    }
+    
+#              die Dumper(\%from_row);
+    push @branchfromloop, \%from_row;
+}
+
+if ($update && !@errors) {
+    my @update_recs = map {
+        my $from = $_->{code};
+        map { frombranch => $from, tobranch => $_->{code}, cost => $_->{value}, disable_transfer => $_->{disabled} || 0 },
+            grep { $_->{code} ne $from }
+            @{ $_->{branchtoloop} };
+    } @branchfromloop;
+
+    UpdateTransportCostMatrix(\@update_recs);
+    SetUseTransportCostMatrix($use_transport_cost_matrix);
+}
+   
+$template->param(
+    branchloop => \@branchloop,
+    branchfromloop => \@branchfromloop,
+    UseTransportCostMatrix => $use_transport_cost_matrix,
+);
+output_html_with_http_headers $input, $cookie, $template->output;
+
+exit 0;
+
diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 4b51423..cf529f0 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -31,7 +31,7 @@ use C4::Biblio;
 use C4::Items;
 use C4::Koha;   # GetItemTypes
 use C4::Branch; # GetBranches
-use C4::Dates qw/format_date/;
+use C4::HoldsQueue qw(GetHoldsQueueItems);
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -51,6 +51,7 @@ my $branchlimit    = $params->{'branchlimit'};
 my $itemtypeslimit = $params->{'itemtypeslimit'};
 
 if ( $run_report ) {
+    # XXX GetHoldsQueueItems() does not support $itemtypeslimit!
     my $items = GetHoldsQueueItems($branchlimit, $itemtypeslimit);
     $template->param(
         branch     => $branchlimit,
@@ -76,36 +77,5 @@ $template->param(
    itemtypeloop => \@itemtypesloop,
 );
 
-sub GetHoldsQueueItems {
-	my ($branchlimit,$itemtypelimit) = @_;
-	my $dbh = C4::Context->dbh;
-
-    my @bind_params = ();
-	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
-                  FROM tmp_holdsqueue
-                       JOIN biblio      USING (biblionumber)
-				  LEFT JOIN biblioitems USING (biblionumber)
-                  LEFT JOIN items       USING (  itemnumber)
-                /;
-    if ($branchlimit) {
-	    $query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
-        push @bind_params, $branchlimit;
-    }
-    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
-	my $sth = $dbh->prepare($query);
-	$sth->execute(@bind_params);
-	my $items = [];
-    while ( my $row = $sth->fetchrow_hashref ){
-	$row->{reservedate} = format_date($row->{reservedate});
-	my $record = GetMarcBiblio($row->{biblionumber});
-    if ($record){
-        $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
-	    $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
-	    $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
-	}
-        push @$items, $row;
-    }
-    return $items;
-}
 # writing the template
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 9a94e0f..cbe3474 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2785,6 +2785,23 @@ CREATE TABLE `fieldmapping` ( -- koha to keyword mapping
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
+-- Table structure for table `transport_cost`
+--
+
+DROP TABLE IF EXISTS `transport_cost`;
+CREATE TABLE `transport_cost` (
+      `frombranch` varchar(10) NOT NULL,
+      `tobranch` varchar(10) NOT NULL,
+      `cost` decimal(4,3) NOT NULL,
+      `disable_transfer` tinyint(1) NOT NULL DEFAULT 0,
+      CHECK ( `frombranch` <> `tobranch` ), -- a dud check, mysql does not support that
+      CHECK ( cost >= 0.0 AND cost <= 1.0), -- a dud check, mysql does not support that
+      PRIMARY KEY (`frombranch`, `tobranch`),
+      CONSTRAINT `transport_cost_ibfk_1` FOREIGN KEY (`frombranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
+      CONSTRAINT `transport_cost_ibfk_2` FOREIGN KEY (`tobranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
 -- Table structure for table `biblioimages`
 --
 
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 1edf08e..977c1d3 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -324,6 +324,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTransportCostMatrix',0,"Use Transport Cost Matrix when filling holds",'','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 035e1e6..efc4109 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5239,6 +5239,26 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.07.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTransportCostMatrix',0,'Use Transport Cost Matrix when filling holds','','YesNo')");
+
+ $dbh->do("CREATE TABLE `transport_cost` (
+              `frombranch` varchar(10) NOT NULL,
+              `tobranch` varchar(10) NOT NULL,
+              `cost` decimal(4,3) NOT NULL,
+              `disable_transfer` tinyint(1) NOT NULL DEFAULT 0,
+              CHECK ( `frombranch` <> `tobranch` ), -- a dud check, mysql does not support that
+              CHECK ( cost >= 0.0 AND cost <= 1.0), -- a dud check, mysql does not support that
+              PRIMARY KEY (`frombranch`, `tobranch`),
+              CONSTRAINT `transport_cost_ibfk_1` FOREIGN KEY (`frombranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
+              CONSTRAINT `transport_cost_ibfk_2` FOREIGN KEY (`tobranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
+          ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+
+    print "Upgrade to $DBversion done (creating `transport_cost` table; adding UseTransportCostMatrix systempref, in circulation)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index ef46ede..14486f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -53,6 +53,8 @@
 	Define circulation and fines rules for combinations of libraries, patron categories, and item types
     Library transfer limits
 	Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.
+    Transport Cost Matrix
+	Define transport costs between branches
     Item circulation alerts
 	Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
new file mode 100644
index 0000000..c426e16
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
@@ -0,0 +1,126 @@
+[% INCLUDE 'doc-head-open.inc' %]
+Koha › Administration › Transport Cost Matrix
+[% INCLUDE 'doc-head-close.inc' %]
+
+
+
+
+
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+Home › Administration › Transport Cost Matrix
+
+
+
+
+    
+    
+    
+            Defining transport costs between libraries
+    
+    
+        
+            
+             Use Transport Cost Matrix 
+            

+                
+                    Costs are normalised decimal values 0 to 1, 0 being minimum (no) cost, 1 maximum.
+                    Red cells signify no transfer allowed
+                    Click on the cell to edit
+                
+                
+                    
+                        
+                [% FOR b IN branchloop %]
+                        
+                [% END %]
+                    
+                [% FOR bf IN branchfromloop %]
+                    
+                        
+                    [% FOR bt IN bf.branchtoloop %]
+                        
+                    [% END %]
+                    
+                [% END %]
+                From \ To [% b.name %]
[% bf.name %] 
+                        [% IF bt.skip %]
+                             
+                        [% ELSE %]
+                            
+                            [% bt.value %]
+                            
+                            [% IF bt.disabled %]
+                            
+                            [% END %]
+                            
+                        [% END %]
+                        
+            
+            
+        
+    
+    
+    
+
+[% INCLUDE 'admin-menu.inc' %]
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/misc/cronjobs/holds/build_holds_queue.pl b/misc/cronjobs/holds/build_holds_queue.pl
index f01153e..9ec9825 100755
--- a/misc/cronjobs/holds/build_holds_queue.pl
+++ b/misc/cronjobs/holds/build_holds_queue.pl
@@ -5,7 +5,6 @@
 #-----------------------------------
 # FIXME: add command-line options for verbosity and summary
 # FIXME: expand perldoc, explain intended logic
-# FIXME: refactor all subroutines into C4 for testability
 
 use strict;
 use warnings;
@@ -16,384 +15,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use C4::Context;
-use C4::Search;
-use C4::Items;
-use C4::Branch;
-use C4::Circulation;
-use C4::Members;
-use C4::Biblio;
+use C4::HoldsQueue qw(CreateQueue);
 
-use List::Util qw(shuffle);
+CreateQueue();
 
-my $bibs_with_pending_requests = GetBibsWithPendingHoldRequests();
-
-my $dbh   = C4::Context->dbh;
-$dbh->do("DELETE FROM tmp_holdsqueue");  # clear the old table for new info
-$dbh->do("DELETE FROM hold_fill_targets");
-
-my $total_bibs            = 0;
-my $total_requests        = 0;
-my $total_available_items = 0;
-my $num_items_mapped      = 0;
-
-my @branches_to_use = _get_branches_to_pull_from();
-
-foreach my $biblionumber (@$bibs_with_pending_requests) {
-    $total_bibs++;
-    my $hold_requests   = GetPendingHoldRequestsForBib($biblionumber);
-    my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, @branches_to_use);
-    $total_requests        += scalar(@$hold_requests);
-    $total_available_items += scalar(@$available_items);
-    my $item_map = MapItemsToHoldRequests($hold_requests, $available_items, @branches_to_use);
-
-    (defined($item_map)) or next;
-
-    my $item_map_size = scalar(keys %$item_map);
-    $num_items_mapped += $item_map_size;
-    CreatePicklistFromItemMap($item_map);
-    AddToHoldTargetMap($item_map);
-    if (($item_map_size < scalar(@$hold_requests  )) and
-        ($item_map_size < scalar(@$available_items))) {
-        # DOUBLE CHECK, but this is probably OK - unfilled item-level requests
-        # FIXME
-        #warn "unfilled requests for $biblionumber";
-        #warn Dumper($hold_requests), Dumper($available_items), Dumper($item_map);
-    }
-}
-
-exit 0;
-
-=head1 FUNCTIONS
-
-=head2 GetBibsWithPendingHoldRequests
-
-  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
-
-Return an arrayref of the biblionumbers of all bibs
-that have one or more unfilled hold requests.
-
-=cut
-
-sub GetBibsWithPendingHoldRequests {
-    my $dbh = C4::Context->dbh;
-
-    my $bib_query = "SELECT DISTINCT biblionumber
-                     FROM reserves
-                     WHERE found IS NULL
-                     AND priority > 0
-                     AND reservedate <= CURRENT_DATE()";
-    my $sth = $dbh->prepare($bib_query);
-
-    $sth->execute();
-    my $biblionumbers = $sth->fetchall_arrayref();
-
-    return [ map { $_->[0] } @$biblionumbers ];
-}
-
-=head2 GetPendingHoldRequestsForBib
-
-  my $requests = GetPendingHoldRequestsForBib($biblionumber);
-
-Returns an arrayref of hashrefs to pending, unfilled hold requests
-on the bib identified by $biblionumber.  The following keys
-are present in each hashref:
-
-    biblionumber
-    borrowernumber
-    itemnumber
-    priority
-    branchcode
-    reservedate
-    reservenotes
-    borrowerbranch
-
-The arrayref is sorted in order of increasing priority.
-
-=cut
-
-sub GetPendingHoldRequestsForBib {
-    my $biblionumber = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode, 
-                                reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
-                         FROM reserves
-                         JOIN borrowers USING (borrowernumber)
-                         WHERE biblionumber = ?
-                         AND found IS NULL
-                         AND priority > 0
-                         AND reservedate <= CURRENT_DATE()
-                         ORDER BY priority";
-    my $sth = $dbh->prepare($request_query);
-    $sth->execute($biblionumber);
-
-    my $requests = $sth->fetchall_arrayref({});
-    return $requests;
-
-}
-
-=head2 GetItemsAvailableToFillHoldRequestsForBib
-
-  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber);
-
-Returns an arrayref of items available to fill hold requests
-for the bib identified by C<$biblionumber>.  An item is available
-to fill a hold request if and only if:
-
-    * it is not on loan
-    * it is not withdrawn
-    * it is not marked notforloan
-    * it is not currently in transit
-    * it is not lost
-    * it is not sitting on the hold shelf
-
-=cut
-
-sub GetItemsAvailableToFillHoldRequestsForBib {
-    my $biblionumber = shift;
-    my @branches_to_use = @_;
-
-    my $dbh = C4::Context->dbh;
-    my $items_query = "SELECT itemnumber, homebranch, holdingbranch, itemtypes.itemtype AS itype
-                       FROM items ";
-
-    if (C4::Context->preference('item-level_itypes')) {
-        $items_query .=   "LEFT JOIN itemtypes ON (itemtypes.itemtype = items.itype) ";
-    } else {
-        $items_query .=   "JOIN biblioitems USING (biblioitemnumber)
-                           LEFT JOIN itemtypes USING (itemtype) ";
-    }
-    $items_query .=   "WHERE items.notforloan = 0
-                       AND holdingbranch IS NOT NULL
-                       AND itemlost = 0
-                       AND wthdrawn = 0";
-    $items_query .=   " AND damaged = 0 " unless C4::Context->preference('AllowHoldsOnDamagedItems');
-    $items_query .=   " AND items.onloan IS NULL
-                       AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0)
-                       AND itemnumber NOT IN (
-                           SELECT itemnumber
-                           FROM reserves
-                           WHERE biblionumber = ?
-                           AND itemnumber IS NOT NULL
-                           AND (found IS NOT NULL OR priority = 0)
-                        )
-                       AND items.biblionumber = ?";
-    my @params = ($biblionumber, $biblionumber);
-    if ($#branches_to_use > -1) {
-        $items_query .= " AND holdingbranch IN (" . join (",", map { "?" } @branches_to_use) . ")";
-        push @params, @branches_to_use;
-    }
-    my $sth = $dbh->prepare($items_query);
-    $sth->execute(@params);
-
-    my $items = $sth->fetchall_arrayref({});
-    $items = [ grep { my @transfers = GetTransfers($_->{itemnumber}); $#transfers == -1; } @$items ]; 
-    map { my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype}); $_->{holdallowed} = $rule->{holdallowed}; $rule->{holdallowed} != 0 } @$items;
-    return [ grep { $_->{holdallowed} != 0 } @$items ];
-}
-
-=head2 MapItemsToHoldRequests
-
-  MapItemsToHoldRequests($hold_requests, $available_items);
-
-=cut
-
-sub MapItemsToHoldRequests {
-    my $hold_requests = shift;
-    my $available_items = shift;
-    my @branches_to_use = @_;
-
-    # handle trival cases
-    return unless scalar(@$hold_requests) > 0;
-    return unless scalar(@$available_items) > 0;
-
-    # identify item-level requests
-    my %specific_items_requested = map { $_->{itemnumber} => 1 } 
-                                   grep { defined($_->{itemnumber}) }
-                                   @$hold_requests;
-
-    # group available items by itemnumber
-    my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
-
-    # items already allocated
-    my %allocated_items = ();
-
-    # map of items to hold requests
-    my %item_map = ();
- 
-    # figure out which item-level requests can be filled    
-    my $num_items_remaining = scalar(@$available_items);
-    foreach my $request (@$hold_requests) {
-        last if $num_items_remaining == 0;
-
-        # is this an item-level request?
-        if (defined($request->{itemnumber})) {
-            # fill it if possible; if not skip it
-            if (exists $items_by_itemnumber{$request->{itemnumber}} and
-                not exists $allocated_items{$request->{itemnumber}}) {
-                $item_map{$request->{itemnumber}} = { 
-                    borrowernumber => $request->{borrowernumber},
-                    biblionumber => $request->{biblionumber},
-                    holdingbranch =>  $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
-                    pickup_branch => $request->{branchcode},
-                    item_level => 1,
-                    reservedate => $request->{reservedate},
-                    reservenotes => $request->{reservenotes},
-                };
-                $allocated_items{$request->{itemnumber}}++;
-                $num_items_remaining--;
-            }
-        } else {
-            # it's title-level request that will take up one item
-            $num_items_remaining--;
-        }
-    }
-
-    # group available items by branch
-    my %items_by_branch = ();
-    foreach my $item (@$available_items) {
-        push @{ $items_by_branch{ $item->{holdingbranch} } }, $item unless exists $allocated_items{ $item->{itemnumber} };
-    }
-
-    # now handle the title-level requests
-    $num_items_remaining = scalar(@$available_items) - scalar(keys %allocated_items); 
-    foreach my $request (@$hold_requests) {
-        last if $num_items_remaining <= 0;
-        next if defined($request->{itemnumber}); # already handled these
-
-        # look for local match first
-        my $pickup_branch = $request->{branchcode};
-        if (exists $items_by_branch{$pickup_branch} and 
-            not ($items_by_branch{$pickup_branch}->[0]->{holdallowed} == 1 and 
-                 $request->{borrowerbranch} ne $items_by_branch{$pickup_branch}->[0]->{homebranch}) 
-           ) {
-            my $item = pop @{ $items_by_branch{$pickup_branch} };
-            delete $items_by_branch{$pickup_branch} if scalar(@{ $items_by_branch{$pickup_branch} }) == 0;
-            $item_map{$item->{itemnumber}} = { 
-                                                borrowernumber => $request->{borrowernumber},
-                                                biblionumber => $request->{biblionumber},
-                                                holdingbranch => $pickup_branch,
-                                                pickup_branch => $pickup_branch,
-                                                item_level => 0,
-                                                reservedate => $request->{reservedate},
-                                                reservenotes => $request->{reservenotes},
-                                             };
-            $num_items_remaining--;
-        } else {
-            my @pull_branches = ();
-            if ($#branches_to_use > -1) {
-                @pull_branches = @branches_to_use;
-            } else {
-                @pull_branches = sort keys %items_by_branch;
-            }
-            foreach my $branch (@pull_branches) {
-                next unless exists $items_by_branch{$branch} and
-                            not ($items_by_branch{$branch}->[0]->{holdallowed} == 1 and 
-                                $request->{borrowerbranch} ne $items_by_branch{$branch}->[0]->{homebranch});
-                my $item = pop @{ $items_by_branch{$branch} };
-                delete $items_by_branch{$branch} if scalar(@{ $items_by_branch{$branch} }) == 0;
-                $item_map{$item->{itemnumber}} = { 
-                                                    borrowernumber => $request->{borrowernumber},
-                                                    biblionumber => $request->{biblionumber},
-                                                    holdingbranch => $branch,
-                                                    pickup_branch => $pickup_branch,
-                                                    item_level => 0,
-                                                    reservedate => $request->{reservedate},
-                                                    reservenotes => $request->{reservenotes},
-                                                 };
-                $num_items_remaining--; 
-                last;
-            }
-        }
-    }
-    return \%item_map;
-}
-
-=head2 CreatePickListFromItemMap 
-
-=cut
-
-sub CreatePicklistFromItemMap {
-    my $item_map = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $sth_load=$dbh->prepare("
-        INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
-                                    cardnumber,reservedate,title, itemcallnumber,
-                                    holdingbranch,pickbranch,notes, item_level_request)
-        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-    ");
-
-    foreach my $itemnumber  (sort keys %$item_map) {
-        my $mapped_item = $item_map->{$itemnumber};
-        my $biblionumber = $mapped_item->{biblionumber}; 
-        my $borrowernumber = $mapped_item->{borrowernumber}; 
-        my $pickbranch = $mapped_item->{pickup_branch};
-        my $holdingbranch = $mapped_item->{holdingbranch};
-        my $reservedate = $mapped_item->{reservedate};
-        my $reservenotes = $mapped_item->{reservenotes};
-        my $item_level = $mapped_item->{item_level};
-
-        my $item = GetItem($itemnumber);
-        my $barcode = $item->{barcode};
-        my $itemcallnumber = $item->{itemcallnumber};
-
-        my $borrower = GetMember('borrowernumber'=>$borrowernumber);
-        my $cardnumber = $borrower->{'cardnumber'};
-        my $surname = $borrower->{'surname'};
-        my $firstname = $borrower->{'firstname'};
-        my $phone = $borrower->{'phone'};
-   
-        my $bib = GetBiblioData($biblionumber);
-        my $title = $bib->{title}; 
-
-        $sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
-                           $cardnumber, $reservedate, $title, $itemcallnumber,
-                           $holdingbranch, $pickbranch, $reservenotes, $item_level);
-    }
-}
-
-=head2 AddToHoldTargetMap
-
-=cut
-
-sub AddToHoldTargetMap {
-    my $item_map = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $insert_sql = q(
-        INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request)
-                               VALUES (?, ?, ?, ?, ?)
-    );
-    my $sth_insert = $dbh->prepare($insert_sql);
-
-    foreach my $itemnumber (keys %$item_map) {
-        my $mapped_item = $item_map->{$itemnumber};
-        $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber,
-                             $mapped_item->{holdingbranch}, $mapped_item->{item_level});
-    }
-}
-
-=head2 _get_branches_to_pull_from
-
-Query system preferences to get ordered list of
-branches to use to fill hold requests.
-
-=cut
-
-sub _get_branches_to_pull_from {
-    my @branches_to_use = ();
-  
-    my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight");
-    if ($static_branch_list) {
-        @branches_to_use = map { s/^\s+//; s/\s+$//; $_; } split /,/, $static_branch_list;
-    }
-
-    @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
-
-    return @branches_to_use;
-}
diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t
new file mode 100755
index 0000000..6cce4d9
--- /dev/null
+++ b/t/db_dependent/HoldsQueue.t
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+
+# Test C4::HoldsQueue::CreateQueue() for both transport cost matrix
+# and StaticHoldsQueueWeight array (no RandomizeHoldsQueueWeight, no point)
+# Wraps tests in transaction that's rolled back, so no data is destroyed
+# MySQL WARNING: This makes sense only if your tables are InnoDB, otherwise
+# transactions are not supported and mess is left behind
+
+use strict;
+use warnings;
+use C4::Context;
+
+use Data::Dumper;
+
+use Test::More tests => 15;
+
+BEGIN {
+	use FindBin;
+	use lib $FindBin::Bin;
+	use_ok('C4::Reserves');
+	use_ok('C4::HoldsQueue');
+}
+
+my $TITLE = "Test Holds Queue XXX";
+# Pick a plausible borrower. Easier than creating one.
+my $BORROWER_QRY = <dbh;
+my $borrower = $dbh->selectrow_hashref($BORROWER_QRY);
+my $borrowernumber = $borrower->{borrowernumber};
+# Set special (for this test) branches
+my $borrower_branchcode = $borrower->{branchcode};
+my @other_branches = grep { $_ ne $borrower_branchcode } @{ $dbh->selectcol_arrayref("SELECT branchcode FROM branches") };
+my $least_cost_branch_code = pop @other_branches
+ or BAIL_OUT("No point testing only one branch...");
+
+# Start transaction
+$dbh->{AutoCommit} = 0;
+$dbh->{RaiseError} = 1;
+
+#Set up the stage
+# Sysprefs and cost matrix
+$dbh->do("UPDATE systempreferences SET value = ? WHERE variable = 'StaticHoldsQueueWeight'", undef,
+         join( ',', @other_branches, $borrower_branchcode, $least_cost_branch_code));
+$dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'RandomizeHoldsQueueWeight'");
+
+$dbh->do("DELETE FROM transport_cost");
+my $transport_cost_insert_sth = $dbh->prepare("insert into transport_cost (frombranch, tobranch, cost) values (?, ?, ?)");
+# Favour $least_cost_branch_code
+$transport_cost_insert_sth->execute($borrower_branchcode, $least_cost_branch_code, 0.2);
+$transport_cost_insert_sth->execute($least_cost_branch_code, $borrower_branchcode, 0.2);
+my @b = @other_branches;
+while ( my $b1 = shift @b ) {
+    foreach my $b2 ($borrower_branchcode, $least_cost_branch_code, @b) {
+        $transport_cost_insert_sth->execute($b1, $b2, 0.5);
+        $transport_cost_insert_sth->execute($b2, $b1, 0.5);
+    }
+}
+
+
+# Loanable items - all possible combinations of homebranch and holdingbranch
+$dbh->do("INSERT INTO biblio (frameworkcode, author, title, datecreated)
+          VALUES             ('SER', 'Koha test', '$TITLE', '2011-02-01')");
+my $biblionumber = $dbh->selectrow_array("SELECT biblionumber FROM biblio WHERE title = '$TITLE'")
+  or BAIL_OUT("Cannot find newly created biblio record");
+$dbh->do("INSERT INTO biblioitems (biblionumber, marcxml)
+          VALUES                  ($biblionumber, '')");
+my $biblioitemnumber = $dbh->selectrow_array("SELECT biblioitemnumber FROM biblioitems WHERE biblionumber = $biblionumber")
+  or BAIL_OUT("Cannot find newly created biblioitems record");
+
+my $items_insert_sth = $dbh->prepare("INSERT INTO items (biblionumber, biblioitemnumber, barcode, homebranch, holdingbranch, notforloan, damaged, itemlost, wthdrawn, onloan)
+                                      VALUES            ($biblionumber, $biblioitemnumber, ?, ?, ?, 0, 0, 0, 0, NULL)"); # CURRENT_DATE - 3)");
+my $first_barcode = int(rand(1000000000000)); # XXX
+my $barcode = $first_barcode;
+foreach ( $borrower_branchcode, $least_cost_branch_code, @other_branches ) {
+    $items_insert_sth->execute($barcode++, $borrower_branchcode, $_);
+    $items_insert_sth->execute($barcode++, $_, $_);
+    $items_insert_sth->execute($barcode++, $_, $borrower_branchcode);
+}
+
+# Remove existing reserves, makes debugging easier
+$dbh->do("DELETE FROM reserves");
+my $constraint = undef;
+my $bibitems = undef;
+my $priority = 1;
+# Make a reserve
+AddReserve ( $borrower_branchcode, $borrowernumber, $biblionumber, $constraint, $bibitems,  $priority );
+#                           $resdate, $expdate, $notes, $title, $checkitem, $found
+$dbh->do("UPDATE reserves SET reservedate = reservedate - 1");
+
+# Tests
+my $use_cost_matrix_sth = $dbh->prepare("UPDATE systempreferences SET value = ? WHERE variable = 'UseTransportCostMatrix'");
+my $test_sth = $dbh->prepare("SELECT * FROM hold_fill_targets
+                              JOIN tmp_holdsqueue USING (borrowernumber, biblionumber, itemnumber)
+                              JOIN items USING (itemnumber)
+                              WHERE borrowernumber = $borrowernumber");
+
+# We have a book available homed in borrower branch
+test_queue ('take from homebranch',  0, $borrower_branchcode, $borrower_branchcode);
+test_queue ('take from homebranch',  1, $borrower_branchcode, $borrower_branchcode);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE homebranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE homebranch = '$borrower_branchcode'");
+# We have a book available held in borrower branch
+test_queue ('take from holdingbranch', 0, $borrower_branchcode, $borrower_branchcode);
+test_queue ('take from holdingbranch', 1, $borrower_branchcode, $borrower_branchcode);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE holdingbranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE holdingbranch = '$borrower_branchcode'");
+# No book available in borrower branch, pick according to the rules
+# Frst branch from StaticHoldsQueueWeight
+test_queue ('take from lowest cost branch', 0, $borrower_branchcode, $other_branches[0]);
+test_queue ('take from lowest cost branch', 1, $borrower_branchcode, $least_cost_branch_code);
+my $queue = C4::HoldsQueue::GetHoldsQueueItems($least_cost_branch_code) || [];
+my $queue_item = $queue->[0];
+ok( $queue_item
+ && $queue_item->{pickbranch} eq $borrower_branchcode
+ && $queue_item->{holdingbranch} eq $least_cost_branch_code, "GetHoldsQueueItems" )
+  or diag( "Expected item for pick $borrower_branchcode, hold $least_cost_branch_code, got ".Dumper($queue_item) );
+
+# XXX All this tests are for borrower branch pick-up.
+# Maybe needs expanding to homebranch or holdingbranch pick-up.
+
+# Cleanup
+$dbh->rollback;
+
+exit;
+
+sub test_queue {
+    my ($test_name, $use_cost_matrix, $pick_branch, $hold_branch) = @_;
+
+    $test_name = "$test_name (".($use_cost_matrix ? "" : "don't")." use cost matrix)";
+
+    $use_cost_matrix_sth->execute($use_cost_matrix);
+    C4::Context->_flush_preferences();
+    C4::HoldsQueue::CreateQueue();
+
+    my $results = $dbh->selectall_arrayref($test_sth, { Slice => {} }); # should be only one
+    my $r = $results->[0];
+
+    my $ok = is( $r->{pickbranch}, $pick_branch, "$test_name pick up branch");
+    $ok &&=  is( $r->{holdingbranch}, $hold_branch, "$test_name holding branch")
+      if $hold_branch;
+
+    diag( "Wrong pick-up/hold: ". Dumper ($pick_branch,, $hold_branch, map dump_records($_), qw(reserves hold_fill_targets tmp_holdsqueue)) )
+      unless $ok;
+}
+
+sub dump_records {
+    my ($tablename) = @_;
+    return $dbh->selectall_arrayref("SELECT * from $tablename where borrowernumber = ?", { Slice => {} }, $borrowernumber);
+}
+
+
-- 
1.7.9.5


From mtj at kohaaloha.com  Tue May 15 05:39:37 2012
From: mtj at kohaaloha.com (Mason James)
Date: Tue, 15 May 2012 15:39:37 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Preservation transparency
	of png-images cover.
In-Reply-To: <1337027358-32111-1-git-send-email-serhijdubyk@gmail.com>
References: <1337027358-32111-1-git-send-email-serhijdubyk@gmail.com>
Message-ID: <703D8F4A-7558-4D35-9787-264DB21768B0@kohaaloha.com>


On 2012-05-15, at 8:29 AM, Serhij Dubyk {?????? ?????} wrote:

> From: Serhij Dubyk {???????????? ??= =?UTF-8?q??????????} 
> 
> 
> Signed-off-by: Serhij Dubyk {???????????? ??????????} 
> ---
> C4/Images.pm |    8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/C4/Images.pm b/C4/Images.pm
> index 8afc8fa..3a8a383 100644
> --- a/C4/Images.pm
> +++ b/C4/Images.pm
> @@ -187,10 +187,14 @@ sub _scale_image {
>           and warn "Reducing image by "
>           . ( $percent_reduce * 100 )
>           . "\% or to $width_reduce pix X $height_reduce pix";
> -        my $newimage = GD::Image->new( $width_reduce, $height_reduce, 1 )
> -          ;        #'1' creates true color image...
> +        my $newimage = GD::Image->new( $width_reduce, $height_reduce, 1 );        #'1' creates true color image...
> +        #my $newimage = $image->clone;
> +        $newimage->alphaBlending(0);
> +        $newimage->saveAlpha(1);
> +        #$newimage->transparent( $image->transparent() );
>         $newimage->copyResampled( $image, 0, 0, 0, 0, $width_reduce,
>             $height_reduce, $width, $height );
> +        #$newimage->transparent( $image->transparent() );
>         return $newimage;
>     }
>     else {
> -- 
> 1.7.10
> 

hmmm, a bugzilla ticket would help to ensure this important patch does not get lost...

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 535 bytes
Desc: This is a digitally signed message part
URL: 

From srdjan at catalyst.net.nz  Tue May 15 07:05:20 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue, 15 May 2012 17:05:20 +1200
Subject: [Koha-patches] [PATCH] bug_8083: parameters subpermissions:
	manage_circ_rules and parameters_remaining_permissions
In-Reply-To: 
References: 
Message-ID: <1337058320-20541-1-git-send-email-srdjan@catalyst.net.nz>

---
 admin/admin-home.pl                                |    2 +-
 admin/auth_subfields_structure.pl                  |    2 +-
 admin/auth_tag_structure.pl                        |    2 +-
 admin/authorised_values.pl                         |    2 +-
 admin/authtypes.pl                                 |    2 +-
 admin/biblio_framework.pl                          |    2 +-
 admin/branches.pl                                  |    2 +-
 admin/categorie.pl                                 |    2 +-
 admin/checkmarc.pl                                 |    2 +-
 admin/cities.pl                                    |    2 +-
 admin/classsources.pl                              |    2 +-
 admin/clone-rules.pl                               |    2 +-
 admin/currency.pl                                  |    2 +-
 admin/env_tz_test.pl                               |    2 +-
 admin/fieldmapping.pl                              |    2 +-
 admin/item_circulation_alerts.pl                   |    2 +-
 admin/itemtypes.pl                                 |    2 +-
 admin/koha2marclinks.pl                            |    2 +-
 admin/marc_subfields_structure.pl                  |    2 +-
 admin/marctagstructure.pl                          |    2 +-
 admin/matching-rules.pl                            |    2 +-
 admin/oai_set_mappings.pl                          |    2 +-
 admin/oai_sets.pl                                  |    2 +-
 admin/patron-attr-types.pl                         |    2 +-
 admin/preferences.pl                               |    2 +-
 admin/printers.pl                                  |    2 +-
 admin/roadtype.pl                                  |    2 +-
 admin/smart-rules.pl                               |    2 +-
 admin/stopwords.pl                                 |    2 +-
 admin/systempreferences.pl                         |    2 +-
 admin/z3950servers.pl                              |    2 +-
 .../data/mysql/en/mandatory/userpermissions.sql    |    2 ++
 installer/data/mysql/updatedatabase.pl             |   18 ++++++++++++++++++
 .../prog/en/modules/admin/admin-home.tt            |    2 ++
 34 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/admin/admin-home.pl b/admin/admin-home.pl
index ad7a897..2d60b0a 100755
--- a/admin/admin-home.pl
+++ b/admin/admin-home.pl
@@ -30,7 +30,7 @@ my ($template, $loggedinuser, $cookie)
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => '*'},
 			     debug => 1,
 			     });
 
diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 432d496..537f0ea 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -57,7 +57,7 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index bd3dc93..587b27f 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -50,7 +50,7 @@ my ($template, $loggedinuser, $cookie)
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 1545f0e..949e488 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -55,7 +55,7 @@ our $dbh = C4::Context->dbh;
 our ($template, $borrowernumber, $cookie)= get_template_and_user({
     template_name => "admin/authorised_values.tmpl",
     authnotrequired => 0,
-    flagsrequired => {parameters => 1},
+    flagsrequired => {parameters => 'parameters_remaining_permissions'},
     query => $input,
     type => "intranet",
     debug => 1,
diff --git a/admin/authtypes.pl b/admin/authtypes.pl
index 250a89c..9869372 100755
--- a/admin/authtypes.pl
+++ b/admin/authtypes.pl
@@ -45,7 +45,7 @@ my ($template, $borrowernumber, $cookie)
                 query => $input,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {parameters => 1},
+                flagsrequired => {parameters => 'parameters_remaining_permissions'},
                 debug => 1,
                 });
 
diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl
index f2c147e..e2130cf 100755
--- a/admin/biblio_framework.pl
+++ b/admin/biblio_framework.pl
@@ -47,7 +47,7 @@ my ($template, $borrowernumber, $cookie)
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
diff --git a/admin/branches.pl b/admin/branches.pl
index c12762d..d172ea6 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -63,7 +63,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1},
+        flagsrequired   => { parameters => 'parameters_remaining_permissions'},
         debug           => 1,
     }
 );
diff --git a/admin/categorie.pl b/admin/categorie.pl
index 521346b..51e736a 100755
--- a/admin/categorie.pl
+++ b/admin/categorie.pl
@@ -73,7 +73,7 @@ my ($template, $loggedinuser, $cookie)
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
diff --git a/admin/checkmarc.pl b/admin/checkmarc.pl
index e08796f..8523b02 100755
--- a/admin/checkmarc.pl
+++ b/admin/checkmarc.pl
@@ -34,7 +34,7 @@ my ($template, $borrowernumber, $cookie)
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
diff --git a/admin/cities.pl b/admin/cities.pl
index 0303a48..378ceda 100755
--- a/admin/cities.pl
+++ b/admin/cities.pl
@@ -41,7 +41,7 @@ my ($template, $loggedinuser, $cookie)
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
diff --git a/admin/classsources.pl b/admin/classsources.pl
index 45183cd..e7f6c9a 100755
--- a/admin/classsources.pl
+++ b/admin/classsources.pl
@@ -40,7 +40,7 @@ my ($template, $loggedinuser, $cookie)
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {parameters => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
                  debug => 1,
                  });
 
diff --git a/admin/clone-rules.pl b/admin/clone-rules.pl
index dcf4abe..c9e4665 100755
--- a/admin/clone-rules.pl
+++ b/admin/clone-rules.pl
@@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {parameters => 1},
+                            flagsrequired => {parameters => 'parameters_remaining_permissions'},
                             debug => 1,
                             });
 
diff --git a/admin/currency.pl b/admin/currency.pl
index e24f6b6..aa878fd 100755
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -57,7 +57,7 @@ our ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => 'admin/currency.tmpl',
     query => $input,
     type => 'intranet',
-    flagsrequired => {parameters => 1},
+    flagsrequired => {parameters => 'parameters_remaining_permissions'},
     authnotrequired => 0,
 });
 
diff --git a/admin/env_tz_test.pl b/admin/env_tz_test.pl
index 5bd5cd7..876e546 100755
--- a/admin/env_tz_test.pl
+++ b/admin/env_tz_test.pl
@@ -14,7 +14,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
 			   query => $q,
 			 	type => "intranet",
 	 authnotrequired => 0,
- 	   flagsrequired => {parameters => 1},
+ 	   flagsrequired => {parameters => 'parameters_remaining_permissions'},
 		       debug => 1,
 });
 
diff --git a/admin/fieldmapping.pl b/admin/fieldmapping.pl
index f7eca3c..2856e70 100755
--- a/admin/fieldmapping.pl
+++ b/admin/fieldmapping.pl
@@ -39,7 +39,7 @@ my ($template, $loggedinuser, $cookie)
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
diff --git a/admin/item_circulation_alerts.pl b/admin/item_circulation_alerts.pl
index ee77ae8..2bfb496 100755
--- a/admin/item_circulation_alerts.pl
+++ b/admin/item_circulation_alerts.pl
@@ -65,7 +65,7 @@ sub show {
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
-            flagsrequired   => { parameters => 1 },
+            flagsrequired   => { parameters => 'parameters_remaining_permissions' },
             debug           => defined($input->param('debug')),
         }
     );
diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl
index 3219da3..841672d 100755
--- a/admin/itemtypes.pl
+++ b/admin/itemtypes.pl
@@ -77,7 +77,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
index a89681d..fc320ad 100755
--- a/admin/koha2marclinks.pl
+++ b/admin/koha2marclinks.pl
@@ -39,7 +39,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index bc6636a..365a861 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -72,7 +72,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index a86d788..2d7d913 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -52,7 +52,7 @@ my ($template, $loggedinuser, $cookie)
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
diff --git a/admin/matching-rules.pl b/admin/matching-rules.pl
index b167026..2fa2ac6 100755
--- a/admin/matching-rules.pl
+++ b/admin/matching-rules.pl
@@ -39,7 +39,7 @@ my ($template, $loggedinuser, $cookie)
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {parameters => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
                  debug => 1,
                  });
 
diff --git a/admin/oai_set_mappings.pl b/admin/oai_set_mappings.pl
index 4d570f9..1a9762c 100755
--- a/admin/oai_set_mappings.pl
+++ b/admin/oai_set_mappings.pl
@@ -45,7 +45,7 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     query           => $input,
     type            => 'intranet',
     authnotrequired => 0,
-    flagsrequired   => { 'parameters' => '*' },
+    flagsrequired   => { 'parameters' => 'parameters_remaining_permissions' },
     debug           => 1,
 } );
 
diff --git a/admin/oai_sets.pl b/admin/oai_sets.pl
index a826107..c923e87 100755
--- a/admin/oai_sets.pl
+++ b/admin/oai_sets.pl
@@ -41,7 +41,7 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     query           => $input,
     type            => 'intranet',
     authnotrequired => 0,
-    flagsrequired   => { 'parameters' => '*' },
+    flagsrequired   => { 'parameters' => 'parameters_remaining_permissions' },
     debug           => 1,
 } );
 
diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl
index 638456e..c0ad1f7 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -42,7 +42,7 @@ our ($template, $loggedinuser, $cookie)
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {parameters => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
                  debug => 1,
                  });
 
diff --git a/admin/preferences.pl b/admin/preferences.pl
index 0dcec19..b1ad005 100755
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -261,7 +261,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
diff --git a/admin/printers.pl b/admin/printers.pl
index c32b4e6..79c9949 100755
--- a/admin/printers.pl
+++ b/admin/printers.pl
@@ -72,7 +72,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
 			   query => $input,
 			 	type => "intranet",
 	 authnotrequired => 0,
- 	   flagsrequired => {parameters => 1},
+ 	   flagsrequired => {parameters => 'parameters_remaining_permissions'},
 		       debug => 1,
 });
 
diff --git a/admin/roadtype.pl b/admin/roadtype.pl
index a756594..a75c0dc 100755
--- a/admin/roadtype.pl
+++ b/admin/roadtype.pl
@@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie)
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 8e5a2d5..cb35214 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -38,7 +38,7 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {parameters => 1},
+                            flagsrequired => {parameters => 'manage_circ_rules'},
                             debug => 1,
                             });
 
diff --git a/admin/stopwords.pl b/admin/stopwords.pl
index 7a24af7..a64745f 100755
--- a/admin/stopwords.pl
+++ b/admin/stopwords.pl
@@ -48,7 +48,7 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/stopwords.tmpl",
     query => $input,
     type => "intranet",
-    flagsrequired => {parameters => 1},
+    flagsrequired => {parameters => 'parameters_remaining_permissions'},
     authnotrequired => 0,
     debug => 1,
     });
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 5e3848d..078f5e8 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -592,7 +592,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index 3bc0ef2..8d5ebdc 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -75,7 +75,7 @@ my ($template, $loggedinuser, $cookie)
 				query => $input,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {parameters => 1},
+				flagsrequired => {parameters => 'parameters_remaining_permissions'},
 				debug => 1,
 				});
 
diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql
index 873089a..4f05b15 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -1,6 +1,8 @@
 INSERT INTO permissions (module_bit, code, description) VALUES
    ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
    ( 1, 'override_renewals', 'Override blocked renewals'),
+   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
+   ( 3, 'manage_circ_rules', 'manage circulation rules'),
    ( 6, 'place_holds', 'Place holds for patrons'),
    ( 6, 'modify_holds_priority', 'Modify holds priority'),
    ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 035e1e6..a251847 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5239,6 +5239,24 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+
+
+$DBversion = "3.09.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES
+        ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
+        ( 3, 'manage_circ_rules', 'manage circulation rules')");
+    $dbh->do("INSERT INTO user_permissions (borrowernumber, module_bit, code)
+        SELECT borrowernumber, 3, 'parameters_remaining_permissions'
+        FROM borrowers WHERE flags & (1 << 3)");
+    $dbh->do("INSERT INTO user_permissions (borrowernumber, module_bit, code)
+        SELECT borrowernumber, 3, 'manage_circ_rules'
+        FROM borrowers WHERE flags & (1 << 3)");
+    print "Upgrade to $DBversion done (Added parameters subpermissions)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index ef46ede..1d08028 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -49,8 +49,10 @@
 	Define road types (street, avenue, way, etc.). Road types display as authorized values when adding/editing patrons and can be used in geographic statistics.
 	Patron attribute types
 	Define extended attributes (identifiers and statistical categories) for patron records
+[% IF CAN_user_parameters_manage_circ_rules %]
 	Circulation and fines rules
 	Define circulation and fines rules for combinations of libraries, patron categories, and item types
+[% END %]
     Library transfer limits
 	Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.
     Item circulation alerts
-- 
1.7.9.5


From oleonard at myacpl.org  Tue May 15 20:37:03 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 15 May 2012 14:37:03 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_7500_=5BFOLLOW-UP=5D_Use?=
	=?utf-8?q?_CSS_Sprites_for_faster_page_loading?=
Message-ID: <1337107023-5038-1-git-send-email-oleonard@myacpl.org>

This patch adds a new sprite image for social network links.
The page markup has been modified to accommodate the image-
replacement technique used to display the images.

When testing be sure to clear your cache to load the new CSS.
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   42 ++++++++++++++++++++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   14 +++----
 koha-tmpl/opac-tmpl/prog/images/social-sprite.png  |  Bin 0 -> 2802 bytes
 3 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/social-sprite.png

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 0cc7f2d..f0690d8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -2405,6 +2405,48 @@ span.sep {
 	text-shadow: 1px 1px 0 #FFF;
 }
 
+#social_networks span {
+    color: #274D7F;
+	display : block;
+	float : left;
+    font-size: 85%;
+    font-weight: bold;
+    line-height: 2em;
+	margin : .5em 0 .5em .5em !important;
+}
+#social_networks a {
+    background: transparent url("../../images/social-sprite.png") no-repeat;
+    display: block;
+    height : 20px !important;
+    width : 20px;
+    text-indent : -999em;
+}
+
+#social_networks div {
+	float : left !important;
+	margin : .5em 0 .5em .2em !important;
+}
+
+#social_networks #facebook {
+    background-position : -7px -35px;
+}
+
+#social_networks #twitter {
+    background-position : -7px -5px;
+}
+
+#social_networks #linkedin {
+    background-position : -7px -95px;
+}
+
+#social_networks #delicious {
+    background-position : -7px -66px;
+}
+
+#social_networks #email {
+    background-position : -7px -126px;
+}
+
 /* ## BABELTHEQUE ##?*/
 /* Uncomment if babeltheque configuration no contains these lines */
 /*
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index cc59fb2..2ab8f80 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -1206,14 +1206,14 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% END %]
 
 [% IF ( SocialNetworks ) %]
-    
+    
         Share
-        
-        
-        
-        
-        
-        
+        Facebook
+        Twitter
+        LinkedIn
+        Delicious
+        Email
+        
     
 [% END %]
 
diff --git a/koha-tmpl/opac-tmpl/prog/images/social-sprite.png b/koha-tmpl/opac-tmpl/prog/images/social-sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..63d6b74b31cd5d37dfced08b0e918e65c48a5402
GIT binary patch
literal 2802
zcmd^BX;c$g8Z8nU5k-T>1+f`KK^CzU8wZ?5mL_dj#UvmqA|RkP3W^Nk$Ou6Yh$tok
zii(mzSOX#m2w at WlghdE~4aTs9orFLL5fYYUD#3G{K683ze$2nAbLv&ScfR`GefPWf
zI~C{bbWBxchYA1ysx|0WWN-ZisIK78sK9GVxeMD|MTqsWgkTI#3xlV60{#SNzD
z$CqE1a2KVKwB}F4Q-UvxX4ey`9~Z<+D_MPmZQabjrgVyzrDRGap^APpr;a%^eEwF^
zh5XludI at WiH_Dwm9hCFDsGQ1}+TipSzec=KX5n;nU{Rd at Fed?=cJ&!Z$i^6)zs8d^V%+k6>Qib
zVf7DpejLTWsEnly8B-;`d9RF&jNId!%gV|${RnBK4Bni`JE3i}3zj=Ax{a at J!58=T
zarOtNYPd%~BGMA`spz{jb8MCmG2JsWmoq(AI5g^#QXyDaeom&=*ViM?J-$pcI
zkc&g&O5fGBC$x2Nx!i_nsZhLBIXUGVPw$%)-+J&?_k1jsBhfq={*su%==uzIi|&}2
zCDu$%f02w$iwCA8yZw{*+YyT1&#IrqKFw}y<4YfAm3Fc at A3m})HOFc{4wh86Z*j+&
z#k>XpXUm0{}{wZEdVDp-gYlaYaB`OUWCqpa?sG
z10b<_2tdImQ9AqG
z6ZQITW)@#(d21;^a*sWfC9}pOn6m{m3ybg>J9{pNGZY at 10p@xL7i;XeUDG0rIn>_D
zU=*%91 at 5v--`mSeTmUx--hKW_dzfTlW~Q4?U!u!k*{VVB_*vQ=?7Eld58b|9n~aws
zBWOE18WLZgpwVb2)~wX~D<4Yk11V!wF2b&CiVxZtbJI^hxaR*6oXI-%37pN
z-~Tg at Hu?~7?LX4}`!HqO6XWUbrrBLqGE~ZlB7aOT+cMhxds{iC(Vma*bD&tWz`e&`
z)K{plE?%KWMK*JSf+&IAtH&k{F#9oKYO$sY6iV$!}>4{NvhBLlAl*IuUks3
z1+p*Re}oSIfdHz&8YL87vVfVIY+vpwS()E1FPEV}2`f>099}X0yb`|!q!g#Es>PqK
zk-SpR)|5qf>3v}6iJGcWtEA}*+JQU8-$~t0`lY>H3yL683%*G)L{%CT#@mO7ZU$HE
zl1yeWmVu6k&Eb5Pg)vHbox7$OY7Dw#^!t
zdQF8JXKZFMyu3Cc(UP9wxB37kTyFZPUo0V$h5LdBsqGw
zP7Z~@EM*TSnZ;-m&mjc~qJ37Nj
z#`ko0$t<%6k>`I^_5w#d at I)As_LCl%$enu%AK&Jlqib%SqFbe_4wtc;OIK60gy+ik
z{nffXA8!?bpsVfxXL>>9X4j7HbodF!as{oKSlSY4r{@;IluiB at KK-UXYdwLz@$GYG
z&$_zKSCqI=Oibacw(L8|Fu?-bwmp8q^pu;>*@x14=+-6Vvf%GA3x=Bea8IIFSyZPC
zrSw5DL6)=5ojC^bmgp?(kGQg>!- at vAcTDc9%1j`EWrN{7G@=U2b-p(~cq%#A(Gpl~
zROLIOcAgIz7Js?d^j_6brXfS`>!w>tH9m1iKOgkN$lG{g?nG^Am{

Combines two star ratings sprites into one and makes
the corresponding CSS changes. The two original images
have been removed.

To test, view star ratings on search results and the detail page.
Try setting star ratings on the detail page.
---
 koha-tmpl/opac-tmpl/prog/en/css/jquery.rating.css  |    8 +++++---
 koha-tmpl/opac-tmpl/prog/images/delete.gif         |  Bin 752 -> 0 bytes
 .../opac-tmpl/prog/images/star-ratings-sprite.png  |  Bin 0 -> 2000 bytes
 koha-tmpl/opac-tmpl/prog/images/star.gif           |  Bin 815 -> 0 bytes
 4 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100755 koha-tmpl/opac-tmpl/prog/images/delete.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/star-ratings-sprite.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/star.gif

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/jquery.rating.css b/koha-tmpl/opac-tmpl/prog/en/css/jquery.rating.css
index e89096b..616db6f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/jquery.rating.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/jquery.rating.css
@@ -1,9 +1,11 @@
 /* jQuery.Rating Plugin CSS - http://www.fyneworks.com/jquery/star-rating/ */
 div.rating-cancel,div.star-rating{float:left;width:15px;height:15px;text-indent:-999em;cursor:pointer;display:block;background:transparent;overflow:hidden}
-div.rating-cancel,div.rating-cancel a{background:url(../../images/delete.gif) no-repeat 0 -16px}
-div.star-rating,div.star-rating a{background:url(../../images/star.gif) no-repeat 0 0px}
-div.rating-cancel a,div.star-rating a{display:block;width:16px;height:100%;background-position:0 0px;border:0}
+div.rating-cancel,div.rating-cancel a{background:url(../../images/star-ratings-sprite.png) no-repeat 0 -49px}
+div.star-rating,div.star-rating a{background:url(../../images/star-ratings-sprite.png) no-repeat 0 0px}
+div.rating-cancel a{display:block;width:16px;height:100%;background-position:0 -49px;border:0}
+div.star-rating a{display:block;width:16px;height:100%;background-position:0 0px;border:0}
 div.star-rating-on a{background-position:0 -32px!important}
+div.rating-cancel.star-rating-hover a{background-position:0 -65px}
 div.star-rating-hover a{background-position:0 -16px}
 /* Read Only CSS */
 div.star-rating-readonly a{cursor:default !important}
diff --git a/koha-tmpl/opac-tmpl/prog/images/delete.gif b/koha-tmpl/opac-tmpl/prog/images/delete.gif
deleted file mode 100755
index 43c6ca8763d79bde87bcf437e497af00c8be562d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 752
zcmZ?wbhEHb6kt$bc*el6GthYN-n}zt&b)vB{*)i+-#|NQy$
zABXln&Q1FL`t{#CH*SY|{oJwc*Qz;h;)0))7aYq9ewP~fc2e)_P3vAY)$9wl{IzJp
zy{ydlr;a^HiGHwZ{*SH8FZkJhE{gei`OM?;ir*_{?@ji478&@mD*tSH_`A&5 at 6Vqe
z at G<&xeCOwiq-WvY-eS5f?;vgCP8#IHGBw=+^cY}xvy
zx8c*8mDl2ff1W;kCeZrNm9vlQYJg5Caki?(^G9DBs4DA0KlA4-ZT3fl8
z8F_gb*}2-1v>0WWwY1oIg_&Emc-aM+Wn|bpRc1GF^$N-etzA1qr9X*XNNWw_j-BjG
zGEKc(x)1gUF{(82E at ad^eMXp9hUxg0Q)f<}lVRDncBb&%dq*yAR+(|l-D at bZwvw%g)cL7VG
z)An_f*+XqOetkIP*eg{wS7K(+qJ{-x0ue3?v&y~1d1To>MqD_2keNGNE=Pc|!BJ7b
fV_(F^#N=Z_Jo9)pKRPly^YODPxtBy-~8&_;o+gq{@*Z@$!4=PMd^zJ
z-ct|ll}e>Tp-`z*3tUf?Bz#_YcynPvaxPl_c&A#eUhe-^DLDQ-Cugzfn!Ja+GUT;7
z8uA;}MUl;1910msOIseGzNvGbIZvOgv3Xm4S5;p*`|u$*)P1e#7vNN?}blct_?
zR5?9ly}5o}p%}S(byFo(4-U$@S~PO`5-V9HeZ4$!iy!GD<$5Rte2whQcvbN at n~e;n
zDqr}nya-wmpX@(->fM at B+TpUuvztpzdR1G#QCqfAR?zI}IeOblgS0P~6|3(4JP<)u
z at X3EpjLf859J_ZDLU
zzw2$;RE?|;i>7~dSea^Ay#~*w#LK!879Q2lHCV}eeJ4{AR+8y&6T;p- at 1Jk_TEX|3
z&tlHD9b02vkc9;;<-~~s4#;>Rv)riZ4CeFr$e9f0%P{|y2lrN|raEafd2j5h7*ep{
zxz^TB- at X55nTy3@QB>6X_wPj_5jytO3yjce>qw&bQPJf;_yfFRb6n6q^7Hm2pSUunbfh>IiGS;mZfx{EEd~v>d5J1K|r`YdP(slOXz`TfZ!$K}A
z)zr)`u@*qL_~&xW{~+LC01Z_vF~CC!#%M4ky8v3V-2}iq+&S$aTw#YX2{!9YhQ5Ol
zoGz&lcrM`5enF2Hq3ta|Ej8w891gh^wtxXp51BMj6J)0YNqR(xgew{R9YdA+BlQ3q
zM}+Kf^^+K0vi5^yrDJvj0P5N{l(JY_JW!XE2am?u+mi`)AEVc)gVz)E6k^%-*=gET
zU91!&LWUa?VRSlu0zoV$CbBG$7y#GRaJ at 7%-HAXraA4=o at z`X?G!(+E#)GPaG^oX>749CpJUJqVZLG#$%4ErN;9|M$N!*pySp*X
z>4;0A7DixOZ1P8{ftr7--ADuy41qB*zmc4FX~dv6MmFZkZtm4IMTX;dM#5>62EMZWWD%T-Nzw_~!ZOc+{rj
z`raZnHT9c}zxWJqt#)SO77S at eS0v53Xu%6iy{TaQuor@@l$Gw)nw6J?rso%fG>)Zp?7inC7|Z1>U>zJ=zB;JMKTm8cqGeGq1oyJ0=sv
z(jWJiWB%pc#ER1C#t%*zr?NV0{p0CcCRWZvV;2rrx3`lroA)O^#l%P|VK6!Q^^5wG
zh|!CIt&$hWPm}NS92}w+?FcIvs*yy=Ye(t+&)i~3ju4CklKza1V_aIUKp#oK+sn_h
I-h-C)H_bQ)TL1t6

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/star.gif b/koha-tmpl/opac-tmpl/prog/images/star.gif
deleted file mode 100644
index d0948a70843bf01952d1f81dcfcdadc92976a04a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 815
zcmZ?wbhEHb6ksr5c*el6(A at m!(W5UnOP^`reSRqFN=wUy;^KSv?mbz*{y;*);~mc5
z-|RUW6m;#{wMW}bp6pHg_U+rN({8s`u6+0I-Q5+MAMeb%w`5!M#
z{q=^=j}*N*e*EQepZ7;K-(U6l^W*)qy-uI5Mx04YJ9FmD at 2@w0e|`3BzvYV!svmDJ
zy1UBtA9dUx3IVz=bW<9TmSpMHPB|LHc1x92?H at 6~*NPV?1P?R#4d
zPbMV1-s|#ytJ9}D;U7+0e!n;8#jahi&$Zv4GUd&Fk1akv*Jf&ey1!wEi_7gU#eYv#yB=$CE4*Ha3+f942mV(XO4k$!yUkYI4!^v
z(7()>%8M?Gl%7kx>Gn`^RAQF96>H~
zqm`q-QcY~aQ7_g~!8sNO9r=2u3Mlqi#CWtc9T(=ypIRf>c$iT@(<;xV at nLFbqN;ve
z&H|wp at 2R5NS2`L#KJ=KR(rKEJaLDyUmqb%cL}by=)-=YHmH-A at k7GPXma%d?aC*qL
zh)X7I#x;cnUQ^jS^;|kOFmg at Nv0U}W!=<5%L(6DYL1B*CL?*3JjSUV#i&`dVbSiW!
SUO9NY!6jXVS5kz7!5RQ
References: 
Message-ID: <1337136305-1489-1-git-send-email-srdjan@catalyst.net.nz>

Create transport_cost table,  added UseTransportCostMatrix syspref.
transport_cost table contains branch to branch transfer
costs. These are used for fulilling inter-branch hold transfers.

Moved GetHoldsQueueItems() from .pl to HoldsQueue.pm
---
 C4/Context.pm                                      |    3 +
 C4/HoldsQueue.pm                                   |  630 ++++++++++++++++++++
 admin/systempreferences.pl                         |    1 +
 admin/transport-cost-matrix.pl                     |  127 ++++
 circ/view_holdsqueue.pl                            |   34 +-
 installer/data/mysql/kohastructure.sql             |   16 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   22 +
 .../prog/en/modules/admin/admin-home.tt            |    2 +
 .../prog/en/modules/admin/transport-cost-matrix.tt |  134 +++++
 misc/cronjobs/holds/build_holds_queue.pl           |  382 +-----------
 t/db_dependent/HoldsQueue.t                        |  161 +++++
 12 files changed, 1101 insertions(+), 412 deletions(-)
 create mode 100755 C4/HoldsQueue.pm
 create mode 100755 admin/transport-cost-matrix.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
 create mode 100755 t/db_dependent/HoldsQueue.t

diff --git a/C4/Context.pm b/C4/Context.pm
index 67d31ee..6643c1d 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -523,6 +523,9 @@ with this method.
 # flushing the caching mechanism.
 
 my %sysprefs;
+sub _flush_preferences {
+    %sysprefs = ();
+}
 
 sub preference {
     my $self = shift;
diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
new file mode 100755
index 0000000..dd999d9
--- /dev/null
+++ b/C4/HoldsQueue.pm
@@ -0,0 +1,630 @@
+package C4::HoldsQueue;
+
+# Copyright 2011 Catalyst IT
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# FIXME: expand perldoc, explain intended logic
+
+use strict;
+use warnings;
+
+use C4::Context;
+use C4::Search;
+use C4::Items;
+use C4::Branch;
+use C4::Circulation;
+use C4::Members;
+use C4::Biblio;
+use C4::Dates qw/format_date/;
+
+use List::Util qw(shuffle);
+use Data::Dumper;
+
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+BEGIN {
+    $VERSION = 3.03;
+    require Exporter;
+    @ISA = qw(Exporter);
+    @EXPORT_OK = qw(
+        &CreateQueue
+        &GetHoldsQueueItems
+
+        &SetUseTransportCostMatrix
+        &TransportCostMatrix
+        &UpdateTransportCostMatrix
+     );
+}
+
+# XXX This is not safe in a persistant environment
+my $dbh   = C4::Context->dbh;
+
+=head1 FUNCTIONS
+
+=head2 SetUseTransportCostMatrix
+
+  SetUseTransportCostMatrix($true_false);
+
+Updates UseTransportCostMatrix syspref
+
+=cut
+
+sub SetUseTransportCostMatrix {
+    my ($bool) = @_;
+
+    $dbh->do("UPDATE systempreferences SET value=? WHERE variable='UseTransportCostMatrix'", undef, $bool ? '1' : '0');
+}
+
+=head2 TransportCostMatrix
+
+  TransportCostMatrix();
+
+Returns Transport Cost Matrix as a hashref  =>  => cost
+
+=cut
+
+sub TransportCostMatrix {
+    my $transport_costs = $dbh->selectall_arrayref("SELECT * FROM transport_cost",{ Slice => {} });
+
+    my %transport_cost_matrix;
+    foreach (@$transport_costs) {
+        my $from = $_->{frombranch};
+        my $to = $_->{tobranch};
+        my $cost = $_->{cost};
+        my $disabled = $_->{disable_transfer};
+        $transport_cost_matrix{$to}{$from} = { cost => $cost, disable_transfer => $disabled };
+    }
+    return \%transport_cost_matrix;
+}
+
+=head2 UpdateTransportCostMatrix
+
+  UpdateTransportCostMatrix($records);
+
+Updates full Transport Cost Matrix table. $records is an arrayref of records.
+Records: { frombranch => , tobranch => , cost => , disable_transfer => <0,1> }
+
+=cut
+
+sub UpdateTransportCostMatrix {
+    my ($records) = @_;
+
+    my $sth = $dbh->prepare("INSERT INTO transport_cost (frombranch, tobranch, cost, disable_transfer) VALUES (?, ?, ?, ?)");
+                 
+    $dbh->do("TRUNCATE TABLE transport_cost");
+    foreach (@$records) {
+        my $cost = $_->{cost};
+        my $from = $_->{frombranch};
+        my $to = $_->{tobranch};
+        if ( !defined ($cost) || ($cost !~ m/(0|[1-9][0-9]*)(\.[0-9]*)?/o) ) {
+            warn  "Invalid $from -> $to cost $cost - nust be a number in 0 to 1 range, disablig";
+            $_->{disable_transfer} = 1;
+        }
+        $sth->execute( $from, $to, $cost, $_->{disable_transfer} ? 1 : 0 );
+    }
+}
+
+=head2 GetHoldsQueueItems
+
+  GetHoldsQueueItems($branch);
+
+Returns hold queue for a holding branch. If branch is omitted, then whole queue is returned
+
+=cut
+
+sub GetHoldsQueueItems {
+    my ($branchlimit) = @_;
+
+    my @bind_params = ();
+    my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
+                  FROM tmp_holdsqueue
+                       JOIN biblio      USING (biblionumber)
+                  LEFT JOIN biblioitems USING (biblionumber)
+                  LEFT JOIN items       USING (  itemnumber)
+                /;
+    if ($branchlimit) {
+        $query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
+        push @bind_params, $branchlimit;
+    }
+    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@bind_params);
+    my $items = [];
+    while ( my $row = $sth->fetchrow_hashref ){
+        $row->{reservedate} = format_date($row->{reservedate});
+        my $record = GetMarcBiblio($row->{biblionumber});
+        if ($record){
+            $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
+            $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
+            $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
+        }
+        push @$items, $row;
+    }
+    return $items;
+}
+
+=head2 CreateQueue
+
+  CreateQueue();
+
+Top level function that turns reserves into tmp_holdsqueue and hold_fill_targets.
+
+=cut
+
+sub CreateQueue {
+
+    $dbh->do("DELETE FROM tmp_holdsqueue");  # clear the old table for new info
+    $dbh->do("DELETE FROM hold_fill_targets");
+
+    my $total_bibs            = 0;
+    my $total_requests        = 0;
+    my $total_available_items = 0;
+    my $num_items_mapped      = 0;
+
+    my $branches_to_use;
+    my $transport_cost_matrix;
+    my $use_transport_cost_matrix = C4::Context->preference("UseTransportCostMatrix");
+    if ($use_transport_cost_matrix) {
+        debug( "Using cost matrix" );
+        $transport_cost_matrix = TransportCostMatrix();
+        unless (keys %$transport_cost_matrix) {
+            warn "UseTransportCostMatrix set to yes, but matrix not populated";
+            undef $transport_cost_matrix;
+        }
+    }
+    unless ($transport_cost_matrix) {
+        debug( "Not using cost matrix" );
+        $branches_to_use = load_branches_to_pull_from();
+    }
+
+    my $bibs_with_pending_requests = GetBibsWithPendingHoldRequests();
+    debug( "bibs_with_pending_requests: ".Dumper($bibs_with_pending_requests) );
+
+    foreach my $biblionumber (@$bibs_with_pending_requests) {
+        $total_bibs++;
+        my $hold_requests   = GetPendingHoldRequestsForBib($biblionumber);
+        my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, $branches_to_use);
+        $total_requests        += scalar(@$hold_requests);
+        $total_available_items += scalar(@$available_items);
+
+        my $item_map = MapItemsToHoldRequests($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix);
+        $item_map  or next;
+        my $item_map_size = scalar(keys %$item_map)
+        or next;;
+
+        $num_items_mapped += $item_map_size;
+        CreatePicklistFromItemMap($item_map);
+        AddToHoldTargetMap($item_map);
+        if (($item_map_size < scalar(@$hold_requests  )) and
+            ($item_map_size < scalar(@$available_items))) {
+            # DOUBLE CHECK, but this is probably OK - unfilled item-level requests
+            # FIXME
+            #warn "unfilled requests for $biblionumber";
+            #warn Dumper($hold_requests), Dumper($available_items), Dumper($item_map);
+        }
+    }
+}
+
+=head2 GetBibsWithPendingHoldRequests
+
+  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
+
+Return an arrayref of the biblionumbers of all bibs
+that have one or more unfilled hold requests.
+
+=cut
+
+sub GetBibsWithPendingHoldRequests {
+    my $dbh = C4::Context->dbh;
+
+    my $bib_query = "SELECT DISTINCT biblionumber
+                     FROM reserves
+                     WHERE found IS NULL
+                     AND priority > 0
+                     AND reservedate <= CURRENT_DATE()";
+    my $sth = $dbh->prepare($bib_query);
+
+    $sth->execute();
+    my $biblionumbers = $sth->fetchall_arrayref();
+
+    return [ map { $_->[0] } @$biblionumbers ];
+}
+
+=head2 GetPendingHoldRequestsForBib
+
+  my $requests = GetPendingHoldRequestsForBib($biblionumber);
+
+Returns an arrayref of hashrefs to pending, unfilled hold requests
+on the bib identified by $biblionumber.  The following keys
+are present in each hashref:
+
+    biblionumber
+    borrowernumber
+    itemnumber
+    priority
+    branchcode
+    reservedate
+    reservenotes
+    borrowerbranch
+
+The arrayref is sorted in order of increasing priority.
+
+=cut
+
+sub GetPendingHoldRequestsForBib {
+    my $biblionumber = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode, 
+                                reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
+                         FROM reserves
+                         JOIN borrowers USING (borrowernumber)
+                         WHERE biblionumber = ?
+                         AND found IS NULL
+                         AND priority > 0
+                         AND reservedate <= CURRENT_DATE()
+                         ORDER BY priority";
+    my $sth = $dbh->prepare($request_query);
+    $sth->execute($biblionumber);
+
+    my $requests = $sth->fetchall_arrayref({});
+    return $requests;
+
+}
+
+=head2 GetItemsAvailableToFillHoldRequestsForBib
+
+  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, $branches_ar);
+
+Returns an arrayref of items available to fill hold requests
+for the bib identified by C<$biblionumber>.  An item is available
+to fill a hold request if and only if:
+
+    * it is not on loan
+    * it is not withdrawn
+    * it is not marked notforloan
+    * it is not currently in transit
+    * it is not lost
+    * it is not sitting on the hold shelf
+
+=cut
+
+sub GetItemsAvailableToFillHoldRequestsForBib {
+    my ($biblionumber, $branches_to_use) = @_;
+
+    my $dbh = C4::Context->dbh;
+    my $items_query = "SELECT itemnumber, homebranch, holdingbranch, itemtypes.itemtype AS itype
+                       FROM items ";
+
+    if (C4::Context->preference('item-level_itypes')) {
+        $items_query .=   "LEFT JOIN itemtypes ON (itemtypes.itemtype = items.itype) ";
+    } else {
+        $items_query .=   "JOIN biblioitems USING (biblioitemnumber)
+                           LEFT JOIN itemtypes USING (itemtype) ";
+    }
+    $items_query .=   "WHERE items.notforloan = 0
+                       AND holdingbranch IS NOT NULL
+                       AND itemlost = 0
+                       AND wthdrawn = 0
+                       AND items.onloan IS NULL
+                       AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0)
+                       AND itemnumber NOT IN (
+                           SELECT itemnumber
+                           FROM reserves
+                           WHERE biblionumber = ?
+                           AND itemnumber IS NOT NULL
+                           AND (found IS NOT NULL OR priority = 0)
+                        )
+                       AND items.biblionumber = ?";
+    $items_query .=  " AND damaged = 0 "
+      unless C4::Context->preference('AllowHoldsOnDamagedItems');
+
+    my @params = ($biblionumber, $biblionumber);
+    if ($branches_to_use && @$branches_to_use) {
+        $items_query .= " AND holdingbranch IN (" . join (",", map { "?" } @$branches_to_use) . ")";
+        push @params, @$branches_to_use;
+    }
+    my $sth = $dbh->prepare($items_query);
+    $sth->execute(@params);
+
+    my $items = $sth->fetchall_arrayref({});
+    $items = [ grep { my @transfers = GetTransfers($_->{itemnumber}); $#transfers == -1; } @$items ]; 
+    map { my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype}); $_->{holdallowed} = $rule->{holdallowed}; $rule->{holdallowed} != 0 } @$items;
+    return [ grep { $_->{holdallowed} != 0 } @$items ];
+}
+
+=head2 MapItemsToHoldRequests
+
+  MapItemsToHoldRequests($hold_requests, $available_items, $branches, $transport_cost_matrix)
+
+=cut
+
+sub MapItemsToHoldRequests {
+    my ($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix) = @_;
+
+    # handle trival cases
+    return unless scalar(@$hold_requests) > 0;
+    return unless scalar(@$available_items) > 0;
+
+    debug( "MapItemsToHoldRequests() for ".Dumper($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix) );
+    my $automatic_return = C4::Context->preference("AutomaticItemReturn");
+
+    # identify item-level requests
+    my %specific_items_requested = map { $_->{itemnumber} => 1 } 
+                                   grep { defined($_->{itemnumber}) }
+                                   @$hold_requests;
+
+    # group available items by itemnumber
+    my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
+
+    # items already allocated
+    my %allocated_items = ();
+
+    # map of items to hold requests
+    my %item_map = ();
+ 
+    # figure out which item-level requests can be filled    
+    my $num_items_remaining = scalar(@$available_items);
+    foreach my $request (@$hold_requests) {
+        last if $num_items_remaining == 0;
+
+        # is this an item-level request?
+        if (defined($request->{itemnumber})) {
+            # fill it if possible; if not skip it
+            if (exists $items_by_itemnumber{$request->{itemnumber}} and
+                not exists $allocated_items{$request->{itemnumber}}) {
+                $item_map{$request->{itemnumber}} = { 
+                    borrowernumber => $request->{borrowernumber},
+                    biblionumber => $request->{biblionumber},
+                    holdingbranch =>  $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
+                    pickup_branch => $request->{branchcode} || $request->{borrowerbranch},
+                    item_level => 1,
+                    reservedate => $request->{reservedate},
+                    reservenotes => $request->{reservenotes},
+                };
+                $allocated_items{$request->{itemnumber}}++;
+                $num_items_remaining--;
+            }
+        } else {
+            # it's title-level request that will take up one item
+            $num_items_remaining--;
+        }
+    }
+
+    # group available items by branch
+    my %items_by_branch = ();
+    foreach my $item (@$available_items) {
+        next unless $item->{holdallowed};
+
+        push @{ $items_by_branch{  $automatic_return ? $item->{homebranch}
+                                                     : $item->{holdingbranch} } }, $item
+          unless exists $allocated_items{ $item->{itemnumber} };
+    }
+    return unless keys %items_by_branch;
+
+    # now handle the title-level requests
+    $num_items_remaining = scalar(@$available_items) - scalar(keys %allocated_items); 
+    my $pull_branches;
+    foreach my $request (@$hold_requests) {
+        last if $num_items_remaining == 0;
+        next if defined($request->{itemnumber}); # already handled these
+
+        # look for local match first
+        my $pickup_branch = $request->{branchcode} || $request->{borrowerbranch};
+        my ($itemnumber, $holdingbranch);
+
+        my $holding_branch_items = $automatic_return ? undef : $items_by_branch{$pickup_branch};
+        if ( $holding_branch_items ) {
+            foreach my $item (@$holding_branch_items) {
+                if ( $request->{borrowerbranch} eq $item->{homebranch} ) {
+                    $itemnumber = $item->{itemnumber};
+                    last;
+                }
+            }
+            $holdingbranch = $pickup_branch;
+            $itemnumber ||= $holding_branch_items->[0]->{itemnumber};
+        }
+        elsif ($transport_cost_matrix) {
+            $pull_branches = [keys %items_by_branch];
+            $holdingbranch = least_cost_branch( $pickup_branch, $pull_branches, $transport_cost_matrix );
+            if ( $holdingbranch ) {
+
+                my $holding_branch_items = $items_by_branch{$holdingbranch};
+                foreach my $item (@$holding_branch_items) {
+                    next if $request->{borrowerbranch} ne $item->{homebranch};
+
+                    $itemnumber = $item->{itemnumber};
+                    last;
+                }
+                $itemnumber ||= $holding_branch_items->[0]->{itemnumber};
+            }
+            else {
+                warn "No transport costs for $pickup_branch";
+            }
+        }
+
+        unless ($itemnumber) {
+            # not found yet, fall back to basics
+            if ($branches_to_use) {
+                $pull_branches = $branches_to_use;
+            } else {
+                $pull_branches = [keys %items_by_branch];
+            }
+            PULL_BRANCHES:
+            foreach my $branch (@$pull_branches) {
+                my $holding_branch_items = $items_by_branch{$branch}
+                  or next;
+
+                $holdingbranch ||= $branch;
+                foreach my $item (@$holding_branch_items) {
+                    next if $pickup_branch ne $item->{homebranch};
+
+                    $itemnumber = $item->{itemnumber};
+                    $holdingbranch = $branch;
+                    last PULL_BRANCHES;
+                }
+            }
+            $itemnumber ||= $items_by_branch{$holdingbranch}->[0]->{itemnumber}
+              if $holdingbranch;
+        }
+
+        if ($itemnumber) {
+            my $holding_branch_items = $items_by_branch{$holdingbranch}
+              or die "Have $itemnumber, $holdingbranch, but no items!";
+            @$holding_branch_items = grep { $_->{itemnumber} != $itemnumber } @$holding_branch_items;
+            delete $items_by_branch{$holdingbranch} unless @$holding_branch_items;
+
+            $item_map{$itemnumber} = {
+                borrowernumber => $request->{borrowernumber},
+                biblionumber => $request->{biblionumber},
+                holdingbranch => $holdingbranch,
+                pickup_branch => $pickup_branch,
+                item_level => 0,
+                reservedate => $request->{reservedate},
+                reservenotes => $request->{reservenotes},
+            };
+            $num_items_remaining--; 
+        }
+    }
+    return \%item_map;
+}
+
+=head2 CreatePickListFromItemMap 
+
+=cut
+
+sub CreatePicklistFromItemMap {
+    my $item_map = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $sth_load=$dbh->prepare("
+        INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
+                                    cardnumber,reservedate,title, itemcallnumber,
+                                    holdingbranch,pickbranch,notes, item_level_request)
+        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+    ");
+
+    foreach my $itemnumber  (sort keys %$item_map) {
+        my $mapped_item = $item_map->{$itemnumber};
+        my $biblionumber = $mapped_item->{biblionumber}; 
+        my $borrowernumber = $mapped_item->{borrowernumber}; 
+        my $pickbranch = $mapped_item->{pickup_branch};
+        my $holdingbranch = $mapped_item->{holdingbranch};
+        my $reservedate = $mapped_item->{reservedate};
+        my $reservenotes = $mapped_item->{reservenotes};
+        my $item_level = $mapped_item->{item_level};
+
+        my $item = GetItem($itemnumber);
+        my $barcode = $item->{barcode};
+        my $itemcallnumber = $item->{itemcallnumber};
+
+        my $borrower = GetMember('borrowernumber'=>$borrowernumber);
+        my $cardnumber = $borrower->{'cardnumber'};
+        my $surname = $borrower->{'surname'};
+        my $firstname = $borrower->{'firstname'};
+        my $phone = $borrower->{'phone'};
+   
+        my $bib = GetBiblioData($biblionumber);
+        my $title = $bib->{title}; 
+
+        $sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
+                           $cardnumber, $reservedate, $title, $itemcallnumber,
+                           $holdingbranch, $pickbranch, $reservenotes, $item_level);
+    }
+}
+
+=head2 AddToHoldTargetMap
+
+=cut
+
+sub AddToHoldTargetMap {
+    my $item_map = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $insert_sql = q(
+        INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request)
+                               VALUES (?, ?, ?, ?, ?)
+    );
+    my $sth_insert = $dbh->prepare($insert_sql);
+
+    foreach my $itemnumber (keys %$item_map) {
+        my $mapped_item = $item_map->{$itemnumber};
+        $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber,
+                             $mapped_item->{holdingbranch}, $mapped_item->{item_level});
+    }
+}
+
+# Helper functions, not part of any interface
+
+sub debug {
+#   warn @_;
+}
+
+sub load_branches_to_pull_from {
+    my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight")
+      or return;
+
+    my @branches_to_use = map { s/^\s+//; s/\s+$//; $_; } split /,/, $static_branch_list;
+
+    @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
+
+    return \@branches_to_use;
+}
+
+sub least_cost_branch {
+
+    #$from - arrayref
+    my ($to, $from, $transport_cost_matrix) = @_;
+
+# Nothing really spectacular: supply to branch, a list of potential from branches
+# and find the minimum from - to value from the transport_cost_matrix
+    return $from->[0] if @$from == 1;
+
+    my ($least_cost, @branch);
+    foreach (@$from) {
+        my $cell = $transport_cost_matrix->{$to}{$_};
+        next if $cell->{disable_transfer};
+
+        my $cost = $cell->{cost};
+
+        unless (defined $least_cost) {
+            $least_cost = $cost;
+            push @branch, $_;
+            next;
+        }
+
+        next if $cost > $least_cost;
+
+        if ($cost == $least_cost) {
+            push @branch, $_;
+            next;
+        }
+
+        @branch = ($_);
+        $least_cost = $cost;
+    }
+
+    return $branch[0];
+
+    # XXX return a random @branch with minimum cost instead of the first one;
+    # return $branch[0] if @branch == 1;
+}
+
+
+1;
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 5e3848d..cf46e22 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -203,6 +203,7 @@ $tabsysprefs{DisplayClearScreenButton}       = "Circulation";
 $tabsysprefs{AllowAllMessageDeletion}        = "Circulation";
 $tabsysprefs{OverdueNoticeBcc}               = "Circulation";
 $tabsysprefs{OverduesBlockCirc}              = "Circulation";
+$tabsysprefs{UseTransportCostMatrix}         = "Circulation";
 
 
 # Staff Client
diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl
new file mode 100755
index 0000000..6119ba9
--- /dev/null
+++ b/admin/transport-cost-matrix.pl
@@ -0,0 +1,127 @@
+#!/usr/bin/perl
+# Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+use CGI;
+use C4::Context;
+use C4::Output;
+use C4::Auth;
+use C4::Koha;
+use C4::Debug;
+use C4::Branch; # GetBranches
+use C4::HoldsQueue qw(TransportCostMatrix UpdateTransportCostMatrix SetUseTransportCostMatrix);
+
+use Data::Dumper;
+
+my $input = new CGI;
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "admin/transport-cost-matrix.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {parameters => 1},
+                            debug => 1,
+                            });
+
+my $update = $input->param('op') eq 'set-cost-matrix';
+my $use_transport_cost_matrix = $input->param('UseTransportCostMatrix') || 0;
+
+my ($cost_matrix, $have_matrix);
+unless ($update) {
+    $cost_matrix = TransportCostMatrix();
+    $have_matrix = keys %$cost_matrix if $cost_matrix;
+    $use_transport_cost_matrix = C4::Context->preference("UseTransportCostMatrix");
+}
+
+my $branches = GetBranches();
+my @branchloop = map { code => $_,
+                       name => $branches->{$_}->{'branchname'} },
+                 sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
+                 keys %$branches;
+my (@branchfromloop, @cost, @errors);
+foreach my $branchfrom ( @branchloop ) {
+    my $fromcode = $branchfrom->{code};
+
+    my %from_row = ( code => $fromcode, name => $branchfrom->{name} );
+    foreach my $branchto ( @branchloop ) {
+        my $tocode = $branchto->{code};
+
+        my %from_to_input_def = ( code => $tocode, name => $branchto->{name} );
+        push @{ $from_row{branchtoloop} }, \%from_to_input_def;
+
+        if ($fromcode eq $tocode) {
+            $from_to_input_def{skip} = 1;
+            next;
+        }
+
+        (my $from_to = "${fromcode}_${tocode}") =~ s/\W//go;
+         $from_to_input_def{id} = $from_to;
+        my $input_name   = "cost_$from_to";
+        my $disable_name = "disable_$from_to";
+
+        if ($update) {
+            my $value = $from_to_input_def{value} = $input->param($input_name);
+            if ( $input->param($disable_name) ) {
+                $from_to_input_def{disabled} = 1;
+            }
+            else {
+                push @errors, "Invalid value for $from_row{name} -> $from_to_input_def{name}"
+                  unless $value =~ /\d/o && $value >= 0.0;
+            }
+        }
+        else {
+            if ($have_matrix) {
+                if ( my $cell = $cost_matrix->{$tocode}{$fromcode} ) {
+                    $from_to_input_def{value} = $cell->{cost};
+                    $from_to_input_def{disabled} = 1 if $cell->{disable_transfer};
+                }
+            } else {
+                $from_to_input_def{disabled} = 1;
+            }
+        }
+    }
+    
+#              die Dumper(\%from_row);
+    push @branchfromloop, \%from_row;
+}
+
+if ($update && !@errors) {
+    my @update_recs = map {
+        my $from = $_->{code};
+        map { frombranch => $from, tobranch => $_->{code}, cost => $_->{value}, disable_transfer => $_->{disabled} || 0 },
+            grep { $_->{code} ne $from }
+            @{ $_->{branchtoloop} };
+    } @branchfromloop;
+
+    UpdateTransportCostMatrix(\@update_recs);
+    SetUseTransportCostMatrix($use_transport_cost_matrix);
+}
+   
+$template->param(
+    branchloop => \@branchloop,
+    branchfromloop => \@branchfromloop,
+    UseTransportCostMatrix => $use_transport_cost_matrix,
+    errors => \@errors,
+);
+output_html_with_http_headers $input, $cookie, $template->output;
+
+exit 0;
+
diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 4b51423..cf529f0 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -31,7 +31,7 @@ use C4::Biblio;
 use C4::Items;
 use C4::Koha;   # GetItemTypes
 use C4::Branch; # GetBranches
-use C4::Dates qw/format_date/;
+use C4::HoldsQueue qw(GetHoldsQueueItems);
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -51,6 +51,7 @@ my $branchlimit    = $params->{'branchlimit'};
 my $itemtypeslimit = $params->{'itemtypeslimit'};
 
 if ( $run_report ) {
+    # XXX GetHoldsQueueItems() does not support $itemtypeslimit!
     my $items = GetHoldsQueueItems($branchlimit, $itemtypeslimit);
     $template->param(
         branch     => $branchlimit,
@@ -76,36 +77,5 @@ $template->param(
    itemtypeloop => \@itemtypesloop,
 );
 
-sub GetHoldsQueueItems {
-	my ($branchlimit,$itemtypelimit) = @_;
-	my $dbh = C4::Context->dbh;
-
-    my @bind_params = ();
-	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
-                  FROM tmp_holdsqueue
-                       JOIN biblio      USING (biblionumber)
-				  LEFT JOIN biblioitems USING (biblionumber)
-                  LEFT JOIN items       USING (  itemnumber)
-                /;
-    if ($branchlimit) {
-	    $query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
-        push @bind_params, $branchlimit;
-    }
-    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
-	my $sth = $dbh->prepare($query);
-	$sth->execute(@bind_params);
-	my $items = [];
-    while ( my $row = $sth->fetchrow_hashref ){
-	$row->{reservedate} = format_date($row->{reservedate});
-	my $record = GetMarcBiblio($row->{biblionumber});
-    if ($record){
-        $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
-	    $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
-	    $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
-	}
-        push @$items, $row;
-    }
-    return $items;
-}
 # writing the template
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 9a94e0f..bdda0b9 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2785,6 +2785,22 @@ CREATE TABLE `fieldmapping` ( -- koha to keyword mapping
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
+-- Table structure for table `transport_cost`
+--
+
+DROP TABLE IF EXISTS transport_cost;
+CREATE TABLE transport_cost (
+      frombranch varchar(10) NOT NULL,
+      tobranch varchar(10) NOT NULL,
+      cost decimal(6,2) NOT NULL,
+      disable_transfer tinyint(1) NOT NULL DEFAULT 0,
+      CHECK ( frombranch <> tobranch ), -- a dud check, mysql does not support that
+      PRIMARY KEY (frombranch, tobranch),
+      CONSTRAINT transport_cost_ibfk_1 FOREIGN KEY (frombranch) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE,
+      CONSTRAINT transport_cost_ibfk_2 FOREIGN KEY (tobranch) REFERENCES branches (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
 -- Table structure for table `biblioimages`
 --
 
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 1edf08e..977c1d3 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -324,6 +324,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTransportCostMatrix',0,"Use Transport Cost Matrix when filling holds",'','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 38aa70c..b7bf80f 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5246,6 +5246,28 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+
+
+$DBversion = "3.09.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTransportCostMatrix',0,'Use Transport Cost Matrix when filling holds','','YesNo')");
+
+ $dbh->do("CREATE TABLE `transport_cost` (
+              `frombranch` varchar(10) NOT NULL,
+              `tobranch` varchar(10) NOT NULL,
+              `cost` decimal(6,2) NOT NULL,
+              `disable_transfer` tinyint(1) NOT NULL DEFAULT 0,
+              CHECK ( `frombranch` <> `tobranch` ), -- a dud check, mysql does not support that
+              PRIMARY KEY (`frombranch`, `tobranch`),
+              CONSTRAINT `transport_cost_ibfk_1` FOREIGN KEY (`frombranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
+              CONSTRAINT `transport_cost_ibfk_2` FOREIGN KEY (`tobranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
+          ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+
+    print "Upgrade to $DBversion done (creating `transport_cost` table; adding UseTransportCostMatrix systempref, in circulation)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index ef46ede..14486f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -53,6 +53,8 @@
 	Define circulation and fines rules for combinations of libraries, patron categories, and item types
     Library transfer limits
 	Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.
+    Transport Cost Matrix
+	Define transport costs between branches
     Item circulation alerts
 	Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
new file mode 100644
index 0000000..a57749a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
@@ -0,0 +1,134 @@
+[% INCLUDE 'doc-head-open.inc' %]
+Koha › Administration › Transport Cost Matrix
+[% INCLUDE 'doc-head-close.inc' %]
+
+
+
+
+
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+Home › Administration › Transport Cost Matrix
+
+
+
+
+    
+    
+    
+            Defining transport costs between libraries
+    
+    
+        
+            
+             Use Transport Cost Matrix 
+            

+                
+                    Costs are decimal values 0 to some arbitrarymax value (1 or 100), 0 being minimum (no) cost.
+                    Red cells signify no transfer allowed
+                    Click on the cell to edit
+                
+                
+                [% FOR e IN errors %]
+                    [% e %]
+                [% END %]
+                
+                
+                    
+                        
+                [% FOR b IN branchloop %]
+                        
+                [% END %]
+                    
+                [% FOR bf IN branchfromloop %]
+                    
+                        
+                    [% FOR bt IN bf.branchtoloop %]
+                        
+                    [% END %]
+                    
+                [% END %]
+                From \ To [% b.name %]
[% bf.name %] 
+                        [% IF bt.skip %]
+                             
+                        [% ELSE %]
+                            
+                            [% !bt.disabled && bt.value > '' ? bt.value : ' ' %]
+                            
+                            [% IF bt.disabled %]
+                            
+                            [% END %]
+                            
+                        [% END %]
+                        
+            
+            
+        
+    
+    
+    
+
+[% INCLUDE 'admin-menu.inc' %]
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/misc/cronjobs/holds/build_holds_queue.pl b/misc/cronjobs/holds/build_holds_queue.pl
index f01153e..9ec9825 100755
--- a/misc/cronjobs/holds/build_holds_queue.pl
+++ b/misc/cronjobs/holds/build_holds_queue.pl
@@ -5,7 +5,6 @@
 #-----------------------------------
 # FIXME: add command-line options for verbosity and summary
 # FIXME: expand perldoc, explain intended logic
-# FIXME: refactor all subroutines into C4 for testability
 
 use strict;
 use warnings;
@@ -16,384 +15,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use C4::Context;
-use C4::Search;
-use C4::Items;
-use C4::Branch;
-use C4::Circulation;
-use C4::Members;
-use C4::Biblio;
+use C4::HoldsQueue qw(CreateQueue);
 
-use List::Util qw(shuffle);
+CreateQueue();
 
-my $bibs_with_pending_requests = GetBibsWithPendingHoldRequests();
-
-my $dbh   = C4::Context->dbh;
-$dbh->do("DELETE FROM tmp_holdsqueue");  # clear the old table for new info
-$dbh->do("DELETE FROM hold_fill_targets");
-
-my $total_bibs            = 0;
-my $total_requests        = 0;
-my $total_available_items = 0;
-my $num_items_mapped      = 0;
-
-my @branches_to_use = _get_branches_to_pull_from();
-
-foreach my $biblionumber (@$bibs_with_pending_requests) {
-    $total_bibs++;
-    my $hold_requests   = GetPendingHoldRequestsForBib($biblionumber);
-    my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, @branches_to_use);
-    $total_requests        += scalar(@$hold_requests);
-    $total_available_items += scalar(@$available_items);
-    my $item_map = MapItemsToHoldRequests($hold_requests, $available_items, @branches_to_use);
-
-    (defined($item_map)) or next;
-
-    my $item_map_size = scalar(keys %$item_map);
-    $num_items_mapped += $item_map_size;
-    CreatePicklistFromItemMap($item_map);
-    AddToHoldTargetMap($item_map);
-    if (($item_map_size < scalar(@$hold_requests  )) and
-        ($item_map_size < scalar(@$available_items))) {
-        # DOUBLE CHECK, but this is probably OK - unfilled item-level requests
-        # FIXME
-        #warn "unfilled requests for $biblionumber";
-        #warn Dumper($hold_requests), Dumper($available_items), Dumper($item_map);
-    }
-}
-
-exit 0;
-
-=head1 FUNCTIONS
-
-=head2 GetBibsWithPendingHoldRequests
-
-  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
-
-Return an arrayref of the biblionumbers of all bibs
-that have one or more unfilled hold requests.
-
-=cut
-
-sub GetBibsWithPendingHoldRequests {
-    my $dbh = C4::Context->dbh;
-
-    my $bib_query = "SELECT DISTINCT biblionumber
-                     FROM reserves
-                     WHERE found IS NULL
-                     AND priority > 0
-                     AND reservedate <= CURRENT_DATE()";
-    my $sth = $dbh->prepare($bib_query);
-
-    $sth->execute();
-    my $biblionumbers = $sth->fetchall_arrayref();
-
-    return [ map { $_->[0] } @$biblionumbers ];
-}
-
-=head2 GetPendingHoldRequestsForBib
-
-  my $requests = GetPendingHoldRequestsForBib($biblionumber);
-
-Returns an arrayref of hashrefs to pending, unfilled hold requests
-on the bib identified by $biblionumber.  The following keys
-are present in each hashref:
-
-    biblionumber
-    borrowernumber
-    itemnumber
-    priority
-    branchcode
-    reservedate
-    reservenotes
-    borrowerbranch
-
-The arrayref is sorted in order of increasing priority.
-
-=cut
-
-sub GetPendingHoldRequestsForBib {
-    my $biblionumber = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode, 
-                                reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
-                         FROM reserves
-                         JOIN borrowers USING (borrowernumber)
-                         WHERE biblionumber = ?
-                         AND found IS NULL
-                         AND priority > 0
-                         AND reservedate <= CURRENT_DATE()
-                         ORDER BY priority";
-    my $sth = $dbh->prepare($request_query);
-    $sth->execute($biblionumber);
-
-    my $requests = $sth->fetchall_arrayref({});
-    return $requests;
-
-}
-
-=head2 GetItemsAvailableToFillHoldRequestsForBib
-
-  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber);
-
-Returns an arrayref of items available to fill hold requests
-for the bib identified by C<$biblionumber>.  An item is available
-to fill a hold request if and only if:
-
-    * it is not on loan
-    * it is not withdrawn
-    * it is not marked notforloan
-    * it is not currently in transit
-    * it is not lost
-    * it is not sitting on the hold shelf
-
-=cut
-
-sub GetItemsAvailableToFillHoldRequestsForBib {
-    my $biblionumber = shift;
-    my @branches_to_use = @_;
-
-    my $dbh = C4::Context->dbh;
-    my $items_query = "SELECT itemnumber, homebranch, holdingbranch, itemtypes.itemtype AS itype
-                       FROM items ";
-
-    if (C4::Context->preference('item-level_itypes')) {
-        $items_query .=   "LEFT JOIN itemtypes ON (itemtypes.itemtype = items.itype) ";
-    } else {
-        $items_query .=   "JOIN biblioitems USING (biblioitemnumber)
-                           LEFT JOIN itemtypes USING (itemtype) ";
-    }
-    $items_query .=   "WHERE items.notforloan = 0
-                       AND holdingbranch IS NOT NULL
-                       AND itemlost = 0
-                       AND wthdrawn = 0";
-    $items_query .=   " AND damaged = 0 " unless C4::Context->preference('AllowHoldsOnDamagedItems');
-    $items_query .=   " AND items.onloan IS NULL
-                       AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0)
-                       AND itemnumber NOT IN (
-                           SELECT itemnumber
-                           FROM reserves
-                           WHERE biblionumber = ?
-                           AND itemnumber IS NOT NULL
-                           AND (found IS NOT NULL OR priority = 0)
-                        )
-                       AND items.biblionumber = ?";
-    my @params = ($biblionumber, $biblionumber);
-    if ($#branches_to_use > -1) {
-        $items_query .= " AND holdingbranch IN (" . join (",", map { "?" } @branches_to_use) . ")";
-        push @params, @branches_to_use;
-    }
-    my $sth = $dbh->prepare($items_query);
-    $sth->execute(@params);
-
-    my $items = $sth->fetchall_arrayref({});
-    $items = [ grep { my @transfers = GetTransfers($_->{itemnumber}); $#transfers == -1; } @$items ]; 
-    map { my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype}); $_->{holdallowed} = $rule->{holdallowed}; $rule->{holdallowed} != 0 } @$items;
-    return [ grep { $_->{holdallowed} != 0 } @$items ];
-}
-
-=head2 MapItemsToHoldRequests
-
-  MapItemsToHoldRequests($hold_requests, $available_items);
-
-=cut
-
-sub MapItemsToHoldRequests {
-    my $hold_requests = shift;
-    my $available_items = shift;
-    my @branches_to_use = @_;
-
-    # handle trival cases
-    return unless scalar(@$hold_requests) > 0;
-    return unless scalar(@$available_items) > 0;
-
-    # identify item-level requests
-    my %specific_items_requested = map { $_->{itemnumber} => 1 } 
-                                   grep { defined($_->{itemnumber}) }
-                                   @$hold_requests;
-
-    # group available items by itemnumber
-    my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
-
-    # items already allocated
-    my %allocated_items = ();
-
-    # map of items to hold requests
-    my %item_map = ();
- 
-    # figure out which item-level requests can be filled    
-    my $num_items_remaining = scalar(@$available_items);
-    foreach my $request (@$hold_requests) {
-        last if $num_items_remaining == 0;
-
-        # is this an item-level request?
-        if (defined($request->{itemnumber})) {
-            # fill it if possible; if not skip it
-            if (exists $items_by_itemnumber{$request->{itemnumber}} and
-                not exists $allocated_items{$request->{itemnumber}}) {
-                $item_map{$request->{itemnumber}} = { 
-                    borrowernumber => $request->{borrowernumber},
-                    biblionumber => $request->{biblionumber},
-                    holdingbranch =>  $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
-                    pickup_branch => $request->{branchcode},
-                    item_level => 1,
-                    reservedate => $request->{reservedate},
-                    reservenotes => $request->{reservenotes},
-                };
-                $allocated_items{$request->{itemnumber}}++;
-                $num_items_remaining--;
-            }
-        } else {
-            # it's title-level request that will take up one item
-            $num_items_remaining--;
-        }
-    }
-
-    # group available items by branch
-    my %items_by_branch = ();
-    foreach my $item (@$available_items) {
-        push @{ $items_by_branch{ $item->{holdingbranch} } }, $item unless exists $allocated_items{ $item->{itemnumber} };
-    }
-
-    # now handle the title-level requests
-    $num_items_remaining = scalar(@$available_items) - scalar(keys %allocated_items); 
-    foreach my $request (@$hold_requests) {
-        last if $num_items_remaining <= 0;
-        next if defined($request->{itemnumber}); # already handled these
-
-        # look for local match first
-        my $pickup_branch = $request->{branchcode};
-        if (exists $items_by_branch{$pickup_branch} and 
-            not ($items_by_branch{$pickup_branch}->[0]->{holdallowed} == 1 and 
-                 $request->{borrowerbranch} ne $items_by_branch{$pickup_branch}->[0]->{homebranch}) 
-           ) {
-            my $item = pop @{ $items_by_branch{$pickup_branch} };
-            delete $items_by_branch{$pickup_branch} if scalar(@{ $items_by_branch{$pickup_branch} }) == 0;
-            $item_map{$item->{itemnumber}} = { 
-                                                borrowernumber => $request->{borrowernumber},
-                                                biblionumber => $request->{biblionumber},
-                                                holdingbranch => $pickup_branch,
-                                                pickup_branch => $pickup_branch,
-                                                item_level => 0,
-                                                reservedate => $request->{reservedate},
-                                                reservenotes => $request->{reservenotes},
-                                             };
-            $num_items_remaining--;
-        } else {
-            my @pull_branches = ();
-            if ($#branches_to_use > -1) {
-                @pull_branches = @branches_to_use;
-            } else {
-                @pull_branches = sort keys %items_by_branch;
-            }
-            foreach my $branch (@pull_branches) {
-                next unless exists $items_by_branch{$branch} and
-                            not ($items_by_branch{$branch}->[0]->{holdallowed} == 1 and 
-                                $request->{borrowerbranch} ne $items_by_branch{$branch}->[0]->{homebranch});
-                my $item = pop @{ $items_by_branch{$branch} };
-                delete $items_by_branch{$branch} if scalar(@{ $items_by_branch{$branch} }) == 0;
-                $item_map{$item->{itemnumber}} = { 
-                                                    borrowernumber => $request->{borrowernumber},
-                                                    biblionumber => $request->{biblionumber},
-                                                    holdingbranch => $branch,
-                                                    pickup_branch => $pickup_branch,
-                                                    item_level => 0,
-                                                    reservedate => $request->{reservedate},
-                                                    reservenotes => $request->{reservenotes},
-                                                 };
-                $num_items_remaining--; 
-                last;
-            }
-        }
-    }
-    return \%item_map;
-}
-
-=head2 CreatePickListFromItemMap 
-
-=cut
-
-sub CreatePicklistFromItemMap {
-    my $item_map = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $sth_load=$dbh->prepare("
-        INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
-                                    cardnumber,reservedate,title, itemcallnumber,
-                                    holdingbranch,pickbranch,notes, item_level_request)
-        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-    ");
-
-    foreach my $itemnumber  (sort keys %$item_map) {
-        my $mapped_item = $item_map->{$itemnumber};
-        my $biblionumber = $mapped_item->{biblionumber}; 
-        my $borrowernumber = $mapped_item->{borrowernumber}; 
-        my $pickbranch = $mapped_item->{pickup_branch};
-        my $holdingbranch = $mapped_item->{holdingbranch};
-        my $reservedate = $mapped_item->{reservedate};
-        my $reservenotes = $mapped_item->{reservenotes};
-        my $item_level = $mapped_item->{item_level};
-
-        my $item = GetItem($itemnumber);
-        my $barcode = $item->{barcode};
-        my $itemcallnumber = $item->{itemcallnumber};
-
-        my $borrower = GetMember('borrowernumber'=>$borrowernumber);
-        my $cardnumber = $borrower->{'cardnumber'};
-        my $surname = $borrower->{'surname'};
-        my $firstname = $borrower->{'firstname'};
-        my $phone = $borrower->{'phone'};
-   
-        my $bib = GetBiblioData($biblionumber);
-        my $title = $bib->{title}; 
-
-        $sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
-                           $cardnumber, $reservedate, $title, $itemcallnumber,
-                           $holdingbranch, $pickbranch, $reservenotes, $item_level);
-    }
-}
-
-=head2 AddToHoldTargetMap
-
-=cut
-
-sub AddToHoldTargetMap {
-    my $item_map = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $insert_sql = q(
-        INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request)
-                               VALUES (?, ?, ?, ?, ?)
-    );
-    my $sth_insert = $dbh->prepare($insert_sql);
-
-    foreach my $itemnumber (keys %$item_map) {
-        my $mapped_item = $item_map->{$itemnumber};
-        $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber,
-                             $mapped_item->{holdingbranch}, $mapped_item->{item_level});
-    }
-}
-
-=head2 _get_branches_to_pull_from
-
-Query system preferences to get ordered list of
-branches to use to fill hold requests.
-
-=cut
-
-sub _get_branches_to_pull_from {
-    my @branches_to_use = ();
-  
-    my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight");
-    if ($static_branch_list) {
-        @branches_to_use = map { s/^\s+//; s/\s+$//; $_; } split /,/, $static_branch_list;
-    }
-
-    @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
-
-    return @branches_to_use;
-}
diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t
new file mode 100755
index 0000000..6cce4d9
--- /dev/null
+++ b/t/db_dependent/HoldsQueue.t
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+
+# Test C4::HoldsQueue::CreateQueue() for both transport cost matrix
+# and StaticHoldsQueueWeight array (no RandomizeHoldsQueueWeight, no point)
+# Wraps tests in transaction that's rolled back, so no data is destroyed
+# MySQL WARNING: This makes sense only if your tables are InnoDB, otherwise
+# transactions are not supported and mess is left behind
+
+use strict;
+use warnings;
+use C4::Context;
+
+use Data::Dumper;
+
+use Test::More tests => 15;
+
+BEGIN {
+	use FindBin;
+	use lib $FindBin::Bin;
+	use_ok('C4::Reserves');
+	use_ok('C4::HoldsQueue');
+}
+
+my $TITLE = "Test Holds Queue XXX";
+# Pick a plausible borrower. Easier than creating one.
+my $BORROWER_QRY = <dbh;
+my $borrower = $dbh->selectrow_hashref($BORROWER_QRY);
+my $borrowernumber = $borrower->{borrowernumber};
+# Set special (for this test) branches
+my $borrower_branchcode = $borrower->{branchcode};
+my @other_branches = grep { $_ ne $borrower_branchcode } @{ $dbh->selectcol_arrayref("SELECT branchcode FROM branches") };
+my $least_cost_branch_code = pop @other_branches
+ or BAIL_OUT("No point testing only one branch...");
+
+# Start transaction
+$dbh->{AutoCommit} = 0;
+$dbh->{RaiseError} = 1;
+
+#Set up the stage
+# Sysprefs and cost matrix
+$dbh->do("UPDATE systempreferences SET value = ? WHERE variable = 'StaticHoldsQueueWeight'", undef,
+         join( ',', @other_branches, $borrower_branchcode, $least_cost_branch_code));
+$dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'RandomizeHoldsQueueWeight'");
+
+$dbh->do("DELETE FROM transport_cost");
+my $transport_cost_insert_sth = $dbh->prepare("insert into transport_cost (frombranch, tobranch, cost) values (?, ?, ?)");
+# Favour $least_cost_branch_code
+$transport_cost_insert_sth->execute($borrower_branchcode, $least_cost_branch_code, 0.2);
+$transport_cost_insert_sth->execute($least_cost_branch_code, $borrower_branchcode, 0.2);
+my @b = @other_branches;
+while ( my $b1 = shift @b ) {
+    foreach my $b2 ($borrower_branchcode, $least_cost_branch_code, @b) {
+        $transport_cost_insert_sth->execute($b1, $b2, 0.5);
+        $transport_cost_insert_sth->execute($b2, $b1, 0.5);
+    }
+}
+
+
+# Loanable items - all possible combinations of homebranch and holdingbranch
+$dbh->do("INSERT INTO biblio (frameworkcode, author, title, datecreated)
+          VALUES             ('SER', 'Koha test', '$TITLE', '2011-02-01')");
+my $biblionumber = $dbh->selectrow_array("SELECT biblionumber FROM biblio WHERE title = '$TITLE'")
+  or BAIL_OUT("Cannot find newly created biblio record");
+$dbh->do("INSERT INTO biblioitems (biblionumber, marcxml)
+          VALUES                  ($biblionumber, '')");
+my $biblioitemnumber = $dbh->selectrow_array("SELECT biblioitemnumber FROM biblioitems WHERE biblionumber = $biblionumber")
+  or BAIL_OUT("Cannot find newly created biblioitems record");
+
+my $items_insert_sth = $dbh->prepare("INSERT INTO items (biblionumber, biblioitemnumber, barcode, homebranch, holdingbranch, notforloan, damaged, itemlost, wthdrawn, onloan)
+                                      VALUES            ($biblionumber, $biblioitemnumber, ?, ?, ?, 0, 0, 0, 0, NULL)"); # CURRENT_DATE - 3)");
+my $first_barcode = int(rand(1000000000000)); # XXX
+my $barcode = $first_barcode;
+foreach ( $borrower_branchcode, $least_cost_branch_code, @other_branches ) {
+    $items_insert_sth->execute($barcode++, $borrower_branchcode, $_);
+    $items_insert_sth->execute($barcode++, $_, $_);
+    $items_insert_sth->execute($barcode++, $_, $borrower_branchcode);
+}
+
+# Remove existing reserves, makes debugging easier
+$dbh->do("DELETE FROM reserves");
+my $constraint = undef;
+my $bibitems = undef;
+my $priority = 1;
+# Make a reserve
+AddReserve ( $borrower_branchcode, $borrowernumber, $biblionumber, $constraint, $bibitems,  $priority );
+#                           $resdate, $expdate, $notes, $title, $checkitem, $found
+$dbh->do("UPDATE reserves SET reservedate = reservedate - 1");
+
+# Tests
+my $use_cost_matrix_sth = $dbh->prepare("UPDATE systempreferences SET value = ? WHERE variable = 'UseTransportCostMatrix'");
+my $test_sth = $dbh->prepare("SELECT * FROM hold_fill_targets
+                              JOIN tmp_holdsqueue USING (borrowernumber, biblionumber, itemnumber)
+                              JOIN items USING (itemnumber)
+                              WHERE borrowernumber = $borrowernumber");
+
+# We have a book available homed in borrower branch
+test_queue ('take from homebranch',  0, $borrower_branchcode, $borrower_branchcode);
+test_queue ('take from homebranch',  1, $borrower_branchcode, $borrower_branchcode);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE homebranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE homebranch = '$borrower_branchcode'");
+# We have a book available held in borrower branch
+test_queue ('take from holdingbranch', 0, $borrower_branchcode, $borrower_branchcode);
+test_queue ('take from holdingbranch', 1, $borrower_branchcode, $borrower_branchcode);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE holdingbranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE holdingbranch = '$borrower_branchcode'");
+# No book available in borrower branch, pick according to the rules
+# Frst branch from StaticHoldsQueueWeight
+test_queue ('take from lowest cost branch', 0, $borrower_branchcode, $other_branches[0]);
+test_queue ('take from lowest cost branch', 1, $borrower_branchcode, $least_cost_branch_code);
+my $queue = C4::HoldsQueue::GetHoldsQueueItems($least_cost_branch_code) || [];
+my $queue_item = $queue->[0];
+ok( $queue_item
+ && $queue_item->{pickbranch} eq $borrower_branchcode
+ && $queue_item->{holdingbranch} eq $least_cost_branch_code, "GetHoldsQueueItems" )
+  or diag( "Expected item for pick $borrower_branchcode, hold $least_cost_branch_code, got ".Dumper($queue_item) );
+
+# XXX All this tests are for borrower branch pick-up.
+# Maybe needs expanding to homebranch or holdingbranch pick-up.
+
+# Cleanup
+$dbh->rollback;
+
+exit;
+
+sub test_queue {
+    my ($test_name, $use_cost_matrix, $pick_branch, $hold_branch) = @_;
+
+    $test_name = "$test_name (".($use_cost_matrix ? "" : "don't")." use cost matrix)";
+
+    $use_cost_matrix_sth->execute($use_cost_matrix);
+    C4::Context->_flush_preferences();
+    C4::HoldsQueue::CreateQueue();
+
+    my $results = $dbh->selectall_arrayref($test_sth, { Slice => {} }); # should be only one
+    my $r = $results->[0];
+
+    my $ok = is( $r->{pickbranch}, $pick_branch, "$test_name pick up branch");
+    $ok &&=  is( $r->{holdingbranch}, $hold_branch, "$test_name holding branch")
+      if $hold_branch;
+
+    diag( "Wrong pick-up/hold: ". Dumper ($pick_branch,, $hold_branch, map dump_records($_), qw(reserves hold_fill_targets tmp_holdsqueue)) )
+      unless $ok;
+}
+
+sub dump_records {
+    my ($tablename) = @_;
+    return $dbh->selectall_arrayref("SELECT * from $tablename where borrowernumber = ?", { Slice => {} }, $borrowernumber);
+}
+
+
-- 
1.7.9.5


From oleonard at myacpl.org  Wed May 16 15:29:17 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 16 May 2012 09:29:17 -0400
Subject: [Koha-patches] [PATCH] Bug 8108 - Remove unused images from the OPAC
Message-ID: <1337174957-8219-1-git-send-email-oleonard@myacpl.org>

Removing image files which are no longer used. Some have been
replaced by a sprite, some by CSS gradients, and some are
simply left behind from previous designs.
---
 koha-tmpl/opac-tmpl/prog/images/addtobasket.gif    |  Bin 115 -> 0 bytes
 .../opac-tmpl/prog/images/addtolist-small.gif      |  Bin 487 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/addtoshelf.gif     |  Bin 121 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/alert.gif          |  Bin 605 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/back.gif           |  Bin 175 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/bluestars.png      |  Bin 2681 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/brief.gif          |  Bin 97 -> 0 bytes
 .../prog/images/button-background-gradient.png     |  Bin 2111 -> 0 bytes
 .../opac-tmpl/prog/images/button-background.png    |  Bin 824 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/cart-small.gif     |  Bin 456 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/cart.gif           |  Bin 330 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/cart2.gif          |  Bin 97 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/check.png          |  Bin 210 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/checkall.gif       |  Bin 83 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/checknone.gif      |  Bin 83 -> 0 bytes
 .../opac-tmpl/prog/images/checkout-bottom-left.gif |  Bin 1007 -> 0 bytes
 .../prog/images/checkout-bottom-right.gif          |  Bin 502 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/checkout-right.gif |  Bin 104 -> 0 bytes
 .../opac-tmpl/prog/images/checkout-top-left.gif    |  Bin 2094 -> 0 bytes
 .../opac-tmpl/prog/images/checkout-top-right.gif   |  Bin 870 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/checks.png         |  Bin 223 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/clearbasket.gif    |  Bin 114 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/close.gif          |  Bin 106 -> 0 bytes
 .../prog/images/delete-shelf-disabled.gif          |  Bin 117 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/detail.gif         |  Bin 97 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/download.png       |  Bin 425 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/empty-small.png    |  Bin 474 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/emptystars.png     |  Bin 1508 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/further-bullet.gif |  Bin 100 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/highlight.gif      |  Bin 111 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/ico_b_results.gif  |  Bin 58 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/isbd.gif           |  Bin 301 -> 0 bytes
 .../opac-tmpl/prog/images/koha-logo-black.png      |  Bin 6263 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/koha-logo-blue.png |  Bin 1652 -> 0 bytes
 .../opac-tmpl/prog/images/koha-logo-yellow.png     |  Bin 5733 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/list.gif           |  Bin 49 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/marc.gif           |  Bin 287 -> 0 bytes
 .../prog/images/member-menu-background-hover.gif   |  Bin 396 -> 0 bytes
 .../prog/images/member-menu-background-link.gif    |  Bin 396 -> 0 bytes
 .../images/member-menu-background-logout-hover.gif |  Bin 360 -> 0 bytes
 .../prog/images/member-menu-background-logout.gif  |  Bin 353 -> 0 bytes
 .../prog/images/member-menu-background.gif         |  Bin 394 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/menu-arrow.gif     |  Bin 54 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/new.gif            |  Bin 503 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/normal.gif         |  Bin 280 -> 0 bytes
 .../prog/images/place-hold-small-disabled.png      |  Bin 316 -> 0 bytes
 .../opac-tmpl/prog/images/place-hold-small.png     |  Bin 430 -> 0 bytes
 .../opac-tmpl/prog/images/placehold-small.gif      |  Bin 121 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/placereserve.gif   |  Bin 97 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/print-small.png    |  Bin 507 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/print.gif          |  Bin 106 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/send.gif           |  Bin 98 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/send.png           |  Bin 472 -> 0 bytes
 .../prog/images/shelf-delete-disabled.gif          |  Bin 118 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/shelf-delete.gif   |  Bin 117 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/shelf-edit.gif     |  Bin 303 -> 0 bytes
 .../opac-tmpl/prog/images/shelf-new-disabled.gif   |  Bin 300 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/shelf-new.gif      |  Bin 305 -> 0 bytes
 .../opac-tmpl/prog/images/star-ratings-empty.png   |  Bin 449 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/star-ratings.png   |  Bin 908 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/tag.gif            |  Bin 81 -> 0 bytes
 .../opac-tmpl/prog/images/tags-small-disabled.png  |  Bin 316 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/tags-small.png     |  Bin 361 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/tags.gif           |  Bin 93 -> 0 bytes
 .../opac-tmpl/prog/images/transaction-complete.gif |  Bin 206 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/trash.gif          |  Bin 103 -> 0 bytes
 66 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/addtobasket.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/addtolist-small.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/addtoshelf.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/alert.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/back.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/bluestars.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/brief.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/button-background-gradient.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/button-background.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/cart-small.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/cart.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/cart2.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/check.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/checkall.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/checknone.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/checkout-bottom-left.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/checkout-bottom-right.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/checkout-right.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/checkout-top-left.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/checkout-top-right.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/checks.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/clearbasket.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/close.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/delete-shelf-disabled.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/detail.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/download.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/empty-small.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/emptystars.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/further-bullet.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/highlight.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/ico_b_results.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/isbd.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/koha-logo-black.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/koha-logo-blue.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/koha-logo-yellow.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/list.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/marc.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/member-menu-background-hover.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/member-menu-background-link.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/member-menu-background-logout-hover.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/member-menu-background-logout.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/member-menu-background.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/menu-arrow.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/new.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/normal.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/place-hold-small-disabled.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/place-hold-small.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/placehold-small.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/placereserve.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/print-small.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/print.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/send.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/send.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/shelf-delete-disabled.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/shelf-delete.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/shelf-edit.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/shelf-new-disabled.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/shelf-new.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/star-ratings-empty.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/star-ratings.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/tag.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/tags-small-disabled.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/tags-small.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/tags.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/transaction-complete.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/trash.gif

diff --git a/koha-tmpl/opac-tmpl/prog/images/addtobasket.gif b/koha-tmpl/opac-tmpl/prog/images/addtobasket.gif
deleted file mode 100644
index 9d2ce0fd2e49a0560546ac83f4e1a359187bc50b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 115
zcmZ?wbhEHb6k!l$n8?iV9|X>r9_qYE$&>!
ziSusW%r|v1U|V9TtH4p>nRzVb^ns5W7gqT^+SSDUD`w(6*00qIRko)Hs-70q-gA4)
PCa%D3cit^xV6X-NB%&|K

diff --git a/koha-tmpl/opac-tmpl/prog/images/addtolist-small.gif b/koha-tmpl/opac-tmpl/prog/images/addtolist-small.gif
deleted file mode 100644
index 03b4c83debcb8b8f3738006d66bc7b74b7a73585..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmZ?wbhEHb6xgU5(yATZtDiVUKWWO#&wn+-JHGw?XP7$u)tA4z at e|*F
z|M%_Jf34_V-M9%azx at 6E_uu39e_ww7ckk^V)zH=t-~Jkk-}2Q}V(`$r?9^V_d~^1e0y|Nmzg1*jpQ_>%=JpaUX7al*jv(xBYb
z+$^rr-k~DSAR*r?FE79#qNK#bK2?cPQIt(oaRIj?6RQv>zsyQrJ}J4ia&m%PEDDm6
U!U{W?Wo5<0WTg*sG%{EN0Fw4u7XSbN

diff --git a/koha-tmpl/opac-tmpl/prog/images/addtoshelf.gif b/koha-tmpl/opac-tmpl/prog/images/addtoshelf.gif
deleted file mode 100644
index 76fe77455e6c876948fd7d8e76beb111aa67a78b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 121
zcmZ?wbhEHb6k!l$n8?iV9|X>r9zg
z^|o*`36?nub>R{VdD^;^+_vhar*gbJx90l^6}#@IbqgPyoo at WC?c{s`_nePB0hu4u
UnGG9fAAH6=ujBX=Peul70G{VCBLDyZ

diff --git a/koha-tmpl/opac-tmpl/prog/images/alert.gif b/koha-tmpl/opac-tmpl/prog/images/alert.gif
deleted file mode 100644
index 0aaeb36b4784aa5c48653133ba50d85ba9b69f21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 605
zcmV-j0;2s#Nk%w1VKo3Q0M$PL%$ZI2 at s8H5T)~7r0002VlSt>!b%=;k)vH?Dw_~J9
z5c>6!wrwk(JqNsbG?|%PySs3(VIr(q9sd27^XG at ZfI9B(kG*>~@#2H@>4~2|37a?s
zL_{g0Mh?DxIJj{yv126N-G!>EX7}!l!i7Ek`<7;AJ*!t6p+pV3buq?`M6X^T%9Tpv
z$Z+M#apui)@8E*aqEpC`M&G_ at _3Vq9H3H1cdg#%2!-hWL!))5MVW2?^ty~|OGXVep
zng9QpA^8LW002J#EC2ui05t$E000L6z at KnPEEFs)+F;&-7z#2V+S{msIe1#rk4$Vs at J_`yx2z*U6C~-cE2|YZ9OcgyTitDlJBlG>M*aO
z2oWXmwXnjkqz?-gYzEvzg`mxPpMeG?j1pjwfu9ykn8;Z&;uJ|AfMO#6vSdaXQ8)r!
zN1&a}8$CurAqmt+h!AB{I%$NWW!bX$ayaoo=&jvFF?x__vYC>n+1pxp%Z4er5

diff --git a/koha-tmpl/opac-tmpl/prog/images/back.gif b/koha-tmpl/opac-tmpl/prog/images/back.gif
deleted file mode 100644
index 5c11f61598aafe24de1919319a4bac3ebd5ac2a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 175
zcmZ?wbhEHblw*)%Sj56`=6 at PP+Drx@m}$%~6U+c{7!-f9FfuT(FzA3dAhit4B_6x(
z{4+Sk$-37&!iV)n%oE;(7d=aUE?Dwx-})nb4!QTsZk};||9 at YD9y5bf|Dn*2CwTZO
zeUm3K_A)K+TJ^R4EZerT>%@CxgjnK at uGjdjW=~o*TV{GO^N&4p=g;j(Y|xXzO!dvH&N8H2`T^Ko9@`

diff --git a/koha-tmpl/opac-tmpl/prog/images/bluestars.png b/koha-tmpl/opac-tmpl/prog/images/bluestars.png
deleted file mode 100644
index a93489693ee8917d6ae121027e51bf0ab3ae9486..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2681
zcmV-<3WoKGP)(UsT<#i&;E#`g~YL4k|SC2
z_4%I9{hfP#ukSHRDWOv1%=cqLL^N-tw^a;R(Kz>SB*??lmv#e-92SbiEmJSO at W}V
zIVyPYj!OB8CxlVY9Uj+gbUNZdiF4Uh3uMgQ>UPdTm!lRabuFK=N8PJjjyiBT>VQ#K
z%Tzr|UCUjLTJSh$Bc<*s|86qkT;^2b;C9VIMm5ZjBO02$2Q>NdN&=
z!_26N1UT~+y+WUqcAs4sPFwb69RQ<#&%)?9??FV;JI)IhJwFl(oO%X|UjH~RHrDgG
z7eoWIssRUyx>Bp^(>$UY+V~ij8{Sk>9x=
zA`2F>q`N1v>L!podyD%(m`--AIkiFb7
z!844$qBrm;A%b$|-%%gCZx(01 at t*1TE)yuK#
zrQ{w<&;0Y)a6a*{lro27mlcW#-lOo));V=sf{F;)AZISVnih8x;|HYHr=nKoMGb&(L}2g+D>w
zNdMk2`%A941rI*x5aB21)ITN_9<<7N!$y*y>DqyLQ~#Y|_V1q5QzB2yt$Pdv50v-v
zNpa at F_Cns&pE1mV_eVd+@#{Q9)D#hUEvB_J#6qi#Qdp}0GjS>TK{9V7ACOXZm)kKS
zMg-S(#k5swJiMmARHj!y;_pfAAIh8Q%~Hyq3SLZbZD%}mt1lL687P%Wq(4%7(g(7J
zsc)82CMtMwg@<;=!?$^&+KNo6Oi${=Ktew_V3_(QDP^*PS0lK#t0uh871fqc;{8oc
z=!bPUIGBtC_+0L3$;w*?bi&me@&HM4*=Y%h|sa9wqk-OWdRcUN4~tFudUMS
zM#RD}OUDt at bk(>tr9n}yvpd$BZ~4)=Me7s`UcC=Dt!MA_1pT6GOzBN_T at X
zZJx(9J2jc-5YZSShNP6~@%<&A*%|e24hL at OEP_3~`eAY at xmS#C$3iV98TI|N%Hn`h
z_d}83^5X!I0DweyYM=W;;ywT9c2ryWIiv1JtM^=w#6qjS936kLcaQgC?;h{yb|kp`
zOG at 1jSL-qAel)7B{Csr$g~WUQ?$kc_81Fcx?uV{ozK_JT)nmMO)$Y`O*XVXQc*|Fm
zx;K>?Tk?bu!j}d8OTGetMCXO=wHJHe at 9s%|c&g+4wpjp>a621LQzGV9TOdKUBW40!I{U&R07&>fjVBQKg6chft>1I)2>?j6pL^-rMEXEFkv@=a
zKljH*07wM=OWFvs#npOI9sXMuEsN?*$`D45#S5e(3(6?^m8IHgcwRS#~bf*70O(cIf0W%g#M**}3Nj
zbDjH-w?BTTVP|Y2hLaX=jDhO?ljDde!TthI|p-}`z<^7yk+N}&JLYC*4FW4t7Yd>oT*(^dP^Nj
z?37{l>&M%FanDfh%wEgBQuI#zy{+R{YixTs$(b*Kh_fdEQp#_<2vMGy5xx5%M!oML
zvYW>DBalUuy7x51H{MT(^2+%B33+7CMS?5V5~Az|AUBTh2Ov#^DDT8Vt6LD+i&c0p
zMYUC{2~pkwAk8JbWTq60q{)#
zJOTiuOpXBHr$sMTCKm(1*8%Wwxr0~qj*RRZqGfWmBm2aUp}16-B*y{pXweIo_sHu2
zc%bYF0f1%zcozU%mA(l8AOLVD0IVyMxfuZ7snT-*z#9Ots!V28G2^%jZ|O97uHsy7
nE|XaY0DlGmaTVSTV?X~NK7nZ**ZFP;00000NkvXXu0mjf1(Ft1

diff --git a/koha-tmpl/opac-tmpl/prog/images/brief.gif b/koha-tmpl/opac-tmpl/prog/images/brief.gif
deleted file mode 100644
index 9b0efe72945b0dcc5b70644990a39001321a6c11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 97
zcmZ?wbhEHb6k!l$n8?iV|NnoJyjB1Ip8+xyf3h$#FfcRdFaQBao`K0|PXEf&Z~3EV
x822d@@d?&#~tz_9*=IcwKTAYZb?
zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K at MNkD0|Wa-PZ!6Kid#v4{{R2)!^Xs*
z&=Aq^LtoLAfzf4(QUimMm!JbfqsU*yB^(M39YHJt4lbHZ910T_-ER?LWDyALVqogf
zfGK9u{N?HaR4=#`q<9k_kTBvz*0$&l$bh4=KqaX{nCcLUBiVuKX2NV+WTXz$0oH~f
zKo&W4{SyQ`46GhRD7gOT1i4a;O^E?!3*708Fx?IIB*f99%HXj+8X$<2J*-lQ!{Lv=
z!TDnm+c!q0juo0r(0q;_gTe~DWM4f0VB~e

diff --git a/koha-tmpl/opac-tmpl/prog/images/button-background.png b/koha-tmpl/opac-tmpl/prog/images/button-background.png
deleted file mode 100644
index 82f59531a82e9dffb5583f90cdb485065f398875..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 824
zcmeAS at N?(olHy`uVBq!ia0y~yVEhPVAK_pIk~?%>JOxtB#ZI0f92^|CANoH4a-9Nv
zLR|m<|Id&%6OQf;#`!PSdy8arx22vo62BdsBdJUZ(za6DxV2dp-=);5uBe^
zQl40p%HW%rT$G=inv$8Q;FejGTAp8&U98|6v3sJH3IhX^tfz}(NX4ADmji{f at _yTW`)#A!-1OAs{qKr7U*AQX>o2t3
zTgB?XrLO1YBh}L~pRY<+XdTTKSs%E^?W5EvV^9Xdzi$2Y_YMf_7ROuFVdQ&MBb at 08}(`
A2LJ#7

diff --git a/koha-tmpl/opac-tmpl/prog/images/cart-small.gif b/koha-tmpl/opac-tmpl/prog/images/cart-small.gif
deleted file mode 100644
index e7899a7e02f4f64b41b9525c0c4bbc3b3e5d362e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 456
zcmZ?wbhEHbk

diff --git a/koha-tmpl/opac-tmpl/prog/images/cart.gif b/koha-tmpl/opac-tmpl/prog/images/cart.gif
deleted file mode 100644
index 560cc288f976dacc5e2ee8e7c8ce3f56d9e8fb9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmZ?wbhEHb8Jb~xA-+}wa!~;SGdHhZlhD#imQuTiylanF?Z%|3#~CO9
zia%Kx85nec5C}kiVqi;m;A(Z%k?QO}{_2Fvyjea>i!M3{Sa5JSdf#DTYR!KottTMP
z&+`dp=$HJGPP^-+}wa2Hpb
X?V`fYw}_36oz0z#Yo(HlBZD;n`Q~Q;

diff --git a/koha-tmpl/opac-tmpl/prog/images/cart2.gif b/koha-tmpl/opac-tmpl/prog/images/cart2.gif
deleted file mode 100644
index 443e521f1d51ba1cbeacaf8bbeffe21668fc6ad8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 97
zcmZ?wbhEHb6lD-$n8?InlDF#r|1%6=p!k!8k%57UK?lSG$ulq+P3d2G`Yr!~3?#4ne^UZdEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=?1^9%xns;yg|Nno0&Gg4W5vGzL
zzu^B2Pq!O*0eLQ-E{-7;w~`WC7#kRp8ZI+1vZNXs7%;I2Fe@|9ICy|Vz=0=0Prw)`
yFoVfZf|03%QHhm>f$<2#b$*~!!Dj|09tLg}2HUjyoo9gNF?hQAxvXM?cUvaUz35s8US3V8GZl&

diff --git a/koha-tmpl/opac-tmpl/prog/images/checknone.gif b/koha-tmpl/opac-tmpl/prog/images/checknone.gif
deleted file mode 100644
index 372cc4a69812098b764e36ad7825074356e09069..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 83
zcmZ?wbhEHb6k-r!XkcVGbLPzd|Nj+#vM at 3*Ff!;c00Bsbfk~@JzTx!B+If=&G`zLX
l6`18Ugo(Q;TPCIKSi3BuRzYdyi_&}BcJJ=IugSn*4FD;F9D4u&

diff --git a/koha-tmpl/opac-tmpl/prog/images/checkout-bottom-left.gif b/koha-tmpl/opac-tmpl/prog/images/checkout-bottom-left.gif
deleted file mode 100644
index 0ae44aa8f13bc0b12f858113a7813413fbf505a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1007
zcmV#z
zZYg?t8c$Cyii#j#UkxWGEQ5m`SXeG>XqB^)F_V+Fxr=I)f4{_(q_2mAtdJBvJui-q
z7ez%el9Dfsj1e?6DPCGynv9~Se=v)StFnj{K0YjjgjQ@>8A?hle||z(OLBi>k(_y|
zuZ1Xic at HiwBWP$dnVHPYnE(I)0000000000000000000000000000000000000000
z00000A^8LV00000EC2ui0DJ;h000L6z*uY`D;kf;q;kn at I-k&}bV{vSuh^`1%k6r<
z;IMd1E}M-);(5((yWjA*d`_?1 at 9Q*v&+q&HfPsR8gkO4vh>41ejE#xVgH!TeiHvz`??@zQe}H$jOk!
z%FWKt&~nVt)YaD4Rnyqp+}+gL-r?foyWr&K=;@~B>h13DkL>XC^!0r5_WAnzX88R7
z00U+lBCw#rgI4?@T*%O#!iEqdqI)Q at qD5>JFKXPVEF;H{AbEKVNwOrYktS2B6oqo7
z%a at i~!kkG{k<6MnbNacdv!_r0X#{@?9g2u2(W6MY7){Ewsg$Koqe?{rb*fdTRj+D2
znsuvJpIyI-tr>Q#S(jzcsx6szty_+5-^#5RcdlKAb?@pen0K#VetrK6t`~T)VRwZO
zD?XQav14zIA4|R#d9r0_l`m^fmU**hVVysVE*EsPX~3mVt0tU!wQIz!U(043d$w)J
zwQuXDoO`!#%)NgL=Nx>vanQw&D<`dHxpU;rpGzk_VY+o)LNZ+6PD at A#?%+?x7;z!I
z`BXv-SUAsqln??bFtnfVNk|M25=hYBf5|?90wA!!-+;^5*MSQMoX`S+4BBKL0tPG)
zfd(q9AVLKVW(bIVLLfl at 0R%8GP{IcNCL^Be;X8_fCC4hz<~f%R%zvxSZ1l^mRxq}<(FWFDdw1D
zmTBghXr`&=nryb|=9_TFDd(JYvbiLO1Q^hO2?YS)=bwNED(Iku7Ha6Bh$gD&qKr1`
z=%bKED(R$@R%+>`m}aW!rkr-_>7{puD(a}DmTKy$sHUpws;su^>Z`EED(kGY)@tjm
zxaO+suDtf@>#x8DE9|hu7HjOW$R?}ovdlK??6c5DEA6z at R%`9G*k-Hkw%m5>?YH2D
dEAF`DmTT_0=%%X-?z-%@>+ZYo#%o^?06W-v@!0?X

diff --git a/koha-tmpl/opac-tmpl/prog/images/checkout-bottom-right.gif b/koha-tmpl/opac-tmpl/prog/images/checkout-bottom-right.gif
deleted file mode 100644
index eb462ef1fe64cb1866605b13020bd0bd6a33af18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 502
zcmVXlPq%R(FMJF_Mxg
zdU`L6j4q3d6FNG!xr;4^hErovjFxpIZEX!FCq-ONl%9GVR8%a5g)^C%%*>ep00000
z00000A^8LV00000EC2ui022UL000L6K%Q_&6ykEaopM)f@{Y-+vj|->r^BigYeZVP
z-KY}$^lrJ at F*toio7HY{8_Oow*YElC9{=Lyc6ot-e|~*ubb^J5dy0o}iG+`OPJEGu
zmyDH;nUIZ=os>JL at Ns7LN^aG-X|IcFWxE*H3HlW9UK7w
z*cM=bA;N_fSS3(wP%r=>tpzhoAaFo|#lb5v7*w#3Awh!&Ed&&}NPvJ14+#)J2$5n$
sgpn5y8~`D~fq at AFJ~+I%BY at 8n0T)OJ*vYe~(W6L{DqYI7DbFAPJDv;4ZU6uP

diff --git a/koha-tmpl/opac-tmpl/prog/images/checkout-right.gif b/koha-tmpl/opac-tmpl/prog/images/checkout-right.gif
deleted file mode 100644
index f97725f101388a5ce177195a3fc658a13a34a077..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 104
zcmZ?wbhEHb6lM@$Sj51f)7m;^UX at Hpi1EysXU@!IfC0syEMTS%hyt<)lYl$K>Cf+7{Jpa{K)DyU(V7R$*YU1_1n7Bjx}A

diff --git a/koha-tmpl/opac-tmpl/prog/images/checkout-top-left.gif b/koha-tmpl/opac-tmpl/prog/images/checkout-top-left.gif
deleted file mode 100644
index f7c6d27da678daeea5baf6ec2679a03e4f239431..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2094
zcmV+}2+{XPNk%w1VSEDk0mJ|RGntv5xRX4bnKhc3g|wJ*u9;`5nYhK7vBR02xs_X{
znX18=ufmyxw3)xinVq+km$;Uwz?qx8nO>)v%*>ep0000000000000000000000000
z000000000000000A^8LV00000EC2ui0DJ=Y0RRR6ARvxpX`X1Ru59bRa4gSsZQppV
z?|kq7z at TtQEEB2!;L4XUV-h+kv!>0PZ)oD&$@8Yp
zoC;b5qh4)PHS5?;*hJ9$r;fHv5
z2;zuyh)CjzZkUMTifO3G;)`Us2qTL!&WK`-Hj;>Ajv(&HBZofzh+&XIQb=Tx5FUvn
zgGw%mV3SS~2xXK2PDv$yR$hr;mRi!sWtZ at M2_}1Dj)`8GW|D_yn&7R;CU
zQb%W<(A|kAb9(NHT%Udt2WX(c4N53)h8~JrqKeYSXrr(_3Mp%nPKsKkmXd~Prl4)g
zDQBL3idm?lQbua2ke!MuW2&y&n1Zf4*=nqV%}Q%zu-+=9t-A8XYp<2%3apL44m($|
z#%3mLvNSHs?2XPot7Ej%_DF62wLo5r?U34TYh<_HCJAo1OpZ(Lljfc)WxDEC$!@z?
zz6|sh%<`o!zpQD at GIvUI&7j_l^Qb!SY--OwrwVk?
ztPV}|tA!ms9d+j^Lj(aw`@1EZ6
zzSq=y at X-uUe0#tjpIh?Et7Lrh$2<=`NX$=9lJwU9f_?U8RnPs^sej*@_u^-?efhYY
zkG?GGuiqc}?xziZ{A`C$zgF$vAK?7 at H^qPd2FV`)M$dm#yFhL7^
z;87eXK}%4uf-H$327_|J4Mw7a9()7{L)eHBlCVMuJYhRbsKS|~u!ZViAq)c{!x{de
zhBoZb3v&p&9rAE?8vLR2d?-Y1;IN2yI3g13pu{DXh=@*M=kd8ihrbH
zAfq@)Cl+#vheTo`i?~Q3Hu8s$GVwexlFWL-Q}
zH_y}6lXUkCT|Pax&&~A{bN{SdKqWWO#}$-u2Tfc;4Y$z2H570U?OR0kHqpCPlx`P|
zTSncs(Y1B|6m1_ZTS&z=(yx`2YbVWGO0BliskIbpFKt>(l{V9()s$#A4O&ipw$q*U
z6lXuJSx{v*)Rz^NWk*d}Qcbqhku?=$PwiM#H8$0YRh42_jaXJ4w$+7o6=7d3SXc!%
z)_;|iUuVr%TJ5#gd9 at W@Z*5mx)iu|1)shwbyO+6V>TYAv7fI(WQhImQ-SM)oz3zP!_>-|xF
zd9>dg^_N)iy)P^NJ0k+a$iOc`aI@?yU!IKkbr at P2
z-tas=d?FH0E5ssx$AweO2@{XV#nwVGi at PJ^8Jh#fAHs3AYHVY2=y*dv<`$28+`}Og
Y8Hh)gpOKSn#1%7Hgid~PBSHWGJGEOGjsO4v

diff --git a/koha-tmpl/opac-tmpl/prog/images/checkout-top-right.gif b/koha-tmpl/opac-tmpl/prog/images/checkout-top-right.gif
deleted file mode 100644
index a456e654f05bbe74f983db9ffe968b9c61634b82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 870
zcmZ?wbhEHb6lQqAc$I;{X!>-$?(V7csubemWkN%ZCQZ_9Z#SGgS+}tvXHMJfol{pG
zoSD9I#*U*i_Z^<1lABvKu~e(JcIy0UgNYM+XIDlqo4Iu7q>YDWSkIbnHGPVHPft)&
z$-4bhWg{Y5w#<|X3DIe7oieY=c;?JAXJ#_c04V-s0h_7=B0+v)VEgYdvA{z|s{h22
zAPXr|v3aK^-CPqVae7tRk^?H+qx{%7uSIbk-(*&3uxd3Q%Yq;4@=U(`;t-n2|5aIp
zU)ZHVh?%jqib722rccS5y&!eb%z1N^8kWwTI)B;P6|2^*
zS-5%StZkb%?%2J2al-2D`_^yWyJ3Iy!Cfb!PVG4pdhYO+B|Fa_xq9sA1>Z}@ZydOG
z`Oy6<4{zPPqkQl7gOiV*K6(4>{fp4&
z`T42O|G5^G&r)`7e!6LqN3+!4WhO8E7x^x>ds|ujDqxkvTCTghO6~-%jNe+;E51!9
zc%$FhD%;i5bZ&3Ye!Oey>-D*@JBmNwTUvb~FMdz;*MCo?FXbm5Xl9jH)45!be56~{
zKJCrr!qgL!RpXb%TrEmJGuyQO*_^AznHLtj&R63V)s48aI&{04t#n!LwTS%F=g$6K
zmA@`C_dDA^sqgPMHcnO#lbczY_I%;O<aVzkhz*__$oZ=6~()zl=NPmE9HnF}LxdqQ$(Xr-l{tnm>Fr
zSE&8P86n at uo;G7a8+Xx-<^}EiO%f05CGs+o+STi3Bz0)_NhEY?99yxdN9WRuM=d`W
zKEK~B at +u>-)!>{)O0V<1io||_cO8pc+ at H;O(r?G+`DBV4Q|FQnFSC~pG}Wz%S at Y<(d4oWax8
K&t;ucLK6U at T|m_U

diff --git a/koha-tmpl/opac-tmpl/prog/images/clearbasket.gif b/koha-tmpl/opac-tmpl/prog/images/clearbasket.gif
deleted file mode 100644
index b2392114b52c258c4d4e5c5e0c15f319202d439c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 114
zcmZ?wbhEHb6k!l$n8?iV9|X>r9_qYE$&>!
ziSusW%r|v1U|V9TtH4p>nRzVb^np)r+)^|jnr1m(4B0r(Ae>Q()%j?~&zyaEt|_Ua
Ni!!#~ab;w%1^~prEW!W)

diff --git a/koha-tmpl/opac-tmpl/prog/images/close.gif b/koha-tmpl/opac-tmpl/prog/images/close.gif
deleted file mode 100644
index 8f02351ab3b987fd062b5ea3b1d82e3ae7428c22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmZ?wbhEHb6k!l$n8?gvlDFzV2%G_8#h)yU3=GT+It)Mnl4oGDp3}eb^jm&qmMu}I
z9B$0vp1>O7Ub}F`!ls=|GIloUa<2LK^V;_{b-UJFIFMwT;FRvYscHJMC!D=r%e$Bu
FtO2cXEaLzG

diff --git a/koha-tmpl/opac-tmpl/prog/images/delete-shelf-disabled.gif b/koha-tmpl/opac-tmpl/prog/images/delete-shelf-disabled.gif
deleted file mode 100644
index 3d68178636f4838032901a7e7af67ad9106d5400..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmZ?wbhEHb$hImP92si1RN%H)sdcFjhy4fjvRlu*bW#;- at _#V4?&bQ>;bX_eU=0AFbRzWt

diff --git a/koha-tmpl/opac-tmpl/prog/images/download.png b/koha-tmpl/opac-tmpl/prog/images/download.png
deleted file mode 100644
index 0d5bcb89a59037437ffceaa95099057b805c46b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 425
zcmeAS at N?(olHy`uVBq!ia0vp^oIuRY!3-p4wTEj0DVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5XDgt~$TowK6zyA8C=wG+=;9aG_
zCf$UIb+fmB{dV!ir at v~Ut#z}u|Ni at 5JEr&1hd=MX{nJaB7*f4t$N6Utd2{~%|Ns2c
zU+tK_keVegKK;>8nyMVwXrDLt-M7E0p{*JbUGKjAQw?pC_pRw!y6 at t{FPYuzGJDqD
zd-dHOthduh<{;1w8YMw~!9b&k0Sx;NoDj(aQhw#il9nY6
cDh>^d47Cp2xxQJ2ATKa at y85}Sb4q9e0IZ(E+W-In

diff --git a/koha-tmpl/opac-tmpl/prog/images/empty-small.png b/koha-tmpl/opac-tmpl/prog/images/empty-small.png
deleted file mode 100644
index 74fe623cc27131a1c9bbf9d945c4f3c3f2f2d173..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 474
zcmeAS at N?(olHy`uVBq!ia0vp^oIuRY!3-p4wTEj0DVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5XrUm$fxT=M=>c&kpOrEOfSEn4@
zq!&Ly!LRn!=f6LH|NHXu-;Y246a(rt!aMX6CL1PA(~RnV_2sW>XscpC!{?v>9=`jd
z;9sW~H&H#j*u}zx?>89n<&l{okK|{ylvE=iRrz8WA1(
ziIac){`d6bU!{Nso!CBk-x{r`ZsnjR1;09#peDoQY5&2%`PY;vpbL#kg8YIZA|#Lu
zya6-b19kU!x;TbZ+)6SqF}ZT-64N9G#v=(UPV1~%z4~+-hkyf*)Ezd31&S;{R+Uv%
zm6er_RTW5y#)*Y1jx9Zw08-NSXpT*h)*-Dnki-f7g==|Qz|0jV*J&!~ug(OkNqS}U
zs%O#~h?><4v=*&WNd-$>^7&Qs>(?)!1RDcK25;ZXS>Bt0?qcwC^>bP0l+XkKuKeS?

diff --git a/koha-tmpl/opac-tmpl/prog/images/emptystars.png b/koha-tmpl/opac-tmpl/prog/images/emptystars.png
deleted file mode 100644
index e6618da51915d7b57b27665ebab778305abd4f5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1508
zcmV`;+-F9WyD>`0M#OM#nab~K-ENlIoj
zFr`;k{lB~?foVnLO#z-NGOsy}VrfcX1t3YXG*c=auNa(+lmjXvuY_P at uSJpww)Icj
zaX#QM;5zUPFrio01>OkY3eX{`p$NROz(wGq-}jc+0GtPYc3XQZ69}=p?y*diG)vZW
zpdB~{%;=qM;EZF=EGDm*_O(-d``QVyOq4VO@&s_k%q{?r_0BdRtfya?*?C}G5qJ}U
zuYs?CNk!l_m{|w#IWV;dyhqLKJKziL<#g9z(sM!p1IlyoDDlVOh_d=TS!oj|oSGIADpLDH`=yh`Vp^Rj*I1ZuK)
z-%5H8xE14ThSvpLjq$b9<8eB|yW}bVpE15x0uP8Vjot>f0Y74|9KvxI2hOsEJ=XPcUW!8f!mvhw*c6eGSD?1=*0;-i(RKC<-qL&
z79{8_aUaqIy4GVeKM!v=Ft}S?LZickj3}<|Xb+a6BR#20Xmd27?xP;?Vr}qcr6Bvf
zO{{%{q~~z1wy|lQe;mIzv#z*$;1rO0S1hR(=txjGE2+K!UOgeB$|dIt*<~m3EJU%x
zeMl=~2{DS}brG_yhhtmj7{ynC#z=WOk+qYso~|q4jcFllxH9D#z}!fAB(Sys-dbQ(
zq&y3l6)86WYYOCzjFjgBGqQLs1 at P7p`EC-vrPCwj$AQ;U&k!GsvjCD_0h)l(l2-d5
zUh_doE8{Heev!1Ckot|0)Z)C$gw!vsJYr@)I&TGGhdxQt>(1+-uv3M4w*j|l3^2`Y
z&F~62RT%Cu!ecfXXp*$ddFRM+s?cpfeEMFN)JM`L;Fg(fFte?|1xdRk^#x8zYRYGs
zAJ%n9DwVW_ at V`KYcS+KAN#%rPt1$(y(RIrtZ3C{F*=94_3|y1cDyfvPsmptK8R3=t
zCi#+?Z8ftEz)eY8oR{h_)MIi=QeR2CfC~}cZAlv?^#Oj6G^!gQX1cve7`--NYE1oj
zLi#rrXiYJF*Aw2ZeK~j&fdkIln1Z*7 at b(`7CdbrICS*k8fp=2yHhSL&fQd2nQ{DD)
z!1@%tR_7f8#^>Pear at rtRv**g6E|*HLZ?FrsohDSEJ07eao~eIylUsQlOwZpy%OMr
z^Kz!N{F at pd%M-j3 at ADuDdl6um_j#Oz?2>R+b<%l5^6>TpA14k7&R7jIx}6TUje+PBJnERm*xbWIUbYp0(euR&;J1$#3KiP+=vzc0000<
KMNUMnLSTYo3c&mT

diff --git a/koha-tmpl/opac-tmpl/prog/images/further-bullet.gif b/koha-tmpl/opac-tmpl/prog/images/further-bullet.gif
deleted file mode 100644
index f5e240f850f823e2392e02b110096db7c20d4b6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 100
zcmZ?wbhEHbWMyDw*v!T7 at y9=(hLu5W>uOeA{Q2i!(zJt~wafnhzdvXHz5igqfC?0U
mvM at 3*a53nBgh6I7um}e5wuE at HC=?oSxtnXW1!@Q~SOWkYjUgid

diff --git a/koha-tmpl/opac-tmpl/prog/images/highlight.gif b/koha-tmpl/opac-tmpl/prog/images/highlight.gif
deleted file mode 100644
index f60e9632dd44ea0ea8c9a268c0b7650178d3d62f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 111
zcmZ?wbhEHb6k!l$Sj57x at Ae~;yjA}};0zEmz<}aU7DfgJ76u)V07xwZvx	JO2z$
zd9I$S7&G%RZ`|LFZ+!{n**
zel;I|{D1iVpJDPet*9Q2 at b+h){yqEjS3hCW#~=Un5+ at s^Of^WJ_VN3_*I)m=`T9>e
zuu&_z``O38>Jja4z5osX|N6_nhwuLy0FCmkQ3`BS4Qc%k1`N~yia%Kx85lGebU=oI
z{KUZKMVIP)M0=
z{Z*aQ-CtGzsu}><@kCBiDr^8i5-*MK=VH$c4hdyq#{dL~00-zmFM^YrZ0F;ExCZW50R0E82AJU1$pBjhw8$8wXnEA{ae&P+=d)?h~=)A_;!
z3ORU%BfoLt3deloonL$W{Tzf`1^|u}^OXrlS2*%3Q%|ihCzhWCfNYnrU+vqzUn8!$
zaudurURo5N7m=t1{@eMdy~I*i9(ZJWTwqqvv}q@;CsUB>+f2<)rg7zSU4G3mOmrML35tKoO_{O`r>mfElm^
zw!jIv18?9DLcm7A0kI$n at IfZX0lPpxC4lF?sgoVfu4U&PBAazIwGJ at EUHRJ?&LVi#P6b{8eJSZK?fp$ZMP$^Ue
z)j>_rFVH#YGIRqPf*wK>&@A*f^btm25=@5`U=3IwX2W){2kZ}TfMehkI1A2$_rVo#
zJ$wr8fG at +h;1O5=zl0YMfDjP|qKxPwY{UWaMnaKjgpX`T3XpQ79%)6ok$&VJB0%Pl
z4=4Tf&Ru)$ta1Z#);j
z6<>^Rz<1;C;HU6Q1PKC*U`6mJ#1nQADhREFtAugF8zPaYLNq7(661(Fi50}t#OuTf
z;s+9yq)l=lg^|)p`$#89mq-suZ^&e_2HBPzN=_s1BR7$+ke`y at i_ygN#N5QVVmrjD
z#X7`>#a>bH6m^OnWg{hvQcgKbxkH%~$BS!-JBUY!Zx^o?KPNsWz92!9FqH6?NRlX$
zXqLDkF+;^tHKsLEJ{{e)>k%D_K56N**Q77oTVH`u0ZaL+#`8dUR&NzK3o2n
z{DAy|f}(3fkDNd7vpLrX(1OD*=uYS{^gQ))^*Z%l>8t67>hIU@*Z*Q*
zVvuOiVDQ+GYUpm5YuIi0w~@9H$Ee!q{%Z1S=hZt_cddSHtYaKye8l*H3C+aIWRFR&
z$!AkDQ@&}d>8zQWS-4q^*%+J7_F)&XubZRI?ag-cHp(^;HuW~oY*lT!wvD#ac3O7vcBkxK*&EpN
z?c41a9V{HSIb3o?9990#4KP619;PEVaxoMW6 at oabFkT(Vs*xuRV?T=%<H4t
zP6+<3q)%j6XH;jr&kW2wyG3FPZ_B_|?X7#aPG>o19nVH(
zbFzDLlyi3FOl-5;R<|A69=W}Dhw6^J9aB49cAnft*p;yBcCJBgY3|$ILA$&26!LcF
zP5$8WLrcC`K0kkKkL8})A5lNX{W!RH_1?<8UkbPdHwz64%L_jhaf)vKWcX9XPs{tF
z_YD at C79T0Wl<-PM_uK40St?PQRXTaV>p({tv#g-(?ZHh4Z1Bky8E-^&t0v$t#xgT
zw!+ikbo%KRzl8rXddA~S?^*WQ)?d|st!byV7j!@!TRY}EV><<1Azee~+|TuPTXwhq
zruW;4^UCL|FGyY}?jiK#^(jvq*PO3i
z>9^~@c-`vy`5P8D&fR3+?7U at qt7E`qp#8SV?e;;_!Hzp-ce?JH-|Ze+Gt at I|Gkp1;
zEHv9xr$z{-pe={L}j1wSI3C
zmaTlehoBxmyFAE|$Qn#y}leqKJUG~F~~G;@B|dG_v$^)IGgCcj*o%l}j2
z&ze`7uYUc at _OF5Y;Q6W7{MXBW7rl{rbK+ujAAg{SY5-YqQ_yq9@@@&o%r|Hq(@
z(@UA3u%9YEYklti;_+pCIca%Wxq!$8L at pq5
z0g(&*AG^TUe>cJ)E6cGl0Q|E7 at VpH`WfcG#(Ew1w{sDK$12m6LnIixI4zNi?K~#9!
z?VT%E8(SELCs}7LP`IG#K(z`~!XKz2Rf$S!payCZMHQ%0Lr|>=7(gW|sft4dR8c`u
zR|O75)tr3kfs;ZmGn2XO%k!+Y&*~{{I at vSteAm5q%5_}_0Q{3?3IGrf0OA2aJOBps
z4^v<_&1Tc>^?HL}cRC&C{{DXKpDh#$&ceciQ>|80%$(z-$hO(R-rk-o;`sUVr*n6A
z7ux48EiE~7b8}V-3-K68{{emy%J1L56S)QvRX(40YPDJl at qp5YyuM5(
z4XI~)lL&|>AoKI{E(rm<1%%t?6G=gfn}%@IMedEnpjaM-kS>Am- at h{vnhxE-o&G at mgvB8=eLq at CBa#_z46QrTdB8m(g
zZrcbXQ-g5KLNah+FY87;Lr8xV-2&z!nNo>i!}>hjwjtrf-QEFuyKh(?goFEr*J$xbN}5^@L_w`qn;t6Y>b9}(03_|YX)7KQ1Q0ddZr91>aw((SHc1e0Yawb5
z4-d_Xc}NgIT%4bunNf=NFg(R5NZJ>pCSkwkd
zF=?5C@@|_fP(nD66cfE2)w`t~x_lW4kKNtfkzLkGTb?+M0|%JKxW$#qibqz2a>x{@
zz}T=sMORG at U&UQus5H9WuB(OHRxB2I-GNecIvw at hHt8auo&$)-Cv*{js*H-il`4|b
zMF1-Ee0`5HmPZbpLO7rkN{FZ3Zgb!iAf6zQT>~9>zL$04;vu^Ry6`;XmZ*5dT_d{&
zy70WyAkl0a*)`CO;fz~imPdNm5Dw@}VwQ)kqX5ej0IBJ48$d^fx8Y4E at sCr}0bS|!
zdQM{EDVNLK0WgAC#Un)~k_4bL!?m7R69yy+KzClhel4zBDpt!Qodirh;I;*TP69wY
z0gz1#nQA~h0btWYFoofSSLEWMAPOciYzQLHwvk~2(|ByriPZ97b--jIwLDlI!14ru
z3>#p1usQ(oSsr2?!17>q0OGSeSRKIfV08fEvpiTGu!+#bb8&IO@@l|s3u<)`57^|k
zg(e$GXy!rosBvtKq
zR4Ns5*%%D##;^_o)po%Og#o
z2nTFsxIpS#JhfVl83bz?E|B^b&*kMMGYHo5SB*#TTH84|I3Ul at pvDuV&a=3<=+adH
zHZxq~@$9xqZ3p21IR0ZEYC8Zg@#MBq+X35oUgPm>c at PfR&WlW&7xC0;H5R>r^<=YI
z|884faqji?HM0j+^E}h$Njz+52ryba6WumRQ8R5|JDE&o
zot-grU_FIGVRT3{Ddr*G0T>jZfczwQjVqM^ZC^6?QN?6BBR(6|J(=ri%F)b*VosrwKUU)
z)T^)x>bh)CZd=^$f|$vAy^e6E3{~7|T($|~iMvjNF#HW-AvKdz={S8$@#la1_>scP
z_J_nmUe?rue=3zq;J-Uqk`VP$1V3%wFrLlLP51ctn2Av2xlF5mf$%>^M at OlXlM^N)
zB(}D;X8V9BV;Hd&2#dU}eh
z79r(w85eE_K7IN$^Jj!E9?1%kQA0o~BU|atvXVFw at rZD4Zf+0`0x~;M5Vm+EtA=n8
zkPhta?S=B3ro-C!qtR$^R}vNwO{LSxX0zdaSQt&A8yg#B)>s>4MS42aY+GMAgW?_U
zG&PW9jhC}!Y{bu=Y>~%2a+45_di3uJlQ8DRqKtUBNopbs>%=2~=&X*A`p*{(bTQO(
z)MkEu-eot_KX~1|Jr>J at aMWjKXNO5}yd9AkSdfjR^7wHLuUg$1hzGDbBg7-es^hYeG{EXa;I^@_
z${f7BD0L?8B{EapHZ~Z?^5}q+Qe+)dtm2uLg(2Pn9Y|t{OnO=trdq8M?|{-I^@2|`
z^`JYAMkA%1cx-Fw0R2dEuevnx4(N*PQXAIppMk|QE*+iZg#k?C^z<~*e}AHQz$}{0
zrZL||QqxHn?@1VdmZ-3M(?C2nb==yFDNC_c+0cF#A4z4!s01?FMG28a at 3s1l2(
z{yWh3#WGze1O`McvyO1F70+3
zcP&csfU$`JZ4bCo{dBv(#KRH<^Vr_r#$Ag;Je*@`p4GX#yTe_JLp;PiW>GGewY+Xs
zde^2h?ijwl3&+uk8jt=1sO1reD=RD7Ja;b=2Aqaq24B8>(e9e1%SESyqF;!IwjBN0
z+}zYM!}jp-pjX&1${fjWXEGUM+_sI44Xa#G9o;o?Gj*HirzHu)JhrZzauS?;A6rhf
zo1dT8&g!hMuS+3UyZbY;NNVEQqw-LhE}YfXRqcc$^&B0AGgds+YSp+0OCGAl#YJNU
zR4$j at tE(&Ru3LwCj<1;K(Qh^}23T5JGA{lpl}cKsrR(*&*7suU4@`QBl+R--C%oHd7w3$HK2^0 at 77Dro6nSR;f++lG$u_H3|d60f6hbe{969R|-U
zz9ukkm8>KYB#o`x<`~P%%UUJ}+5VAAMzyGHa>H5v_flnaW*QP6F(t?Di}
zSRPQ-uD#W24LUw_6pg9E8QWoCBI4?J-ELNP61us$QNq2D!l#Zdnu>E7OOez>_V at Qa
z|5*{4#6t4mCMg=Z2Azc?Z8xS0$C{XDQp(!#xW*(dcdk$>V?qE<4F~Zg`=t#yYC|Pt>Ap_Or^&X>09$N@>!#T#9BVC)pyP^5+%znY
z63C4=rFSoGq<&+&aI6;3qkxctKWkI3*R@?XjoXF`M^XUGgA1pVwLv&oo{9Kr9>v-K
zmS+fQVkC|IXFI4?tA%i|Ji(A{s&qY`V-^=}XJ^Nn_8KftM96+(+8lKe0 at 9l&u^+<0
z@`Q at X{cs|hMx%jXusqQqzJIsdHR|{k5smEMjc~9$SR!JY_~8__;N#%nV6cIoqxj|<
zvItOi5aOP(7*0uK at 3&^N>0Do5Cw?uGYA%&Z1J^8<%VA}3+w`JZt-5ip7L^sPTU%Qk
z%8Yo-LY7}&TwFMvPA3%0B$h?QB0HfHzaSp##U*S
zCc=Fzc6k&8glMie7XStA!bbT3#2JyR{k#E)R|1fX05Ac0j_(Ix3m=|a0dONh76-ZQ
zTW0`fsXSe|{KS%o8I@`k-l_Rm$du}AQ at m(US#g=R*Q+*yaxnNa#jYzqx4c-Lidyma
zEJSvHl^s)M`h-O;O&YPj)1PTGTUsR6`LRoSSw1StD_C at cBay>d&M>@iLAJ1=nIYB|ex=yAfFlIEobNuymi1bvZM%Ga^c0AwR
zKBm$G{)qXTBlGqf5Co at dFG)nDuJys28Z+ka1
zn+oPFkf1IkfVhf1MjPj=!W%zQP2BTl9Y51B+qz5K3WM1$!Z=sHKXg-sx|s&n53({m?BI;2G)tBI{nUn+6Rj&Km&2M6
zxf%+zK4|frY&SP2JZs3IjDMdBKeFbjA=U?l3Ovw1KbADotM}9hk>5kfX;1+BOL{UljPM%eQZQUMweVHqX$wsrpukFtD0~QLI)X
zIeBK{*#8*TNCimxptx+l0fS*GdjO~?jjp%#3WBS)>YzZhaq|ATzFe+z-_&rmx!|CO(GbujI-)+&+U$qlef*0t35EZ#ew+US8D-0dT0m
z;eIl-HD%fmyKM`=!xkzT8tG;FhTSya$@A3Fv}ZN80u10D1U4lr#a3x3Uh(|4AD(bn
z`Qy&+SNHw5Hi%h*U1hVP at jt~{j2GvParJu&%V`e$&AWZFh3=~R8ynke4yg_lPg#HH
z(4r$`#$CB at sZ!H>tn~s-XLQlZ018t2#MqbjaarQ9s%tVccCNo&zKl{8y+PJbfb%0c
zzQP(5-&!O3V%mpizl_)=Be%TV6tGpqYwR5 at 8%J&~*F-3ToGu
z#Xhg2&UFISTd9w;HkEdQKTvd8)4=DtJeoo6Ly`oD(LT8
zZO$GAoZRP3_r{zkJ)b#@=t)sw_VO3`I?!&SWQPf_>zpp=JS>)yHoU+P3`C?ZNy{K4
z-iw>3hjn|NM>XS8r*(h&_=uu#m2{;WJr#qU{fFG^f_a+MZoUx#;K(H&0%h1i at G#FR
zW+s;gyuQ8(LR at Frp@7T5Z7)8dhF%Ra-iAvJT9Y8GK(Y`?0I|Lh?FA?hI^m>`xQpC!
z(w6_elhJ2yP;aPA8E;u~t~=Gj+b>w}-}Y*Iy4~1u7=0Xit=}@sLWrJsP})BgR$R|U
zB%IS}758rw;iSKx3=Z`VP?0Vc;IC~tRN_sWdA^pNkFf4qhbFbL4SRJLC2;jGO$Mez
zt716ners7Jxm~wFA$xmuUPhJ8K(cW|mAZ67aTRyZf(wg&ZeD!%=(NzQqB}M0=
z{Z*aQ-CtGzsu}><@kCBiDr^8i5-*MK=VH$c4hdyq#{dL~00-zmFM^YrZ0F;ExCZW50R0E82AJU1$pBjhw8$8wXnEA{ae&P+=d)?h~=)A_;!
z3ORU%BfoLt3deloonL$W{Tzf`1^|u}^OXrlS2*%3Q%|ihCzhWCfNYnrU+vqzUn8!$
zaudurURo5N7m=t1{@eMdy~I*i9(ZJWTwqqvv}q@;CsUB>+f2<)rg7zSU4G3mOmrML35tKoO_{O`r>mfElm^
zw!jIv18?9DLcm7A0kI$n at IfZX0lPpxC4lF?sgoVfu4U&PBAazIwGJ at EUHRJ?&LVi#P6b{8eJSZK?fp$ZMP$^Ue
z)j>_rFVH#YGIRqPf*wK>&@A*f^btm25=@5`U=3IwX2W){2kZ}TfMehkI1A2$_rVo#
zJ$wr8fG at +h;1O5=zl0YMfDjP|qKxPwY{UWaMnaKjgpX`T3XpQ79%)6ok$&VJB0%Pl
z4=4Tf&Ru)$ta1Z#);j
z6<>^Rz<1;C;HU6Q1PKC*U`6mJ#1nQADhREFtAugF8zPaYLNq7(661(Fi50}t#OuTf
z;s+9yq)l=lg^|)p`$#89mq-suZ^&e_2HBPzN=_s1BR7$+ke`y at i_ygN#N5QVVmrjD
z#X7`>#a>bH6m^OnWg{hvQcgKbxkH%~$BS!-JBUY!Zx^o?KPNsWz92!9FqH6?NRlX$
zXqLDkF+;^tHKsLEJ{{e)>k%D_K56N**Q77oTVH`u0ZaL+#`8dUR&NzK3o2n
z{DAy|f}(3fkDNd7vpLrX(1OD*=uYS{^gQ))^*Z%l>8t67>hIU@*Z*Q*
zVvuOiVDQ+GYUpm5YuIi0w~@9H$Ee!q{%Z1S=hZt_cddSHtYaKye8l*H3C+aIWRFR&
z$!AkDQ@&}d>8zQWS-4q^*%+J7_F)&XubZRI?ag-cHp(^;HuW~oY*lT!wvD#ac3O7vcBkxK*&EpN
z?c41a9V{HSIb3o?9990#4KP619;PEVaxoMW6 at oabFkT(Vs*xuRV?T=%<H4t
zP6+<3q)%j6XH;jr&kW2wyG3FPZ_B_|?X7#aPG>o19nVH(
zbFzDLlyi3FOl-5;R<|A69=W}Dhw6^J9aB49cAnft*p;yBcCJBgY3|$ILA$&26!LcF
zP5$8WLrcC`K0kkKkL8})A5lNX{W!RH_1?<8UkbPdHwz64%L_jhaf)vKWcX9XPs{tF
z_YD at C79T0Wl<-PM_uK40St?PQRXTaV>p({tv#g-(?ZHh4Z1Bky8E-^&t0v$t#xgT
zw!+ikbo%KRzl8rXddA~S?^*WQ)?d|st!byV7j!@!TRY}EV><<1Azee~+|TuPTXwhq
zruW;4^UCL|FGyY}?jiK#^(jvq*PO3i
z>9^~@c-`vy`5P8D&fR3+?7U at qt7E`qp#8SV?e;;_!Hzp-ce?JH-|Ze+Gt at I|Gkp1;
zEHv9xr$z{-pe={L}j1wSI3C
zmaTlehoBxmyFAE|$Qn#y}leqKJUG~F~~G;@B|dG_v$^)IGgCcj*o%l}j2
z&ze`7uYUc at _OF5Y;Q6W7{MXBW7rl{rbK+ujAAg{SY5-YqQ_yq9@@@&o%r|Hq(@
z(@UA3u%9YEYklti;_+pCIca%Wxq!$8L at pq5
z0g(&*AG^TUe>cJ)E6cGl0Q|E7 at VpH`WfcG#(Ew1w{sDK$12m6LnIixI44z3uK~#9!
z?VU at A6lWg5t11TBLk4m(2SEsg_y|E}AviEO$O;AtLtvRv5*rz8%z}wBP4+MlVL-uy
zp$B6QW*Lw$1k5yoG(pl3$w6V@^d+-pF+Wxo9q at C$U)z?*DeUIPo
zB;upz>-yFI at x8)0jspNlPs9)aAP)fY03Z*5!)##){H9i`#m#23^Xo>V5wu#ZzJGRl
zdO8>z8w)CxO326sK}fgF4;B^{Vv*y<#g{Yxw@3Y^=dz)xkQyLMUv<=F)KYPzxmQv420#W91BA=Gd at 0!IEwuG{d at 89^0F~+
zdm at h}rlzLiFFt;OfyjVUm!hC8QHVT_v$V7n|NZsv7zhW`IOIVZ1VSFOa&tyOA7B6U
zR!}OHv`a+8AVXx&4C3hL?N`4EifAMdd5AVdAR-UZh6wZxk;fKf&gSOjT?~Y$O$6j2
zO+z5kHa$oS8gY2JAx}zVl>l=$2t?XOnnnso#rDwy7$b&eLNA!sh2jJ;^ACU)fKvVQ_Hu7Y>f)?B-ZRgF&$ioCE
z=!ibfMIOmr5eHO}+sD0(JgkleozW*k9Drv at y5`Lpc at PIOOx^rR+h|Ec5vf~*H~?y?
zo7M8KxF);^LxPX&d5zDXE)Pk%z^e
zU=r5IBMpKtK7N63474(6t(!IS&>(;!sMTtA*F4lYU}D{4eB>GBXdnQuYo61Ge&$;O
zBVXV~r){KbU~=kaY~)cn%>=;vv`sEw<=PK0iC#-}jFg8PsKGQEjfVM=hgAe%i#$d(
z4A^D>HZ={5iadw|Gz=7w3#a%x0C`d(-8C+p0_0JE?i$#@#+3$z%R_e!Y++-^tEFd+)aL(~D#Cl65vkVgSJY=ArfpidrZ9Y7vx9RPju5On}~h&llJR4~+tVM2wA%jV=#I=Yo$MJa}+)c{n;3NZSA)F?;sx8BLx_r9#REUNSvB
zJ=%r7XO28#6oIrY?O%|s2Mim4f;@|hi;Nn8iagBifUk6~E=Vm8i$K9=x+h3e%TujZ
z8A0%t?g`S=^4z%iG9w7y(mltMN}hJqA!P%v>7L_BCC}{ST}BTetvt-_04U1C+zx=E
zJk0HY?`)joNmcUz_{_#mTOxVrvH=9azJ2>P{azTy at i61!?z`s!eB{M9z6?`G9>f7q
zXc*9<22hlzR;w{W;5~;<|2Mrn>=*^;EX(Qn`vV&WzkdH7X&cZi=+P_~711Q!!
z)H?wE>z#q}uy+Sw^9Hy?H4pU;K>vEDZ{(rg0Z^=Y?%cV<$N;Fw!xjX9AUJziofj2c0qFXfC&?R4VD^X|-C;41g@?
zlRka-@`@xnehvO0rBwRY3*r8=--VC%`C5>Z5yg at uLCq|b#+cBX9Y at +G}I
zwshM5_K*JrM~@!u`Sv$F9f(=_WH#Ua@{U^MFY
z*D$(OEn)P>-#_U5P_Bq0+`D%#l%GkWD40RgiBaPtkNhAjD=VQdUmTIBc;qELZ2wNr
z$kTqS8zGK#$>fdflQ?UU=+?u-Ji!H$R-AQtif&U&q!DSV)oSSLmp3&v)k)=~wgdB1
zw)M2Fs5bSnbB}|1y&m%QZH9G*W~XfHk*5f8uHD~{I0GOGnVqt&M;@JTIq5J-j?Y&{
z6fz}cQ?0SJwyNb#ia2Ufh*8Lgxw$#zzpE|s at BoZXxm=DfoOr at O81h_3rhh>AlclAl
z at av!6VjwbN*omNp$|Lm+;$%yyR0=QOe2sy~fKjJLqP!+ZPhE4>b+~nNC)d&k^DvkZ)wQy(P-(phH##
z7cUUYd4`kbbey5`WU-?9pa1$xXH_s?P4RD3HrNd&%^3x`r)?sROy2Rem;ue2{$%}P
z8Cf30F%ME`JujAsFUdV5g_eu}@{2k`_`iR at 8>@a8QUtSME5o1U(Fstt
zNgmZb-=G(lj_Vo)In2-)d3-zF#%4xccJBgNEXB!09- at w2_50h9-a6eo at L)iteKTqG4Sa>K(9wBDTmx!@4k)N`-m{jHak=aKzAq?G&|G
zd7wPLE$IOJC~~)KM7;wxQ{-;h$kY!8FpQ$NT12F0{!pvcocUR#HC^=NJq-h}5))2u
z>d52Mid&z#ePu6Af~@7)zI{7S7SJS6k*C*0D0L8+h)G8QQ1kfnwzmEZ1Jlmm?kf*-
zJZ|Aar_Hn*IU>?Dngyh5Bg#X^&0SVkSFKLjOua5;T^>4a?y|VJNV=A%JZwF1m(M?X
zo^(xT!vLIV6j+7wXO@~|w&e#+&tl~KpG`=2(+vsU-G
zviHO0he?$SC!SE}XkZHulUvw$1KhE5kAr&MzVkAAHVj;>dwjT7aD05+%Ac`buUpyW
z?I}+?b>ppU8KqJwzIk~UbxzUpxO}CEivo!_pMLmE
zm&>7(^4Qq@@J%3F#j&~0NhFWV^186^UFg>Uu~{H#4%jM=&2>)Vv~BCwtxiOlLAzu{
zAlqIN@|kUH4!9(a5XQ0l^M|qxdFOMV4g52*rpolCA+k!^<}C&;iQ|ntX;L&fJlwQy
zW4k_x-+bvStH<9pafYUCJ|b^+lWHNUZ4d`}3MK7z6e3WOGxqX-+g#fS(vEgj9Iw*0
zG^ty!dT4%rUQ0SRGcyz0d|<~Kr!Gao^769Nn=8GNCyNJD&Uuh+8(D4Gk|x0U^XCJb
zBaDyYcqdPiuA2&S8?y*CEHa5G&1N%bwOYZMBafUMW0_p{DiX1`T9cgE^S-Ghs|-MX+$2rc*Agg{swsvC>LY{n+w|s
zNZUx^v^E83wh(!UKnl?Yafm!bAfgSCC$9)Z8~Z7 at 9v(&T1wvG%|}!a)hv)gi8H_Jl at MCXB%`gHa12SK^_1%VV(y7c>s_H0C at nA2LO-7cM;ZD?x+78UW8~
B32*=a

diff --git a/koha-tmpl/opac-tmpl/prog/images/marc.gif b/koha-tmpl/opac-tmpl/prog/images/marc.gif
deleted file mode 100644
index 4441f5823bd822512bd2da96da60b7dac87e3aef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmZ?wbhEHbk-}2Q}V(`$r?9^V_d~^1e0y|Nm#8Hc|ejttfSQ at mwS

diff --git a/koha-tmpl/opac-tmpl/prog/images/member-menu-background-hover.gif b/koha-tmpl/opac-tmpl/prog/images/member-menu-background-hover.gif
deleted file mode 100644
index c1245d0fbafbf4b816076c437d940ae87dfdadd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmV;70dxLGNk%w1VI2S^0K@-o0J
z=K1{pgR0)=@cgB|;FY!C)#LP;x8JeH+}7q!s4O4;K9 at CA^8LV00000EC2ui0384&000I5U?z at aX`b1lu59bR3n$NXZQop@
z?|kq74S;Y+EE41ejExWikdcy;l$Dm3n2`mWoSmMZpamAAq@|{(s1_Tm
ztgWuEup1h)w6(UkxEde3yuH4^z#kOD#Kp$P$P^08%+1cv&9%!-o(f
qN}Ol_fyIj$Giuz3fPu%4AVZ2A$zXuVlPFUOs$9vkrOT5c0029So9U|n

diff --git a/koha-tmpl/opac-tmpl/prog/images/member-menu-background-link.gif b/koha-tmpl/opac-tmpl/prog/images/member-menu-background-link.gif
deleted file mode 100644
index c222ccf4c0798334393c4e52f4aa19544f88b1c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmV;70dxLGNk%w1VI2S^0K@iDh0
z;)AN*+~@YCzTnW_ at xapRnYZ7ax!&+CoSmMZpbiwHq@|{(sHv)}
zq!_NRu(7hU7!S6$xVgH!4;#L}z`?@98wke7$jQpf2olcE(9zP<5(?JW*xB0K3I^Wa
z;Njxq1`X!t=;`X~4IJ+8 at bU8V91-^S`1$(#5fJ|W00Rmf2%&(%g9sBUTv(uk!-o(f
qN}SjsgT;#&GiuzJVS&ewAVZ2AxnO|FlPFUOs$9vkrOT5c0028Ed*hb?

diff --git a/koha-tmpl/opac-tmpl/prog/images/member-menu-background-logout-hover.gif b/koha-tmpl/opac-tmpl/prog/images/member-menu-background-logout-hover.gif
deleted file mode 100644
index fbd1c671ce6c1ca6128d5902e3f000d90de283aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360
zcmV-u0hj(qNk%w1VFdsq0M!5h{r0c^^LqdDcmMKp|MGGE^^W}b#{KrG{`83d@^$?9
z#Q*bw{P)8B_qYD^nf~>a|MPwP_`&`5qWt&2{r0T>^^*ScfBpEn{rJ89^_l7@@@X~i~aVi{P at 59_NM*!vi6mZv6MO{P(r~
z^M(ENlKu9w{q>*y_MZOroc{BO{`Q~#^`HIpj{fzd{_=SL^Kbq2rTzA${`IE(_qhJ_
zfdBM-A^8LV00000EC2ui00jUe000JsK!b2d^e8+YMr0XbOeQ4K1O&oVKNsw$*J$*5
ztksIedYMdSfLcu%jVP3ZT(0BoN+ron!mq(#G%+V9DKaS;84idKjEpWW6_5oslm#Lp
zD3}PF2s0fmEgc;k91Elt3qBSW5D-7D0kN?Hv^W9 at xCsISyu1Xzzd0Mj8!9Rx$QsJZ
GK>$04$<{Fd

diff --git a/koha-tmpl/opac-tmpl/prog/images/member-menu-background-logout.gif b/koha-tmpl/opac-tmpl/prog/images/member-menu-background-logout.gif
deleted file mode 100644
index 733fdd7f69e182c2dfb31d30508a5aed9e84bf07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 353
zcmV-n0iOOxNk%w1VFdsq0M!5h|LS at F=yd<%W&her|J6GG(>4F(YX8a_|J_vo+)w|}
zF#q+N|KVW&;9CFUU;p1)|HTXc#}NPUjQ{eG|MQgp_MZRje*erK|M#K)?}-1#4gcqF
z|MZyu$P at q2EC0zB|LueS*+l>Dga6JZ|IH%*_n`mphyV7Q|K at Q2*FXQu9{=>0|IaJ`
z%_INTKmX1r|LcGM*hK&2W&g($|K3#p$Q1w2CjZtx|K)1`+fV<@BLB!2|H&8s#t#3*
z4gb+EA^8LV00000EC2ui00jUe000Jlz)}fAtQd`_MRKv?G&z)LbV8*{u2)kgqZNU^
zBA8_i1DMT$bb5nAZ8o?#&LF4 at WDEx*-*`0o2!RMRISGad1Br)00vd84G#^k@!>eb@(&D`+8)9c07
z?cC`1z0m32>G-wF=EvCX;Oh9e%;(eL^U>e(*W~rX)$Fs#<>>MJ+2!@y=l0Lu at vX$-
zxy|Ui&*{tC at 5$NkA^8LV00000EC2ui0384&000I5;3bY^X`Yv$u59bRa4gSs4BU9G
z?>rFvz at TtQEEMlPFUMs$9vkrO6NgJ4Z|9+5i9m

diff --git a/koha-tmpl/opac-tmpl/prog/images/menu-arrow.gif b/koha-tmpl/opac-tmpl/prog/images/menu-arrow.gif
deleted file mode 100644
index 62cf717e7adbe801d45fdc7ef7789ce94b60c7f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54
zcmZ?wbhEHbIgm?UZlBOEksvX^{pEyN7Y08K1|2};C`}qA|)sWV2zyB%t*BPcxR|;&LaKuR?
zqSGj4`peIMUw!@;yC}*ib-Hfc1l{-v%0Z2H-~KU7nJ({J^X=Ea|3GjijbX$C#h)yU
z3=CQfI-rmM#R&s at NP|{Wb4#lxqo!I{m%J1&qqxQ-4F*jqO-VM%*^&(MT72s29Ab+^
zwWNimS4#^?Yw^o+am64IqYGkkm0G^v<
AS^xk5

diff --git a/koha-tmpl/opac-tmpl/prog/images/normal.gif b/koha-tmpl/opac-tmpl/prog/images/normal.gif
deleted file mode 100644
index 34012c136bff4885eb3cd708b704b1e824c20ad2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmZ?wbhEHbWM|-HxXQrr;rqYGAO61j{O{ZEe=k4()d=tS at a^xtw||UMrfWs_s)n>`
zNB8Q+Pkj9T at 5|5s{`~#_`|rPRzy9kdO?mm{uYTeb!_?`ozWjav{hw-Rt8Ux`-S`Pc
zsneB%8t=aSqu^h6 at 9kfWh|X`n{u!oBR|;&D_pSN=|33p&f#OdVuz5Nl667ZaHdBX5
z1sh-8b1f-_?YV}lq=d#aL03e&8fWd|pe*v)rtR}#uKQ*u$|
HV6X-NW?y1a

diff --git a/koha-tmpl/opac-tmpl/prog/images/place-hold-small-disabled.png b/koha-tmpl/opac-tmpl/prog/images/place-hold-small-disabled.png
deleted file mode 100644
index 827cd4d0bcecf59b57c3fce493f81bdc690a341e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmeAS at N?(olHy`uVBq!ia0vp at K+M6x3?xN=wEhKBEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<91o(uwW at l#?6%~E{{Q1L&55Io>
z`u_dpd`pI7$|}a7#=9c
zN&@A|JY5_^DsCk`c>X;7!IP8(2Bo^X1_mZ2KRb>GPoA at LC@Az#WansLQMR{tU at -h(
zyorHvLPAQ)6R^zGiBqRfojP^m^y%^n4H6YIZ``PuIpao!BLk4PW5&&!H)qbgX=!1x
r!-9dSqp`bt_H5~v#;}jfED{W7{xL6__#z<-=mG{$S3j3^P6R1^9%x{{H*_-M4=)KK(UFn)>Md
zU&Ev+%7Kmg at e@@;Ti<>A`|a011;2WYh_2s%{=Ww)`}6JRKef=dM<4#EhP3L%PgD+S
zR10lY at UPR3>D7$v)JvFTkTgXUjfhU|n7-eC|GoJ9S0|?L>#u*0-v2R7
znkw&G^B)Y({3rnVMXMypFBl?11j%5u;zJBjSA(aEV at SoVqzhNBgtRmH`Zh2CnIhL4
z81g`DrcW-C6{3nrz&6t
zjq#qIj-8#Jk&aH0l0XGZB0 at q#BSTtmq~1(*VE~#iYwFa<-bi0x-i)bg4h at V9EBU!?
UC#5QQ<|d}62BjvZR2H60wE-%cAK(+>s_0*@64Ig`*7o_wzh8g;
zX+(5sM09FIc4kMz4%G`iBtAH__y!jf90S?y at ZL6-~ZK$?lDZ7rr=j+
zm^}6Ihrc?p{WstI{q*DCndkphLs|@zr|HJ_pLzE0)|F!Nd}Be&Ke9H3Tz6q&r9%x_%bkYoDfV%6nHF@%D4&0
z>8O~ob;i~$TSR<(KvEYcUPw&2GVzL`AtQ%^Lc3>dXLM}T+>=LG6dELaEFx~+xKSDT
z^QI+GZHMDc4n7wU?e84t9O3Nc at 9*!&4^)=2<*TCr#}-jWpj5zRhsy^TS}aq6oP#dD
luHhcO;lAPFcUTk-Fl3(<`BL}c0yogH44$rjF6*2UngBUF>q-Cs

diff --git a/koha-tmpl/opac-tmpl/prog/images/print.gif b/koha-tmpl/opac-tmpl/prog/images/print.gif
deleted file mode 100644
index e42738862fb6929145501c5db9f82b1c3a5e210c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmZ?wbhEHb6lD-$n8?gvlDF#r|1bjpDc_F49pBV3_t*qXJE3P)4%fcTmHo{
z3vRt`xKY!r6BGI)L-u>)qG at K&Ja?@=!Emtmd3pDlqyyGBN{%cz*rxJM!)xxx7n^;S
JU1nmi1_0Z-FIE5m

diff --git a/koha-tmpl/opac-tmpl/prog/images/send.gif b/koha-tmpl/opac-tmpl/prog/images/send.gif
deleted file mode 100644
index d8e9b0a953b63d5a8955739af2ca31b6f2a0d078..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmZ?wbhEHb6k!l$n8?gvlDF#r|1!3-pCZQt7qq*&4&eH|GX)}JtE?Rp91OP07s
zlmzFem6RtIr7}3C%g1poj5

diff --git a/koha-tmpl/opac-tmpl/prog/images/shelf-delete.gif b/koha-tmpl/opac-tmpl/prog/images/shelf-delete.gif
deleted file mode 100644
index 6de7fa734f4a7fc2a29c2ec3d73e24c95290c708..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmZ?wbhEHb0qJ`e8K+%UD
za%YT<|NsBb00xRbSr{1 at co}p+Jdha-EJ_W&Q7026*|>i_@%

diff --git a/koha-tmpl/opac-tmpl/prog/images/shelf-new-disabled.gif b/koha-tmpl/opac-tmpl/prog/images/shelf-new-disabled.gif
deleted file mode 100644
index b2c7bc0a0cb22dc6cee537792fdf86ee1b0fe3dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 300
zcmZ?wbhEHbzkC6^z7NQty{MS2M5Q+#YIO)dwY9dxpE~TAt4|j;N81-K0ZFLUcE|8Onm+N
zbxcgmr%#`L{rdGE3>at$6o0ZXGB7AG=zuH%`H6we(_un^hfa{#6i&BJK^qy_W9h$6
z28eKYA9|!2VZIgm?UZlBOEksvX^{pEyN7Y08K1|2};C`}qA|)sWV2zyB%t*BPcxR|;&LaKuR?
zqSGj4`peIMUw!@;yC}*ib-Hfc1l{-v%0Z2H-~KU7nJ({J^X=Ea|3Gji4M;Fh1{8m?
zFfuS`G3bDd0r`o6&Cg+KfrrjACe6t~KQEdviBAz>^~em8Jp95$iqTH%_{)|JJ=&|z
wwp`?FRgu2BcyfS<&Ae7E6M?U;A}m^hDojl5Dk=h6s;UYKsxmSXT8<3X08iX;oB#j-

diff --git a/koha-tmpl/opac-tmpl/prog/images/star-ratings-empty.png b/koha-tmpl/opac-tmpl/prog/images/star-ratings-empty.png
deleted file mode 100644
index 71c9171103d035e623b0602e230336eb0189cf74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmeAS at N?(olHy`uVBq!ia0vp^DL^d3!3-pQQK$!8;-MT+uZLSd|&PAz-C7Jno3L%-fsSE~2
z`Ua- at 1{NFK`#gav6iR?9g7ec#$`gxH8GI9yi}G_*Q!*13+%k(&%kzt}ixqq$c2Cq&
z0jgc*>EaktF=y+QlYEB^cvvnhG?|cBxb5fvc-7p6La$7X)nDJ0xy`svC;!f++X8d$
z*|_gae5_+`z`nEc*4q8|+SW$QO)=AVm(Xq9{N*mMbHYhWbz|?PQ%;q>$g9>r^UZr<
z`yqzoQv6+}Hm=v^t?AA5k5x2I`1?r3#31t2#eeUXZ at 1jW$@=VsV_Jmv?fE~G9;z6B
vhkD|JjYkXV-e(UoC!iw(!|mljkQi-|t~~wp;Mob`Fr#m8xgw@*v{R4~T=rVS+C%
zT0A?a`Rqi at i=*_$n$^1tnlDcIy*TFj>WC#!9BAq5-R!ULCIj`pyq*5~X4Jdu?m%U)FL=GV;0RRw
z{+#mXv(j(QSbaPq@&A9?{~wY6zXkvQ==J}d^Y`~*-`++2e_{FcWx&suuHRpHe0~w}
z|Eb}}N1pE<#{7Sv`SXGC_Xif=?>YUytMu+}Fwlzsw`6|Y(*A!#0%*&}>xTcY3Vpw#
z at a>A)|BIYoFUkR}`+iRI{}~3LjUanZiF`fI1+ at 3`A(js{tCE3%nN||y7tCM`18ES@
z0RyX6ok4)RFz^l;0E3=5AnmRF252K^fk$L90|U1Z2s2)~TlWVjC|2ScQQ};bnpl#V
zpQjL#nVZUBV5Dzgs&8Pi!M)EDs6qjxA~-*-q&%@GmBBYLxhOw3H6=4q!7Z~WwLHHl
zyI8?DV)sNX6=0Gu^mK6yshG3%a=88B1QE6m?5194Z$-CU%L`T2lw2CB$YJVq_R;Tp
z*8E#vM19{E*@Qp;zTcYrf#+GJ314K^KCH0Fa9_N|Z2dR3oWQs0rgK(zHq2e=8PvQ?
zG&-X5ikM04`|M4sY0NEc*|Fxco|hiZ={-^wtTVGGQR3(7S}{+d31ySd?kdwf-L>e+
zk$|>u!J)}(4Nr at 6Ez68#7c3E*t#e)YRD at 97=GLhCllE$DW(iAb8*4qJXf
zi3?@-C9b}IwoA^&dWm7e`n+$u&ZnH;*1;pb_2bQ_{bFINn|65Xm;F4~Sunfc?cJ>!
zosLFpms>28J%01SvKiMNtEA0%J3%7v?sEpEtEZ-)&tjMRyQXGx#F=WogwJaeoBtfx
u?#a`1;Pl6*eN~F<3T8*W<;(v+PySBmPKRZ-VPU|4X7F_Nb6Mw<&;$T|>F4PH

diff --git a/koha-tmpl/opac-tmpl/prog/images/tag.gif b/koha-tmpl/opac-tmpl/prog/images/tag.gif
deleted file mode 100644
index 7d9e9e7dcc87fc83e09a612b2bb5d39926e2f124..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 81
zcmZ?wbhEHb**gIY
i0ejUmcosdMRWR>a#r?ENVO(Bmugf-+xcV|OSOWm7r5)S=

diff --git a/koha-tmpl/opac-tmpl/prog/images/tags-small-disabled.png b/koha-tmpl/opac-tmpl/prog/images/tags-small-disabled.png
deleted file mode 100644
index f0b63b486a63ee19aa5ab39a3248555bdc8499b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmeAS at N?(olHy`uVBq!ia0vp^+(695!3-or^+GlRDVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5X3<7*YTw7XNnwpyG>+3r at Iw~tG
ztE#HHy1Hs>Yk&Uy`R&`cFJHd={{8#!- at iRQJvB8oKux&`f4zW|KuM5a at PAam@IX0M
z5-3;Z>EaktaVzNoJCj(Q0Rx8un?Uze(KBou3JSCP`}^DZj{uo$c4cL1a&mHN3epM<
z5a)8XV&zlPi
pKYsee#3ImgmOtg=XJ!@&23=2<*G`r<7Xw|u;OXk;vd$@?2>{KlcWVFu

diff --git a/koha-tmpl/opac-tmpl/prog/images/tags-small.png b/koha-tmpl/opac-tmpl/prog/images/tags-small.png
deleted file mode 100644
index cecd0bf1e19b03de93778c4736d502995114cf60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 361
zcmeAS at N?(olHy`uVBq!ia0vp^+(695!3-or^+GlRDVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5X0t0+PTy*fWnQV523f?|FtS3NhO+P~gZ>OeMFD`|KhO8Eq2A#mb
zFwF)ArcFyLDjReX6WM_5jZ1g1Ht3|e0hybZ{$QOcX*q*|iQ~|;M~@OFO=99OV9 at 8{
VSgWA5G!7=QpI&%mTNM|ZjPq?$<#
u{g&(+If>71#W+sSyx38t*3_q^vE|9~BWu}^dOL?6mAnwe_U=08!#v)$;

diff --git a/koha-tmpl/opac-tmpl/prog/images/transaction-complete.gif b/koha-tmpl/opac-tmpl/prog/images/transaction-complete.gif
deleted file mode 100644
index 69b16646c5af25966267cd6c3ab2aec19f617c01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 206
zcmZ?wbhEHblw*)%Sj58c|NsBAnP(Un7-pUUGC>RoQ2fcl$iTqDpabH9)G{zn_Skjj
zpTVi0Eqf(`)tdg#V`VtBtt3H#>2QGCd(L&a(&6T-`bul9nI`ERd395zsd2&rZmIs|
zK0%RLV!b;je)HO77dz+mY;`7E^w0rMr=#Ao-0PhRGrvvQTg+I1T at 32`!50{}ou
BQf~kN

diff --git a/koha-tmpl/opac-tmpl/prog/images/trash.gif b/koha-tmpl/opac-tmpl/prog/images/trash.gif
deleted file mode 100644
index 78d73d1d2e09a20ec3036c770b8391b01ceb3961..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmZ?wbhEHb6k!l$n8?gvlDFzV2%G_8#h)yU3=GT+It)Mnl4oGDnA5-V^jm(}8HHyg
z^(H9%n4jC at 7R0NtWR=3aH{IKmdF%~!_3zG0Ejxc&v+00*;0%petuxC$uhd{*um%9f
C$0xS{

-- 
1.7.9.5


From oleonard at myacpl.org  Wed May 16 18:51:29 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 16 May 2012 12:51:29 -0400
Subject: [Koha-patches] [PATCH] Bug 8111 - Language chooser display problem
	in self-checkout
Message-ID: <1337187089-10845-1-git-send-email-oleonard@myacpl.org>

- Adds required JavaScript and JavaScript linked files
- Updates CSS with changes relevant to this feature which had
  been made to the main CSS file.
- Removes an image file which has been made obsolete now that
  sco.css uses the main image sprite like opac.css does.
---
 koha-tmpl/opac-tmpl/prog/en/css/sco.css            |   74 ++++++++++++++------
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |   33 +++++++++
 koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif  |  Bin 66 -> 0 bytes
 3 files changed, 84 insertions(+), 23 deletions(-)
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sco.css b/koha-tmpl/opac-tmpl/prog/en/css/sco.css
index 234036b..3c4a8b4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/sco.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/sco.css
@@ -271,41 +271,69 @@ a.koha_url {
     color: #666666;
 }
 
-
 div#changelanguage{
-	background-color: #fff;
-	border-top: 1px solid #CCC;
-	color : #666;
-	font-size : 85%;
-	padding : 1em;
-	margin-top : 2em;
+    background-color: #fff;
+    border-top: 1px solid #CCC;
+    color : #666;
+    font-size : 85%;
+    padding : 1em;
+    margin-top : 2em;
  }
 
 div#changelanguage a {
-	font-weight : normal;
-	padding : .5em;
+    font-weight : normal;
+    padding : .5em 0;
 }
 
-div#changelanguage a.more {
-	background-image:url(../../images/more-up-arrow.gif);
-	background-position:right center;
-	background-repeat:no-repeat;
-	padding-right:13px;
+div#changelanguage li.yuimenuitem {
+    font-size: 120%;
+    font-weight: normal;
+    margin: 0;
+    padding: 0 1em;
+}
+div#changelanguage li.yuimenuitem a.yuimenuitemlabel {
+    padding: 0;
 }
 
-div#changelanguage li.yuimenuitem {
-	font-size : 120%;
-	font-weight : normal;
-	margin : 0;
-	padding : 0 1em;
+ul#i18nMenu {
+    margin : 0;
+    padding : .2em 0;
+ }
+
+ul#i18nMenu li {
+    border-left : 1px solid #CCC;
+    display : inline;
+    list-style : none;
+    padding : 0 .4em;
+ }
+
+ul#i18nMenu li:first-child {
+    border-left : 0;
+ }
+
+ul#i18nMenu li ul li {
+    border : 0;
+    display : block;
+    padding : 0;
+ }
+
+
+ul#i18nMenu li.more a {
+    background-image : url("../../images/sprite.png");
+    background-position : 37px -940px;
+    background-repeat:no-repeat;
+    padding-right: 1.3em;
 }
 
-div#changelanguage li.yuimenuitem a.yuimenuitemlabel {
-	padding : 0;
+ul#i18nMenu li.more ul li a {
+    background-image : none;
+    padding: 0 1.3em;
 }
 
-div.lang{
-        float:left;
+span.lang{
+    float:left;
+    border-right : 1px solid black;
+    padding : 0 .5em;
 }
 
 div.ft {
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
index 35db4fd..8eb9f08 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
@@ -3,6 +3,10 @@
 
  
 
+
+
+
+
 
 
 
+    
 [% END %]
 
 
@@ -1208,12 +1209,11 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% IF ( SocialNetworks ) %]
     
         Share
-        
-        
+        
         
-        
-        
-        
+                
+        
+    Tweet
     
 [% END %]
 
-- 
1.7.9.5


From srdjan at catalyst.net.nz  Thu May 17 02:44:19 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 17 May 2012 12:44:19 +1200
Subject: [Koha-patches] [PATCH] bug_5911: Transport Cost Matrix
In-Reply-To: 
References: 
Message-ID: <1337215459-11639-1-git-send-email-srdjan@catalyst.net.nz>

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
---
 C4/Context.pm                                      |    3 +
 C4/HoldsQueue.pm                                   |  615 ++++++++++++++++++++
 admin/systempreferences.pl                         |    1 +
 admin/transport-cost-matrix.pl                     |  125 ++++
 circ/view_holdsqueue.pl                            |   34 +-
 installer/data/mysql/kohastructure.sql             |   16 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   22 +
 .../prog/en/modules/admin/admin-home.tt            |    2 +
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 .../prog/en/modules/admin/transport-cost-matrix.tt |  127 ++++
 misc/cronjobs/holds/build_holds_queue.pl           |  382 +-----------
 t/db_dependent/HoldsQueue.t                        |  161 +++++
 13 files changed, 1083 insertions(+), 412 deletions(-)
 create mode 100755 C4/HoldsQueue.pm
 create mode 100755 admin/transport-cost-matrix.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
 create mode 100755 t/db_dependent/HoldsQueue.t

diff --git a/C4/Context.pm b/C4/Context.pm
index 67d31ee..6643c1d 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -523,6 +523,9 @@ with this method.
 # flushing the caching mechanism.
 
 my %sysprefs;
+sub _flush_preferences {
+    %sysprefs = ();
+}
 
 sub preference {
     my $self = shift;
diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
new file mode 100755
index 0000000..b305281
--- /dev/null
+++ b/C4/HoldsQueue.pm
@@ -0,0 +1,615 @@
+package C4::HoldsQueue;
+
+# Copyright 2011 Catalyst IT
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# FIXME: expand perldoc, explain intended logic
+
+use strict;
+use warnings;
+
+use C4::Context;
+use C4::Search;
+use C4::Items;
+use C4::Branch;
+use C4::Circulation;
+use C4::Members;
+use C4::Biblio;
+use C4::Dates qw/format_date/;
+
+use List::Util qw(shuffle);
+use Data::Dumper;
+
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+BEGIN {
+    $VERSION = 3.03;
+    require Exporter;
+    @ISA = qw(Exporter);
+    @EXPORT_OK = qw(
+        &CreateQueue
+        &GetHoldsQueueItems
+
+        &TransportCostMatrix
+        &UpdateTransportCostMatrix
+     );
+}
+
+# XXX This is not safe in a persistant environment
+my $dbh   = C4::Context->dbh;
+
+=head1 FUNCTIONS
+
+=head2 TransportCostMatrix
+
+  TransportCostMatrix();
+
+Returns Transport Cost Matrix as a hashref  =>  => cost
+
+=cut
+
+sub TransportCostMatrix {
+    my $transport_costs = $dbh->selectall_arrayref("SELECT * FROM transport_cost",{ Slice => {} });
+
+    my %transport_cost_matrix;
+    foreach (@$transport_costs) {
+        my $from = $_->{frombranch};
+        my $to = $_->{tobranch};
+        my $cost = $_->{cost};
+        my $disabled = $_->{disable_transfer};
+        $transport_cost_matrix{$to}{$from} = { cost => $cost, disable_transfer => $disabled };
+    }
+    return \%transport_cost_matrix;
+}
+
+=head2 UpdateTransportCostMatrix
+
+  UpdateTransportCostMatrix($records);
+
+Updates full Transport Cost Matrix table. $records is an arrayref of records.
+Records: { frombranch => , tobranch => , cost => , disable_transfer => <0,1> }
+
+=cut
+
+sub UpdateTransportCostMatrix {
+    my ($records) = @_;
+
+    my $sth = $dbh->prepare("INSERT INTO transport_cost (frombranch, tobranch, cost, disable_transfer) VALUES (?, ?, ?, ?)");
+                 
+    $dbh->do("TRUNCATE TABLE transport_cost");
+    foreach (@$records) {
+        my $cost = $_->{cost};
+        my $from = $_->{frombranch};
+        my $to = $_->{tobranch};
+        if ( !defined ($cost) || ($cost !~ m/(0|[1-9][0-9]*)(\.[0-9]*)?/o) ) {
+            warn  "Invalid $from -> $to cost $cost - nust be a number in 0 to 1 range, disablig";
+            $_->{disable_transfer} = 1;
+        }
+        $sth->execute( $from, $to, $cost, $_->{disable_transfer} ? 1 : 0 );
+    }
+}
+
+=head2 GetHoldsQueueItems
+
+  GetHoldsQueueItems($branch);
+
+Returns hold queue for a holding branch. If branch is omitted, then whole queue is returned
+
+=cut
+
+sub GetHoldsQueueItems {
+    my ($branchlimit) = @_;
+
+    my @bind_params = ();
+    my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
+                  FROM tmp_holdsqueue
+                       JOIN biblio      USING (biblionumber)
+                  LEFT JOIN biblioitems USING (biblionumber)
+                  LEFT JOIN items       USING (  itemnumber)
+                /;
+    if ($branchlimit) {
+        $query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
+        push @bind_params, $branchlimit;
+    }
+    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@bind_params);
+    my $items = [];
+    while ( my $row = $sth->fetchrow_hashref ){
+        $row->{reservedate} = format_date($row->{reservedate});
+        my $record = GetMarcBiblio($row->{biblionumber});
+        if ($record){
+            $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
+            $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
+            $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
+        }
+        push @$items, $row;
+    }
+    return $items;
+}
+
+=head2 CreateQueue
+
+  CreateQueue();
+
+Top level function that turns reserves into tmp_holdsqueue and hold_fill_targets.
+
+=cut
+
+sub CreateQueue {
+
+    $dbh->do("DELETE FROM tmp_holdsqueue");  # clear the old table for new info
+    $dbh->do("DELETE FROM hold_fill_targets");
+
+    my $total_bibs            = 0;
+    my $total_requests        = 0;
+    my $total_available_items = 0;
+    my $num_items_mapped      = 0;
+
+    my $branches_to_use;
+    my $transport_cost_matrix;
+    my $use_transport_cost_matrix = C4::Context->preference("UseTransportCostMatrix");
+    if ($use_transport_cost_matrix) {
+        debug( "Using cost matrix" );
+        $transport_cost_matrix = TransportCostMatrix();
+        unless (keys %$transport_cost_matrix) {
+            warn "UseTransportCostMatrix set to yes, but matrix not populated";
+            undef $transport_cost_matrix;
+        }
+    }
+    unless ($transport_cost_matrix) {
+        debug( "Not using cost matrix" );
+        $branches_to_use = load_branches_to_pull_from();
+    }
+
+    my $bibs_with_pending_requests = GetBibsWithPendingHoldRequests();
+    debug( "bibs_with_pending_requests: ".Dumper($bibs_with_pending_requests) );
+
+    foreach my $biblionumber (@$bibs_with_pending_requests) {
+        $total_bibs++;
+        my $hold_requests   = GetPendingHoldRequestsForBib($biblionumber);
+        my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, $branches_to_use);
+        $total_requests        += scalar(@$hold_requests);
+        $total_available_items += scalar(@$available_items);
+
+        my $item_map = MapItemsToHoldRequests($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix);
+        $item_map  or next;
+        my $item_map_size = scalar(keys %$item_map)
+        or next;;
+
+        $num_items_mapped += $item_map_size;
+        CreatePicklistFromItemMap($item_map);
+        AddToHoldTargetMap($item_map);
+        if (($item_map_size < scalar(@$hold_requests  )) and
+            ($item_map_size < scalar(@$available_items))) {
+            # DOUBLE CHECK, but this is probably OK - unfilled item-level requests
+            # FIXME
+            #warn "unfilled requests for $biblionumber";
+            #warn Dumper($hold_requests), Dumper($available_items), Dumper($item_map);
+        }
+    }
+}
+
+=head2 GetBibsWithPendingHoldRequests
+
+  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
+
+Return an arrayref of the biblionumbers of all bibs
+that have one or more unfilled hold requests.
+
+=cut
+
+sub GetBibsWithPendingHoldRequests {
+    my $dbh = C4::Context->dbh;
+
+    my $bib_query = "SELECT DISTINCT biblionumber
+                     FROM reserves
+                     WHERE found IS NULL
+                     AND priority > 0
+                     AND reservedate <= CURRENT_DATE()";
+    my $sth = $dbh->prepare($bib_query);
+
+    $sth->execute();
+    my $biblionumbers = $sth->fetchall_arrayref();
+
+    return [ map { $_->[0] } @$biblionumbers ];
+}
+
+=head2 GetPendingHoldRequestsForBib
+
+  my $requests = GetPendingHoldRequestsForBib($biblionumber);
+
+Returns an arrayref of hashrefs to pending, unfilled hold requests
+on the bib identified by $biblionumber.  The following keys
+are present in each hashref:
+
+    biblionumber
+    borrowernumber
+    itemnumber
+    priority
+    branchcode
+    reservedate
+    reservenotes
+    borrowerbranch
+
+The arrayref is sorted in order of increasing priority.
+
+=cut
+
+sub GetPendingHoldRequestsForBib {
+    my $biblionumber = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode, 
+                                reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
+                         FROM reserves
+                         JOIN borrowers USING (borrowernumber)
+                         WHERE biblionumber = ?
+                         AND found IS NULL
+                         AND priority > 0
+                         AND reservedate <= CURRENT_DATE()
+                         ORDER BY priority";
+    my $sth = $dbh->prepare($request_query);
+    $sth->execute($biblionumber);
+
+    my $requests = $sth->fetchall_arrayref({});
+    return $requests;
+
+}
+
+=head2 GetItemsAvailableToFillHoldRequestsForBib
+
+  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, $branches_ar);
+
+Returns an arrayref of items available to fill hold requests
+for the bib identified by C<$biblionumber>.  An item is available
+to fill a hold request if and only if:
+
+    * it is not on loan
+    * it is not withdrawn
+    * it is not marked notforloan
+    * it is not currently in transit
+    * it is not lost
+    * it is not sitting on the hold shelf
+
+=cut
+
+sub GetItemsAvailableToFillHoldRequestsForBib {
+    my ($biblionumber, $branches_to_use) = @_;
+
+    my $dbh = C4::Context->dbh;
+    my $items_query = "SELECT itemnumber, homebranch, holdingbranch, itemtypes.itemtype AS itype
+                       FROM items ";
+
+    if (C4::Context->preference('item-level_itypes')) {
+        $items_query .=   "LEFT JOIN itemtypes ON (itemtypes.itemtype = items.itype) ";
+    } else {
+        $items_query .=   "JOIN biblioitems USING (biblioitemnumber)
+                           LEFT JOIN itemtypes USING (itemtype) ";
+    }
+    $items_query .=   "WHERE items.notforloan = 0
+                       AND holdingbranch IS NOT NULL
+                       AND itemlost = 0
+                       AND wthdrawn = 0
+                       AND items.onloan IS NULL
+                       AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0)
+                       AND itemnumber NOT IN (
+                           SELECT itemnumber
+                           FROM reserves
+                           WHERE biblionumber = ?
+                           AND itemnumber IS NOT NULL
+                           AND (found IS NOT NULL OR priority = 0)
+                        )
+                       AND items.biblionumber = ?";
+    $items_query .=  " AND damaged = 0 "
+      unless C4::Context->preference('AllowHoldsOnDamagedItems');
+
+    my @params = ($biblionumber, $biblionumber);
+    if ($branches_to_use && @$branches_to_use) {
+        $items_query .= " AND holdingbranch IN (" . join (",", map { "?" } @$branches_to_use) . ")";
+        push @params, @$branches_to_use;
+    }
+    my $sth = $dbh->prepare($items_query);
+    $sth->execute(@params);
+
+    my $items = $sth->fetchall_arrayref({});
+    $items = [ grep { my @transfers = GetTransfers($_->{itemnumber}); $#transfers == -1; } @$items ]; 
+    map { my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype}); $_->{holdallowed} = $rule->{holdallowed}; $rule->{holdallowed} != 0 } @$items;
+    return [ grep { $_->{holdallowed} != 0 } @$items ];
+}
+
+=head2 MapItemsToHoldRequests
+
+  MapItemsToHoldRequests($hold_requests, $available_items, $branches, $transport_cost_matrix)
+
+=cut
+
+sub MapItemsToHoldRequests {
+    my ($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix) = @_;
+
+    # handle trival cases
+    return unless scalar(@$hold_requests) > 0;
+    return unless scalar(@$available_items) > 0;
+
+    debug( "MapItemsToHoldRequests() for ".Dumper($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix) );
+    my $automatic_return = C4::Context->preference("AutomaticItemReturn");
+
+    # identify item-level requests
+    my %specific_items_requested = map { $_->{itemnumber} => 1 } 
+                                   grep { defined($_->{itemnumber}) }
+                                   @$hold_requests;
+
+    # group available items by itemnumber
+    my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
+
+    # items already allocated
+    my %allocated_items = ();
+
+    # map of items to hold requests
+    my %item_map = ();
+ 
+    # figure out which item-level requests can be filled    
+    my $num_items_remaining = scalar(@$available_items);
+    foreach my $request (@$hold_requests) {
+        last if $num_items_remaining == 0;
+
+        # is this an item-level request?
+        if (defined($request->{itemnumber})) {
+            # fill it if possible; if not skip it
+            if (exists $items_by_itemnumber{$request->{itemnumber}} and
+                not exists $allocated_items{$request->{itemnumber}}) {
+                $item_map{$request->{itemnumber}} = { 
+                    borrowernumber => $request->{borrowernumber},
+                    biblionumber => $request->{biblionumber},
+                    holdingbranch =>  $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
+                    pickup_branch => $request->{branchcode} || $request->{borrowerbranch},
+                    item_level => 1,
+                    reservedate => $request->{reservedate},
+                    reservenotes => $request->{reservenotes},
+                };
+                $allocated_items{$request->{itemnumber}}++;
+                $num_items_remaining--;
+            }
+        } else {
+            # it's title-level request that will take up one item
+            $num_items_remaining--;
+        }
+    }
+
+    # group available items by branch
+    my %items_by_branch = ();
+    foreach my $item (@$available_items) {
+        next unless $item->{holdallowed};
+
+        push @{ $items_by_branch{  $automatic_return ? $item->{homebranch}
+                                                     : $item->{holdingbranch} } }, $item
+          unless exists $allocated_items{ $item->{itemnumber} };
+    }
+    return unless keys %items_by_branch;
+
+    # now handle the title-level requests
+    $num_items_remaining = scalar(@$available_items) - scalar(keys %allocated_items); 
+    my $pull_branches;
+    foreach my $request (@$hold_requests) {
+        last if $num_items_remaining == 0;
+        next if defined($request->{itemnumber}); # already handled these
+
+        # look for local match first
+        my $pickup_branch = $request->{branchcode} || $request->{borrowerbranch};
+        my ($itemnumber, $holdingbranch);
+
+        my $holding_branch_items = $automatic_return ? undef : $items_by_branch{$pickup_branch};
+        if ( $holding_branch_items ) {
+            foreach my $item (@$holding_branch_items) {
+                if ( $request->{borrowerbranch} eq $item->{homebranch} ) {
+                    $itemnumber = $item->{itemnumber};
+                    last;
+                }
+            }
+            $holdingbranch = $pickup_branch;
+            $itemnumber ||= $holding_branch_items->[0]->{itemnumber};
+        }
+        elsif ($transport_cost_matrix) {
+            $pull_branches = [keys %items_by_branch];
+            $holdingbranch = least_cost_branch( $pickup_branch, $pull_branches, $transport_cost_matrix );
+            if ( $holdingbranch ) {
+
+                my $holding_branch_items = $items_by_branch{$holdingbranch};
+                foreach my $item (@$holding_branch_items) {
+                    next if $request->{borrowerbranch} ne $item->{homebranch};
+
+                    $itemnumber = $item->{itemnumber};
+                    last;
+                }
+                $itemnumber ||= $holding_branch_items->[0]->{itemnumber};
+            }
+            else {
+                warn "No transport costs for $pickup_branch";
+            }
+        }
+
+        unless ($itemnumber) {
+            # not found yet, fall back to basics
+            if ($branches_to_use) {
+                $pull_branches = $branches_to_use;
+            } else {
+                $pull_branches = [keys %items_by_branch];
+            }
+            PULL_BRANCHES:
+            foreach my $branch (@$pull_branches) {
+                my $holding_branch_items = $items_by_branch{$branch}
+                  or next;
+
+                $holdingbranch ||= $branch;
+                foreach my $item (@$holding_branch_items) {
+                    next if $pickup_branch ne $item->{homebranch};
+
+                    $itemnumber = $item->{itemnumber};
+                    $holdingbranch = $branch;
+                    last PULL_BRANCHES;
+                }
+            }
+            $itemnumber ||= $items_by_branch{$holdingbranch}->[0]->{itemnumber}
+              if $holdingbranch;
+        }
+
+        if ($itemnumber) {
+            my $holding_branch_items = $items_by_branch{$holdingbranch}
+              or die "Have $itemnumber, $holdingbranch, but no items!";
+            @$holding_branch_items = grep { $_->{itemnumber} != $itemnumber } @$holding_branch_items;
+            delete $items_by_branch{$holdingbranch} unless @$holding_branch_items;
+
+            $item_map{$itemnumber} = {
+                borrowernumber => $request->{borrowernumber},
+                biblionumber => $request->{biblionumber},
+                holdingbranch => $holdingbranch,
+                pickup_branch => $pickup_branch,
+                item_level => 0,
+                reservedate => $request->{reservedate},
+                reservenotes => $request->{reservenotes},
+            };
+            $num_items_remaining--; 
+        }
+    }
+    return \%item_map;
+}
+
+=head2 CreatePickListFromItemMap 
+
+=cut
+
+sub CreatePicklistFromItemMap {
+    my $item_map = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $sth_load=$dbh->prepare("
+        INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
+                                    cardnumber,reservedate,title, itemcallnumber,
+                                    holdingbranch,pickbranch,notes, item_level_request)
+        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+    ");
+
+    foreach my $itemnumber  (sort keys %$item_map) {
+        my $mapped_item = $item_map->{$itemnumber};
+        my $biblionumber = $mapped_item->{biblionumber}; 
+        my $borrowernumber = $mapped_item->{borrowernumber}; 
+        my $pickbranch = $mapped_item->{pickup_branch};
+        my $holdingbranch = $mapped_item->{holdingbranch};
+        my $reservedate = $mapped_item->{reservedate};
+        my $reservenotes = $mapped_item->{reservenotes};
+        my $item_level = $mapped_item->{item_level};
+
+        my $item = GetItem($itemnumber);
+        my $barcode = $item->{barcode};
+        my $itemcallnumber = $item->{itemcallnumber};
+
+        my $borrower = GetMember('borrowernumber'=>$borrowernumber);
+        my $cardnumber = $borrower->{'cardnumber'};
+        my $surname = $borrower->{'surname'};
+        my $firstname = $borrower->{'firstname'};
+        my $phone = $borrower->{'phone'};
+   
+        my $bib = GetBiblioData($biblionumber);
+        my $title = $bib->{title}; 
+
+        $sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
+                           $cardnumber, $reservedate, $title, $itemcallnumber,
+                           $holdingbranch, $pickbranch, $reservenotes, $item_level);
+    }
+}
+
+=head2 AddToHoldTargetMap
+
+=cut
+
+sub AddToHoldTargetMap {
+    my $item_map = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $insert_sql = q(
+        INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request)
+                               VALUES (?, ?, ?, ?, ?)
+    );
+    my $sth_insert = $dbh->prepare($insert_sql);
+
+    foreach my $itemnumber (keys %$item_map) {
+        my $mapped_item = $item_map->{$itemnumber};
+        $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber,
+                             $mapped_item->{holdingbranch}, $mapped_item->{item_level});
+    }
+}
+
+# Helper functions, not part of any interface
+
+sub debug {
+#   warn @_;
+}
+
+sub load_branches_to_pull_from {
+    my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight")
+      or return;
+
+    my @branches_to_use = map { s/^\s+//; s/\s+$//; $_; } split /,/, $static_branch_list;
+
+    @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
+
+    return \@branches_to_use;
+}
+
+sub least_cost_branch {
+
+    #$from - arrayref
+    my ($to, $from, $transport_cost_matrix) = @_;
+
+# Nothing really spectacular: supply to branch, a list of potential from branches
+# and find the minimum from - to value from the transport_cost_matrix
+    return $from->[0] if @$from == 1;
+
+    my ($least_cost, @branch);
+    foreach (@$from) {
+        my $cell = $transport_cost_matrix->{$to}{$_};
+        next if $cell->{disable_transfer};
+
+        my $cost = $cell->{cost};
+
+        unless (defined $least_cost) {
+            $least_cost = $cost;
+            push @branch, $_;
+            next;
+        }
+
+        next if $cost > $least_cost;
+
+        if ($cost == $least_cost) {
+            push @branch, $_;
+            next;
+        }
+
+        @branch = ($_);
+        $least_cost = $cost;
+    }
+
+    return $branch[0];
+
+    # XXX return a random @branch with minimum cost instead of the first one;
+    # return $branch[0] if @branch == 1;
+}
+
+
+1;
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 5e3848d..cf46e22 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -203,6 +203,7 @@ $tabsysprefs{DisplayClearScreenButton}       = "Circulation";
 $tabsysprefs{AllowAllMessageDeletion}        = "Circulation";
 $tabsysprefs{OverdueNoticeBcc}               = "Circulation";
 $tabsysprefs{OverduesBlockCirc}              = "Circulation";
+$tabsysprefs{UseTransportCostMatrix}         = "Circulation";
 
 
 # Staff Client
diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl
new file mode 100755
index 0000000..725257c
--- /dev/null
+++ b/admin/transport-cost-matrix.pl
@@ -0,0 +1,125 @@
+#!/usr/bin/perl
+# Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+use CGI;
+use C4::Context;
+use C4::Output;
+use C4::Auth;
+use C4::Koha;
+use C4::Debug;
+use C4::Branch; # GetBranches
+use C4::HoldsQueue qw(TransportCostMatrix UpdateTransportCostMatrix);
+
+use Data::Dumper;
+
+my $input = new CGI;
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "admin/transport-cost-matrix.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {parameters => 1},
+                            debug => 1,
+                            });
+my $use_transport_cost_matrix = C4::Context->preference("UseTransportCostMatrix");
+
+my $update = $input->param('op') eq 'set-cost-matrix';
+
+my ($cost_matrix, $have_matrix);
+unless ($update) {
+    $cost_matrix = TransportCostMatrix();
+    $have_matrix = keys %$cost_matrix if $cost_matrix;
+}
+
+my $branches = GetBranches();
+my @branchloop = map { code => $_,
+                       name => $branches->{$_}->{'branchname'} },
+                 sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
+                 keys %$branches;
+my (@branchfromloop, @cost, @errors);
+foreach my $branchfrom ( @branchloop ) {
+    my $fromcode = $branchfrom->{code};
+
+    my %from_row = ( code => $fromcode, name => $branchfrom->{name} );
+    foreach my $branchto ( @branchloop ) {
+        my $tocode = $branchto->{code};
+
+        my %from_to_input_def = ( code => $tocode, name => $branchto->{name} );
+        push @{ $from_row{branchtoloop} }, \%from_to_input_def;
+
+        if ($fromcode eq $tocode) {
+            $from_to_input_def{skip} = 1;
+            next;
+        }
+
+        (my $from_to = "${fromcode}_${tocode}") =~ s/\W//go;
+         $from_to_input_def{id} = $from_to;
+        my $input_name   = "cost_$from_to";
+        my $disable_name = "disable_$from_to";
+
+        if ($update) {
+            my $value = $from_to_input_def{value} = $input->param($input_name);
+            if ( $input->param($disable_name) ) {
+                $from_to_input_def{disabled} = 1;
+            }
+            else {
+                push @errors, "Invalid value for $from_row{name} -> $from_to_input_def{name}"
+                  unless $value =~ /\d/o && $value >= 0.0;
+            }
+        }
+        else {
+            if ($have_matrix) {
+                if ( my $cell = $cost_matrix->{$tocode}{$fromcode} ) {
+                    $from_to_input_def{value} = $cell->{cost};
+                    $from_to_input_def{disabled} = 1 if $cell->{disable_transfer};
+                }
+            } else {
+                $from_to_input_def{disabled} = 1;
+            }
+        }
+    }
+    
+#              die Dumper(\%from_row);
+    push @branchfromloop, \%from_row;
+}
+
+if ($update && !@errors) {
+    my @update_recs = map {
+        my $from = $_->{code};
+        map { frombranch => $from, tobranch => $_->{code}, cost => $_->{value}, disable_transfer => $_->{disabled} || 0 },
+            grep { $_->{code} ne $from }
+            @{ $_->{branchtoloop} };
+    } @branchfromloop;
+
+    UpdateTransportCostMatrix(\@update_recs);
+}
+   
+$template->param(
+    branchloop => \@branchloop,
+    branchfromloop => \@branchfromloop,
+    WARNING_transport_cost_matrix_off => !$use_transport_cost_matrix,
+    errors => \@errors,
+);
+output_html_with_http_headers $input, $cookie, $template->output;
+
+exit 0;
+
diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 4b51423..cf529f0 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -31,7 +31,7 @@ use C4::Biblio;
 use C4::Items;
 use C4::Koha;   # GetItemTypes
 use C4::Branch; # GetBranches
-use C4::Dates qw/format_date/;
+use C4::HoldsQueue qw(GetHoldsQueueItems);
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -51,6 +51,7 @@ my $branchlimit    = $params->{'branchlimit'};
 my $itemtypeslimit = $params->{'itemtypeslimit'};
 
 if ( $run_report ) {
+    # XXX GetHoldsQueueItems() does not support $itemtypeslimit!
     my $items = GetHoldsQueueItems($branchlimit, $itemtypeslimit);
     $template->param(
         branch     => $branchlimit,
@@ -76,36 +77,5 @@ $template->param(
    itemtypeloop => \@itemtypesloop,
 );
 
-sub GetHoldsQueueItems {
-	my ($branchlimit,$itemtypelimit) = @_;
-	my $dbh = C4::Context->dbh;
-
-    my @bind_params = ();
-	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
-                  FROM tmp_holdsqueue
-                       JOIN biblio      USING (biblionumber)
-				  LEFT JOIN biblioitems USING (biblionumber)
-                  LEFT JOIN items       USING (  itemnumber)
-                /;
-    if ($branchlimit) {
-	    $query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
-        push @bind_params, $branchlimit;
-    }
-    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
-	my $sth = $dbh->prepare($query);
-	$sth->execute(@bind_params);
-	my $items = [];
-    while ( my $row = $sth->fetchrow_hashref ){
-	$row->{reservedate} = format_date($row->{reservedate});
-	my $record = GetMarcBiblio($row->{biblionumber});
-    if ($record){
-        $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
-	    $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
-	    $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
-	}
-        push @$items, $row;
-    }
-    return $items;
-}
 # writing the template
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 9a94e0f..bdda0b9 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2785,6 +2785,22 @@ CREATE TABLE `fieldmapping` ( -- koha to keyword mapping
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
+-- Table structure for table `transport_cost`
+--
+
+DROP TABLE IF EXISTS transport_cost;
+CREATE TABLE transport_cost (
+      frombranch varchar(10) NOT NULL,
+      tobranch varchar(10) NOT NULL,
+      cost decimal(6,2) NOT NULL,
+      disable_transfer tinyint(1) NOT NULL DEFAULT 0,
+      CHECK ( frombranch <> tobranch ), -- a dud check, mysql does not support that
+      PRIMARY KEY (frombranch, tobranch),
+      CONSTRAINT transport_cost_ibfk_1 FOREIGN KEY (frombranch) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE,
+      CONSTRAINT transport_cost_ibfk_2 FOREIGN KEY (tobranch) REFERENCES branches (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
 -- Table structure for table `biblioimages`
 --
 
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 1edf08e..977c1d3 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -324,6 +324,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTransportCostMatrix',0,"Use Transport Cost Matrix when filling holds",'','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 38aa70c..b7bf80f 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5246,6 +5246,28 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+
+
+$DBversion = "3.09.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTransportCostMatrix',0,'Use Transport Cost Matrix when filling holds','','YesNo')");
+
+ $dbh->do("CREATE TABLE `transport_cost` (
+              `frombranch` varchar(10) NOT NULL,
+              `tobranch` varchar(10) NOT NULL,
+              `cost` decimal(6,2) NOT NULL,
+              `disable_transfer` tinyint(1) NOT NULL DEFAULT 0,
+              CHECK ( `frombranch` <> `tobranch` ), -- a dud check, mysql does not support that
+              PRIMARY KEY (`frombranch`, `tobranch`),
+              CONSTRAINT `transport_cost_ibfk_1` FOREIGN KEY (`frombranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
+              CONSTRAINT `transport_cost_ibfk_2` FOREIGN KEY (`tobranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
+          ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+
+    print "Upgrade to $DBversion done (creating `transport_cost` table; adding UseTransportCostMatrix systempref, in circulation)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index ef46ede..14486f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -53,6 +53,8 @@
 	Define circulation and fines rules for combinations of libraries, patron categories, and item types
     Library transfer limits
 	Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.
+    Transport Cost Matrix
+	Define transport costs between branches
     Item circulation alerts
 	Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 471aa0e..46a169d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -164,6 +164,12 @@ Circulation:
                   itemtype: item type
             - .
         -
+            - pref: UseTransportCostMatrix
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - Transport Cost Matrix for calculating optimal holds filling between branches.
+        -
             - Use the checkout and fines rules of
             - pref: CircControl
               type: choice
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
new file mode 100644
index 0000000..725eba5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
@@ -0,0 +1,127 @@
+[% INCLUDE 'doc-head-open.inc' %]
+Koha › Administration › Transport Cost Matrix
+[% INCLUDE 'doc-head-close.inc' %]
+
+
+
+
+
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+Home › Administration › Transport Cost Matrix
+
+
+
+
+    
+    
+    
+            Defining transport costs between libraries
+    
+[% IF ( WARNING_transport_cost_matrix_off ) %]
+Because the "UseTransportCostMatrix" system preference is currently not enabled, Transport Cost Matrix is not being used.  Go here if you wish to enable this feature.
+[% END %]
+
+    
+        
+            
+            
+                
+                    Costs are decimal values 0 to some arbitrarymax value (1 or 100), 0 being minimum (no) cost.
+                    Red cells signify no transfer allowed
+                    Click on the cell to edit
+                
+                
+                [% FOR e IN errors %]
+                    [% e %]
+                [% END %]
+                
+                
+                    
+                        
+                [% FOR b IN branchloop %]
+                        
+                [% END %]
+                    
+                [% FOR bf IN branchfromloop %]
+                    
+                        
+                    [% FOR bt IN bf.branchtoloop %]
+                        
+                    [% END %]
+                    
+                [% END %]
+                From \ To [% b.name %]
[% bf.name %] 
+                        [% IF bt.skip %]
+                             
+                        [% ELSE %]
+                            
+                            [% !bt.disabled && bt.value > '' ? bt.value : ' ' %]
+                            
+                            [% IF bt.disabled %]
+                            
+                            [% END %]
+                            
+                        [% END %]
+                        
+            
+            
+        
+    
+    
+    
+
+[% INCLUDE 'admin-menu.inc' %]
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/misc/cronjobs/holds/build_holds_queue.pl b/misc/cronjobs/holds/build_holds_queue.pl
index f01153e..9ec9825 100755
--- a/misc/cronjobs/holds/build_holds_queue.pl
+++ b/misc/cronjobs/holds/build_holds_queue.pl
@@ -5,7 +5,6 @@
 #-----------------------------------
 # FIXME: add command-line options for verbosity and summary
 # FIXME: expand perldoc, explain intended logic
-# FIXME: refactor all subroutines into C4 for testability
 
 use strict;
 use warnings;
@@ -16,384 +15,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use C4::Context;
-use C4::Search;
-use C4::Items;
-use C4::Branch;
-use C4::Circulation;
-use C4::Members;
-use C4::Biblio;
+use C4::HoldsQueue qw(CreateQueue);
 
-use List::Util qw(shuffle);
+CreateQueue();
 
-my $bibs_with_pending_requests = GetBibsWithPendingHoldRequests();
-
-my $dbh   = C4::Context->dbh;
-$dbh->do("DELETE FROM tmp_holdsqueue");  # clear the old table for new info
-$dbh->do("DELETE FROM hold_fill_targets");
-
-my $total_bibs            = 0;
-my $total_requests        = 0;
-my $total_available_items = 0;
-my $num_items_mapped      = 0;
-
-my @branches_to_use = _get_branches_to_pull_from();
-
-foreach my $biblionumber (@$bibs_with_pending_requests) {
-    $total_bibs++;
-    my $hold_requests   = GetPendingHoldRequestsForBib($biblionumber);
-    my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, @branches_to_use);
-    $total_requests        += scalar(@$hold_requests);
-    $total_available_items += scalar(@$available_items);
-    my $item_map = MapItemsToHoldRequests($hold_requests, $available_items, @branches_to_use);
-
-    (defined($item_map)) or next;
-
-    my $item_map_size = scalar(keys %$item_map);
-    $num_items_mapped += $item_map_size;
-    CreatePicklistFromItemMap($item_map);
-    AddToHoldTargetMap($item_map);
-    if (($item_map_size < scalar(@$hold_requests  )) and
-        ($item_map_size < scalar(@$available_items))) {
-        # DOUBLE CHECK, but this is probably OK - unfilled item-level requests
-        # FIXME
-        #warn "unfilled requests for $biblionumber";
-        #warn Dumper($hold_requests), Dumper($available_items), Dumper($item_map);
-    }
-}
-
-exit 0;
-
-=head1 FUNCTIONS
-
-=head2 GetBibsWithPendingHoldRequests
-
-  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
-
-Return an arrayref of the biblionumbers of all bibs
-that have one or more unfilled hold requests.
-
-=cut
-
-sub GetBibsWithPendingHoldRequests {
-    my $dbh = C4::Context->dbh;
-
-    my $bib_query = "SELECT DISTINCT biblionumber
-                     FROM reserves
-                     WHERE found IS NULL
-                     AND priority > 0
-                     AND reservedate <= CURRENT_DATE()";
-    my $sth = $dbh->prepare($bib_query);
-
-    $sth->execute();
-    my $biblionumbers = $sth->fetchall_arrayref();
-
-    return [ map { $_->[0] } @$biblionumbers ];
-}
-
-=head2 GetPendingHoldRequestsForBib
-
-  my $requests = GetPendingHoldRequestsForBib($biblionumber);
-
-Returns an arrayref of hashrefs to pending, unfilled hold requests
-on the bib identified by $biblionumber.  The following keys
-are present in each hashref:
-
-    biblionumber
-    borrowernumber
-    itemnumber
-    priority
-    branchcode
-    reservedate
-    reservenotes
-    borrowerbranch
-
-The arrayref is sorted in order of increasing priority.
-
-=cut
-
-sub GetPendingHoldRequestsForBib {
-    my $biblionumber = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode, 
-                                reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
-                         FROM reserves
-                         JOIN borrowers USING (borrowernumber)
-                         WHERE biblionumber = ?
-                         AND found IS NULL
-                         AND priority > 0
-                         AND reservedate <= CURRENT_DATE()
-                         ORDER BY priority";
-    my $sth = $dbh->prepare($request_query);
-    $sth->execute($biblionumber);
-
-    my $requests = $sth->fetchall_arrayref({});
-    return $requests;
-
-}
-
-=head2 GetItemsAvailableToFillHoldRequestsForBib
-
-  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber);
-
-Returns an arrayref of items available to fill hold requests
-for the bib identified by C<$biblionumber>.  An item is available
-to fill a hold request if and only if:
-
-    * it is not on loan
-    * it is not withdrawn
-    * it is not marked notforloan
-    * it is not currently in transit
-    * it is not lost
-    * it is not sitting on the hold shelf
-
-=cut
-
-sub GetItemsAvailableToFillHoldRequestsForBib {
-    my $biblionumber = shift;
-    my @branches_to_use = @_;
-
-    my $dbh = C4::Context->dbh;
-    my $items_query = "SELECT itemnumber, homebranch, holdingbranch, itemtypes.itemtype AS itype
-                       FROM items ";
-
-    if (C4::Context->preference('item-level_itypes')) {
-        $items_query .=   "LEFT JOIN itemtypes ON (itemtypes.itemtype = items.itype) ";
-    } else {
-        $items_query .=   "JOIN biblioitems USING (biblioitemnumber)
-                           LEFT JOIN itemtypes USING (itemtype) ";
-    }
-    $items_query .=   "WHERE items.notforloan = 0
-                       AND holdingbranch IS NOT NULL
-                       AND itemlost = 0
-                       AND wthdrawn = 0";
-    $items_query .=   " AND damaged = 0 " unless C4::Context->preference('AllowHoldsOnDamagedItems');
-    $items_query .=   " AND items.onloan IS NULL
-                       AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0)
-                       AND itemnumber NOT IN (
-                           SELECT itemnumber
-                           FROM reserves
-                           WHERE biblionumber = ?
-                           AND itemnumber IS NOT NULL
-                           AND (found IS NOT NULL OR priority = 0)
-                        )
-                       AND items.biblionumber = ?";
-    my @params = ($biblionumber, $biblionumber);
-    if ($#branches_to_use > -1) {
-        $items_query .= " AND holdingbranch IN (" . join (",", map { "?" } @branches_to_use) . ")";
-        push @params, @branches_to_use;
-    }
-    my $sth = $dbh->prepare($items_query);
-    $sth->execute(@params);
-
-    my $items = $sth->fetchall_arrayref({});
-    $items = [ grep { my @transfers = GetTransfers($_->{itemnumber}); $#transfers == -1; } @$items ]; 
-    map { my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype}); $_->{holdallowed} = $rule->{holdallowed}; $rule->{holdallowed} != 0 } @$items;
-    return [ grep { $_->{holdallowed} != 0 } @$items ];
-}
-
-=head2 MapItemsToHoldRequests
-
-  MapItemsToHoldRequests($hold_requests, $available_items);
-
-=cut
-
-sub MapItemsToHoldRequests {
-    my $hold_requests = shift;
-    my $available_items = shift;
-    my @branches_to_use = @_;
-
-    # handle trival cases
-    return unless scalar(@$hold_requests) > 0;
-    return unless scalar(@$available_items) > 0;
-
-    # identify item-level requests
-    my %specific_items_requested = map { $_->{itemnumber} => 1 } 
-                                   grep { defined($_->{itemnumber}) }
-                                   @$hold_requests;
-
-    # group available items by itemnumber
-    my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
-
-    # items already allocated
-    my %allocated_items = ();
-
-    # map of items to hold requests
-    my %item_map = ();
- 
-    # figure out which item-level requests can be filled    
-    my $num_items_remaining = scalar(@$available_items);
-    foreach my $request (@$hold_requests) {
-        last if $num_items_remaining == 0;
-
-        # is this an item-level request?
-        if (defined($request->{itemnumber})) {
-            # fill it if possible; if not skip it
-            if (exists $items_by_itemnumber{$request->{itemnumber}} and
-                not exists $allocated_items{$request->{itemnumber}}) {
-                $item_map{$request->{itemnumber}} = { 
-                    borrowernumber => $request->{borrowernumber},
-                    biblionumber => $request->{biblionumber},
-                    holdingbranch =>  $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
-                    pickup_branch => $request->{branchcode},
-                    item_level => 1,
-                    reservedate => $request->{reservedate},
-                    reservenotes => $request->{reservenotes},
-                };
-                $allocated_items{$request->{itemnumber}}++;
-                $num_items_remaining--;
-            }
-        } else {
-            # it's title-level request that will take up one item
-            $num_items_remaining--;
-        }
-    }
-
-    # group available items by branch
-    my %items_by_branch = ();
-    foreach my $item (@$available_items) {
-        push @{ $items_by_branch{ $item->{holdingbranch} } }, $item unless exists $allocated_items{ $item->{itemnumber} };
-    }
-
-    # now handle the title-level requests
-    $num_items_remaining = scalar(@$available_items) - scalar(keys %allocated_items); 
-    foreach my $request (@$hold_requests) {
-        last if $num_items_remaining <= 0;
-        next if defined($request->{itemnumber}); # already handled these
-
-        # look for local match first
-        my $pickup_branch = $request->{branchcode};
-        if (exists $items_by_branch{$pickup_branch} and 
-            not ($items_by_branch{$pickup_branch}->[0]->{holdallowed} == 1 and 
-                 $request->{borrowerbranch} ne $items_by_branch{$pickup_branch}->[0]->{homebranch}) 
-           ) {
-            my $item = pop @{ $items_by_branch{$pickup_branch} };
-            delete $items_by_branch{$pickup_branch} if scalar(@{ $items_by_branch{$pickup_branch} }) == 0;
-            $item_map{$item->{itemnumber}} = { 
-                                                borrowernumber => $request->{borrowernumber},
-                                                biblionumber => $request->{biblionumber},
-                                                holdingbranch => $pickup_branch,
-                                                pickup_branch => $pickup_branch,
-                                                item_level => 0,
-                                                reservedate => $request->{reservedate},
-                                                reservenotes => $request->{reservenotes},
-                                             };
-            $num_items_remaining--;
-        } else {
-            my @pull_branches = ();
-            if ($#branches_to_use > -1) {
-                @pull_branches = @branches_to_use;
-            } else {
-                @pull_branches = sort keys %items_by_branch;
-            }
-            foreach my $branch (@pull_branches) {
-                next unless exists $items_by_branch{$branch} and
-                            not ($items_by_branch{$branch}->[0]->{holdallowed} == 1 and 
-                                $request->{borrowerbranch} ne $items_by_branch{$branch}->[0]->{homebranch});
-                my $item = pop @{ $items_by_branch{$branch} };
-                delete $items_by_branch{$branch} if scalar(@{ $items_by_branch{$branch} }) == 0;
-                $item_map{$item->{itemnumber}} = { 
-                                                    borrowernumber => $request->{borrowernumber},
-                                                    biblionumber => $request->{biblionumber},
-                                                    holdingbranch => $branch,
-                                                    pickup_branch => $pickup_branch,
-                                                    item_level => 0,
-                                                    reservedate => $request->{reservedate},
-                                                    reservenotes => $request->{reservenotes},
-                                                 };
-                $num_items_remaining--; 
-                last;
-            }
-        }
-    }
-    return \%item_map;
-}
-
-=head2 CreatePickListFromItemMap 
-
-=cut
-
-sub CreatePicklistFromItemMap {
-    my $item_map = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $sth_load=$dbh->prepare("
-        INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
-                                    cardnumber,reservedate,title, itemcallnumber,
-                                    holdingbranch,pickbranch,notes, item_level_request)
-        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-    ");
-
-    foreach my $itemnumber  (sort keys %$item_map) {
-        my $mapped_item = $item_map->{$itemnumber};
-        my $biblionumber = $mapped_item->{biblionumber}; 
-        my $borrowernumber = $mapped_item->{borrowernumber}; 
-        my $pickbranch = $mapped_item->{pickup_branch};
-        my $holdingbranch = $mapped_item->{holdingbranch};
-        my $reservedate = $mapped_item->{reservedate};
-        my $reservenotes = $mapped_item->{reservenotes};
-        my $item_level = $mapped_item->{item_level};
-
-        my $item = GetItem($itemnumber);
-        my $barcode = $item->{barcode};
-        my $itemcallnumber = $item->{itemcallnumber};
-
-        my $borrower = GetMember('borrowernumber'=>$borrowernumber);
-        my $cardnumber = $borrower->{'cardnumber'};
-        my $surname = $borrower->{'surname'};
-        my $firstname = $borrower->{'firstname'};
-        my $phone = $borrower->{'phone'};
-   
-        my $bib = GetBiblioData($biblionumber);
-        my $title = $bib->{title}; 
-
-        $sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
-                           $cardnumber, $reservedate, $title, $itemcallnumber,
-                           $holdingbranch, $pickbranch, $reservenotes, $item_level);
-    }
-}
-
-=head2 AddToHoldTargetMap
-
-=cut
-
-sub AddToHoldTargetMap {
-    my $item_map = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $insert_sql = q(
-        INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request)
-                               VALUES (?, ?, ?, ?, ?)
-    );
-    my $sth_insert = $dbh->prepare($insert_sql);
-
-    foreach my $itemnumber (keys %$item_map) {
-        my $mapped_item = $item_map->{$itemnumber};
-        $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber,
-                             $mapped_item->{holdingbranch}, $mapped_item->{item_level});
-    }
-}
-
-=head2 _get_branches_to_pull_from
-
-Query system preferences to get ordered list of
-branches to use to fill hold requests.
-
-=cut
-
-sub _get_branches_to_pull_from {
-    my @branches_to_use = ();
-  
-    my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight");
-    if ($static_branch_list) {
-        @branches_to_use = map { s/^\s+//; s/\s+$//; $_; } split /,/, $static_branch_list;
-    }
-
-    @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
-
-    return @branches_to_use;
-}
diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t
new file mode 100755
index 0000000..6cce4d9
--- /dev/null
+++ b/t/db_dependent/HoldsQueue.t
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+
+# Test C4::HoldsQueue::CreateQueue() for both transport cost matrix
+# and StaticHoldsQueueWeight array (no RandomizeHoldsQueueWeight, no point)
+# Wraps tests in transaction that's rolled back, so no data is destroyed
+# MySQL WARNING: This makes sense only if your tables are InnoDB, otherwise
+# transactions are not supported and mess is left behind
+
+use strict;
+use warnings;
+use C4::Context;
+
+use Data::Dumper;
+
+use Test::More tests => 15;
+
+BEGIN {
+	use FindBin;
+	use lib $FindBin::Bin;
+	use_ok('C4::Reserves');
+	use_ok('C4::HoldsQueue');
+}
+
+my $TITLE = "Test Holds Queue XXX";
+# Pick a plausible borrower. Easier than creating one.
+my $BORROWER_QRY = <dbh;
+my $borrower = $dbh->selectrow_hashref($BORROWER_QRY);
+my $borrowernumber = $borrower->{borrowernumber};
+# Set special (for this test) branches
+my $borrower_branchcode = $borrower->{branchcode};
+my @other_branches = grep { $_ ne $borrower_branchcode } @{ $dbh->selectcol_arrayref("SELECT branchcode FROM branches") };
+my $least_cost_branch_code = pop @other_branches
+ or BAIL_OUT("No point testing only one branch...");
+
+# Start transaction
+$dbh->{AutoCommit} = 0;
+$dbh->{RaiseError} = 1;
+
+#Set up the stage
+# Sysprefs and cost matrix
+$dbh->do("UPDATE systempreferences SET value = ? WHERE variable = 'StaticHoldsQueueWeight'", undef,
+         join( ',', @other_branches, $borrower_branchcode, $least_cost_branch_code));
+$dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'RandomizeHoldsQueueWeight'");
+
+$dbh->do("DELETE FROM transport_cost");
+my $transport_cost_insert_sth = $dbh->prepare("insert into transport_cost (frombranch, tobranch, cost) values (?, ?, ?)");
+# Favour $least_cost_branch_code
+$transport_cost_insert_sth->execute($borrower_branchcode, $least_cost_branch_code, 0.2);
+$transport_cost_insert_sth->execute($least_cost_branch_code, $borrower_branchcode, 0.2);
+my @b = @other_branches;
+while ( my $b1 = shift @b ) {
+    foreach my $b2 ($borrower_branchcode, $least_cost_branch_code, @b) {
+        $transport_cost_insert_sth->execute($b1, $b2, 0.5);
+        $transport_cost_insert_sth->execute($b2, $b1, 0.5);
+    }
+}
+
+
+# Loanable items - all possible combinations of homebranch and holdingbranch
+$dbh->do("INSERT INTO biblio (frameworkcode, author, title, datecreated)
+          VALUES             ('SER', 'Koha test', '$TITLE', '2011-02-01')");
+my $biblionumber = $dbh->selectrow_array("SELECT biblionumber FROM biblio WHERE title = '$TITLE'")
+  or BAIL_OUT("Cannot find newly created biblio record");
+$dbh->do("INSERT INTO biblioitems (biblionumber, marcxml)
+          VALUES                  ($biblionumber, '')");
+my $biblioitemnumber = $dbh->selectrow_array("SELECT biblioitemnumber FROM biblioitems WHERE biblionumber = $biblionumber")
+  or BAIL_OUT("Cannot find newly created biblioitems record");
+
+my $items_insert_sth = $dbh->prepare("INSERT INTO items (biblionumber, biblioitemnumber, barcode, homebranch, holdingbranch, notforloan, damaged, itemlost, wthdrawn, onloan)
+                                      VALUES            ($biblionumber, $biblioitemnumber, ?, ?, ?, 0, 0, 0, 0, NULL)"); # CURRENT_DATE - 3)");
+my $first_barcode = int(rand(1000000000000)); # XXX
+my $barcode = $first_barcode;
+foreach ( $borrower_branchcode, $least_cost_branch_code, @other_branches ) {
+    $items_insert_sth->execute($barcode++, $borrower_branchcode, $_);
+    $items_insert_sth->execute($barcode++, $_, $_);
+    $items_insert_sth->execute($barcode++, $_, $borrower_branchcode);
+}
+
+# Remove existing reserves, makes debugging easier
+$dbh->do("DELETE FROM reserves");
+my $constraint = undef;
+my $bibitems = undef;
+my $priority = 1;
+# Make a reserve
+AddReserve ( $borrower_branchcode, $borrowernumber, $biblionumber, $constraint, $bibitems,  $priority );
+#                           $resdate, $expdate, $notes, $title, $checkitem, $found
+$dbh->do("UPDATE reserves SET reservedate = reservedate - 1");
+
+# Tests
+my $use_cost_matrix_sth = $dbh->prepare("UPDATE systempreferences SET value = ? WHERE variable = 'UseTransportCostMatrix'");
+my $test_sth = $dbh->prepare("SELECT * FROM hold_fill_targets
+                              JOIN tmp_holdsqueue USING (borrowernumber, biblionumber, itemnumber)
+                              JOIN items USING (itemnumber)
+                              WHERE borrowernumber = $borrowernumber");
+
+# We have a book available homed in borrower branch
+test_queue ('take from homebranch',  0, $borrower_branchcode, $borrower_branchcode);
+test_queue ('take from homebranch',  1, $borrower_branchcode, $borrower_branchcode);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE homebranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE homebranch = '$borrower_branchcode'");
+# We have a book available held in borrower branch
+test_queue ('take from holdingbranch', 0, $borrower_branchcode, $borrower_branchcode);
+test_queue ('take from holdingbranch', 1, $borrower_branchcode, $borrower_branchcode);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE holdingbranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE holdingbranch = '$borrower_branchcode'");
+# No book available in borrower branch, pick according to the rules
+# Frst branch from StaticHoldsQueueWeight
+test_queue ('take from lowest cost branch', 0, $borrower_branchcode, $other_branches[0]);
+test_queue ('take from lowest cost branch', 1, $borrower_branchcode, $least_cost_branch_code);
+my $queue = C4::HoldsQueue::GetHoldsQueueItems($least_cost_branch_code) || [];
+my $queue_item = $queue->[0];
+ok( $queue_item
+ && $queue_item->{pickbranch} eq $borrower_branchcode
+ && $queue_item->{holdingbranch} eq $least_cost_branch_code, "GetHoldsQueueItems" )
+  or diag( "Expected item for pick $borrower_branchcode, hold $least_cost_branch_code, got ".Dumper($queue_item) );
+
+# XXX All this tests are for borrower branch pick-up.
+# Maybe needs expanding to homebranch or holdingbranch pick-up.
+
+# Cleanup
+$dbh->rollback;
+
+exit;
+
+sub test_queue {
+    my ($test_name, $use_cost_matrix, $pick_branch, $hold_branch) = @_;
+
+    $test_name = "$test_name (".($use_cost_matrix ? "" : "don't")." use cost matrix)";
+
+    $use_cost_matrix_sth->execute($use_cost_matrix);
+    C4::Context->_flush_preferences();
+    C4::HoldsQueue::CreateQueue();
+
+    my $results = $dbh->selectall_arrayref($test_sth, { Slice => {} }); # should be only one
+    my $r = $results->[0];
+
+    my $ok = is( $r->{pickbranch}, $pick_branch, "$test_name pick up branch");
+    $ok &&=  is( $r->{holdingbranch}, $hold_branch, "$test_name holding branch")
+      if $hold_branch;
+
+    diag( "Wrong pick-up/hold: ". Dumper ($pick_branch,, $hold_branch, map dump_records($_), qw(reserves hold_fill_targets tmp_holdsqueue)) )
+      unless $ok;
+}
+
+sub dump_records {
+    my ($tablename) = @_;
+    return $dbh->selectall_arrayref("SELECT * from $tablename where borrowernumber = ?", { Slice => {} }, $borrowernumber);
+}
+
+
-- 
1.7.9.5


From oleonard at myacpl.org  Thu May 17 17:26:46 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 17 May 2012 11:26:46 -0400
Subject: [Koha-patches] [PATCH] Bug 7889 - Use standard style for errors and
	messages
Message-ID: <1337268406-14147-1-git-send-email-oleonard@myacpl.org>

Styling subscription renew message according to standard style.
Also:
 - Adding direct link to renew from message suggesting renew.
 - Adding output of expiration date to message.

To test open a subscription with an impending expiration. You
should see a dialog-styled message, "Subscription will expire XX/XX/XXXX.
Renew this subscription."
---
 .../prog/en/modules/serials/subscription-detail.tt |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index ebf2afc..93e28d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -34,6 +34,10 @@ function popup(subscriptionid) {
 }
 $(document).ready(function() {
     $("#subscription_description > ul").tabs();
+    $("#renewsub").click(function(){
+        popup([% subscriptionid %]);
+        return false;
+    })
 });
 //]]>
 
@@ -52,7 +56,7 @@ $(document).ready(function() {
 	[% INCLUDE 'serials-toolbar.inc' %]
 
     Subscription for [% bibliotitle %] 
-    [% IF ( abouttoexpire ) %]Subscription is near its end. It should be renewed now.[% END %]
+    [% IF ( abouttoexpire ) %]Subscription will expire [% enddate %]. Renew this subscription.[% END %]
     [% IF ( NEEDSCONFIRMATION ) %]
     
 			Please Confirm Subscription deletion
-- 
1.7.9.5


From oleonard at myacpl.org  Thu May 17 19:14:31 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 17 May 2012 13:14:31 -0400
Subject: [Koha-patches] [PATCH] Bug 7889 [Authorities duplicates] Use
	standard style for errors and messages
Message-ID: <1337274871-16748-1-git-send-email-oleonard@myacpl.org>

The warning shown in the authorities editor when there is
a possible duplicate is styled incorrectly. In addition the
design of the warning is inconsistent with that shown in the
bibliographic record editor.

This patch revises the style and layout of the duplicate error
box. It also corrects a problem which appears in the biblio
and authority editors where a non-existent JS window function
was called. I have added the function to the default JS include
and revised the editor pages to use it.

To test:

- Create a record in both the cataloging and authorities
  editors which will trigger a duplicate warning.
- Click the link to the existing record. A separate window
  should pop up.
- In both editors try each option:
   - Confirm the duplicate and go to the existing record.
   - Deny that the record is duplicate and continue to save.
---
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |    9 ++-
 .../prog/en/modules/authorities/authorities.tt     |   80 +++++++++++---------
 .../prog/en/modules/cataloguing/addbiblio.tt       |    2 +-
 3 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 24b785d..bf45048 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -101,4 +101,11 @@ jQuery.fn.preventDoubleFormSubmit = function() {
         else
             this.beenSubmitted = true;
     });
-};
\ No newline at end of file
+};
+
+function openWindow(link,name,width,height) {
+    name = (typeof name == "undefined")?'popup':name;
+    width = (typeof width == "undefined")?'600':width;
+    height = (typeof height == "undefined")?'400':height;
+    var newin=window.open(link,name,'width='+width+',height='+height+',resizable=yes,toolbar=false,scrollbars=yes,top');
+}
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index d720b35..6512360 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -520,6 +520,31 @@ function searchauthority() {
 		opacity: 0.8
 	});
 })();
+     $(document).ready(function() {
+        yuiToolbar();
+        $("#addauthc,#action").empty();
+     });
+    // YUI Toolbar Functions
+    function yuiToolbar() {
+    var addauthButton = new YAHOO.widget.Button({
+                                            id: "addauth",
+                                            type: "button",
+                                            label: "Save",
+                                            container: "addauthc",
+                                            onclick: {fn: Check }
+                                        });
+    var addauthButton2 = new YAHOO.widget.Button({
+                                            id: "addauth2",
+                                            type: "button",
+                                            label: "Save",
+                                            container: "action",
+                                            onclick: {fn: Check }
+                                        });
+    }
+    function confirmnotdup(redirect){
+        $("#confirm_not_duplicate").attr("value","1");
+        Check();
+    }
 //]]>
 
 [% INCLUDE 'header.inc' %]
@@ -536,53 +561,34 @@ function searchauthority() {
 Modify authority #[% authid %] [% authtypetext %]
 [% ELSE %]
 Adding authority [% authtypetext %]
-[% END %]  
+[% END %]
+
+[% IF ( duplicateauthid ) %]
+        
+                Duplicate record suspected
+                Is this a duplicate of [% duplicateauthvalue %]?
+
+                
+                    
+                    
+                
+                
+                    
+                
+        
+[% END %]
+
 
     
     
     
     
     
+    
 
 	
-	
 	
 
-[% IF ( duplicateauthid ) %]
-        
-                Duplicate suspected with [% duplicateauthvalue %]
-                You must either :
-                
-                        confirm it's not a duplicate (and click on  again)
-                        Go to original authority
-                
-        
-[% END %]
-
 
         [% FOREACH BIG_LOO IN BIG_LOOP %]
             [% IF ( BIG_LOO.number ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index da22e93..a9e9841 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -675,7 +675,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
         [% IF ( duplicatebiblionumber ) %]
                     
                         Duplicate record suspected
-                        Is this a duplicate of [% duplicatetitle %]?
+                        Is this a duplicate of [% duplicatetitle %]?
                         [% IF ( CAN_user_editcatalogue_edit_items ) %]
                                                     
                                                     
-- 
1.7.9.5


From oleonard at myacpl.org  Thu May 17 20:18:39 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 17 May 2012 14:18:39 -0400
Subject: [Koha-patches] [PATCH] Bug 7889 [Search errors] Use standard style
	for errors and messages
Message-ID: <1337278719-17122-1-git-send-email-oleonard@myacpl.org>

There are two instances in the templates where markup is defined
for displaying search errors. I've never seen these appear and I
have no idea what kind of error might trigger it, but now it will
display correctly.
---
 .../prog/en/modules/acqui/neworderbiblio.tt        |    6 +-----
 .../prog/en/modules/catalogue/results.tt           |    6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
index 6342d33..60feb52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
@@ -29,11 +29,7 @@
 [% END %]
 
 [% IF ( query_error ) %]
-


-Error:
-
-    [% query_error %]
-
+    Error: [% query_error %]
 [% END %]
 
 [% IF ( total ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 5af106a..1ebc862 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -318,11 +318,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
     [% END %]
 
     [% IF ( query_error ) %]
-        


-        Error:
-        
-            [% query_error %]
-        
+        Error: [% query_error %]
     [% END %]
 
     
-- 
1.7.9.5


From oleonard at myacpl.org  Thu May 17 21:13:11 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 17 May 2012 15:13:11 -0400
Subject: [Koha-patches] [PATCH] Bug 7889 [Acquisitions] Use standard style
	for errors and messages
Message-ID: <1337281991-17952-1-git-send-email-oleonard@myacpl.org>

Correcting style of the warning on the Acquisitions home page
which appears if no budgets have been defined.

Also correcting the logic by which the warning appears, as a
change to the script inadvertently prevented it.
---
 .../prog/en/modules/acqui/acqui-home.tt            |   21 ++++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index f0e2942..7a44420 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -41,27 +41,22 @@ $(document).ready(function() {
 
 
 
-    
-        Manage orders
-    [% IF ( nobudget ) %]
+
+    [% UNLESS ( loop_budget ) %]
         [% IF ( CAN_user_parameters ) %]
-        You must define a budget in Administration
+        You must define a budget in Administration
         [% ELSE %]
-        Your administrator must define a budget in Administration
+        Your administrator must define a budget in Administration
         [% END %]
-        
-            Vendor 
-            
-            
-        
-    [% ELSE %]
+    [% END %]
+
+    
+        Manage orders
         
             Vendor: 
             
             
         
-
-    [% END %]
     
 
 
-- 
1.7.9.5


From oleonard at myacpl.org  Fri May 18 15:20:38 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 18 May 2012 09:20:38 -0400
Subject: [Koha-patches] [PATCH] Bug 8119 - Show hint when disabling active
	currency checkbox
Message-ID: <1337347238-19707-1-git-send-email-oleonard@myacpl.org>

Display a hint when the exchange rate != 1.0: "The active currency
must have a rate of 1.0"
---
 .../prog/en/modules/admin/currency.tt              |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index d2d0597..e235838 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -41,9 +41,11 @@
         $("#rate").keyup(function() {
             if ( $(this).val() == 1.0 ) {
                 $("#active").removeAttr('disabled');
+                $("#hint").html("");
             } else {
                 $("#active").removeAttr('checked');
                 $("#active").attr('disabled','disabled');
+                $("#hint").html(_("The active currency must have a rate of 1.0"));
             }
         });
     });
@@ -114,6 +116,7 @@
             [% ELSE %]
             
             [% END %]
+            
         
 
         
-- 
1.7.9.5


From oleonard at myacpl.org  Fri May 18 15:44:21 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 18 May 2012 09:44:21 -0400
Subject: [Koha-patches] [PATCH] Bug 8122 - Add a link to new library group
	creation from empty groups message
Message-ID: <1337348661-20120-1-git-send-email-oleonard@myacpl.org>

When there are no groups, add a link to group creation from
the message, "No properties defined."
---
 .../prog/en/modules/admin/branches.tt              |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index bedeb8b..42b364c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -287,7 +287,7 @@ tinyMCE.init({
+ Defining transport costs between libraries +
Because the "UseTransportCostMatrix" system preference is currently not enabled, Transport Cost Matrix is not being used. Go here if you wish to enable this feature.
+ +
Costs are decimal values 0 to some arbitrarymax value (1 or 100), 0 being minimum (no) cost.
Red cells signify no transfer allowed
Click on the cell to edit
[% e %]
+ + + + [% FOR b IN branchloop %] + + [% END %] + + [% FOR bf IN branchfromloop %] + + + [% FOR bt IN bf.branchtoloop %] + + [% END %] + + [% END %] +
From \ To	[% b.name %]
[% bf.name %]	+ [% IF bt.skip %] + + [% ELSE %] + + [% !bt.disabled && bt.value > '' ? bt.value : ' ' %] + + [% IF bt.disabled %] + + [% END %] + + [% END %] +
+ +
[% pa_loo.lib %]

Notices and Slips

[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]

[% attribute.lib %]

Fines and charges

Fines and charges

Credits

Fines and charges

Fines and charges

Credits

+ Defining transport costs between libraries +

+ Defining transport costs between libraries +

+ Defining transport costs between libraries +

Subscription for [% bibliotitle %]

Please Confirm Subscription deletion

Modify authority #[% authid %] [% authtypetext %]

Adding authority [% authtypetext %]

Duplicate record suspected

Duplicate record suspected

+ Defining transport costs between libraries +
