Attachment 16614 Details for Bug 7957 – Bug 7957: Routing lists enhancements

[patch] Bug 7957: Routing lists enhancements

Bug-7957-Routing-lists-enhancements.patch (text/plain), 80.36 KB, created by Julian Maurice on 2013-03-21 12:32:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2013-03-21 12:32:29 UTC

Size: 80.36 KB

patch

obsolete

>From 701248881c41b2c0c280cbbba771bb15fb493417 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Tue, 17 Apr 2012 14:08:46 +0200
>Subject: [PATCH] Bug 7957: Routing lists enhancements
>
>- Manage several routing list per subscription
>- Export a routing list as CSV
>
>Test plan:
>
>Run the updatedatabase.pl script
>Existing routing lists should have been imported in a routing list named
>'import'
>
>From the serials-home.pl page:
>  - Make a search, in the results list you have a column 'Routing lists'
>    (if not, consider setting RoutingSerials syspref). If the
>    subscription doesn't have a routing list, you should have a 'New'
>    link. Otherwise you have an 'Edit(X)' link, where X is the number of
>    routing lists.
>  - Choose a subscription which have no routing lists and click on 'New'
>  - You are on the routing list creation page. Enter a title for the
>    routing list and click on 'Save'.
>  - The routing list has been created and now you are on the routing
>    list modification page. The behaviour of this page is quite the same
>    as before. A sensible change is that reordering borrowers doesn't
>    reload the page each time you make a change.
>  - Click on 'Save' to finish routing list modifications.
>  - Now you are on the routing lists management page. You can edit a
>    routing list by clicking on its title, preview it, export it, and
>    delete it by clicking on the corresponding link.
>  - Click on 'Preview'.
>  - You will be asked to choose a serial. Pick the one you want to print
>    the routing list for and click on 'Continue'.
>  - If RoutingListAddReserves is OFF, the routing list is displayed and
>    you just have to click on 'Print'. If the syspref is ON, you will
>    have to click on 'Confirm and print', an alert will show telling you
>    that holds will be placed on the serial you chose. Click 'OK' and
>    you will be able to print the slip. Now check if the holds have been
>    placed. (It works only if an item is attached to this serial).
>  - Go back to the routing lists management page (routinglists.pl) and
>    click on 'Export'. Download the CSV and check that it contains
>    correct data.
>
>From serials-collection.pl page:
>  - In the serials list, click on 'Print list'.
>  - You will be asked to choose a routing list. Pick one and click on
>    'Continue'.
>  - ... (same behaviour as above)
>
>Try to add and delete routing lists to show if links are correctly
>updated in serials-home.pl, serials-collection.pl and
>subscription-detail.pl
>---
> C4/Items.pm                                        |    2 +-
> C4/Serials.pm                                      |  208 ++++-----------
> C4/Serials/RoutingLists.pm                         |  274 ++++++++++++++++++++
> installer/data/mysql/kohastructure.sql             |   46 +++-
> installer/data/mysql/updatedatabase.pl             |   67 +++++
> .../prog/en/includes/serials-menu.inc              |    4 +-
> .../prog/en/includes/serials-toolbar.inc           |    7 +
> .../prog/en/modules/serials/member-search.tt       |   26 ++-
> .../en/modules/serials/routing-preview-slip.tt     |  116 +++++++--
> .../prog/en/modules/serials/routing-preview.tt     |   57 ----
> .../prog/en/modules/serials/routing.tt             |   97 -------
> .../prog/en/modules/serials/routinglist.tt         |  194 ++++++++++++++
> .../prog/en/modules/serials/routinglists.tt        |   69 +++++
> .../prog/en/modules/serials/serials-collection.tt  |   11 +-
> .../prog/en/modules/serials/serials-search.tt      |    8 +-
> .../prog/en/modules/serials/subscription-detail.tt |    6 -
> serials/member-search.pl                           |    5 +-
> serials/reorder_members.pl                         |   38 ---
> serials/routing-preview-slip.pl                    |  144 ++++++++++
> serials/routing-preview.pl                         |  139 ----------
> serials/routing.pl                                 |  128 ---------
> serials/routinglist.pl                             |  114 ++++++++
> serials/routinglists.pl                            |   79 ++++++
> serials/serials-collection.pl                      |    7 +-
> serials/serials-search.pl                          |    4 +-
> serials/subscription-detail.pl                     |    3 +-
> t/db_dependent/lib/KohaTest/Serials.pm             |    5 -
> 27 files changed, 1169 insertions(+), 689 deletions(-)
> create mode 100644 C4/Serials/RoutingLists.pm
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglist.tt
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglists.tt
> delete mode 100755 serials/reorder_members.pl
> create mode 100755 serials/routing-preview-slip.pl
> delete mode 100755 serials/routing-preview.pl
> delete mode 100755 serials/routing.pl
> create mode 100755 serials/routinglist.pl
> create mode 100755 serials/routinglists.pl
>
>diff --git a/C4/Items.pm b/C4/Items.pm
>index 6533a68..15e5c2f 100644
>--- a/C4/Items.pm
>+++ b/C4/Items.pm
>@@ -164,7 +164,7 @@ sub GetItem {
>         ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
>     }
> 	#if we don't have an items.itype, use biblioitems.itemtype.
>-	if( ! $data->{'itype'} ) {
>+	if( $data and ! $data->{'itype'} ) {
> 		my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems  WHERE biblionumber = ?");
> 		$sth->execute($data->{'biblionumber'});
> 		($data->{'itype'}) = $sth->fetchrow_array;
>diff --git a/C4/Serials.pm b/C4/Serials.pm
>index 0b31a2b..0630300 100644
>--- a/C4/Serials.pm
>+++ b/C4/Serials.pm
>@@ -45,13 +45,12 @@ BEGIN {
>       &ReNewSubscription  &GetLateIssues      &GetLateOrMissingIssues
>       &GetSerialInformation                   &AddItem2Serial
>       &PrepareSerialsData &GetNextExpected    &ModNextExpected
>+      &GetSerial &GetSerialItemnumber
> 
>       &UpdateClaimdateIssues
>       &GetSuppliersWithLateIssues             &getsupplierbyserialid
>       &GetDistributedTo   &SetDistributedTo
>-      &getroutinglist     &delroutingmember   &addroutingmember
>-      &reorder_members
>-      &check_routing &updateClaim &removeMissingIssue
>+      &updateClaim        &removeMissingIssue
>       &CountIssues
>       HasItems
>       &GetSubscriptionsFromBorrower
>@@ -178,6 +177,60 @@ sub GetSubscriptionHistoryFromSubscriptionId {
>     return $dbh->prepare($query);
> }
> 
>+=head2 GetSerial
>+
>+    my $serial = &GetSerial($serialid);
>+
>+This sub returns serial informations (ie. in serial table) for given $serialid
>+It returns a hashref where each key is a sql column.
>+
>+=cut
>+
>+sub GetSerial {
>+    my ($serialid) = @_;
>+
>+    return unless $serialid;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $query = qq{
>+        SELECT *
>+        FROM serial
>+        WHERE serialid = ?
>+    };
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute($serialid);
>+    return $sth->fetchrow_hashref;
>+}
>+
>+=head2 GetSerialItemnumber
>+
>+    my $itemnumber = GetSerialItemnumber($serialid);
>+
>+Returns the itemnumber associated to $serialid or undef if there is no item.
>+
>+=cut
>+
>+sub GetSerialItemnumber {
>+    my ($serialid) = @_;
>+
>+    return unless $serialid;
>+    my $itemnumber;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $query = qq{
>+        SELECT itemnumber
>+        FROM serialitems
>+        WHERE serialid = ?
>+    };
>+    my $sth = $dbh->prepare($query);
>+    my $rv = $sth->execute($serialid);
>+    if ($rv) {
>+        my $result = $sth->fetchrow_hashref;
>+        $itemnumber = $result->{itemnumber};
>+    }
>+    return $itemnumber;
>+}
>+
> =head2 GetSerialStatusFromSerialId
> 
> $sth = GetSerialStatusFromSerialId();
>@@ -1991,155 +2044,6 @@ sub getsupplierbyserialid {
>     return $result;
> }
> 
>-=head2 check_routing
>-
>-$result = &check_routing($subscriptionid)
>-
>-this function checks to see if a serial has a routing list and returns the count of routingid
>-used to show either an 'add' or 'edit' link
>-
>-=cut
>-
>-sub check_routing {
>-    my ($subscriptionid) = @_;
>-    my $dbh              = C4::Context->dbh;
>-    my $sth              = $dbh->prepare(
>-        "SELECT count(routingid) routingids FROM subscription LEFT JOIN subscriptionroutinglist 
>-                              ON subscription.subscriptionid = subscriptionroutinglist.subscriptionid
>-                              WHERE subscription.subscriptionid = ? ORDER BY ranking ASC
>-                              "
>-    );
>-    $sth->execute($subscriptionid);
>-    my $line   = $sth->fetchrow_hashref;
>-    my $result = $line->{'routingids'};
>-    return $result;
>-}
>-
>-=head2 addroutingmember
>-
>-addroutingmember($borrowernumber,$subscriptionid)
>-
>-this function takes a borrowernumber and subscriptionid and adds the member to the
>-routing list for that serial subscription and gives them a rank on the list
>-of either 1 or highest current rank + 1
>-
>-=cut
>-
>-sub addroutingmember {
>-    my ( $borrowernumber, $subscriptionid ) = @_;
>-    my $rank;
>-    my $dbh = C4::Context->dbh;
>-    my $sth = $dbh->prepare( "SELECT max(ranking) rank FROM subscriptionroutinglist WHERE subscriptionid = ?" );
>-    $sth->execute($subscriptionid);
>-    while ( my $line = $sth->fetchrow_hashref ) {
>-        if ( $line->{'rank'} > 0 ) {
>-            $rank = $line->{'rank'} + 1;
>-        } else {
>-            $rank = 1;
>-        }
>-    }
>-    $sth = $dbh->prepare( "INSERT INTO subscriptionroutinglist (subscriptionid,borrowernumber,ranking) VALUES (?,?,?)" );
>-    $sth->execute( $subscriptionid, $borrowernumber, $rank );
>-}
>-
>-=head2 reorder_members
>-
>-reorder_members($subscriptionid,$routingid,$rank)
>-
>-this function is used to reorder the routing list
>-
>-it takes the routingid of the member one wants to re-rank and the rank it is to move to
>-- it gets all members on list puts their routingid's into an array
>-- removes the one in the array that is $routingid
>-- then reinjects $routingid at point indicated by $rank
>-- then update the database with the routingids in the new order
>-
>-=cut
>-
>-sub reorder_members {
>-    my ( $subscriptionid, $routingid, $rank ) = @_;
>-    my $dbh = C4::Context->dbh;
>-    my $sth = $dbh->prepare( "SELECT * FROM subscriptionroutinglist WHERE subscriptionid = ? ORDER BY ranking ASC" );
>-    $sth->execute($subscriptionid);
>-    my @result;
>-    while ( my $line = $sth->fetchrow_hashref ) {
>-        push( @result, $line->{'routingid'} );
>-    }
>-
>-    # To find the matching index
>-    my $i;
>-    my $key = -1;    # to allow for 0 being a valid response
>-    for ( $i = 0 ; $i < @result ; $i++ ) {
>-        if ( $routingid == $result[$i] ) {
>-            $key = $i;    # save the index
>-            last;
>-        }
>-    }
>-
>-    # if index exists in array then move it to new position
>-    if ( $key > -1 && $rank > 0 ) {
>-        my $new_rank = $rank - 1;                       # $new_rank is what you want the new index to be in the array
>-        my $moving_item = splice( @result, $key, 1 );
>-        splice( @result, $new_rank, 0, $moving_item );
>-    }
>-    for ( my $j = 0 ; $j < @result ; $j++ ) {
>-        my $sth = $dbh->prepare( "UPDATE subscriptionroutinglist SET ranking = '" . ( $j + 1 ) . "' WHERE routingid = '" . $result[$j] . "'" );
>-        $sth->execute;
>-    }
>-    return;
>-}
>-
>-=head2 delroutingmember
>-
>-delroutingmember($routingid,$subscriptionid)
>-
>-this function either deletes one member from routing list if $routingid exists otherwise
>-deletes all members from the routing list
>-
>-=cut
>-
>-sub delroutingmember {
>-
>-    # if $routingid exists then deletes that row otherwise deletes all with $subscriptionid
>-    my ( $routingid, $subscriptionid ) = @_;
>-    my $dbh = C4::Context->dbh;
>-    if ($routingid) {
>-        my $sth = $dbh->prepare("DELETE FROM subscriptionroutinglist WHERE routingid = ?");
>-        $sth->execute($routingid);
>-        reorder_members( $subscriptionid, $routingid );
>-    } else {
>-        my $sth = $dbh->prepare("DELETE FROM subscriptionroutinglist WHERE subscriptionid = ?");
>-        $sth->execute($subscriptionid);
>-    }
>-    return;
>-}
>-
>-=head2 getroutinglist
>-
>-@routinglist = getroutinglist($subscriptionid)
>-
>-this gets the info from the subscriptionroutinglist for $subscriptionid
>-
>-return :
>-the routinglist as an array. Each element of the array contains a hash_ref containing
>-routingid - a unique id, borrowernumber, ranking, and biblionumber of subscription
>-
>-=cut
>-
>-sub getroutinglist {
>-    my ($subscriptionid) = @_;
>-    my $dbh              = C4::Context->dbh;
>-    my $sth              = $dbh->prepare(
>-        'SELECT routingid, borrowernumber, ranking, biblionumber
>-            FROM subscription 
>-            JOIN subscriptionroutinglist ON subscription.subscriptionid = subscriptionroutinglist.subscriptionid
>-            WHERE subscription.subscriptionid = ? ORDER BY ranking ASC'
>-    );
>-    $sth->execute($subscriptionid);
>-    my $routinglist = $sth->fetchall_arrayref({});
>-    return @{$routinglist};
>-}
>-
> =head2 countissuesfrom
> 
> $result = countissuesfrom($subscriptionid,$startdate)
>diff --git a/C4/Serials/RoutingLists.pm b/C4/Serials/RoutingLists.pm
>new file mode 100644
>index 0000000..46dc1ff
>--- /dev/null
>+++ b/C4/Serials/RoutingLists.pm
>@@ -0,0 +1,274 @@
>+package C4::Serials::RoutingLists;
>+
>+# Copyright 2012 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 Modern::Perl;
>+
>+use C4::Context;
>+
>+use vars qw($VERSION @ISA @EXPORT_OK);
>+
>+BEGIN {
>+    $VERSION = 3.01;
>+    require Exporter;
>+    @ISA = qw(Exporter);
>+    @EXPORT_OK = qw(
>+        &AddRoutingList
>+        &ModRoutingList
>+        &DelRoutingList
>+        &GetRoutingList
>+        &GetRoutingLists
>+        &GetRoutingListsCount
>+        &GetRoutingListAsCSV
>+    );
>+}
>+
>+=head2 AddRoutingList
>+
>+$routinglistid = &AddRoutingList($subscriptionid, $title);
>+
>+this function create a new routing list for a subscription.
>+
>+=cut
>+
>+sub AddRoutingList {
>+    my ($subscriptionid, $title) = @_;
>+
>+    my $dbh = C4::Context->dbh();
>+    my $query = qq{
>+        INSERT INTO subscriptionroutinglist (subscriptionid, title)
>+        VALUES (?, ?)
>+    };
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute($subscriptionid, $title);
>+
>+    return $dbh->last_insert_id(undef, undef, 'subscriptionroutinglist', undef);
>+}
>+
>+=head2 ModRoutingList
>+
>+&ModRoutingList($routinglistid, $subscriptionid, $title, $notes, @borrowernumbers);
>+
>+this function modifies a routing list.
>+
>+=cut
>+
>+sub ModRoutingList {
>+    my ($routinglistid, $subscriptionid, $title, $notes, @borrowernumbers) = @_;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $query = 'UPDATE subscriptionroutinglist';
>+    my @setstrings = ();
>+    my @setargs = ();
>+    if($subscriptionid) {
>+        push @setstrings, 'subscriptionid = ?';
>+        push @setargs, $subscriptionid;
>+    }
>+    if($title) {
>+        push @setstrings, 'title = ?';
>+        push @setargs, $title;
>+    }
>+    if($notes) {
>+        push @setstrings, 'notes = ?';
>+        push @setargs, $notes;
>+    }
>+
>+    if(@setstrings) {
>+        $query .= ' SET ' . join(',', @setstrings);
>+        $query .= ' WHERE routinglistid = ?';
>+        my $sth = $dbh->prepare($query);
>+        $sth->execute(@setargs, $routinglistid);
>+    }
>+
>+    $query = qq{
>+        DELETE FROM subscriptionrouting
>+        WHERE routinglistid = ?
>+    };
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute($routinglistid);
>+
>+    if(@borrowernumbers > 0){
>+        $query = qq{
>+            INSERT INTO subscriptionrouting (routinglistid, borrowernumber, ranking)
>+            VALUES (?, ?, ?)
>+        };
>+        $sth = $dbh->prepare($query);
>+        my $i = 1;
>+        foreach (@borrowernumbers) {
>+            $sth->execute($routinglistid, $_, $i);
>+            $i++;
>+        }
>+    }
>+}
>+
>+=head2 DelRoutingList
>+
>+&DelRoutingList($routinglistid);
>+
>+this function delete a routing list.
>+
>+=cut
>+
>+sub DelRoutingList {
>+    my ($routinglistid) = @_;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $query = qq{
>+        DELETE FROM subscriptionroutinglist
>+        WHERE routinglistid = ?
>+    };
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute($routinglistid);
>+}
>+
>+
>+=head2 GetRoutingList
>+
>+$routinglist = &GetRoutingList($routinglistid);
>+
>+this function get infos from subscriptionroutinglist table.
>+The 'borrowers' keys contains the list of borrowernumbers attached
>+to this routing list.
>+
>+=cut
>+
>+sub GetRoutingList {
>+    my ($routinglistid) = @_;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $query = qq{
>+        SELECT *
>+        FROM subscriptionroutinglist
>+        WHERE routinglistid = ?
>+    };
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute($routinglistid);
>+    my $result = $sth->fetchrow_hashref;
>+
>+    $query = qq{
>+        SELECT borrowernumber
>+        FROM subscriptionrouting
>+        WHERE routinglistid = ?
>+        ORDER BY ranking ASC
>+    };
>+    $sth = $dbh->prepare($query);
>+    $sth->execute($routinglistid);
>+    while (my $row = $sth->fetchrow_hashref) {
>+        push @{$result->{borrowers}}, $row->{borrowernumber};
>+    }
>+
>+    return $result;
>+}
>+
>+=head2 GetRoutingLists
>+
>+$routinglists = &GetRoutingLists($subscriptionid);
>+
>+this function get all routing lists for a subscription.
>+
>+=cut
>+
>+sub GetRoutingLists {
>+    my ($subscriptionid) = @_;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $query = qq{
>+        SELECT routinglistid
>+        FROM subscriptionroutinglist
>+        WHERE subscriptionid = ?
>+    };
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute($subscriptionid);
>+    my @results;
>+    while (my $row = $sth->fetchrow_hashref) {
>+        my $routinglistid = $row->{routinglistid};
>+        push @results, GetRoutingList($routinglistid);
>+    }
>+
>+    return @results;
>+}
>+
>+=head2 GetRoutingListsCount
>+
>+$count = &GetRoutingListsCount($subscriptionid);
>+
>+this function return the number of routing lists for a subscription.
>+
>+=cut
>+
>+sub GetRoutingListsCount {
>+    my ($subscriptionid) = @_;
>+
>+    return unless $subscriptionid;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $query = qq{
>+        SELECT COUNT(*) AS count
>+        FROM subscriptionroutinglist
>+        WHERE subscriptionid = ?
>+    };
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute($subscriptionid);
>+    my $result = $sth->fetchrow_hashref;
>+
>+    return $result->{count};
>+}
>+
>+=head2 GetRoutingListAsCSV
>+
>+$csv_output = &GetRoutingListAsCSV($routinglistid);
>+
>+this function return the routing list as a CSV file.
>+
>+=cut
>+
>+sub GetRoutingListAsCSV {
>+    my ($routinglistid) = @_;
>+
>+    require C4::Biblio;
>+    require C4::Serials;
>+    require C4::Members;
>+    require Text::CSV::Encoded;
>+
>+    my $csv = Text::CSV::Encoded->new( {encoding => "utf8" } );
>+    my $output;
>+
>+    my $routinglist = GetRoutingList($routinglistid);
>+    my $subscription = C4::Serials::GetSubscription($routinglist->{'subscriptionid'});
>+    my (undef, $biblio) = C4::Biblio::GetBiblio($subscription->{'biblionumber'});
>+
>+    my @headers = ("Subscription title", "Routing list", qw(Surname Firstname Notes));
>+    $csv->combine(@headers);
>+    $output .= $csv->string() . "\n";
>+
>+    foreach (@{$routinglist->{borrowers}}) {
>+        my $member = C4::Members::GetMemberDetails($_);
>+        $csv->combine(
>+            $biblio->{'title'},
>+            $routinglist->{'title'},
>+            $member->{'surname'},
>+            $member->{'firstname'},
>+            $routinglist->{'notes'},
>+        );
>+        $output .= $csv->string() . "\n";
>+    }
>+
>+    return $output;
>+}
>+
>+1;
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index c74c39b..153e9d3 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -1930,21 +1930,37 @@ CREATE TABLE `subscriptionhistory` (
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
> 
> --
>--- Table structure for table `subscriptionroutinglist`
>---
>-
>-DROP TABLE IF EXISTS `subscriptionroutinglist`;
>-CREATE TABLE `subscriptionroutinglist` ( -- information related to the routing lists attached to subscriptions
>-  `routingid` int(11) NOT NULL auto_increment, -- unique identifier assigned by Koha
>-  `borrowernumber` int(11) NOT NULL, -- foreign key from the borrowers table, defines with patron is on the routing list
>-  `ranking` int(11) default NULL, -- where the patron stands in line to receive the serial
>-  `subscriptionid` int(11) NOT NULL, -- foreign key from the subscription table, defines which subscription this routing list is for
>-  PRIMARY KEY  (`routingid`),
>-  UNIQUE (`subscriptionid`, `borrowernumber`),
>-  CONSTRAINT `subscriptionroutinglist_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`)
>-    ON DELETE CASCADE ON UPDATE CASCADE,
>-  CONSTRAINT `subscriptionroutinglist_ibfk_2` FOREIGN KEY (`subscriptionid`) REFERENCES `subscription` (`subscriptionid`)
>-    ON DELETE CASCADE ON UPDATE CASCADE
>+-- Table structure for table subscriptionroutinglist
>+--
>+
>+DROP TABLE IF EXISTS subscriptionroutinglist;
>+CREATE TABLE subscriptionroutinglist (
>+    routinglistid int(11) NOT NULL AUTO_INCREMENT, -- unique identifier assigned by Koha
>+    subscriptionid int(11) NOT NULL, -- foreign key from the subscription table,
>+                                     -- defines which subscription this routing list is for
>+    title varchar(256) NOT NULL, -- title of this routing list
>+    notes text default NULL, -- notes for this routing list
>+    PRIMARY KEY (routinglistid),
>+    CONSTRAINT subscriptionroutinglist_ibfk_1 FOREIGN KEY (subscriptionid)
>+      REFERENCES subscription (subscriptionid) ON DELETE CASCADE
>+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
>+
>+--
>+-- Table structure for subscriptionrouting
>+--
>+
>+DROP TABLE IF EXISTS subscriptionrouting;
>+CREATE TABLE subscriptionrouting (
>+    routinglistid int(11) NOT NULL, -- foreign key from the subscriptionroutinglist
>+                                    -- table, defines which routing list is affected
>+    borrowernumber int(11) NOT NULL, -- foreign key from the borrowers table,
>+                                     -- defines which patron is on the routing list
>+    ranking int(11) DEFAULT NULL, -- where the patron stands in line to receive the serial
>+    PRIMARY KEY (routinglistid, borrowernumber),
>+    CONSTRAINT subscriptionrouting_ibfk_1 FOREIGN KEY (routinglistid)
>+      REFERENCES subscriptionroutinglists (routinglistid) ON DELETE CASCADE,
>+    CONSTRAINT subscriptionrouting_ibfk_2 FOREIGN KEY (borrowernumber)
>+      REFERENCES borrowers (borrowernumber) ON DELETE CASCADE
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
> 
> --
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 222428d..764587c 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -6655,6 +6655,73 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>     SetVersion($DBversion);
> }
> 
>+$DBversion = "XXX";
>+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>+    $dbh->do("RENAME TABLE subscriptionroutinglist TO tmp_subscriptionroutinglist");
>+    $dbh->do("
>+        CREATE TABLE subscriptionroutinglist (
>+            routinglistid int(11) NOT NULL AUTO_INCREMENT,
>+            subscriptionid int(11) NOT NULL,
>+            title varchar(256) NOT NULL,
>+            notes text default NULL,
>+            PRIMARY KEY (routinglistid),
>+            CONSTRAINT subscriptionroutinglist_ibfk_1 FOREIGN KEY (subscriptionid)
>+              REFERENCES subscription (subscriptionid) ON DELETE CASCADE
>+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
>+    ");
>+    $dbh->do("
>+        CREATE TABLE subscriptionrouting (
>+            routinglistid int(11) NOT NULL,
>+            borrowernumber int(11) NOT NULL,
>+            ranking int(11) DEFAULT NULL,
>+            PRIMARY KEY (routinglistid, borrowernumber),
>+            CONSTRAINT subscriptionrouting_ibfk_1 FOREIGN KEY (routinglistid)
>+              REFERENCES subscriptionroutinglist (routinglistid) ON DELETE CASCADE,
>+            CONSTRAINT subscriptionrouting_ibfk_2 FOREIGN KEY (borrowernumber)
>+              REFERENCES borrowers (borrowernumber) ON DELETE CASCADE
>+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
>+    ");
>+
>+    # Migrate data from old subscriptionroutinglist table
>+    my $query = qq{
>+        SELECT DISTINCT subscriptionid
>+        FROM tmp_subscriptionroutinglist
>+    };
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute();
>+    my $results = $sth->fetchall_arrayref( {} );
>+    $query = qq{
>+        INSERT INTO subscriptionroutinglist (subscriptionid, title)
>+        VALUES (?, ?)
>+    };
>+    $sth = $dbh->prepare($query);
>+    $query = qq{
>+        SELECT borrowernumber, ranking
>+        FROM tmp_subscriptionroutinglist
>+        WHERE subscriptionid = ?
>+    };
>+    my $select_sth = $dbh->prepare($query);
>+    $query = qq{
>+        INSERT INTO subscriptionrouting (routinglistid, borrowernumber, ranking)
>+        VALUES(?, ?, ?)
>+    };
>+    my $insert_sth = $dbh->prepare($query);
>+    foreach ( @$results ) {
>+        $sth->execute($_->{subscriptionid}, 'import');
>+        my $routinglistid = $dbh->last_insert_id(undef, undef, 'subscriptionroutinglist', undef);
>+        $select_sth->execute($_->{subscriptionid});
>+        my $routings = $select_sth->fetchall_arrayref( {} );
>+        foreach (@$routings) {
>+            $insert_sth->execute($routinglistid, $_->{borrowernumber}, $_->{ranking});
>+        }
>+    }
>+
>+    $dbh->do("DROP TABLE tmp_subscriptionroutinglist");
>+    print "Upgrade to $DBversion done (New subscription routing list system).\n";
>+    SetVersion($DBversion);
>+}
>+
>+
> =head1 FUNCTIONS
> 
> =head2 TableExists($table)
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>index 8083192..29cac2c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>@@ -4,9 +4,9 @@
>   [% UNLESS closed %]
>     [% IF ( routing && CAN_user_serials_routing ) %]
>         [% IF ( hasRouting ) %]
>-             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]">Edit routing list</a></li>
>+             <li><a href="/cgi-bin/koha/serials/routinglists.pl?subscriptionid=[% subscriptionid %]">Edit routing list</a></li>
>         [% ELSE %]
>-            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
>+            <li><a href="/cgi-bin/koha/serials/routinglist.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
>         [% END %]
>     [% END %]
>   [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>index efc32dd..826a6c9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>@@ -13,6 +13,13 @@
>             window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=reopen";
>         }
>     }
>+    function confirm_deletion() {
>+        var is_confirmed = confirm(_("Are you sure you want to delete this subscription?"));
>+        if (is_confirmed) {
>+            window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=del";
>+        }
>+    }
>+
> 
> 	 $(document).ready(function() {
>         $("#deletesub").click(function(){
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
>index 93357b4..d81b84b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
>@@ -2,14 +2,15 @@
> <title>Koha &rsaquo; Member Search &rsaquo; [% bookselname %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <script type="text/javascript">
>-
>+//]]>
> </script>
> <style type="text/css">
>    #custom-doc { width:36.46em;*width:35.53em;min-width:430px; margin:auto; text-align:left; padding: 1em; }
>@@ -60,11 +61,16 @@ function add_member(subscriptionid,borrowernumber){
> 	</thead>
> 	<tbody>
> 		[% FOREACH resultsloo IN resultsloop %]
>-		[% IF ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
>-		<td>[% resultsloo.cardnumber %] </td>
>-		<td>[% resultsloo.surname %], [% resultsloo.firstname %] </td>
>-		<td>[% resultsloo.branchcode %] </td>
>-		<td><a onclick="add_member([% subscriptionid %],[% resultsloo.borrowernumber %]); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% resultsloo.subscriptionid %]&amp;borrowernumber=[% resultsloo.borrowernumber %]&amp;op=add">Add</a></td></tr>
>+            [% IF ( loop.odd ) %]
>+                <tr class="highlight">
>+            [% ELSE %]
>+                <tr>
>+            [% END %]
>+                <td>[% resultsloo.cardnumber %] </td>
>+                <td>[% resultsloo.surname %], [% resultsloo.firstname %] </td>
>+                <td>[% resultsloo.branchcode %] </td>
>+                <td><a style="cursor:pointer" onclick="add_member([% resultsloo.borrowernumber %], '[% resultsloo.surname %]', '[% resultsloo.firstname %]'); return false;">Add</a></td>
>+            </tr>
> 		[% END %]
> 	</tbody>
> </table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
>index 5a23158..2a0aa2d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
>@@ -14,34 +14,100 @@
> <div id="custom-doc" class="yui-t7">
>    <div id="bd">
> 
>-<table>
>-    <tr>
>-        <td colspan="2"><h3>[% libraryname %]</h3></td>
>-    </tr>
>-    <tr>
>-        <td colspan="2"><b>Title:</b> [% title |html %]<br />[% issue %]</td>
>-    </tr>
>-    <tr>
>-        <td><b>Name</b></td>
>-        <td><b>Date due</b></td>
>-    </tr>
>-    [% FOREACH memberloo IN memberloop %]
>-    <tr>
>-        <td>[% memberloo.name %]</td>
>-        <td>&nbsp;</td>
>-    </tr>
>+[% IF (missing_parameter_routinglistid or missing_parameter_serialid) %]
>+    <h1>Routing list preview for <em>[% title %]</em></h1>
>+
>+    <form action="" method="get">
>+        [% IF (missing_parameter_routinglistid) %]
>+            <input type="hidden" name="serialid" value="[% serialid %]" />
>+            <label for="routinglist">Please select a routing list</label>
>+            <select id="routinglist" name="routinglistid">
>+                [% FOREACH routinglist IN routinglists %]
>+                    <option value="[% routinglist.routinglistid %]">
>+                        [% routinglist.title %]
>+                    </option>
>+                [% END %]
>+            </select>
>+        [% ELSE %]
>+            <input type="hidden" name="routinglistid" value="[% routinglistid %]" />
>+            <label for="serial">Please select a serial</label>
>+            <select id="serial" name="serialid">
>+                [% FOREACH serial IN serials %]
>+                    <option value="[% serial.serialid %]">
>+                        [% serial.serialseq %] ([% serial.planneddate %])
>+                    </option>
>+                [% END %]
>+            </select>
>+        [% END %]
>+        <input type="submit" value="Continue" />
>+    </form>
>+[% ELSE %]
>+    [% IF (error_no_item) %]
>+        <div class="error noprint">
>+            <p>Holds cannot be placed on this serial. There is no item attached to it.</p>
>+        </div>
>     [% END %]
>-</table>
>+    <table>
>+        [% IF (libraryname) %]
>+            <tr>
>+                <td colspan="2"><h3>[% libraryname %]</h3></td>
>+            </tr>
>+        [% END %]
>+        <tr>
>+            <td colspan="2">
>+                <b>Title:</b> [% title |html %]<br />
>+                [% serial.serialseq %] ([% serial.planneddate %])
>+            </td>
>+        </tr>
>+        <tr>
>+            <td colspan="2">
>+                <b>Routing list:</b> [% routinglisttitle %]
>+            </td>
>+        </tr>
>+        <tr>
>+            <td><b>Name</b></td>
>+            <td><b>Date due</b></td>
>+        </tr>
>+        [% FOREACH member IN memberloop %]
>+        <tr>
>+            <td>[% member.surname %], [% member.firstname %]</td>
>+            <td>&nbsp;</td>
>+        </tr>
>+        [% END %]
>+    </table>
> 
>-<div id="routingnotes">
>-    <p id="generalroutingnote">[% generalroutingnote %]</p>
>-    <p id="routingnote">[% routingnotes %]</p>
>-</div>
>+    <div id="routingnotes">
>+        <p id="generalroutingnote">[% generalroutingnote %]</p>
>+        <p id="routingnote">[% routingnotes %]</p>
>+    </div>
> 
>-   <div id="slip-block-links" class="noprint">
>-   <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
>-   </div>
>+    [% IF (need_confirm) %]
>+        [%# RoutingListAddReserves is ON %]
>+        <script type="text/javascript">
>+        //<![CDATA[
>+            function ask_confirm() {
>+                var msg = _("Holds will be placed for all borrowers in this list.");
>+                msg += "\n";
>+                msg += _("Do you want to continue?");
>+                return confirm(msg);
>+            }
>+        //]]>
>+        </script>
>+        <form action="" method="get" onsubmit="return ask_confirm()">
>+            <input type="hidden" name="routinglistid" value="[% routinglistid %]" />
>+            <input type="hidden" name="serialid" value="[% serialid %]" />
>+            <input type="hidden" name="confirm" value="1" />
>+            <input type="submit" value="Confirm and print" />
>+            <input type="button" value="Cancel" onclick="window.close()" />
>+        </form>
>+    [% ELSE %]
>+        <div id="slip-block-links" class="noprint">
>+           <a class="button" href="javascript:window.print();self.close()">Print</a>
>+           &nbsp; <a class="button" href="javascript:self.close()">Close</a>
>+        </div>
>+    [% END %]
>+[% END %]
> 
>-   </div>
>+    </div>
> 
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
>deleted file mode 100644
>index 6892e1c..0000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
>+++ /dev/null
>@@ -1,57 +0,0 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials &rsaquo; Preview routing list</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>-<script type="text/javascript">
>-
>-</script>
>-</head>
>-<body id="ser_routing-preview" class="ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>-
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title |html %]</i></a> &rsaquo; Preview routing list</div>
>-
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>-
>-<h2>Preview routing list for <i>[% title |html %]</i></h2>
>-
>-<form method="post" action="routing-preview.pl">
>-<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
>-<fieldset class="rows">
>-	<ol>
>-		<li><span class="label">Issue:</span>[% issue %]</li>
>-		<li><span class="label">List member:</span><table style="clear:none;margin:0;">
>-        <tr><th>Name</th></tr>
>-[% FOREACH memberloo IN memberloop %]
>-        <tr><td>[% memberloo.surname %], [% memberloo.firstname %]</td></tr>
>-[% END %]
>-        </table></li>
>-		<li><span class="label">Notes:</span>[% routingnotes %]</li>
>-	</ol>
>-</fieldset>
>-
>-<fieldset class="action">
>-<input type="submit" name="ok" class="button" value="Save and preview routing slip" onclick="print_slip([% subscriptionid %],'[% issue_escaped %]'); return false" />
>-<input type="submit" name="edit" class="button" value="Edit" />
>-<input type="submit" name="delete" class="button" value="Delete" /></fieldset>
>-</form>
>-
>-</div>
>-</div>
>-
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-</div>
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>deleted file mode 100644
>index 6caa3d5..0000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>+++ /dev/null
>@@ -1,97 +0,0 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials &rsaquo; [% title |html %] &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>-<script type="text/javascript">
>-
>-</script>
>-</head>
>-<body id="ser_routing" class="ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>-
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title |html %]</i></a> &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</div>
>-
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>-
>-
>-[% IF ( op ) %]
>-<h1>Create routing list for <i>[% title |html %]</i></h1>
>-[% ELSE %]
>-<h1>Edit routing list for <i>[% title |html %]</i></h1>
>-[% END %]
>-
>-<form method="post" action="routing.pl">
>-<input type="hidden" name="op" value="save" />
>-<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
>-<fieldset class="rows">
>-	<ol>
>-		<li><label for="date_selected">Issue: </label>
>-<select name="date_selected" id="date_selected">
>-[% FOREACH date IN dates %]
>-[% IF ( date.selected ) %]<option value="[% date.serialseq %] ([% date.planneddate %])" selected="selected">[% date.serialseq %] ([% date.planneddate %])</option>[% ELSE %]<option value="[% date.serialseq %] ([% date.planneddate %])">[% date.serialseq %] ([% date.planneddate %])</option>[% END %]
>-[% END %]
>-</select> [% issue %]</li>
>-
>-[% IF memberloop %]
>-<li><span class="label">Recipients:</span><table style="clear:none;margin:0;">
>-        <tr><th>Name</th>
>-            <th>Rank</th>
>-            <th>Delete</th>
>-        </tr>
>-        [% USE m_loop = iterator(memberloop) %]
>-        [% FOREACH member IN m_loop %]
>-        <tr><td>[% member.name %]</td>
>-            <td>
>-                <select name="itemrank" onchange="reorder_item([%- subscriptionid -%], [%- member.routingid -%], this.value)">
>-                [% rankings = [1 .. m_loop.size] %]
>-                [% FOREACH r IN rankings %]
>-                    [% IF r == member.ranking %]
>-                      <option selected="selected" value="[% r %]">[% r %]</option>
>-                    [% ELSE %]
>-                      <option value="[% r %]">[% r %]</option>
>-                    [% END %]
>-                [% END %]
>-                </select>
>-            </td>
>-            <td><a href="/cgi-bin/koha/serials/routing.pl?routingid=[% member.routingid %]&amp;subscriptionid=[% subscriptionid %]&amp;op=delete">Delete</a></td>
>-        </tr>
>-        [% END %]
>-        </table><p style="margin-left:10em;"><a onclick="search_member([% subscriptionid %]); return false"
>-href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=[% subscriptionid %]" class="button">Add recipients</a> &nbsp; <a
>-href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=delete" class="button">Delete all</a></p></li>
>-[% ELSE %]
>-<li><span class="label">Recipients:</span>
>-    <a onclick="search_member([% subscriptionid %]); return false" href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=[% subscriptionid %]" class="button">Add recipients</a></li>
>-[% END %]
>-
>-	<li><label for="notes">Notes:</label><textarea name="notes" id="notes" rows="3" cols="50">[% routingnotes %]</textarea></li>
>-	</ol>
>-
>-</fieldset>
>-<fieldset class="action"><input type="submit" name="submit" value="Save" /></fieldset>
>-</form>
>-
>-
>-</div>
>-</div>
>-
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-</div>
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglist.tt
>new file mode 100644
>index 0000000..1d1bca0
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglist.tt
>@@ -0,0 +1,194 @@
>+[% INCLUDE 'doc-head-open.inc' %]
>+<title>Koha &rsaquo; Serials &rsaquo; Routing list</title>
>+[% INCLUDE 'doc-head-close.inc' %]
>+<script type="text/javascript">
>+//<![CDATA[
>+[% UNLESS ( new ) %]
>+var max_rank = [% max_rank %];
>+
>+function IncMaxRank(){
>+    max_rank = max_rank + 1;
>+    var option = '<option value="' + max_rank + '">' + max_rank + '</option>';
>+    $('select[name="ranking"]').append(option);
>+}
>+
>+function DecMaxRank(){
>+    max_rank = max_rank - 1;
>+    $('select[name="ranking"] option[value="'+(max_rank+1)+'"]').remove();
>+}
>+
>+function updateTable(){
>+    var ids = $("#borrowersids").val().split(":");
>+    // split returns an array with one empty string if string is empty
>+    if(ids[0] == "")
>+        ids.splice(0,1);
>+
>+    var new_trs = new Array();
>+    for(var i=0; i<ids.length; i++){
>+        var tr = $("#ranking"+ids[i]).parents("tr");
>+        new_trs.push("<tr>"+$(tr).html()+"</tr>");
>+    }
>+    $("#borrowers tbody").html(new_trs.join(" "));
>+    var i=0;
>+    $("select[name='ranking']").each(function(){
>+        $(this).val(i+1);
>+        i++;
>+        var borrowernumber = $(this).attr('id').replace("ranking","");
>+        $(this).change(function(){
>+            reorderBorrower(borrowernumber, $(this).val());
>+        });
>+    });
>+    if(i < max_rank)
>+        DecMaxRank();
>+
>+    if(max_rank == 0){
>+        $("#borrowers").hide();
>+        $("#noborrowersp").show();
>+    }
>+}
>+
>+// delete borrower if rank <= 0
>+function reorderBorrower(borrowernumber, rank){
>+    var ids = $("#borrowersids").val().split(":");
>+    for(var i=0; i<ids.length; i++){
>+        if(ids[i] == borrowernumber){
>+            ids.splice(i, 1);
>+            break;
>+        }
>+    }
>+    if(rank > 0){
>+      ids.splice(rank-1, 0, borrowernumber);
>+    }
>+    $("#borrowersids").val(ids.join(":"));
>+    updateTable();
>+}
>+
>+function addBorrower(borrowernumber, surname, firstname){
>+    // Check if we have already this borrower
>+    var ids = $("#borrowersids").val();
>+    var re = new RegExp("(^"+borrowernumber+"$)|(^"+borrowernumber+":)|(:"+borrowernumber+"$)|(:"+borrowernumber+":)");
>+    if(ids.match(re))
>+        return -1;
>+
>+    IncMaxRank();
>+    var tr = '<tr>';
>+    tr += '<td>' + surname + ', ' + firstname + '</td>';
>+    tr += '<td><select name="ranking" id="ranking' + borrowernumber + '">';
>+    for(var i=0; i<(max_rank-1); i++){
>+        tr += '<option value="' + (i+1) + '">' + (i+1) + '</option>';
>+    }
>+    tr += '<option selected="selected" value="' + (max_rank) + '">' + (max_rank) + '</option>';
>+    tr += '</select></td>';
>+    tr += '<td><a style="cursor:pointer" onclick="delBorrower('+borrowernumber+');">Delete</a></td>';
>+    tr += '</tr>';
>+    $("#borrowers tbody").append(tr);
>+    $("#ranking"+borrowernumber).change(function(){
>+        reorderBorrower(borrowernumber, $(this).val());
>+    });
>+
>+    if(ids.length != 0)
>+        ids += ':';
>+    ids += borrowernumber;
>+    $("#borrowersids").val(ids);
>+
>+    $("#borrowers").show();
>+    $("#noborrowersp").hide();
>+
>+    return 0;
>+}
>+
>+function delBorrower(borrowernumber){
>+    reorderBorrower(borrowernumber, 0);
>+}
>+
>+function SearchMember(){
>+    window.open("/cgi-bin/koha/serials/member-search.pl", 'MemberSearch',
>+      'menubar=no,status=no,toolbar=no,scrollbars=yes');
>+}
>+
>+$(document).ready(function() {
>+    updateTable();
>+});
>+[% END %]
>+
>+//]]>
>+</script>
>+</head>
>+
>+<body>
>+[% INCLUDE 'header.inc' %]
>+[% INCLUDE 'serials-search.inc' %]
>+
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Routing list</div>
>+
>+<div id="doc3" class="yui-t2">
>+
>+<div id="bd">
>+  <div id="yui-main">
>+    <div class="yui-b">
>+      [% INCLUDE 'serials-toolbar.inc' %]
>+      [% IF ( new ) %]
>+        <h1>Create routing list</h1>
>+
>+        <form action="/cgi-bin/koha/serials/routinglist.pl" method="get">
>+          <input type="hidden" name="op" value="savenew" />
>+          <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
>+          <label for="title">Title: </label>
>+          <input type="text" id="title" name="title" />
>+          <input type="submit" value="Save" />
>+        </form>
>+      [% ELSE %]
>+        <h1>Routing list '[% title %]'</h1>
>+        <a style="cursor:pointer" onclick="SearchMember();">Add a borrower</a>
>+        [% IF ( borrowers_loop ) %]
>+          <table id="borrowers">
>+        [% ELSE %]
>+          <table id="borrowers" style="display:none">
>+        [% END %]
>+            <thead>
>+              <tr>
>+                <th>Name</th>
>+                <th>Rank</th>
>+                <th>&nbsp;</th>
>+              </tr>
>+            </thead>
>+            <tbody>
>+              [% FOREACH borrower IN borrowers_loop %]
>+                <tr>
>+                  <td>[% borrower.surname %], [% borrower.firstname %]</td>
>+                  <td>
>+                    <select name="ranking" id="ranking[% borrower.borrowernumber %]">
>+                      [% FOREACH ranking_loo IN borrower.ranking_loop %]
>+                        [% IF ( ranking_loo.selected ) %]
>+                          <option selected="selected" value="[% ranking_loo.rank %]">[% ranking_loo.rank %]</option>
>+                        [% ELSE %]
>+                          <option value="[% ranking_loo.rank %]">[% ranking_loo.rank %]</option>
>+                        [% END %]
>+                      [% END %]
>+                    </select>
>+                  </td>
>+                  <td><a style="cursor:pointer" onclick="delBorrower([% borrower.borrowernumber %]);">Delete</a></td>
>+                </tr>
>+              [% END %]
>+            </tbody>
>+          </table>
>+          [% UNLESS ( borrowers_loop ) %]
>+            <p id="noborrowersp">There is no borrowers in this routing list.</p>
>+          [% END %]
>+          <form action="/cgi-bin/koha/serials/routinglist.pl" method="post">
>+            <input type="hidden" id="borrowersids" name="borrowersids" value="[% borrowersids %]" />
>+            <input type="hidden" name="op" value="mod" />
>+            <input type="hidden" name="routinglistid" value="[% routinglistid %]" />
>+            <label for="notes">Notes: </label><br />
>+            <textarea id="notes" name="notes">[% notes %]</textarea><br />
>+            <input type="submit" value="Save" />
>+            <input type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/serials/routinglists.pl?subscriptionid=[% subscriptionid %]';" />
>+          </form>
>+      [% END %]
>+    </div>
>+  </div>
>+  <div class="yui-b">
>+    [% INCLUDE 'serials-menu.inc' %]
>+  </div>
>+</div>
>+[% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglists.tt
>new file mode 100644
>index 0000000..11ab8d8
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglists.tt
>@@ -0,0 +1,69 @@
>+[% INCLUDE 'doc-head-open.inc' %]
>+<title>Koha &rsaquo; Serials &rsaquo; Routing lists</title>
>+[% INCLUDE 'doc-head-close.inc' %]
>+<script type="text/javascript">
>+//<![CDATA[
>+
>+function previewSlip(routinglistid){
>+    window.open("/cgi-bin/koha/serials/routing-preview-slip.pl?routinglistid="+routinglistid, 'PreviewSlip', 'menubar=no,status=no,toolbar=no');
>+}
>+
>+function confirmDelete(){
>+    return confirm(_("Are you sure you want to delete this routing list?"));
>+}
>+
>+//]]>
>+</script>
>+</head>
>+
>+<body>
>+[% INCLUDE 'header.inc' %]
>+[% INCLUDE 'serials-search.inc' %]
>+
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Routing lists</div>
>+
>+<div id="doc3" class="yui-t2">
>+
>+<div id="bd">
>+  <div id="yui-main">
>+    <div class="yui-b">
>+      [% INCLUDE 'serials-toolbar.inc' %]
>+      <h1>Routing lists for <em>[% title %]</em></h1>
>+
>+      <a href="/cgi-bin/koha/serials/routinglist.pl?op=new&subscriptionid=[% subscriptionid %]">New routing list</a>
>+
>+      [% IF ( routinglists_loop ) %]
>+      <table>
>+        <thead>
>+          <tr>
>+            <th>Title</th>
>+            <th>No. of borrowers</th>
>+            <th>Notes</th>
>+            <th>&nbsp;</th>
>+          </tr>
>+        </thead>
>+        <tbody>
>+          [% FOREACH routinglist IN routinglists_loop %]
>+            <tr>
>+              <td><a href="/cgi-bin/koha/serials/routinglist.pl?routinglistid=[% routinglist.routinglistid %]">[% routinglist.title %]</a></td>
>+              <td>[% routinglist.borrowers.size || 0 %]</td>
>+              <td>[% routinglist.notes %]</td>
>+              <td>
>+                <a style="cursor:pointer" onclick="previewSlip([% routinglist.routinglistid %]);">Preview</a> |
>+                <a style="text-decoration:none" href="/cgi-bin/koha/serials/routinglists.pl?op=export&routinglistid=[% routinglist.routinglistid %]">Export</a> |
>+                <a style="text-decoration:none" onclick="return confirmDelete();" href="/cgi-bin/koha/serials/routinglists.pl?op=del&routinglistid=[% routinglist.routinglistid %]">Delete</a></td>
>+            </tr>
>+          [% END %]
>+        </tbody>
>+      </table>
>+      [% ELSE %]
>+        <p>There is no routing lists for this subscription.</p>
>+      [% END %]
>+
>+    </div>
>+  </div>
>+  <div class="yui-b">
>+    [% INCLUDE 'serials-menu.inc' %]
>+  </div>
>+</div>
>+[% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>index eeb9262..f52a44e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>@@ -14,9 +14,10 @@ function generateReceive(subscriptionid) {
>     }
> }
> function print_slip(subscriptionid,issue){
>-    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
>+    var myurl = '/cgi-bin/koha/serials/routing-preview-slip.pl?serialid='+serialid;
>     window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
> }
>+
> function addsubscriptionid()
> {
> 	var tab=new Array();
>@@ -188,7 +189,11 @@ $(document).ready(function() {
>         [% IF ( routing && CAN_user_serials_routing ) %]
>         <td>
>             [% UNLESS subscription.closed %]
>-                <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
>+                [% IF (subscription.routinglistscount) %]
>+                    <a href="/cgi-bin/koha/serials/routinglists.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing lists</a> ([% subscription.routinglistscount %])
>+                [% ELSE %]
>+                    <a href="/cgi-bin/koha/serials/routinglist.pl?op=new&subscriptionid=[% subscription.subscriptionid %]">New routing list</a>
>+                [% END %]
>             [% END %]
>         </td>
>         [% END %]
>@@ -314,7 +319,7 @@ $(document).ready(function() {
>                 </td>
>                 [% IF ( routing ) %]
>                 <td>
>-                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.planneddate %])'); return false" >Print list</a>
>+                    <a style="cursor:pointer" onclick="print_slip([% serial.serialid %]);">Print list</a>
>                 </td>
>                 [% END %]
>             </tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>index 0c937bf..41580a8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>@@ -165,11 +165,11 @@
>                           [% IF ( subscription.cannotedit ) %]
>                             &nbsp;
>                           [% ELSE %]
>-                            [% IF ( subscription.routingedit ) %]
>-                              <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
>-                              ([% subscription.routingedit %])
>+                            [% IF ( subscription.routinglistscount ) %]
>+                              <a href="/cgi-bin/koha/serials/routinglists.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
>+                              ([% subscription.routinglistscount %])
>                             [% ELSE %]
>-                              <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
>+                              <a href="/cgi-bin/koha/serials/routinglist.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
>                             [% END %]
>                           [% END %]
>                         </td>
>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 e6a7074..ea5d370 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
>@@ -24,12 +24,6 @@ var textbox = '';
>     }
> }
> 
>-function confirm_deletion() {
>-    var is_confirmed = confirm(_("Are you sure you want to delete this subscription?"));
>-    if (is_confirmed) {
>-        window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=del";
>-    }
>-}
> function popup(subscriptionid) {
>     newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes');
> }
>diff --git a/serials/member-search.pl b/serials/member-search.pl
>index ecbb94f..029324d 100755
>--- a/serials/member-search.pl
>+++ b/serials/member-search.pl
>@@ -105,9 +105,8 @@ if (@searchpatron) {
>         "start_with"
>     );
> }
>-if ($results) {
>-    $count = scalar(@$results);
>-}
>+
>+$count = $results ? scalar(@$results) : 0;
> my @resultsdata;
> $to=($count>$to?$to:$count);
> my $index=$from;
>diff --git a/serials/reorder_members.pl b/serials/reorder_members.pl
>deleted file mode 100755
>index 8b64fc7..0000000
>--- a/serials/reorder_members.pl
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-#!/usr/bin/perl
>-# 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.
>-
>-# Routing.pl script used to create a routing list for a serial subscription
>-# In this instance it is in fact a setting up of a list of reserves for the item
>-# where the hierarchical order can be changed on the fly and a routing list can be
>-# printed out
>-use strict;
>-use warnings;
>-use CGI;
>-use C4::Auth qw( checkauth );
>-use C4::Serials qw( reorder_members );
>-
>-my $query          = CGI->new;
>-my $subscriptionid = $query->param('subscriptionid');
>-my $routingid      = $query->param('routingid');
>-my $rank           = $query->param('rank');
>-
>-checkauth( $query, 0, { serials => 1 }, 'intranet' );
>-
>-reorder_members( $subscriptionid, $routingid, $rank );
>-
>-print $query->redirect(
>-    "/cgi-bin/koha/serials/routing.pl?subscriptionid=$subscriptionid");
>-
>diff --git a/serials/routing-preview-slip.pl b/serials/routing-preview-slip.pl
>new file mode 100755
>index 0000000..985068f
>--- /dev/null
>+++ b/serials/routing-preview-slip.pl
>@@ -0,0 +1,144 @@
>+#!/usr/bin/perl
>+
>+# Copyright 2011 BibLibre SARL
>+# 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.
>+
>+=head1 NAME
>+
>+routing-preview-slip.pl
>+
>+=head1 DESCRIPTION
>+
>+Preview a routing list for printing.
>+
>+=cut
>+
>+use Modern::Perl;
>+
>+use CGI;
>+use C4::Auth;
>+use C4::Output;
>+
>+use C4::Biblio;
>+use C4::Branch;
>+use C4::Members;
>+use C4::Serials;
>+use C4::Serials::RoutingLists qw/GetRoutingList GetRoutingLists/;
>+
>+my $input = new CGI;
>+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
>+    template_name   => 'serials/routing-preview-slip.tt',
>+    query           => $input,
>+    type            => 'intranet',
>+    authnotrequired => 0,
>+    flagsrequired   => { 'serials' => 'routing' },
>+    debug           => 1,
>+} );
>+
>+my $routinglistid = $input->param('routinglistid');
>+my $serialid = $input->param('serialid');
>+
>+if (!$routinglistid and !$serialid) {
>+    exit;
>+}
>+
>+if (!$routinglistid) {
>+    my $serial = GetSerial($serialid);
>+    my $subscription = GetSubscription($serial->{subscriptionid});
>+    my (undef, $biblio) = GetBiblio($subscription->{subscriptionid});
>+    my @routinglists = GetRoutingLists($subscription->{subscriptionid});
>+    $template->param(
>+        missing_parameter_routinglistid => 1,
>+        serialid => $serialid,
>+        title => $biblio->{title},
>+        routinglists => \@routinglists
>+    );
>+    output_html_with_http_headers $input, $cookie, $template->output;
>+    exit;
>+} elsif (!$serialid) {
>+    my $routinglist = GetRoutingList($routinglistid);
>+    my $subscription = GetSubscription($routinglist->{subscriptionid});
>+    my (undef, $biblio) = GetBiblio($subscription->{subscriptionid});
>+    my @serials = GetSerials2($subscription->{subscriptionid}, '1,2,3,4,5,6,7');
>+    $template->param(
>+        missing_parameter_serialid => 1,
>+        routinglistid => $routinglistid,
>+        title => $biblio->{title},
>+        serials => \@serials
>+    );
>+    output_html_with_http_headers $input, $cookie, $template->output;
>+    exit;
>+}
>+
>+my $routinglist = GetRoutingList($routinglistid);
>+my $subscription = GetSubscription($routinglist->{subscriptionid});
>+my $serial = GetSerial($serialid);
>+my (undef, $biblio) = GetBiblio($subscription->{biblionumber});
>+my $branch = GetBranchDetail($subscription->{branchcode});
>+my @memberloop;
>+foreach (@{$routinglist->{borrowers}}) {
>+    my $member = GetMemberDetails($_);
>+    push @memberloop, {
>+        surname => $member->{surname},
>+        firstname => $member->{firstname},
>+    };
>+}
>+
>+my $no_holds = $input->param('no_holds');
>+if(C4::Context->preference('RoutingListAddReserves') and !$no_holds) {
>+    my $confirm = $input->param('confirm');
>+    if ($confirm) {
>+        require C4::Reserves;
>+        require C4::Items;
>+        my $itemnumber = GetSerialItemnumber($serialid);
>+        my $item = C4::Items::GetItem($itemnumber);
>+        if ($item) {
>+            my $rank = 1;
>+            foreach my $borrowernumber ( @{$routinglist->{borrowers}} ) {
>+                my $reserve = C4::Reserves::GetReserveInfo($borrowernumber,
>+                    $item->{biblionumber});
>+                if($reserve) {
>+                    C4::Reserves::ModReserve($rank, $item->{biblionumber},
>+                        $borrowernumber, $item->{holdingbranch}, $itemnumber);
>+                } else {
>+                    my @bibitems = GetBiblioItemByBiblioNumber($item->{biblionumber});
>+                    C4::Reserves::AddReserve($item->{holdingbranch}, $borrowernumber,
>+                        $item->{biblionumber}, 'a', \@bibitems, $rank, undef,
>+                        undef, undef, $biblio->{title}, $itemnumber);
>+                }
>+                $rank++;
>+            }
>+        } else {
>+            $template->param(error_no_item => 1);
>+        }
>+    } else {
>+        $template->param(need_confirm => 1);
>+    }
>+}
>+
>+$template->param(
>+    routinglistid   => $routinglistid,
>+    serialid        => $serialid,
>+    libraryname     => $branch->{branchname},
>+    title           => $biblio->{title},
>+    serial          => $serial,
>+    memberloop      => \@memberloop,
>+    routingnotes    => $routinglist->{notes},
>+    generalroutingnote  => C4::Context->preference('RoutingListNote'),
>+    routinglisttitle    => $routinglist->{title},
>+);
>+
>+output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
>deleted file mode 100755
>index 437c852..0000000
>--- a/serials/routing-preview.pl
>+++ /dev/null
>@@ -1,139 +0,0 @@
>-#!/usr/bin/perl
>-
>-# 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.
>-
>-# Routing Preview.pl script used to view a routing list after creation
>-# lets one print out routing slip and create (in this instance) the heirarchy
>-# of reserves for the serial
>-use strict;
>-use warnings;
>-use CGI;
>-use C4::Koha;
>-use C4::Auth;
>-use C4::Dates;
>-use C4::Output;
>-use C4::Acquisition;
>-use C4::Reserves;
>-use C4::Circulation;
>-use C4::Context;
>-use C4::Members;
>-use C4::Biblio;
>-use C4::Items;
>-use C4::Serials;
>-use URI::Escape;
>-use C4::Branch;
>-
>-my $query = new CGI;
>-my $subscriptionid = $query->param('subscriptionid');
>-my $issue = $query->param('issue');
>-my $routingid;
>-my $ok = $query->param('ok');
>-my $edit = $query->param('edit');
>-my $delete = $query->param('delete');
>-my $dbh = C4::Context->dbh;
>-
>-if($delete){
>-    delroutingmember($routingid,$subscriptionid);
>-    my $sth = $dbh->prepare("UPDATE serial SET routingnotes = NULL WHERE subscriptionid = ?");
>-    $sth->execute($subscriptionid);
>-    print $query->redirect("routing.pl?subscriptionid=$subscriptionid&op=new");
>-}
>-
>-if($edit){
>-    print $query->redirect("routing.pl?subscriptionid=$subscriptionid");
>-}
>-
>-my @routinglist = getroutinglist($subscriptionid);
>-my $subs = GetSubscription($subscriptionid);
>-my ($tmp ,@serials) = GetSerials($subscriptionid);
>-my ($template, $loggedinuser, $cookie);
>-
>-if($ok){
>-    # get biblio information....
>-    my $biblio = $subs->{'biblionumber'};
>-	my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio);
>-	my @itemresults = GetItemsInfo( $subs->{biblionumber} );
>-	my $branch = $itemresults[0]->{'holdingbranch'};
>-	my $branchname = GetBranchName($branch);
>-
>-	if (C4::Context->preference('RoutingListAddReserves')){
>-		# get existing reserves .....
>-		my ($count,$reserves) = GetReservesFromBiblionumber($biblio);
>-		my $totalcount = $count;
>-		foreach my $res (@$reserves) {
>-			if ($res->{'found'} eq 'W') {
>-				$count--;
>-			}
>-		}
>-		my $const = 'o';
>-		my $notes;
>-		my $title = $subs->{'bibliotitle'};
>-        for my $routing ( @routinglist ) {
>-            my $sth = $dbh->prepare('SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? LIMIT 1');
>-            $sth->execute($biblio,$routing->{borrowernumber});
>-            my $reserve = $sth->fetchrow_hashref;
>-
>-            if($routing->{borrowernumber} == $reserve->{borrowernumber}){
>-                ModReserve($routing->{ranking},$biblio,$routing->{borrowernumber},$branch);
>-            } else {
>-                AddReserve($branch,$routing->{borrowernumber},$biblio,$const,\@bibitems,$routing->{ranking}, undef, undef, $notes,$title);
>-        }
>-    }
>-	}
>-
>-    ($template, $loggedinuser, $cookie)
>-= get_template_and_user({template_name => "serials/routing-preview-slip.tmpl",
>-				query => $query,
>-				type => "intranet",
>-				authnotrequired => 0,
>-				flagsrequired => {serials => '*'},
>-				debug => 1,
>-				});
>-    $template->param("libraryname"=>$branchname);
>-} else {
>-    ($template, $loggedinuser, $cookie)
>-= get_template_and_user({template_name => "serials/routing-preview.tmpl",
>-				query => $query,
>-				type => "intranet",
>-				authnotrequired => 0,
>-				flagsrequired => {serials => '*'},
>-				debug => 1,
>-				});
>-}
>-
>-my $memberloop = [];
>-for my $routing (@routinglist) {
>-    my $member = GetMember( borrowernumber => $routing->{borrowernumber} );
>-    $member->{name}           = "$member->{firstname} $member->{surname}";
>-    push @{$memberloop}, $member;
>-}
>-
>-my $routingnotes = $serials[0]->{'routingnotes'};
>-$routingnotes =~ s/\n/\<br \/\>/g;
>-
>-$template->param(
>-    title => $subs->{'bibliotitle'},
>-    issue => $issue,
>-    issue_escaped => URI::Escape::uri_escape($issue),
>-    subscriptionid => $subscriptionid,
>-    memberloop => $memberloop,
>-    routingnotes => $routingnotes,
>-    generalroutingnote => C4::Context->preference('RoutingListNote'),
>-    hasRouting => check_routing($subscriptionid),
>-    (uc(C4::Context->preference("marcflavour"))) => 1
>-    );
>-
>-output_html_with_http_headers $query, $cookie, $template->output;
>diff --git a/serials/routing.pl b/serials/routing.pl
>deleted file mode 100755
>index a95631b..0000000
>--- a/serials/routing.pl
>+++ /dev/null
>@@ -1,128 +0,0 @@
>-#!/usr/bin/perl
>-
>-# 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.
>-
>-
>-=head1 Routing.pl
>-
>-script used to create a routing list for a serial subscription
>-In this instance it is in fact a setting up of a list of reserves for the item
>-where the hierarchical order can be changed on the fly and a routing list can be
>-printed out
>-
>-=cut
>-
>-use strict;
>-use warnings;
>-use CGI;
>-use C4::Koha;
>-use C4::Auth;
>-use C4::Dates;
>-use C4::Output;
>-use C4::Acquisition;
>-use C4::Output;
>-use C4::Context;
>-
>-use C4::Members;
>-use C4::Serials;
>-
>-use URI::Escape;
>-
>-my $query = new CGI;
>-my $subscriptionid = $query->param('subscriptionid');
>-my $serialseq = $query->param('serialseq');
>-my $routingid = $query->param('routingid');
>-my $borrowernumber = $query->param('borrowernumber');
>-my $notes = $query->param('notes');
>-my $op = $query->param('op') || q{};
>-my $date_selected = $query->param('date_selected');
>-$date_selected ||= q{};
>-my $dbh = C4::Context->dbh;
>-
>-if($op eq 'delete'){
>-    delroutingmember($routingid,$subscriptionid);
>-}
>-
>-if($op eq 'add'){
>-    addroutingmember($borrowernumber,$subscriptionid);
>-}
>-if($op eq 'save'){
>-    my $sth = $dbh->prepare('UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?');
>-    $sth->execute($notes,$subscriptionid);
>-    my $urldate = URI::Escape::uri_escape($date_selected);
>-    print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$urldate");
>-}
>-
>-my @routinglist = getroutinglist($subscriptionid);
>-my $subs = GetSubscription($subscriptionid);
>-my ($count,@serials) = GetSerials($subscriptionid);
>-my $serialdates = GetLatestSerials($subscriptionid,$count);
>-
>-my $dates = [];
>-foreach my $dateseq (@{$serialdates}) {
>-    my $d = {};
>-    $d->{planneddate} = $dateseq->{planneddate};
>-    $d->{serialseq} = $dateseq->{serialseq};
>-    $d->{serialid} = $dateseq->{serialid};
>-    if($date_selected eq $dateseq->{serialid}){
>-        $d->{selected} = ' selected';
>-    } else {
>-        $d->{selected} = q{};
>-    }
>-    push @{$dates}, $d;
>-}
>-
>-my ($template, $loggedinuser, $cookie)
>-= get_template_and_user({template_name => 'serials/routing.tmpl',
>-				query => $query,
>-				type => 'intranet',
>-				authnotrequired => 0,
>-				flagsrequired => {serials => 'routing'},
>-				debug => 1,
>-				});
>-
>-my $member_loop = [];
>-for my $routing ( @routinglist ) {
>-    my $member=GetMember('borrowernumber' => $routing->{borrowernumber});
>-    $member->{location} = $member->{branchcode};
>-    if ($member->{firstname} ) {
>-        $member->{name} = $member->{firstname} . q| |;
>-    }
>-    else {
>-        $member->{name} = q{};
>-    }
>-    if ($member->{surname} ) {
>-        $member->{name} .= $member->{surname};
>-    }
>-    $member->{routingid}=$routing->{routingid} || q{};
>-    $member->{ranking} = $routing->{ranking} || q{};
>-
>-    push(@{$member_loop}, $member);
>-}
>-
>-$template->param(
>-    title => $subs->{bibliotitle},
>-    subscriptionid => $subscriptionid,
>-    memberloop => $member_loop,
>-    op => $op eq 'new',
>-    dates => $dates,
>-    routingnotes => $serials[0]->{'routingnotes'},
>-    hasRouting => check_routing($subscriptionid),
>-    (uc(C4::Context->preference("marcflavour"))) => 1
>-
>-    );
>-
>-output_html_with_http_headers $query, $cookie, $template->output;
>diff --git a/serials/routinglist.pl b/serials/routinglist.pl
>new file mode 100755
>index 0000000..f8455d3
>--- /dev/null
>+++ b/serials/routinglist.pl
>@@ -0,0 +1,114 @@
>+#!/usr/bin/perl
>+
>+# Copyright 2011 BibLibre SARL
>+# 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.
>+
>+=head1 NAME
>+
>+routinglist.pl
>+
>+=head1 DESCRIPTION
>+
>+Create or modify a routing list
>+
>+=cut
>+
>+use Modern::Perl;
>+
>+use CGI;
>+use C4::Auth;
>+use C4::Output;
>+
>+use C4::Members;
>+use C4::Serials;
>+use C4::Serials::RoutingLists qw/AddRoutingList ModRoutingList GetRoutingList/;
>+
>+my $input = new CGI;
>+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
>+    template_name   => 'serials/routinglist.tt',
>+    query           => $input,
>+    type            => 'intranet',
>+    authnotrequired => 0,
>+    flagsrequired   => { serials => 'routing' },
>+    debug           => 1,
>+} );
>+
>+my $op = $input->param('op');
>+my $routinglistid;
>+
>+if($op && $op eq 'new') {
>+    my $subscriptionid = $input->param('subscriptionid');
>+    $template->param(
>+        new => 1,
>+        subscriptionid => $subscriptionid,
>+    );
>+    output_html_with_http_headers $input, $cookie, $template->output;
>+    exit;
>+}
>+
>+if($op && $op eq 'savenew') {
>+    my $title = $input->param('title');
>+    my $subscriptionid = $input->param('subscriptionid');
>+
>+    $routinglistid = AddRoutingList($subscriptionid, $title);
>+} else {
>+    $routinglistid = $input->param('routinglistid');
>+}
>+
>+if($op && $op eq 'mod') {
>+    my $borrowersids = $input->param('borrowersids');
>+    my $notes = $input->param('notes');
>+    my @borrowernumbers = split /:/, $borrowersids;
>+    ModRoutingList($routinglistid, undef, undef, $notes, @borrowernumbers);
>+    my $routinglist = GetRoutingList($routinglistid);
>+    print $input->redirect("/cgi-bin/koha/serials/routinglists.pl?subscriptionid=".$routinglist->{'subscriptionid'});
>+    exit;
>+}
>+
>+my $routinglist = GetRoutingList($routinglistid);
>+my @borrowers;
>+my $rank = 1;
>+foreach my $borrowernumber (@{$routinglist->{borrowers}}) {
>+    my @ranking_loop;
>+    for(my $i = 0 ; $i < scalar(@{$routinglist->{borrowers}}) ; $i++){
>+        my $selected = 0;
>+        $selected = 1 if ($rank == $i+1);
>+        push @ranking_loop, {
>+            rank => $i+1,
>+            selected => $selected,
>+        };
>+    }
>+    my $member = GetMemberDetails($borrowernumber);
>+    push @borrowers, {
>+        borrowernumber => $borrowernumber,
>+        surname => $member->{surname},
>+        firstname => $member->{firstname},
>+        ranking_loop => \@ranking_loop
>+    };
>+    $rank ++;
>+}
>+
>+$template->param(
>+    borrowers_loop => \@borrowers,
>+    borrowersids => join(':', map ($_->{borrowernumber}, @borrowers)),
>+    max_rank => scalar(@borrowers),
>+    title => $routinglist->{title},
>+    notes => $routinglist->{notes},
>+    subscriptionid => $routinglist->{subscriptionid},
>+    routinglistid => $routinglistid,
>+);
>+
>+output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/serials/routinglists.pl b/serials/routinglists.pl
>new file mode 100755
>index 0000000..0fecb95
>--- /dev/null
>+++ b/serials/routinglists.pl
>@@ -0,0 +1,79 @@
>+#!/usr/bin/perl
>+
>+# Copyright 2011 BibLibre SARL
>+# 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.
>+
>+=head1 NAME
>+
>+routinglists.pl
>+
>+=head1 DESCRIPTION
>+
>+View all routing lists for a subscription
>+
>+=cut
>+
>+use Modern::Perl;
>+
>+use CGI;
>+use C4::Auth;
>+use C4::Output;
>+
>+use C4::Biblio;
>+use C4::Serials;
>+use C4::Serials::RoutingLists qw/GetRoutingLists GetRoutingList DelRoutingList GetRoutingListAsCSV/;
>+
>+my $input = new CGI;
>+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
>+    template_name   => 'serials/routinglists.tt',
>+    query           => $input,
>+    type            => 'intranet',
>+    authnotrequired => 0,
>+    flagsrequired   => { serials => 'routing' },
>+    debug           => 1,
>+} );
>+
>+my $subscriptionid = $input->param('subscriptionid');
>+my $op = $input->param('op');
>+
>+if($op && $op eq "export") {
>+    my $routinglistid = $input->param('routinglistid');
>+    print $input->header(
>+        -type       => 'text/csv',
>+        -attachment => 'routinglist' . $routinglistid . '.csv',
>+    );
>+    print GetRoutingListAsCSV($routinglistid);
>+    exit;
>+} elsif($op && $op eq "del") {
>+    my $routinglistid = $input->param('routinglistid');
>+    if(!defined $subscriptionid){
>+        my $routinglist = GetRoutingList($routinglistid);
>+        $subscriptionid = $routinglist->{subscriptionid};
>+    }
>+    DelRoutingList($routinglistid);
>+}
>+
>+my $subscription = GetSubscription($subscriptionid);
>+my (undef,$biblio) = GetBiblio($subscription->{biblionumber});
>+my @routinglists = GetRoutingLists($subscriptionid);
>+
>+$template->param(
>+    subscriptionid => $subscriptionid,
>+    routinglists_loop => \@routinglists,
>+    title => $biblio->{title},
>+);
>+
>+output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
>index ad57e07..578acea 100755
>--- a/serials/serials-collection.pl
>+++ b/serials/serials-collection.pl
>@@ -26,6 +26,7 @@ use C4::Auth;
> use C4::Koha;
> use C4::Dates qw/format_date/;
> use C4::Serials;
>+use C4::Serials::RoutingLists qw/GetRoutingListsCount/;
> use C4::Letters;
> use C4::Output;
> use C4::Context;
>@@ -143,8 +144,10 @@ my $yearmax=($subscriptions->[0]{year} eq "manage" && scalar(@$subscriptions)>1)
> my $yearmin=$subscriptions->[scalar(@$subscriptions)-1]{year};
> my $subscriptionidlist="";
> foreach my $subscription (@$subscriptiondescs){
>-  $subscriptionidlist.=$subscription->{'subscriptionid'}."," ;
>-  $biblionumber = $subscription->{'bibnum'} unless ($biblionumber);
>+    $subscriptionidlist.=$subscription->{'subscriptionid'}."," ;
>+    $biblionumber = $subscription->{'bibnum'} unless ($biblionumber);
>+    $subscription->{routinglistscount}
>+        = GetRoutingListsCount($subscription->{subscriptionid});
> }
> 
> # warn "title : $title yearmax : $yearmax nombre d'elements dans le tableau :".scalar(@$subscriptions);
>diff --git a/serials/serials-search.pl b/serials/serials-search.pl
>index aaf64e6..4f44a35 100755
>--- a/serials/serials-search.pl
>+++ b/serials/serials-search.pl
>@@ -35,6 +35,7 @@ use C4::Branch;
> use C4::Context;
> use C4::Output;
> use C4::Serials;
>+use C4::Serials::RoutingLists qw/GetRoutingListsCount/;
> 
> my $query         = new CGI;
> my $title         = $query->param('title_filter') || '';
>@@ -88,7 +89,8 @@ if ($searched){
> # to toggle between create or edit routing list options
> if ($routing) {
>     for my $subscription ( @subscriptions) {
>-        $subscription->{routingedit} = check_routing( $subscription->{subscriptionid} );
>+        $subscription->{routinglistscount}
>+            = GetRoutingListsCount($subscription->{subscriptionid});
>         $subscription->{branchname} = GetBranchName ( $subscription->{branchcode} );
>     }
> }
>diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
>index 009360b..8b55726 100755
>--- a/serials/subscription-detail.pl
>+++ b/serials/subscription-detail.pl
>@@ -22,6 +22,7 @@ use C4::Auth;
> use C4::Koha;
> use C4::Dates qw/format_date/;
> use C4::Serials;
>+use C4::Serials::RoutingLists qw/GetRoutingListsCount/;
> use C4::Output;
> use C4::Context;
> use C4::Search qw/enabled_staff_search_views/;
>@@ -100,7 +101,7 @@ if ($op eq 'del') {
> 		exit;
>     }
> }
>-my $hasRouting = check_routing($subscriptionid);
>+my $hasRouting = GetRoutingListsCount($subscriptionid);
> 
> (undef, $cookie, undef, undef)
>     = checkauth($query, 0, {catalogue => 1}, "intranet");
>diff --git a/t/db_dependent/lib/KohaTest/Serials.pm b/t/db_dependent/lib/KohaTest/Serials.pm
>index e7bb249..1f3fc7a 100644
>--- a/t/db_dependent/lib/KohaTest/Serials.pm
>+++ b/t/db_dependent/lib/KohaTest/Serials.pm
>@@ -46,11 +46,6 @@ sub methods : Test( 1 ) {
>                       removeMissingIssue
>                       updateClaim
>                       getsupplierbyserialid
>-                      check_routing
>-                      addroutingmember
>-                      reorder_members
>-                      delroutingmember
>-                      getroutinglist
>                       countissuesfrom
>                       abouttoexpire
>                       in_array
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 7957: 9259 | 10973 | 13217 | 16614 | 21340 | 22726 | 35709 | 35801 | 35802 | 35803 | 35804 | 35842 | 35860 | 35872 | 35873 | 35874 | 35875 | 38425 | 41762 | 41763 | 41764 | 42427 | 42428 | 42429 | 47633 | 47634 | 47635 | 47659 | 47660 | 47661 | 47662 | 47663 | 47664 | 50226 | 50227 | 50228 | 50265 | 50266 | 50270 | 50273 | 97519 | 97520 | 97521 | 97522 | 97523 | 97524