From srdjan at catalyst.net.nz  Wed Feb  1 00:46:55 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed,  1 Feb 2012 12:46:55 +1300
Subject: [Koha-patches] [PATCH] bug_7477: Copy holidays from one branch to
	another
In-Reply-To: <bug 7477>
References: <bug 7477>
Message-ID: <1328053615-11993-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Calendar.pm                                     |   98 ++++++++++++++------
 .../prog/en/modules/tools/holidays.tt              |   15 +++
 tools/copy-holidays.pl                             |   40 ++++++++
 3 files changed, 125 insertions(+), 28 deletions(-)
 create mode 100755 tools/copy-holidays.pl

diff --git a/C4/Calendar.pm b/C4/Calendar.pm
index dc9037b..741e309 100644
--- a/C4/Calendar.pm
+++ b/C4/Calendar.pm
@@ -20,34 +20,11 @@ use warnings;
 use vars qw($VERSION @EXPORT);
 
 use Carp;
-use Date::Calc qw( Date_to_Days );
+use Date::Calc qw( Date_to_Days Today);
 
 use C4::Context;
 
-BEGIN {
-    # set the version for version checking
-    $VERSION = 3.01;
-    require Exporter;
-    @EXPORT = qw(
-        &get_week_days_holidays
-        &get_day_month_holidays
-        &get_exception_holidays 
-        &get_single_holidays
-        &insert_week_day_holiday
-        &insert_day_month_holiday
-        &insert_single_holiday
-        &insert_exception_holiday
-        &ModWeekdayholiday
-        &ModDaymonthholiday
-        &ModSingleholiday
-        &ModExceptionholiday
-        &delete_holiday
-        &isHoliday
-        &addDate
-        &daysBetween
-    );
-}
-
+use constant ISO_DATE_FORMAT => "%04d-%02d-%02d";
 =head1 NAME
 
 C4::Calendar::Calendar - Koha module dealing with holidays.
@@ -123,7 +100,7 @@ sub _init {
         $exception_holidays{"$year/$month/$day"}{title} = $title;
         $exception_holidays{"$year/$month/$day"}{description} = $description;
         $exception_holidays{"$year/$month/$day"}{date} = 
-		sprintf("%04d-%02d-%02d", $year, $month, $day);
+		sprintf(ISO_DATE_FORMAT, $year, $month, $day);
     }
     $self->{'exception_holidays'} = \%exception_holidays;
 
@@ -133,7 +110,7 @@ sub _init {
         $single_holidays{"$year/$month/$day"}{title} = $title;
         $single_holidays{"$year/$month/$day"}{description} = $description;
         $single_holidays{"$year/$month/$day"}{date} = 
-		sprintf("%04d-%02d-%02d", $year, $month, $day);
+		sprintf(ISO_DATE_FORMAT, $year, $month, $day);
     }
     $self->{'single_holidays'} = \%single_holidays;
     return $self;
@@ -283,6 +260,9 @@ sub insert_single_holiday {
     my $self = shift @_;
     my %options = @_;
     
+    @options{qw(year month day)} = ( $options{date} =~ m/(\d+)-(\d+)-(\d+)/o )
+      if $options{date} && !$options{day};
+
 	my $dbh = C4::Context->dbh();
     my $isexception = 0;
     my $insertHoliday = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
@@ -318,6 +298,9 @@ sub insert_exception_holiday {
     my $self = shift @_;
     my %options = @_;
 
+    @options{qw(year month day)} = ( $options{date} =~ m/(\d+)-(\d+)-(\d+)/o )
+      if $options{date} && !$options{day};
+
     my $dbh = C4::Context->dbh();
     my $isexception = 1;
     my $insertException = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
@@ -567,6 +550,65 @@ sub isHoliday {
 
 }
 
+=head2 copy_to_branch
+
+    $calendar->copy_to_branch($target_branch)
+
+=cut
+
+sub copy_to_branch {
+    my ($self, $target_branch) = @_;
+
+    croak "No target_branch" unless $target_branch;
+
+    my $target_calendar = C4::Calendar->new(branchcode => $target_branch);
+
+    my ($y, $m, $d) = Today();
+    my $today = sprintf ISO_DATE_FORMAT, $y,$m,$d;
+
+    $target_calendar->insert_week_day_holiday(%$_)
+      foreach values %{ $self->get_week_days_holidays };
+    $target_calendar->insert_day_month_holiday(%$_)
+      foreach values %{ $self->get_day_month_holidays };
+    $target_calendar->insert_exception_holiday(%$_)
+      foreach grep { $_->{date} gt $today } values %{ $self->get_exception_holidays };
+    $target_calendar->insert_single_holiday(%$_)
+      foreach grep { $_->{date} gt $today } values %{ $self->get_single_holidays };
+
+    return 1;
+}
+
+=head2 daysBetween
+
+    my $daysBetween = $calendar->daysBetween($startdate, $enddate)
+
+C<$startdate> and C<$enddate> are C4::Dates objects that define the interval.
+
+Returns the number of non-holiday days in the interval.
+useDaysMode syspref has no effect here.
+=cut
+
+sub daysBetween ($$$) {
+    my $self      = shift or return undef;
+    my $startdate = shift or return undef;
+    my $enddate   = shift or return undef;
+	my ($yearFrom,$monthFrom,$dayFrom) = split("-",$startdate->output('iso'));
+	my ($yearTo,  $monthTo,  $dayTo  ) = split("-",  $enddate->output('iso'));
+	if (Date_to_Days($yearFrom,$monthFrom,$dayFrom) > Date_to_Days($yearTo,$monthTo,$dayTo)) {
+		return 0;
+		# we don't go backwards  ( FIXME - handle this error better )
+	}
+    my $count = 0;
+    while (1) {
+        ($yearFrom != $yearTo or $monthFrom != $monthTo or $dayFrom != $dayTo) or last; # if they all match, it's the last day
+        unless ($self->isHoliday($dayFrom, $monthFrom, $yearFrom)) {
+            $count++;
+        }
+        ($yearFrom, $monthFrom, $dayFrom) = &Date::Calc::Add_Delta_Days($yearFrom, $monthFrom, $dayFrom, 1);
+    }
+    return($count);
+}
+
 =head2 addDate
 
     my ($day, $month, $year) = $calendar->addDate($date, $offset)
@@ -601,7 +643,7 @@ sub addDate {
 	} else { ## ($daysMode eq 'Days') 
         ($year, $month, $day) = &Date::Calc::Add_Delta_Days($year, $month, $day, $offset );
     }
-    return(C4::Dates->new( sprintf("%04d-%02d-%02d",$year,$month,$day),'iso'));
+    return(C4::Dates->new( sprintf(ISO_DATE_FORMAT,$year,$month,$day),'iso'));
 }
 
 =head2 daysBetween
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index 686e3af..6ee87df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -388,6 +388,21 @@
 
 
 </div>
+
+<div style="margin-top: 2em;">
+<form action="copy-holidays.pl" method="post">
+	<input type="hidden" name="from_branchcode" value="[% branch %]" /> 
+  <label for="branchcode">Copy holidays to:</label>
+  <select id="branchcode" name="branchcode">
+    <option value=""></option>
+    [% FOREACH branchloo IN branchloop %]
+    <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
+    [% END %]
+  </select>
+	<input type="submit" value="Copy" />
+</form>
+</div>
+	
 </div>
 <div class="yui-u">
 <div class="help">
diff --git a/tools/copy-holidays.pl b/tools/copy-holidays.pl
new file mode 100755
index 0000000..9de4b8c
--- /dev/null
+++ b/tools/copy-holidays.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+# Copyright 2012 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.
+
+use strict;
+use warnings;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+
+
+use C4::Calendar;
+
+my $input               = new CGI;
+my $dbh                 = C4::Context->dbh();
+
+my $branchcode          = $input->param('branchcode');
+my $from_branchcode     = $input->param('from_branchcode');
+
+C4::Calendar->new(branchcode => $from_branchcode)->copy_to_branch($branchcode) if $from_branchcode && $branchcode;
+
+print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=".($branchcode || $from_branchcode));
+
-- 
1.6.5


From srdjan at catalyst.net.nz  Wed Feb  1 03:19:03 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed,  1 Feb 2012 15:19:03 +1300
Subject: [Koha-patches] [PATCH] bug_7458: A call number plugin
In-Reply-To: <bug 7458>
References: <bug 7458>
Message-ID: <1328062743-28298-1-git-send-email-srdjan@catalyst.net.nz>

---
 cataloguing/value_builder/callnumber-KU.pl |  140 ++++++++++++++++++++++++++++
 1 files changed, 140 insertions(+), 0 deletions(-)
 create mode 100755 cataloguing/value_builder/callnumber-KU.pl

diff --git a/cataloguing/value_builder/callnumber-KU.pl b/cataloguing/value_builder/callnumber-KU.pl
new file mode 100755
index 0000000..72fea3f
--- /dev/null
+++ b/cataloguing/value_builder/callnumber-KU.pl
@@ -0,0 +1,140 @@
+#!/usr/bin/perl
+
+# Copyright 2012 CatalystIT Ltd
+#
+# 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 C4::Auth;
+use CGI;
+use C4::Context;
+
+=head1 DESCRIPTION
+
+Is used for callnumber computation.
+
+User must supply a letter prefix (unspecified length) followed by an empty space followed by a "number".
+"Number" is 4 character long, and is either a number sequence which is 0 padded
+or two letters which are 01 padded.
+If input does not conform with this format any processing is omitted.
+
+Some examples of legal values that trigger auto allocation:
+
+AAA 0  - returns first unused number AAA 0xxx starting with AAA 0000
+BBB 12 - returns first unused number BBB 12xx starting with BBB 1200
+CCC QW - returns first unused number CCC QWxx starting with CCC QW01
+
+=cut
+
+sub plugin_parameters {
+}
+
+sub plugin_javascript {
+    my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
+    my $res="
+    <script type='text/javascript'>
+        function Focus$field_number() {
+            return 1;
+        }
+
+        function Blur$field_number() {
+                return 1;
+        }
+
+        function Clic$field_number() {
+                var code = document.getElementById('$field_number');
+                var url = '../cataloguing/plugin_launcher.pl?plugin_name=callnumber-KU.pl&code=' + code.value;
+                var blurcallbackcallnumber = {
+                    success: function(o) {
+                        var field = document.getElementById('$field_number');
+                        field.value = o.responseText;
+                        return 1;
+                    }
+                }
+                var transaction = YAHOO.util.Connect.asyncRequest('GET',url, blurcallbackcallnumber, null);
+            return 1;
+        }
+    </script>
+    ";
+
+    return ($field_number,$res);
+}
+
+my $BASE_CALLNUMBER_RE = qr/^(\w+) (\w+)$/;
+sub plugin {
+    my ($input) = @_;
+    my $code = $input->param('code');
+
+    my ($template, $loggedinuser, $cookie) = get_template_and_user({
+        template_name   => "cataloguing/value_builder/ajax.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => {editcatalogue => '*'},
+        debug           => 1,
+    });
+
+    my $ret;
+    my ($alpha, $num) = ($code =~ $BASE_CALLNUMBER_RE);
+    if (defined $num) { # otherwise no point
+        my ($num_alpha, $num_num) = ($num =~ m/^(\D+)?(\d+)?$/);
+        $num_alpha ||= '';
+        my $pad_len = 4 - length($num);
+        
+        if ($pad_len > 0) {
+            my $num_padded = $num_num;
+            if ($num_alpha) {
+                $num_padded .= "0" x ($pad_len - 1) if $pad_len > 1;
+                $num_padded .= "1";
+            } else {
+                $num_padded .= "0" x $pad_len;
+            }
+            my $padded = "$alpha $num_alpha" . $num_padded;
+
+            my $dbh = C4::Context->dbh;
+            if ( my $first = $dbh->selectrow_array("SELECT itemcallnumber
+                                                    FROM items
+                                                    WHERE itemcallnumber = ?", undef, $padded) ) {
+                my $icn = $dbh->selectcol_arrayref("SELECT itemcallnumber
+                                                    FROM items
+                                                    WHERE itemcallnumber LIKE ?
+                                                      AND itemcallnumber >   ?
+                                                    ORDER BY itemcallnumber", undef, "$alpha $num_alpha%", $first);
+                my $next = $num_padded + 1;
+                my $len = length($num_padded);
+                foreach (@$icn) {
+                    my ($num1) = ( m/(\d+)$/o );
+                    if ($num1 > $next) { # a hole in numbering found, stop
+                        last;
+                    }
+                    $next++;
+                }
+                $ret = "$alpha $num_alpha" . sprintf("%0${len}d", $next) if length($next) <= $len; # no overflow
+            }
+            else {
+                $ret = $padded;
+            }
+        }
+    }
+    
+    $template->param(
+        return => $ret || $code
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
+}
+
+1;
-- 
1.6.5


From adrien.saurat at biblibre.com  Wed Feb  1 16:11:58 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Wed,  1 Feb 2012 16:11:58 +0100
Subject: [Koha-patches] [PATCH] Bug 7488: cleans logs for moremember.pl
Message-ID: <1328109118-14652-1-git-send-email-adrien.saurat@biblibre.com>

---
 C4/Members/Messaging.pm |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/C4/Members/Messaging.pm b/C4/Members/Messaging.pm
index 2b39f11..ae77be0 100644
--- a/C4/Members/Messaging.pm
+++ b/C4/Members/Messaging.pm
@@ -213,6 +213,7 @@ END_SQL
         $choices->{ $row->{'message_name'} }->{'message_name'}         = $row->{'message_name'};
         $choices->{ $row->{'message_name'} }->{'takes_days'}           = $row->{'takes_days'};
         $choices->{ $row->{'message_name'} }->{'has_digest'}           = 1 if $row->{'is_digest'};
+        if ( not defined ($row->{'message_transport_type'}) ) { $row->{'message_transport_type'} = '' }
         $choices->{ $row->{'message_name'} }->{'transport_' . $row->{'message_transport_type'}} = ' ';
     }
 
-- 
1.7.4.1


From gcollum at gmail.com  Wed Feb  1 16:37:08 2012
From: gcollum at gmail.com (Garry Collum)
Date: Wed,  1 Feb 2012 10:37:08 -0500
Subject: [Koha-patches] [PATCH] Bug 6984 - Holds statistics doesn't work.
Message-ID: <1328110628-2961-1-git-send-email-gcollum@gmail.com>

This patch fixes several errors in reserves_stats.pl and reserves_stats.tt.

Testing -
To test this patch, data must be in either the reserves table or old_reserves or both.  The following SQL will give you the raw data that is used by the report.

SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = reserves.itemnumber)
UNION SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
old_reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM old_reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = old_reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = old_reserves.itemnumber)

To test the notificationdate and reminderdate, I added data to the old_reserves table, since I have never run notices on my test machine.

Ex:
UPDATE old_reserves
SET notificationdate = "2012-01-29",
reminderdate = "2012-01-29"
WHERE timestamp = "2012-01-29 20:09:34";
---
 .../prog/en/modules/reports/reserves_stats.tt      |   28 +++---
 reports/reserves_stats.pl                          |   89 ++++++++++++--------
 2 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
index 6f5865b..f5d03f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
@@ -89,18 +89,18 @@
                 <td><input type="radio" name="Line" value="reservestatus" /></td>
                 <td><input type="radio" name="Column" value="reservestatus" checked="checked" /></td>
                 <td>
-				<input type="checkbox" name="filter_reservestatus_or_1" value="1"> Asked</input>
-				<input type="checkbox" name="filter_reservestatus_or_2" value="2"> Processing</input>
-				<input type="checkbox" name="filter_reservestatus_or_3" value="3"> Waiting</input>
-				<input type="checkbox" name="filter_reservestatus_or_4" value="4"> Satisfied</input>
-				<input type="checkbox" name="filter_reservestatus_or_5" value="5"> Cancelled</input>
+				<input type="checkbox" name="filter_reservestatus_or_1" value="1" /> Asked
+				<input type="checkbox" name="filter_reservestatus_or_2" value="2" /> Processing
+				<input type="checkbox" name="filter_reservestatus_or_3" value="3" /> Waiting
+				<input type="checkbox" name="filter_reservestatus_or_4" value="4" /> Satisfied
+				<input type="checkbox" name="filter_reservestatus_or_5" value="5" /> Cancelled
 				</td>
              </tr>
              <tr class="highlight">
                 <td>Hold Date</td>
                 <td><input type="radio" name="Line" value="reservedate" /></td>
                 <td><input type="radio" name="Column" value="reservedate" /></td>
-                <td><label for="reservedate_begin">From</label> <input type="text"  size="10" id="filter_reservedate_begin" name="filter_reservedate_begin" />
+                <td><label for="filter_reservedate_begin">From</label> <input type="text"  size="10" id="filter_reservedate_begin" name="filter_reservedate_begin" />
                     <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openreservedateFrom" style="cursor: pointer;" />
                    <script type="text/javascript">
 				   //<![CDATA[ 
@@ -424,7 +424,7 @@
             <td><input type="radio" name="Column" value="items.itype" /></td>
            <td><select name="filter_items.itype" id="itype">
                <option value=""> </option>
-               [% FOREACH itypeloo IN itypeloop %]
+               [% FOREACH itypeloo IN itemtypeloop %]
                  [% IF ( itypeloo.selected ) %]<option value="[% itypeloo.code %]" selected="selected">[% itypeloo.description %]</option>[% ELSE %]<option value="[% itypeloo.code %]">[% itypeloo.description %]</option>[% END %]
                [% END %]
                </select>
@@ -444,9 +444,9 @@
         </tr>
         <tr class="highlight">
             <td>Holding Library</td>
-            <td><input type="radio" name="Line" value="holdingbranch" /></td>
-            <td><input type="radio" name="Column" value="holdingbranch" /></td>
-            <td><select name="filter_holdingbranch" id="holdingbranch">
+            <td><input type="radio" name="Line" value="items.holdingbranch" /></td>
+            <td><input type="radio" name="Column" value="items.holdingbranch" /></td>
+            <td><select name="filter_items.holdingbranch" id="holdingbranch">
                <option value=""> </option>
                [% FOREACH branchloo IN branchloop %]
 [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
@@ -456,9 +456,9 @@
         </tr>
         <tr>
             <td>Home Library</td>
-            <td><input type="radio" name="Line" value="homebranch" /></td>
-            <td><input type="radio" name="Column" value="homebranch" /></td>
-            <td><select name="filter_homebranch" id="homebranch">
+            <td><input type="radio" name="Line" value="items.homebranch" /></td>
+            <td><input type="radio" name="Column" value="items.homebranch" /></td>
+            <td><select name="filter_items.homebranch" id="homebranch">
                <option value=""> </option>
                [% FOREACH branchloo IN branchloop %]
 [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
@@ -494,7 +494,7 @@
             <td>Item Call Number</td>
             <td></td>
             <td></td>
-            <td>From <input type="text" name="filter_itemcallnumber" size="10" /> (inclusive) to <input type="text" name="fiter_itemcallnumber" size="10" /> (exclusive) </td>
+            <td>From <input type="text" name="filter_items.itemcallnumber_begin" size="10" /> (inclusive) to <input type="text" name="filter_items.itemcallnumber_endex" size="10" /> (exclusive) </td>
         </tr>
         [% IF ( hassort1 ) %]
         <tr><td>Patron sort1</td>
diff --git a/reports/reserves_stats.pl b/reports/reserves_stats.pl
index 4254d5a..a2b3737 100755
--- a/reports/reserves_stats.pl
+++ b/reports/reserves_stats.pl
@@ -19,6 +19,7 @@
 
 
 use strict;
+use warnings;
 
 use CGI;
 
@@ -74,7 +75,7 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
 	flagsrequired => {reports => '*'},
 	debug => 0,
 });
-our $sep     = $input->param("sep");
+our $sep     = $input->param("sep") || '';
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
 	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
@@ -169,6 +170,7 @@ my $CGIsepChoice=GetDelimiterChoices;
 $template->param(
 	categoryloop => $categoryloop,
 	itemtypeloop => \@itemtypeloop,
+	locationloop => \@locations,
 	   ccodeloop => \@ccodes,
 	  branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
 	hassort1=> $hassort1,
@@ -194,18 +196,25 @@ sub calculate {
 # Filters
 # Checking filters
 #
-	my @loopfilter;
-	foreach my $filter (keys %$filters_hashref){
-		$$filters_hashref{$filter} =~s/\*/%/;
-		$$filters_hashref{$filter} = format_date_in_iso($$filters_hashref{$_}) if ($_=~/date/);
-	}
-	#display
-	@loopfilter= map{{ crit=>$_ ,filter=>($_=~/date/?
-											format_date($$filters_hashref{$_})
-											:$$filters_hashref{$_}
-										  )
-					  }
-					} sort keys %$filters_hashref;
+    my @loopfilter;
+    foreach my $filter ( keys %$filters_hashref ) {
+        $filters_hashref->{$filter} =~ s/\*/%/;
+        $filters_hashref->{$filter} =
+          format_date_in_iso( $filters_hashref->{$filter} )
+          if ( $filter =~ /date/ );
+    }
+
+    #display
+    @loopfilter = map {
+        {
+            crit   => $_,
+            filter => (
+                $_ =~ /date/
+                ? format_date( $filters_hashref->{$_} )
+                : $filters_hashref->{$_}
+            )
+        }
+    } sort keys %$filters_hashref;
 
 
 
@@ -228,7 +237,7 @@ sub calculate {
         if ($linefield =~ /^biblio\./ or $colfield =~ /^biblio\./ or any {$_=~/biblio/}keys %$filters_hashref);
 	$strcalc .= "LEFT JOIN items ON reserves.itemnumber=items.itemnumber "
         if ($linefield =~ /^items\./ or $colfield =~ /^items\./ or any {$_=~/items/}keys %$filters_hashref);
-        
+
 	my @sqlparams;
 	my @sqlorparams;
 	my @sqlor;
@@ -238,7 +247,6 @@ sub calculate {
 		my $string;
 		my $stringfield=$filter;
 		$stringfield=~s/\_[a-z_]+$//;
-		warn $stringfield;
 		if ($filter=~/ /){
 			$string=$stringfield;
 		}
@@ -246,6 +254,9 @@ sub calculate {
 			 push @sqlor, qq{( }.changeifreservestatus($filter)." = ? ) ";
 			 push @sqlorparams, $$filters_hashref{$filter};
 		}
+		elsif ($filter=~/_endex$/){
+			$string = " $stringfield < ? ";
+		}
 		elsif ($filter=~/_end$/){
 			$string = " $stringfield <= ? ";
 		}
@@ -274,7 +285,6 @@ sub calculate {
 	$dbcalc->execute(@sqlparams, at sqlparams);
 	my ($emptycol,$emptyrow); 
 	my $data = $dbcalc->fetchall_hashref([qw(line col)]);
-	my @loopline;
 	my %cols_hash;
 	foreach my $row (keys %$data){
 		push @loopline, $row;
@@ -304,14 +314,13 @@ sub calculate {
 	for my $col ( sort keys %cols_hash ) {
 		my $total = 0;
 		foreach my $row (@loopline) {
-			$total += $$data{$row}{$col}{calculation};
+			$total += $data->{$row}{$col}{calculation} if $data->{$row}{$col}{calculation};
 			$debug and warn "value added ".$$data{$row}{$col}{calculation}. "for line ".$row;
 		}
 		push @loopfooter, {'totalcol' => $total};
 		push @loopcol, {'coltitle' => $col,
 						coltitle_display=>display_value($colfield,$col)};
 	}
-
 	# the header of the table
 	$globalline{loopfilter}=\@loopfilter;
 	# the core of the table
@@ -331,22 +340,34 @@ sub null_to_zzempty ($) {
 	($string eq "NULL") and return 'zzEMPTY';
 	return $string;		# else return the valid value
 }
-sub display_value{
-	my ($crit,$value)=@_;
-	my $display_value =
-		($crit =~ /ccode/   ) ? $ccodes->{$value}    :
-		($crit =~ /location/) ? $locations->{$value} :
-		($crit =~ /itemtype/) ? $itemtypes->{$value}->{description} :
-		($crit =~ /branch/) ? GetBranchName($value):
-		($crit =~ /reservestatus/) ? reservestatushuman($value):
-		$value; # default fallback
-	if ($crit =~ /(sort1|sort2)/) {
-		$display_value=GetAuthorisedValues("B$_",$value);
-	} elsif ($crit =~ /category/) {
-		my $element=any{$value eq $_->{categorycode}} @$categoryloop;
-		$display_value=$$element{description};
-	}
-	return $display_value;
+sub display_value {
+    my ( $crit, $value ) = @_;
+    my $display_value =
+        ( $crit =~ /ccode/ )         ? $ccodes->{$value}
+      : ( $crit =~ /location/ )      ? $locations->{$value}
+      : ( $crit =~ /itemtype/ )      ? $itemtypes->{$value}->{description}
+      : ( $crit =~ /branch/ )        ? GetBranchName($value)
+      : ( $crit =~ /reservestatus/ ) ? reservestatushuman($value)
+      :                                $value;    # default fallback
+    if ($crit =~ /sort1/) {
+        foreach (@$Bsort1) {
+            ($value eq $_->{authorised_value}) or next;
+            $display_value = $_->{lib} and last;
+        }
+    }
+    elsif ($crit =~ /sort2/) {
+        foreach (@$Bsort2) {
+            ($value eq $_->{authorised_value}) or next;
+            $display_value = $_->{lib} and last;
+        }
+    }
+    elsif ( $crit =~ /category/ ) {
+        foreach (@$categoryloop) {
+            ( $value eq $_->{categorycode} ) or next;
+            $display_value = $_->{description} and last;
+        }
+    }
+    return $display_value;
 }
 sub reservestatushuman{
 	my ($val)=@_;
-- 
1.7.5.4


From gcollum at gmail.com  Wed Feb  1 18:44:33 2012
From: gcollum at gmail.com (Garry Collum)
Date: Wed,  1 Feb 2012 12:44:33 -0500
Subject: [Koha-patches] [PATCH] Bug 5674: patron name sort ignoring case
	when placing holds.
Message-ID: <1328118273-4126-1-git-send-email-gcollum@gmail.com>

Fixes the patron name sorting when placing holds.

Testing - See Bug 5674.
Create two patrons.  One named SMITH, THOMAS and the other Smith, John.
Search for an item to place on request.  Do a patron search for Smith.
---
 reserve/request.pl |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/reserve/request.pl b/reserve/request.pl
index 21183da..24557f4 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -192,9 +192,9 @@ if ($borrowerslist) {
 
     foreach my $borrower (
         sort {
-                $a->{surname}
-              . $a->{firstname} cmp $b->{surname}
-              . $b->{firstname}
+                uc($a->{surname}
+              . $a->{firstname}) cmp uc($b->{surname}
+              . $b->{firstname})
         } @{$borrowerslist}
       )
     {
-- 
1.7.5.4


From januszop at gmail.com  Wed Feb  1 19:12:47 2012
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Wed,  1 Feb 2012 19:12:47 +0100
Subject: [Koha-patches] [PATCH] Bug 5657: Changes made to sub merge to
	eliminate errors occuring when updating bibio records in
	batch (after updating multiple authority records)
Message-ID: <1328119967-23969-1-git-send-email-januszop@gmail.com>

---
 C4/AuthoritiesMarc.pm |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index b3c5070..b0f90da 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -1331,7 +1331,11 @@ sub merge {
             my $rec;
             $rec=$oResult->record($z);
             my $marcdata = $rec->raw();
-            push @reccache, $marcdata;
+            my $marcrecordzebra= MARC::Record->new_from_xml($marcdata,"utf8",C4::Context->preference("marcflavour"));
+            my ( $biblionumbertagfield, $biblionumbertagsubfield ) = &GetMarcFromKohaField( "biblio.biblionumber", '' );
+            my $i = $marcrecordzebra->subfield($biblionumbertagfield, $biblionumbertagsubfield);
+            my $marcrecorddb=GetMarcBiblio($i);
+            push @reccache, $marcrecorddb;
             $z++;
         }
         $oResult->destroy();
@@ -1357,7 +1361,6 @@ sub merge {
     # May be used as a template for a bulkedit field  
     foreach my $marcrecord(@reccache){
         my $update;           
-        $marcrecord= MARC::Record->new_from_xml($marcrecord,"utf8",C4::Context->preference("marcflavour")) unless(C4::Context->preference('NoZebra'));
         foreach my $tagfield (@tags_using_authtype){
 #             warn "tagfield : $tagfield ";
             foreach my $field ($marcrecord->field($tagfield)){
-- 
1.7.2.5


From srdjan at catalyst.net.nz  Thu Feb  2 04:13:29 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 02 Feb 2012 13:13:29 +1000
Subject: [Koha-patches] [PATCH] bug_7264: Added opac_info field to branches
	table.
Message-ID: <4F29FF59.9030009@catalyst.net.nz>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-bug_7264-Added-opac_info-field-to-branches-table.patch
Type: text/x-patch
Size: 16888 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20120202/4922aa6e/attachment-0001.bin>

From oleonard at myacpl.org  Thu Feb  2 19:01:37 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  2 Feb 2012 13:01:37 -0500
Subject: [Koha-patches] [PATCH] Bug 7147 - Style Z39.50 search errors
	according to style patterns
Message-ID: <1328205697-20367-1-git-send-email-oleonard@myacpl.org>

Styles Z39.50 errors and messages in the standard style.
---
 .../prog/en/modules/acqui/z3950_search.tt          |   14 ++++++++++----
 .../prog/en/modules/cataloguing/z3950_search.tt    |   18 ++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 1f2ad60..3ce3e63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -156,13 +156,19 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 </table>
     [% ELSE %]
         [% IF ( emptyserverlist ) %]
-            You didn't select any Z39.50 target.
+            <div class="dialog alert">You didn't select any Z39.50 target.</div>
         [% ELSE %]
-            [% FOREACH errcon IN errconn %]
-                Connection failed to [% errcon.server %]
+            [% IF ( errconn ) %]
+                <div class="dialog alert">
+                    <ul>
+                    [% FOREACH errcon IN errconn %]
+                        <li>Connection failed to [% errcon.server %]</li>
+                    [% END %]
+                    </ul>
+                </div>
             [% END %]
         [% END %]
-        <p>Nothing found. <a href="javascript: history.back()">Try another search</a>.</p>
+        <div class="dialog message">Nothing found. <a href="javascript: history.back()">Try another search</a>.</div>
     [% END %]
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 6eb4b50..7775f1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -162,14 +162,16 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 </table>
 <p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl"><input type="hidden" name="biblionumber" value="[% biblionumber %]"/><input type="hidden" name="frameworkcode" value="[% frameworkcode %]"/><input type="submit" value="Try Another Search"/></form></p>
     [% ELSE %]
-        [% IF ( emptyserverlist ) %]
-            You didn't select any Z39.50 target.
-        [% ELSE %]
-            [% FOREACH errcon IN errconn %]
-                Connection failed to [% errcon.server %]
-            [% END %]
-        [% END %]
-	<p>Nothing found.</p>
+        [% IF ( errconn ) %]
+            <div class="dialog alert">
+                <ul>
+                [% FOREACH errcon IN errconn %]
+                    <li>Connection failed to [% errcon.server %]</li>
+                [% END %]
+                </ul>
+            </div>
+         [% END %]
+   <div class="dialog message">Nothing found.</div>
 	<p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl"><input type="hidden" name="biblionumber" value="[% biblionumber %]"/><input type="hidden" name="frameworkcode" value="[% frameworkcode %]"/><input type="submit" value="Try Another Search"/></form></p>
     [% END %]
 
-- 
1.7.3


From M.de.Rooy at rijksmuseum.nl  Fri Feb  3 08:59:26 2012
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Fri, 3 Feb 2012 07:59:26 +0000
Subject: [Koha-patches] [PATCH] 6964 Follow-up typo borrowenumber
In-Reply-To: <1328255279-16132-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1328255279-16132-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA31033D3886@S-MAIL-1A.rijksmuseum.intra>

Fixing trivial typo.
---
 members/paycollect.pl |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/members/paycollect.pl b/members/paycollect.pl
index 4a8274d..7dfb622 100755
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -135,9 +135,7 @@ if ( $total_paid and $total_paid ne '0.00' ) {
 borrower_add_additional_fields($borrower);

 $template->param(
-
- #borrowenumber  => $borrower->{borrowernumber}, # some templates require global
-    borrowenumber => $borrowernumber,    # some templates require global
+    borrowernumber => $borrowernumber,    # some templates require global
     borrower      => $borrower,
     total         => $total_due,
     activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
--
1.6.0.6

From adrien.saurat at biblibre.com  Fri Feb  3 11:22:32 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Fri,  3 Feb 2012 11:22:32 +0100
Subject: [Koha-patches] [PATCH] Bug 6968: display of expired subscriptions
Message-ID: <1328264552-4807-1-git-send-email-adrien.saurat@biblibre.com>

From: Maxime Pelletier <maxime.pelletier at libeo.com>


Signed-off-by: Adrien Saurat <adrien.saurat at biblibre.com>
---
 .../prog/en/modules/serials/checkexpiration.tt     |   10 +++++++---
 serials/checkexpiration.pl                         |    7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
index 246eb49..e75b020 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -45,7 +45,7 @@
 <fieldset class="rows">
     <legend>Filter results :</legend>
     
-         <ol>
+        <ol>
         <li><label for="title">Title:</label>
         <input id="title" type="text" name="title" size="15" value="[% title %]" /></li>
 
@@ -65,8 +65,12 @@
                 );
             </script> <span class="required">Required</span>
 			<div class="hint">[% INCLUDE 'date-format.inc' %]</div></li>
-			</ol>
-        
+        <li>
+            <label for="showexpiredtoday">Show expired before today:</label>
+            <input id="showexpiredtoday" type="checkbox" name="showexpiredtoday"
+            [% IF ( showexpiredtoday ) %] checked="checked" [% END %]/>
+        </li>
+        </ol>
 </fieldset>
 <fieldset class="action"><input type="submit" value="Search" /></fieldset>
 </form>
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 02a4fbc..13ad042 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -68,6 +68,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
 my $title = $query->param('title');
 my $issn  = $query->param('issn');
 my $date  = format_date_in_iso($query->param('date'));
+my $showexpiredtoday = $query->param('showexpiredtoday');
 
 if ($date) {
     my @subscriptions = GetSubscriptions( $title, $issn );
@@ -78,9 +79,10 @@ if ($date) {
         my $expirationdate = GetExpirationDate($subscriptionid);
 
         $subscription->{expirationdate} = $expirationdate;
-        next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
+        next if !$expirationdate || $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
         if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
-			 Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
+            (($showexpiredtoday && $showexpiredtoday eq 'on') || (Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today))) 
+            ) {
             $subscription->{expirationdate}=format_date($subscription->{expirationdate});
             push @subscriptions_loop,$subscription;
         }
@@ -89,6 +91,7 @@ if ($date) {
     $template->param (
         title           => $title,
         issn            => $issn,
+        showexpiredtoday => $showexpiredtoday,
         numsubscription => scalar @subscriptions_loop,
         date => format_date($date),
         subscriptions_loop => \@subscriptions_loop,
-- 
1.7.4.1


From stephane.delaune at biblibre.com  Fri Feb  3 17:05:05 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Fri,  3 Feb 2012 17:05:05 +0100
Subject: [Koha-patches] [PATCH] Bug 4032:XSLT systempreference takes a path
	to file rather than YesNo
Message-ID: <1328285105-5921-1-git-send-email-stephane.delaune@biblibre.com>

---
 C4/Search.pm                                       |    3 +-
 C4/VirtualShelves/Page.pm                          |    2 +-
 C4/XSLT.pm                                         |   48 +++++++++++---------
 catalogue/detail.pl                                |    2 +-
 installer/data/mysql/sysprefs.sql                  |    8 ++--
 installer/data/mysql/updatedatabase.pl             |   31 +++++++++++++
 .../prog/en/modules/admin/preferences/opac.pref    |   12 ++---
 .../en/modules/admin/preferences/staff_client.pref |   12 ++---
 opac/opac-detail.pl                                |    3 +-
 9 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index e86bb26..43a19a5 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1839,8 +1839,7 @@ sub searchResults {
             $oldbiblio->{XSLTResultsRecord}
               = XSLTParse4Display($oldbiblio->{biblionumber},
                                   $marcrecord,
-                                  'Results',
-                                  $search_context,
+                                  C4::Context->preference("OPACXSLTResultsDisplay"),
                                   1, # clean up the problematic ampersand entities that Zebra outputs
                                   \@hiddenitems
                                 );
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index cfa4f60..d30db85 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -208,7 +208,7 @@ sub shelfpage ($$$$$) {
                     my $biblionumber = $this_item->{'biblionumber'};
                     my $record = GetMarcBiblio($biblionumber);
                     $this_item->{XSLTBloc} =
-                        XSLTParse4Display($biblionumber, $record, 'Results', 'opac')
+                        XSLTParse4Display($biblionumber, $record, C4::Context->preference("OPACXSLTResultsDisplay"))
                             if C4::Context->preference("OPACXSLTResultsDisplay") && $type eq 'opac';
 
                     # the virtualshelfcontents table does not store these columns nor are they retrieved from the items
diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 06dfaf4..a64ffe3 100755
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -3,6 +3,7 @@ package C4::XSLT;
 # <jmf at liblime dot com>
 # Parts Copyright Katrin Fischer 2011
 # Parts Copyright ByWater Solutions 2011
+# Parts Copyright Biblibre 2012
 #
 # This file is part of Koha.
 #
@@ -32,6 +33,7 @@ use C4::Reserves;
 use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
+use LWP::Simple;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -41,6 +43,7 @@ BEGIN {
     @ISA = qw(Exporter);
     @EXPORT = qw(
         &XSLTParse4Display
+        &GetURI
     );
 }
 
@@ -50,6 +53,19 @@ C4::XSLT - Functions for displaying XSLT-generated content
 
 =head1 FUNCTIONS
 
+=head2 GetURI
+
+GetURI file and returns the xslt as a string
+
+=cut
+
+sub GetURI {
+    my ($uri) = @_;
+    my $string;
+    $string = get $uri ;
+    return $string;
+}
+
 =head2 transformMARCXML4XSLT
 
 Replaces codes with authorized values in a MARC::Record object
@@ -121,8 +137,7 @@ sub getAuthorisedValues4MARCSubfields {
 my $stylesheet;
 
 sub XSLTParse4Display {
-    my ( $biblionumber, $orig_record, $xsl_suffix, $interface, $fixamps, $hidden_items ) = @_;
-    $interface = 'opac' unless $interface;
+    my ( $biblionumber, $orig_record, $xslfilename, $fixamps, $hidden_items ) = @_;
     # grab the XML, run it through our stylesheet, push it out to the browser
     my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
     #return $record->as_formatted();
@@ -153,29 +168,20 @@ sub XSLTParse4Display {
     # don't die when you find &, >, etc
     $parser->recover_silently(0);
     my $source = $parser->parse_string($xmlrecord);
-    unless ( $stylesheet ) {
+    unless ( $stylesheet->{$xslfilename} ) {
         my $xslt = XML::LibXSLT->new();
-        my $xslfile;
-        if ($interface eq 'intranet') {
-            $xslfile = C4::Context->config('intrahtdocs') . 
-                      '/' . C4::Context->preference("template") . 
-                      '/' . C4::Templates::_current_language() .
-                      '/xslt/' .
-                      C4::Context->preference('marcflavour') .
-                      "slim2intranet$xsl_suffix.xsl";
+        my $style_doc;
+        if ( $xslfilename =~ /http:/ ) {
+            my $xsltstring = GetURI($xslfilename);
+            $style_doc = $parser->parse_string($xsltstring);
         } else {
-            $xslfile = C4::Context->config('opachtdocs') . 
-                      '/' . C4::Context->preference("opacthemes") . 
-                      '/' . C4::Templates::_current_language() .
-                      '/xslt/' .
-                      C4::Context->preference('marcflavour') .
-                      "slim2OPAC$xsl_suffix.xsl";
+            use Cwd;
+            $style_doc = $parser->parse_file($xslfilename);
         }
-        my $style_doc = $parser->parse_file($xslfile);
-        $stylesheet = $xslt->parse_stylesheet($style_doc);
+        $stylesheet->{$xslfilename} = $xslt->parse_stylesheet($style_doc);
     }
-    my $results = $stylesheet->transform($source);
-    my $newxmlrecord = $stylesheet->output_string($results);
+    my $results      = $stylesheet->{$xslfilename}->transform($source);
+    my $newxmlrecord = $stylesheet->{$xslfilename}->output_string($results);
     return $newxmlrecord;
 }
 
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index db38551..1d3155d 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -84,7 +84,7 @@ my $marcflavour  = C4::Context->preference("marcflavour");
 # XSLT processing of some stuff
 if (C4::Context->preference("XSLTDetailsDisplay") ) {
     $template->param('XSLTDetailsDisplay' =>'1',
-        'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail','intranet') );
+        'XSLTBloc' => XSLTParse4Display($biblionumber, $record, C4::Context->preference("XSLTDetailsDisplay")) );
 }
 
 $template->param( 'SpineLabelShowPrintOnBibDetails' => C4::Context->preference("SpineLabelShowPrintOnBibDetails") );
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 5e3d79d..4c06fe0 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -218,10 +218,10 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
 
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OPACShelfBrowser','1','','Enable/disable Shelf Browser on item details page. WARNING: this feature is very resource consuming on collections with large numbers of items.','YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
-('OPACXSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC','YesNo'),
-('OPACXSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC','YesNo'),
-('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),
-('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');
+('OPACXSLTDetailsDisplay','','','Enable XSL stylesheet control over details page display on OPAC','Free'),
+('OPACXSLTResultsDisplay','','','Enable XSL stylesheet control over results page display on OPAC','Free'),
+('XSLTDetailsDisplay','','','Enable XSL stylesheet control over details page display on intranet','Free'),
+('XSLTResultsDisplay','','','Enable XSL stylesheet control over results page display on intranet','Free');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..bd6a79e 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -37,6 +37,7 @@ use Getopt::Long;
 use C4::Context;
 use C4::Installer;
 use C4::Dates;
+use C4::Templates;
 
 use MARC::Record;
 use MARC::File::XML ( BinaryEncoding => 'utf8' );
@@ -4663,6 +4664,36 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     SetVersion($DBversion);
 }
+
+$DBversion = "XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    my $countXSLTDetailsDisplay = 0;
+    my $valueXSLTDetailsDisplay = "";
+    my $valueXSLTResultsDisplay = "";
+    my $valueOPACXSLTDetailsDisplay = "";
+    my $valueOPACXSLTResultsDisplay = "";
+    #the line below test if database comes from a BibLibre's branch
+    $countXSLTDetailsDisplay = $dbh->do('SELECT 1 FROM `systempreferences` WHERE `variable`="IntranetXSLTDetailsDisplay"');
+    if ($countXSLTDetailsDisplay > 0)
+    {
+        #the two lines below will only be used to update the databases from the BibLibre's branch. They will not affect the others
+        $dbh->do(q|UPDATE `systempreferences` SET `variable`="XSLTDetailsDisplay" WHERE `variable`="IntranetXSLTDetailsDisplay"|);
+        $dbh->do(q|UPDATE `systempreferences` SET `variable`="XSLTResultsDisplay" WHERE `variable`="IntranetXSLTResultsDisplay"|);
+    }
+    else
+    {
+        $valueXSLTDetailsDisplay = C4::Context->config('intrahtdocs').'/'.C4::Context->preference("template").'/'.C4::Templates::_current_language().'/xslt/'.C4::Context->preference('marcflavour')."slim2intranetDetail.xsl" if (C4::Context->preference("XSLTDetailsDisplay"));
+        $valueXSLTResultsDisplay = C4::Context->config('intrahtdocs').'/'.C4::Context->preference("template").'/'.C4::Templates::_current_language().'/xslt/'.C4::Context->preference('marcflavour')."slim2intranetResults.xsl" if (C4::Context->preference("XSLTResultsDisplay"));
+        $valueOPACXSLTDetailsDisplay = C4::Context->config('opachtdocs').'/'.C4::Context->preference("opacthemes").'/'.C4::Templates::_current_language().'/xslt/'.C4::Context->preference('marcflavour')."slim2OPACDetail.xsl" if (C4::Context->preference("OPACXSLTDetailsDisplay"));
+        $valueOPACXSLTResultsDisplay = C4::Context->config('opachtdocs').'/'.C4::Context->preference("opacthemes").'/'.C4::Templates::_current_language().'/xslt/'.C4::Context->preference('marcflavour')."slim2OPACResults.xsl" if (C4::Context->preference("OPACXSLTResultsDisplay"));
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueXSLTDetailsDisplay\" WHERE variable='XSLTDetailsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueXSLTResultsDisplay\" WHERE variable='XSLTResultsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTDetailsDisplay\" WHERE variable='OPACXSLTDetailsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTResultsDisplay\" WHERE variable='OPACXSLTResultsDisplay'");
+    }
+    print "XSLT systempreference takes a path to file rather than YesNo\n";
+    SetVersion($DBversion);
+}
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index d6ae2b2..e71b4f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -48,17 +48,13 @@ OPAC:
                   no: Show
             - lost items on search and detail pages.
         -
-            - Show biblio records on OPAC result page
+            - XSLT path for the OPAC result page
             - pref: OPACXSLTResultsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
         -
-            - Show item details pages on the OPAC
+            - XSLT path for the details pages on the OPAC
             - pref: OPACXSLTDetailsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
         -
             - On pages displayed with XSLT stylesheets on the OPAC,
             - pref: DisplayOPACiconsXSLT
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
index df0a434..2e2e0f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
@@ -51,17 +51,13 @@ Staff Client:
               class: url
             - for the Staff Client's favicon. (This should be a complete URL, starting with <code>http://</code>.)
         -
-            - Show biblio records on result page in the staff client
+            - XSLT path for the result page in the staff client
             - pref: XSLTResultsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
         -
-            - Show item details pages in the staff client
+            - XSLT path for the details pages in the staff client
             - pref: XSLTDetailsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
         -
             - Use the Yahoo UI libraries
             - pref: yuipath
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index c4d8218..21d7b48 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -79,10 +79,9 @@ SetUTF8Flag($record);
 
 # XSLT processing of some stuff
 if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
-    $template->param( 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail', 'opac') );
+    $template->param( 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, C4::Context->preference("OPACXSLTDetailsDisplay") ) );
 }
 
-
 # We look for the busc param to build the simple paging from the search
 my $session = get_session($query->cookie("CGISESSID"));
 my %paging = (previous => {}, next => {});
-- 
1.7.0.4


From stephane.delaune at biblibre.com  Fri Feb  3 17:05:46 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Fri,  3 Feb 2012 17:05:46 +0100
Subject: [Koha-patches] [PATCH 3/3] Bug 6919/4032:followup to fix
	compatibility between 6919 and 4032
Message-ID: <1328285146-5960-1-git-send-email-stephane.delaune@biblibre.com>

---
 C4/Search.pm |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 32f23c0..0096e69 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1781,8 +1781,7 @@ sub searchResults {
         $debug && warn $marcrecord->as_formatted;
         my $interface = $search_context eq 'opac' ? 'OPAC' : '';
         if (!$scan && C4::Context->preference($interface . "XSLTResultsDisplay")) {
-            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, 'Results',
-                                                                $search_context, 1);
+            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, C4::Context->preference($interface . "XSLTResultsDisplay"), 1);
 	    # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs
         }
 
-- 
1.7.0.4


From christophe.croullebois at biblibre.com  Sun Feb  5 20:15:47 2012
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Sun,  5 Feb 2012 20:15:47 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7351 : feature that allows to delete
	a range of dates
Message-ID: <1328469347-17498-1-git-send-email-christophe.croullebois@biblibre.com>

Two new options, one for single holidays, the other for the repeatable holidays.
Note that the exceptions are not deleted.
---
 C4/Calendar.pm                                     |   70 ++++++++++++++++++++
 .../prog/en/modules/tools/holidays.tt              |   32 ++++++++--
 tools/exceptionHolidays.pl                         |   54 ++++++++++++++-
 3 files changed, 148 insertions(+), 8 deletions(-)

diff --git a/C4/Calendar.pm b/C4/Calendar.pm
index dc9037b..06a1a5a 100644
--- a/C4/Calendar.pm
+++ b/C4/Calendar.pm
@@ -45,6 +45,8 @@ BEGIN {
         &isHoliday
         &addDate
         &daysBetween
+        &delete_holiday_range
+        &delete_holiday_range_repeatable
     );
 }
 
@@ -529,6 +531,74 @@ sub delete_holiday {
     return $self;
 }
 
+=head2 delete_holiday_range
+
+    delete_holiday_range(weekday => $weekday
+                   day => $day,
+                   month => $month,
+                   year => $year);
+
+Delete a holiday for $self->{branchcode}.
+
+C<$weekday> Is the week day to delete.
+
+C<$day> Is the day month to make the date to delete.
+
+C<$month> Is month to make the date to delete.
+
+C<$year> Is year to make the date to delete.
+
+=cut
+
+sub delete_holiday_range {
+    my $self = shift @_;
+    my %options = @_;
+
+    my $dbh = C4::Context->dbh();
+    my $isSingleHoliday = $dbh->prepare("SELECT id FROM special_holidays WHERE (branchcode = ?) AND (day = ?) AND (month = ?) AND (year = ?)");
+    $isSingleHoliday->execute($self->{branchcode}, $options{day}, $options{month}, $options{year});
+    if ($isSingleHoliday->rows) {
+        my $id = $isSingleHoliday->fetchrow;
+        $isSingleHoliday->finish; # Close the last query
+        my $deleteHoliday = $dbh->prepare("DELETE FROM special_holidays WHERE id = ?");
+        $deleteHoliday->execute($id);
+    }
+}
+
+=head2 delete_holiday_range_repeatable
+
+    delete_holiday_range_repeatable(weekday => $weekday
+                   day => $day,
+                   month => $month,
+                   year => $year);
+
+Delete a holiday for $self->{branchcode}.
+
+C<$weekday> Is the week day to delete.
+
+C<$day> Is the day month to make the date to delete.
+
+C<$month> Is month to make the date to delete.
+
+C<$year> Is year to make the date to delete.
+
+=cut
+
+sub delete_holiday_range_repeatable {
+    my $self = shift @_;
+    my %options = @_;
+
+    my $dbh = C4::Context->dbh();
+    my $isDayMonthHoliday = $dbh->prepare("SELECT id FROM repeatable_holidays WHERE (branchcode = ?) AND (day = ?) AND (month = ?)");
+    $isDayMonthHoliday->execute($self->{branchcode}, $options{day}, $options{month});
+    if ($isDayMonthHoliday->rows) {
+        my $id = $isDayMonthHoliday->fetchrow;
+        $isDayMonthHoliday->finish;
+        my $deleteHoliday = $dbh->prepare("DELETE FROM repeatable_holidays WHERE (id = ?)");
+        $deleteHoliday->execute($id);
+    }
+}
+
 =head2 isHoliday
 
     $isHoliday = isHoliday($day, $month $year);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index 686e3af..6042cae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -83,8 +83,8 @@
 	function Help() {
 		newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'width=600,height=600,toolbar=false,scrollbars=yes');
 	}
-	$(document).ready(function() {
 
+	$(document).ready(function() {
 [% IF ( dateformat_metric ) %]		$.tablesorter.addParser({ // http://tablesorter.com/docs/example-parsers.html
 			id: 'shortDates',
 			is: function(s){
@@ -129,6 +129,7 @@
 			$(this).parent().find(".hint").toggle(); return false;
 		});
 		$("#dateofrange").each(function () { this.value = "" });
+		$("#datecancelrange").each(function () { this.value = "" });
 	});
 //]]>
 </script>
@@ -185,7 +186,7 @@
 				<input type="hidden" id="showBranchName" name="showBranchName" />
 			</li>
 			<li>
-				<strong>Date:</strong>
+				<strong>From Date:</strong>
 				<span id="showDaynameOutput"></span>, 
 				
 				[% IF ( dateformat_us ) %]<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>/<span id="showYearOutput"></span>[% ELSIF ( dateformat_metric ) %]<span id="showDayOutput"></span>/<span id="showMonthOutput"></span>/<span id="showYearOutput"></span>[% ELSE %]<span id="showYearOutput"></span>/<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>[% END %]
@@ -196,6 +197,20 @@
 				<input type="hidden" id="showMonth" name="showMonth" />
 				<input type="hidden" id="showYear" name="showYear" />
 			</li>
+			<li class="dateinsert">
+				<b>To Date : </b>
+				<input type="text" id="datecancelrange" name="datecancelrange" size="20" value="[% datecancelrange %]" />
+				<img src="[% themelang %]/lib/calendar/cal.gif" id="datecancelrange_button" alt="Show Calendar" />
+				<script language="JavaScript" type="text/javascript">
+				Calendar.setup(
+					{
+					inputField : "datecancelrange",
+					ifFormat : "[% DHTMLcalendar_dateformat %]",
+					button : "datecancelrange_button"
+					}
+				);
+				</script>
+			</li>
 			<li><label for="showTitle">Title: </label><input type="text" name="showTitle" id="showTitle" size="35" /></li>
 		    <!-- showTitle is necessary for exception radio button to work properly --> 
 				<label for="showDescription">Description:</label>
@@ -209,10 +224,17 @@
 			<li class="radio"><input type="radio" name="showOperation" id="showOperationDel" value="delete" /> <label for="showOperationDel" id="showOperationDelLabel">Delete this holiday</label>
 				<a href="#" class="helptext">[?]</a>
 				<div class="hint">This will delete this holiday rule. If it is a repeatable holiday, this option checks for posible exceptions. If an exception exists, this option will remove the exception and set the date to a regular holiday.</div></li>
+			<li class="radio"><input type="radio" name="showOperation" id="showOperationDelRange" value="deleterange" /><label for="showOperationDelRange" id="showOperationDelLabelRange">Delete the single holidays on a range</label>.
+				<a href="#" class="helptext">[?]</a>
+				<div class="hint">This will delete the single holidays rules only. The repeatable holidays and exceptions will not be deleted</div>
+			</li>
+			<li class="radio"><input type="radio" name="showOperation" id="showOperationDelRangeRepeat" value="deleterangerepeat" /><label for="showOperationDelRangeRepeat" id="showOperationDelLabelRangeRepeat">Delete the repeated holidays on a range</label>.
+				<a href="#" class="helptext">[?]</a>
+				<div class="hint">This will delete the repeated holidays rules only. The repeatable holidays will be deleted but not exceptions</div>
+			</li>
 			<li class="radio"><input type="radio" name="showOperation" id="showOperationEdit" value="edit" checked="checked" /> <label for="showOperationEdit">Edit this holiday</label>
-						<a href="#" class="helptext">[?]</a>
-						<div class="hint">This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.</div></li>
-
+				<a href="#" class="helptext">[?]</a>
+				<div class="hint">This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.</div></li>
 			</ol>
 			<fieldset class="action">
 				<input type="submit" name="submit" value="Save" />
diff --git a/tools/exceptionHolidays.pl b/tools/exceptionHolidays.pl
index 64a4860..7d94eed 100755
--- a/tools/exceptionHolidays.pl
+++ b/tools/exceptionHolidays.pl
@@ -7,7 +7,7 @@ use CGI;
 
 use C4::Auth;
 use C4::Output;
-
+use DateTime;
 
 use C4::Calendar;
 
@@ -19,10 +19,13 @@ my $weekday = $input->param('showWeekday');
 my $day = $input->param('showDay');
 my $month = $input->param('showMonth');
 my $year = $input->param('showYear');
+my $day1;
+my $month1;
+my $year1;
 my $title = $input->param('showTitle');
 my $description = $input->param('showDescription');
 my $holidaytype = $input->param('showHolidayType');
-
+my $datecancelrange         = $input->param('datecancelrange');
 my $calendardate = sprintf("%04d-%02d-%02d", $year, $month, $day);
 my $isodate = C4::Dates->new($calendardate, 'iso');
 $calendardate = $isodate->output('syspref');
@@ -36,7 +39,20 @@ if ($description) {
 } else {
     $description = '';
 }   
-
+my @dateend = split(/[\/-]/, $datecancelrange);
+if (C4::Context->preference("dateformat") eq "metric") {
+    $day1 = $dateend[0];
+    $month1 = $dateend[1];
+    $year1 = $dateend[2];
+}elsif (C4::Context->preference("dateformat") eq "us") {
+    $month1 = $dateend[0];
+    $day1 = $dateend[1];
+    $year1 = $dateend[2];
+} else {
+    $year1 = $dateend[0];
+    $month1 = $dateend[1];
+    $day1 = $dateend[2];
+}
 if ($input->param('showOperation') eq 'exception') {
 	$calendar->insert_exception_holiday(day => $day,
 										month => $month,
@@ -71,5 +87,37 @@ if ($input->param('showOperation') eq 'exception') {
 	                          day => $day,
   	                          month => $month,
 				              year => $year);
+}elsif ($input->param('showOperation') eq 'deleterange') {
+    if ($year1 && $month1 && $day1){
+        #Make an array with holiday's days
+        my $first_dt = DateTime->new(year => $year, month  => $month,  day => $day);
+        my $end_dt   = DateTime->new(year => $year1, month  => $month1,  day => $day1);
+        my @holiday_list = ();
+        for (my $dt = $first_dt->clone(); $dt <= $end_dt; $dt->add(days => 1) ){
+            push @holiday_list, $dt->clone();
+        }
+        foreach my $date (@holiday_list){
+            $calendar->delete_holiday_range(weekday => $weekday,
+                                            day => $date->{local_c}->{day},
+                                            month => $date->{local_c}->{month},
+                                            year => $date->{local_c}->{year});
+            }
+    }
+}elsif ($input->param('showOperation') eq 'deleterangerepeat') {
+    if ($year1 && $month1 && $day1){
+        #Make an array with holiday's days
+        my $first_dt = DateTime->new(year => $year, month  => $month,  day => $day);
+        my $end_dt   = DateTime->new(year => $year1, month  => $month1,  day => $day1);
+        my @holiday_list = ();
+        for (my $dt = $first_dt->clone(); $dt <= $end_dt; $dt->add(days => 1) ){
+            push @holiday_list, $dt->clone();
+        }
+        foreach my $date (@holiday_list){
+           $calendar->delete_holiday_range_repeatable(weekday => $weekday,
+                                         day => $date->{local_c}->{day},
+                                         month => $date->{local_c}->{month});
+        }
+    }
 }
+
 print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$branchcode&calendardate=$calendardate");
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Mon Feb  6 01:35:43 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Mon,  6 Feb 2012 13:35:43 +1300
Subject: [Koha-patches] [PATCH] bug_7458: A call number plugin
In-Reply-To: <bug 7458>
References: <bug 7458>
Message-ID: <1328488543-23036-1-git-send-email-srdjan@catalyst.net.nz>

---
 cataloguing/value_builder/callnumber-KU.pl |  135 ++++++++++++++++++++++++++++
 installer/data/mysql/kohastructure.sql     |    1 +
 installer/data/mysql/updatedatabase.pl     |    8 ++
 3 files changed, 144 insertions(+), 0 deletions(-)
 create mode 100755 cataloguing/value_builder/callnumber-KU.pl

diff --git a/cataloguing/value_builder/callnumber-KU.pl b/cataloguing/value_builder/callnumber-KU.pl
new file mode 100755
index 0000000..8c4b1b7
--- /dev/null
+++ b/cataloguing/value_builder/callnumber-KU.pl
@@ -0,0 +1,135 @@
+#!/usr/bin/perl
+
+# Copyright 2012 CatalystIT Ltd
+#
+# 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 C4::Auth;
+use CGI;
+use C4::Context;
+
+=head1 DESCRIPTION
+
+Is used for callnumber computation.
+
+User must supply a letter prefix (unspecified length) followed by an empty space followed by a "number".
+"Number" is 4 character long, and is either a number sequence which is 01 padded.
+If input does not conform with this format any processing is omitted.
+
+Some examples of legal values that trigger auto allocation:
+
+AAA 0  - returns first unused number AAA 0xxx starting with AAA 0001
+BBB 12 - returns first unused number BBB 12xx starting with BBB 1201
+CCC QW - returns first unused number CCC QWxx starting with CCC QW01
+
+=cut
+
+sub plugin_parameters {
+}
+
+sub plugin_javascript {
+    my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
+    my $res="
+    <script type='text/javascript'>
+        function Focus$field_number() {
+            return 1;
+        }
+
+        function Blur$field_number() {
+                return 1;
+        }
+
+        function Clic$field_number() {
+                var code = document.getElementById('$field_number');
+                var url = '../cataloguing/plugin_launcher.pl?plugin_name=callnumber-KU.pl&code=' + code.value;
+                var blurcallbackcallnumber = {
+                    success: function(o) {
+                        var field = document.getElementById('$field_number');
+                        field.value = o.responseText;
+                        return 1;
+                    }
+                }
+                var transaction = YAHOO.util.Connect.asyncRequest('GET',url, blurcallbackcallnumber, null);
+            return 1;
+        }
+    </script>
+    ";
+
+    return ($field_number,$res);
+}
+
+my $BASE_CALLNUMBER_RE = qr/^(\w+) (\w+)$/;
+sub plugin {
+    my ($input) = @_;
+    my $code = $input->param('code');
+
+    my ($template, $loggedinuser, $cookie) = get_template_and_user({
+        template_name   => "cataloguing/value_builder/ajax.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => {editcatalogue => '*'},
+        debug           => 1,
+    });
+
+    my $ret;
+    my ($alpha, $num) = ($code =~ $BASE_CALLNUMBER_RE);
+    if (defined $num) { # otherwise no point
+        my ($num_alpha, $num_num) = ($num =~ m/^(\D+)?(\d+)?$/);
+        $num_alpha ||= '';
+        my $pad_len = 4 - length($num);
+        
+        if ($pad_len > 0) {
+            my $num_padded = $num_num;
+            $num_padded .= "0" x ($pad_len - 1) if $pad_len > 1;
+            $num_padded .= "1";
+            my $padded = "$alpha $num_alpha" . $num_padded;
+
+            my $dbh = C4::Context->dbh;
+            if ( my $first = $dbh->selectrow_array("SELECT itemcallnumber
+                                                    FROM items
+                                                    WHERE itemcallnumber = ?", undef, $padded) ) {
+                my $icn = $dbh->selectcol_arrayref("SELECT itemcallnumber
+                                                    FROM items
+                                                    WHERE itemcallnumber LIKE ?
+                                                      AND itemcallnumber >   ?
+                                                    ORDER BY itemcallnumber", undef, "$alpha $num_alpha%", $first);
+                my $next = $num_padded + 1;
+                my $len = length($num_padded);
+                foreach (@$icn) {
+                    my ($num1) = ( m/(\d+)$/o );
+                    if ($num1 > $next) { # a hole in numbering found, stop
+                        last;
+                    }
+                    $next++;
+                }
+                $ret = "$alpha $num_alpha" . sprintf("%0${len}d", $next) if length($next) <= $len; # no overflow
+            }
+            else {
+                $ret = $padded;
+            }
+        }
+    }
+    
+    $template->param(
+        return => $ret || $code
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
+}
+
+1;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 37113c2..34bf1d6 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1045,6 +1045,7 @@ CREATE TABLE `items` ( -- holdings/item information
   KEY `itembibnoidx` (`biblionumber`),
   KEY `homebranch` (`homebranch`),
   KEY `holdingbranch` (`holdingbranch`),
+  KEY (itemcallnumber),
   CONSTRAINT `items_ibfk_1` FOREIGN KEY (`biblioitemnumber`) REFERENCES `biblioitems` (`biblioitemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `items_ibfk_2` FOREIGN KEY (`homebranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE,
   CONSTRAINT `items_ibfk_3` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..b6f72f9 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4663,6 +4663,14 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     SetVersion($DBversion);
 }
+
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE items ADD KEY (itemcallnumber)");
+    print "Upgrade to $DBversion done (Added index on items.itemcallnumber)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
-- 
1.6.5


From stephane.delaune at biblibre.com  Mon Feb  6 12:20:12 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Mon,  6 Feb 2012 12:20:12 +0100
Subject: [Koha-patches] [PATCH 1/2] Bug 7246 add offset/length and where
	options to rebuild_zebra
Message-ID: <1328527213-5174-1-git-send-email-stephane.delaune@biblibre.com>

From: Paul Poulain <paul.poulain at biblibre.com>

This patch reimplement a feature that is on biblibre/master for Koha-community/master

It adds 4 parameters:
* offset = the offset of record. Say 1000 to start rebuilding at the 1000th record of your database
* length = how many records to export. Say 400 to export only 400 records
* where = add a where clause to rebuild only a given itemtype, or anything you want to filter on
* l = how many items should be export with biblios. This is a usefull option when you have records with so many items that they can result in a record higher than 99999bytes,  that zebra don't like at all

Another improvement resulting from offset & length limit is the rebuild_zebra_sliced.zsh
that will be submitted in another patch.
rebuild_zebra_sliced will slice your all database in small chunks, and, if something went wrong for a given slice, will slice the slice, and repeat, until you reach a slice size of 1, showing which record is wrong in your database.
---
 misc/migration_tools/rebuild_zebra.pl |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 31e8125..94b37b8 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -34,6 +34,10 @@ my $want_help;
 my $as_xml;
 my $process_zebraqueue;
 my $do_not_clear_zebraqueue;
+my $item_limit;
+my $length;
+my $where;
+my $offset;
 my $verbose_logging = 0;
 my $zebraidx_log_opt = " -v none,fatal,warn ";
 my $result = GetOptions(
@@ -51,7 +55,11 @@ my $result = GetOptions(
 	'x'				=> \$as_xml,
     'y'             => \$do_not_clear_zebraqueue,
     'z'             => \$process_zebraqueue,
-    'v+'            => \$verbose_logging,
+    'l:i'          => \$item_limit,
+    'where:s'        => \$where,
+    'length:i'        => \$length,
+    'offset:i'      => \$offset,
+    'v+'             => \$verbose_logging,
 );
 
 
@@ -294,13 +302,21 @@ sub select_all_records {
 }
 
 sub select_all_authorities {
-    my $sth = $dbh->prepare("SELECT authid FROM auth_header");
+    my $strsth=qq{SELECT authid FROM auth_header};
+    $strsth.=qq{ WHERE $where } if ($where);
+    $strsth.=qq{ LIMIT $length } if ($length && !$offset);
+    $strsth.=qq{ LIMIT $offset,$length } if ($length && $offset);
+    my $sth = $dbh->prepare($strsth);
     $sth->execute();
     return $sth;
 }
 
 sub select_all_biblios {
-    my $sth = $dbh->prepare("SELECT biblionumber FROM biblioitems ORDER BY biblionumber");
+    my $strsth = qq{ SELECT biblionumber FROM biblioitems };
+    $strsth.=qq{ WHERE $where } if ($where);
+    $strsth.=qq{ LIMIT $length } if ($length && !$offset);
+    $strsth.=qq{ LIMIT $offset,$length } if ($offset);
+    my $sth = $dbh->prepare($strsth);
     $sth->execute();
     return $sth;
 }
@@ -635,11 +651,20 @@ Parameters:
                             the same records - specify -y to override this.  
                             Cannot be used with -z.
 
+    -l                      set a maximum number of exported items per biblio.
+                            Doesn't work with -nosanitize.
     -v                      increase the amount of logging.  Normally only 
                             warnings and errors from the indexing are shown.
                             Use log level 2 (-v -v) to include all Zebra logs.
 
-    -munge-config           Deprecated option to try
+    --length   1234         how many biblio you want to export
+    --offset 1243           offset you want to start to
+                                example: --offset 500 --length=500 will result in a LIMIT 500,1000 (exporting 1000 records, starting by the 500th one)
+                                note that the numbers are NOT related to biblionumber, that's the intended behaviour.
+    --where                 let you specify a WHERE query, like itemtype='BOOK' 
+                            or something like that
+
+    --munge-config          Deprecated option to try
                             to fix Zebra config files.
     --help or -h            show this message.
 _USAGE_
-- 
1.7.0.4


From stephane.delaune at biblibre.com  Mon Feb  6 12:20:13 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Mon,  6 Feb 2012 12:20:13 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 7286: fix rebuild_zebra.pl to add
	rebuild_zebra_sliced.zsh
In-Reply-To: <1328527213-5174-1-git-send-email-stephane.delaune@biblibre.com>
References: <1328527213-5174-1-git-send-email-stephane.delaune@biblibre.com>
Message-ID: <1328527213-5174-2-git-send-email-stephane.delaune@biblibre.com>

---
 misc/migration_tools/rebuild_zebra.pl         |   23 +++++-
 misc/migration_tools/rebuild_zebra_sliced.zsh |  127 +++++++++++++++++++++++++
 2 files changed, 149 insertions(+), 1 deletions(-)
 create mode 100755 misc/migration_tools/rebuild_zebra_sliced.zsh

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 94b37b8..ebc2c41 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -86,6 +86,12 @@ if ( !$as_xml and $nosanitize ) {
     die $msg;
 }
 
+if ( $nosanitize and $item_limit ) {
+    my $msg = "Cannot specify both -item_limit and -nosanitize\n";
+    $msg .= "Please do '$0 --help' to see usage.\n";
+    die $msg;
+}
+
 if ($process_zebraqueue and ($skip_export or $reset)) {
     my $msg = "Cannot specify -r or -s if -z is specified\n";
     $msg   .= "Please do '$0 --help' to see usage.\n";
@@ -422,6 +428,7 @@ sub generate_deleted_marc_records {
         my $marc = MARC::Record->new();
         if ($record_type eq 'biblio') {
             fix_biblio_ids($marc, $record_number, $record_number);
+            fix_biblio_items( $marc ) if $item_limit;
         } else {
             fix_authority_id($marc, $record_number);
         }
@@ -447,7 +454,11 @@ sub get_corrected_marc_record {
 
     if (defined $marc) {
         fix_leader($marc);
-        if ($record_type eq 'authority') {
+        if ( $record_type eq 'biblio' ) {
+            my $succeeded = fix_biblio_ids( $marc, $record_number );
+            fix_biblio_items( $marc ) if $item_limit;
+            return unless $succeeded;
+        } else {
             fix_authority_id($marc, $record_number);
         }
         if (C4::Context->preference("marcflavour") eq "UNIMARC") {
@@ -514,6 +525,16 @@ sub fix_leader {
     $marc->leader(substr($leader, 0, 24));
 }
 
+sub fix_biblio_items {
+    my $marc = shift;
+    my ($itemtagfield, $itemtagsubfield) = GetMarcFromKohaField('items.itemnumber','');
+    my $i = 0;
+    for my $itemfield ( $marc->field($itemtagfield) ) {
+	$marc->delete_field($itemfield) if $i >= $item_limit;
+        $i++;
+    }
+}
+
 sub fix_biblio_ids {
     # FIXME - it is essential to ensure that the biblionumber is present,
     #         otherwise, Zebra will choke on the record.  However, this
diff --git a/misc/migration_tools/rebuild_zebra_sliced.zsh b/misc/migration_tools/rebuild_zebra_sliced.zsh
new file mode 100755
index 0000000..e418fd0
--- /dev/null
+++ b/misc/migration_tools/rebuild_zebra_sliced.zsh
@@ -0,0 +1,127 @@
+#!/usr/bin/zsh
+
+# 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.
+
+
+INCREMENT=$1
+BIBLIOSTART=$2
+BIBLIOEND=$3
+
+#echo " | $INCREMENT , $BIBLIOSTART , $BIBLIOEND | ";
+# this script rebuild the zebra index recursively
+# BIBLIOSTART is the record number to BIBLIOSTART on
+# BIBLIOEND is the record number to BIBLIOEND on
+# increment specify how many records we must try at once
+# At the BIBLIOEND of each "chunk", this script checks if the indexing process has been OK
+# if it hasn't, the slice is splitted in 10, and the reindexing is called again on each smaller chunk
+# if the increment goes to 1, it means we tried to reindex 1 by 1, and the failing indexing concern wrong records
+
+# the logs are stored in a directory called logs/ that must be a subdirectory of reindex.zsh
+
+# at the BIBLIOEND of the script, just type :
+#grep -l "previous transaction" `ls rebuild1.*.err`
+# the result contains all the biblios that have not been indexed
+# WARNING : the numbers are not the biblionumber but the record number, they can be reached by :
+# SELECT biblionumber FROM biblio LIMIT YourNumberHere,1;
+
+# EXAMPLE to run the script on a 800 000 biblios database :
+# ./reindex.zsh 50000 0 800000
+# will reindex the DB, BIBLIOSTARTing with chunks of 50k biblios
+#if { grep -E "previous transaction" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ; then
+
+lastbiblionumber=`perl -e '#!/usr/bin/perl
+use C4::Context;
+my $dbh = C4::Context->dbh;
+my $querylastbiblionumber = "SELECT max(biblionumber) FROM biblio;";
+my $sthlastbiblionumber   = $dbh->prepare($querylastbiblionumber);
+$sthlastbiblionumber->execute();
+my ( $lastbiblionumber ) = $sthlastbiblionumber->fetchrow_array; print $lastbiblionumber;'`
+#echo $lastbiblionumber;
+let "maxbiblionumber = $lastbiblionumber + 1"
+if [ $# = 2 ]
+then
+    BIBLIOEND=$lastbiblionumber
+elif [ $# = 1 ]
+then
+    BIBLIOSTART=0
+    BIBLIOEND=$lastbiblionumber
+elif [ $# = 0 ]
+then
+    INCREMENT=10000
+    BIBLIOSTART=0
+    BIBLIOEND=$lastbiblionumber
+fi
+if [[ $INCREMENT =~ ^10*$ ]]
+then
+else
+    echo "The first argument (INCREMENT) must be 1 or a multiple of 10"
+    exit 2
+fi
+if [[ $BIBLIOSTART =~ ^[0-9]*$ ]]
+then
+else
+    echo "The second argument (BIBLIOSTART) must be an integer"
+    exit 2
+fi
+if [[ $BIBLIOEND =~ ^[0-9]*$ ]]
+then
+else
+    echo "The third argument (BIBLIOEND) must be an integer"
+    exit 2
+fi
+if [ $BIBLIOSTART -lt $BIBLIOEND ]
+then
+else
+    echo "The second argument (BIBLIOSTART) must be lower than the third argument (BIBLIOEND)"
+    exit 2
+fi
+if [ $BIBLIOEND -lt $maxbiblionumber ]
+then
+else
+    echo "end"
+    exit 1
+fi
+    ls `dirname $0`/logs/ >/dev/null 2>&1
+    if [ $? != 0 ]
+    then
+        mkdir `dirname $0`/logs
+    else
+        rm `dirname $0`/logs/*
+    fi
+    #/home/koha/src/misc/migration_tools/rebuild_zebra.pl -r -b -v -x -nosanitize -offset 1 -length 1
+    for ((i=$BIBLIOSTART ; i<$BIBLIOEND ; i=i+$INCREMENT))
+    do
+        echo "I = " $i "with increment " $INCREMENT
+        `dirname $0`/rebuild_zebra.pl -b -v -x -nosanitize -d /tmp/rebuild -k -offset $INCREMENT -length $i > `dirname $0`/logs/rebuild$INCREMENT.$i.log 2> `dirname $0`/logs/rebuild$INCREMENT.$i.err
+        if (($INCREMENT >1 ));
+        then
+            if { grep -q "previous transaction" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ;
+            then
+                echo "I must split $i (increment $INCREMENT) because previous transaction didn't reach commit"
+                ((subincrement=$INCREMENT/10))
+                ((newBIBLIOEND=$i+$INCREMENT))
+                $0 $subincrement $i $newBIBLIOEND
+            elif { ! grep -q "Records: $INCREMENT" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ;
+            then
+                echo "I must split $i (increment $INCREMENT) because index was uncomplete, less than $INCREMENT records indexed"
+                ((subincrement=$INCREMENT/10))
+                ((newBIBLIOEND=$i+$INCREMENT))
+                $0 $subincrement $i $newBIBLIOEND
+            fi
+        fi
+    done
+exit 0
-- 
1.7.0.4


From stephane.delaune at biblibre.com  Mon Feb  6 14:03:26 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Mon,  6 Feb 2012 14:03:26 +0100
Subject: [Koha-patches] [PATCH 1/2] Bug 7246 add offset/length and where
	options to rebuild_zebra
Message-ID: <1328533407-7575-1-git-send-email-stephane.delaune@biblibre.com>

From: Paul Poulain <paul.poulain at biblibre.com>

This patch reimplement a feature that is on biblibre/master for Koha-community/master

It adds 4 parameters:
* offset = the offset of record. Say 1000 to start rebuilding at the 1000th record of your database
* length = how many records to export. Say 400 to export only 400 records
* where = add a where clause to rebuild only a given itemtype, or anything you want to filter on
* l = how many items should be export with biblios. This is a usefull option when you have records with so many items that they can result in a record higher than 99999bytes,  that zebra don't like at all

Another improvement resulting from offset & length limit is the rebuild_zebra_sliced.zsh
that will be submitted in another patch.
rebuild_zebra_sliced will slice your all database in small chunks, and, if something went wrong for a given slice, will slice the slice, and repeat, until you reach a slice size of 1, showing which record is wrong in your database.
---
 misc/migration_tools/rebuild_zebra.pl |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 31e8125..94b37b8 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -34,6 +34,10 @@ my $want_help;
 my $as_xml;
 my $process_zebraqueue;
 my $do_not_clear_zebraqueue;
+my $item_limit;
+my $length;
+my $where;
+my $offset;
 my $verbose_logging = 0;
 my $zebraidx_log_opt = " -v none,fatal,warn ";
 my $result = GetOptions(
@@ -51,7 +55,11 @@ my $result = GetOptions(
 	'x'				=> \$as_xml,
     'y'             => \$do_not_clear_zebraqueue,
     'z'             => \$process_zebraqueue,
-    'v+'            => \$verbose_logging,
+    'l:i'          => \$item_limit,
+    'where:s'        => \$where,
+    'length:i'        => \$length,
+    'offset:i'      => \$offset,
+    'v+'             => \$verbose_logging,
 );
 
 
@@ -294,13 +302,21 @@ sub select_all_records {
 }
 
 sub select_all_authorities {
-    my $sth = $dbh->prepare("SELECT authid FROM auth_header");
+    my $strsth=qq{SELECT authid FROM auth_header};
+    $strsth.=qq{ WHERE $where } if ($where);
+    $strsth.=qq{ LIMIT $length } if ($length && !$offset);
+    $strsth.=qq{ LIMIT $offset,$length } if ($length && $offset);
+    my $sth = $dbh->prepare($strsth);
     $sth->execute();
     return $sth;
 }
 
 sub select_all_biblios {
-    my $sth = $dbh->prepare("SELECT biblionumber FROM biblioitems ORDER BY biblionumber");
+    my $strsth = qq{ SELECT biblionumber FROM biblioitems };
+    $strsth.=qq{ WHERE $where } if ($where);
+    $strsth.=qq{ LIMIT $length } if ($length && !$offset);
+    $strsth.=qq{ LIMIT $offset,$length } if ($offset);
+    my $sth = $dbh->prepare($strsth);
     $sth->execute();
     return $sth;
 }
@@ -635,11 +651,20 @@ Parameters:
                             the same records - specify -y to override this.  
                             Cannot be used with -z.
 
+    -l                      set a maximum number of exported items per biblio.
+                            Doesn't work with -nosanitize.
     -v                      increase the amount of logging.  Normally only 
                             warnings and errors from the indexing are shown.
                             Use log level 2 (-v -v) to include all Zebra logs.
 
-    -munge-config           Deprecated option to try
+    --length   1234         how many biblio you want to export
+    --offset 1243           offset you want to start to
+                                example: --offset 500 --length=500 will result in a LIMIT 500,1000 (exporting 1000 records, starting by the 500th one)
+                                note that the numbers are NOT related to biblionumber, that's the intended behaviour.
+    --where                 let you specify a WHERE query, like itemtype='BOOK' 
+                            or something like that
+
+    --munge-config          Deprecated option to try
                             to fix Zebra config files.
     --help or -h            show this message.
 _USAGE_
-- 
1.7.0.4


From stephane.delaune at biblibre.com  Mon Feb  6 14:03:27 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Mon,  6 Feb 2012 14:03:27 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 7286: fix rebuild_zebra.pl to add
	rebuild_zebra_sliced.zsh
In-Reply-To: <1328533407-7575-1-git-send-email-stephane.delaune@biblibre.com>
References: <1328533407-7575-1-git-send-email-stephane.delaune@biblibre.com>
Message-ID: <1328533407-7575-2-git-send-email-stephane.delaune@biblibre.com>

---
 misc/migration_tools/rebuild_zebra.pl         |   23 +++++-
 misc/migration_tools/rebuild_zebra_sliced.zsh |  127 +++++++++++++++++++++++++
 2 files changed, 149 insertions(+), 1 deletions(-)
 create mode 100755 misc/migration_tools/rebuild_zebra_sliced.zsh

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 94b37b8..ebc2c41 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -86,6 +86,12 @@ if ( !$as_xml and $nosanitize ) {
     die $msg;
 }
 
+if ( $nosanitize and $item_limit ) {
+    my $msg = "Cannot specify both -item_limit and -nosanitize\n";
+    $msg .= "Please do '$0 --help' to see usage.\n";
+    die $msg;
+}
+
 if ($process_zebraqueue and ($skip_export or $reset)) {
     my $msg = "Cannot specify -r or -s if -z is specified\n";
     $msg   .= "Please do '$0 --help' to see usage.\n";
@@ -422,6 +428,7 @@ sub generate_deleted_marc_records {
         my $marc = MARC::Record->new();
         if ($record_type eq 'biblio') {
             fix_biblio_ids($marc, $record_number, $record_number);
+            fix_biblio_items( $marc ) if $item_limit;
         } else {
             fix_authority_id($marc, $record_number);
         }
@@ -447,7 +454,11 @@ sub get_corrected_marc_record {
 
     if (defined $marc) {
         fix_leader($marc);
-        if ($record_type eq 'authority') {
+        if ( $record_type eq 'biblio' ) {
+            my $succeeded = fix_biblio_ids( $marc, $record_number );
+            fix_biblio_items( $marc ) if $item_limit;
+            return unless $succeeded;
+        } else {
             fix_authority_id($marc, $record_number);
         }
         if (C4::Context->preference("marcflavour") eq "UNIMARC") {
@@ -514,6 +525,16 @@ sub fix_leader {
     $marc->leader(substr($leader, 0, 24));
 }
 
+sub fix_biblio_items {
+    my $marc = shift;
+    my ($itemtagfield, $itemtagsubfield) = GetMarcFromKohaField('items.itemnumber','');
+    my $i = 0;
+    for my $itemfield ( $marc->field($itemtagfield) ) {
+	$marc->delete_field($itemfield) if $i >= $item_limit;
+        $i++;
+    }
+}
+
 sub fix_biblio_ids {
     # FIXME - it is essential to ensure that the biblionumber is present,
     #         otherwise, Zebra will choke on the record.  However, this
diff --git a/misc/migration_tools/rebuild_zebra_sliced.zsh b/misc/migration_tools/rebuild_zebra_sliced.zsh
new file mode 100755
index 0000000..b6af48c
--- /dev/null
+++ b/misc/migration_tools/rebuild_zebra_sliced.zsh
@@ -0,0 +1,127 @@
+#!/usr/bin/zsh
+
+# 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.
+
+
+INCREMENT=$1
+BIBLIOSTART=$2
+BIBLIOEND=$3
+
+#echo " | $INCREMENT , $BIBLIOSTART , $BIBLIOEND | ";
+# this script rebuild the zebra index recursively
+# BIBLIOSTART is the record number to BIBLIOSTART on
+# BIBLIOEND is the record number to BIBLIOEND on
+# increment specify how many records we must try at once
+# At the BIBLIOEND of each "chunk", this script checks if the indexing process has been OK
+# if it hasn't, the slice is splitted in 10, and the reindexing is called again on each smaller chunk
+# if the increment goes to 1, it means we tried to reindex 1 by 1, and the failing indexing concern wrong records
+
+# the logs are stored in a directory called logs/ that must be a subdirectory of reindex.zsh
+
+# at the BIBLIOEND of the script, just type :
+#grep -l "previous transaction" `ls rebuild1.*.err`
+# the result contains all the biblios that have not been indexed
+# WARNING : the numbers are not the biblionumber but the record number, they can be reached by :
+# SELECT biblionumber FROM biblio LIMIT YourNumberHere,1;
+
+# EXAMPLE to run the script on a 800 000 biblios database :
+# ./reindex.zsh 50000 0 800000
+# will reindex the DB, BIBLIOSTARTing with chunks of 50k biblios
+#if { grep -E "previous transaction" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ; then
+
+lastbiblionumber=`perl -e '#!/usr/bin/perl
+use C4::Context;
+my $dbh = C4::Context->dbh;
+my $querylastbiblionumber = "SELECT max(biblionumber) FROM biblio;";
+my $sthlastbiblionumber   = $dbh->prepare($querylastbiblionumber);
+$sthlastbiblionumber->execute();
+my ( $lastbiblionumber ) = $sthlastbiblionumber->fetchrow_array; print $lastbiblionumber;'`
+#echo $lastbiblionumber;
+let "maxbiblionumber = $lastbiblionumber + 1"
+if [ $# = 2 ]
+then
+    BIBLIOEND=$lastbiblionumber
+elif [ $# = 1 ]
+then
+    BIBLIOSTART=0
+    BIBLIOEND=$lastbiblionumber
+elif [ $# = 0 ]
+then
+    INCREMENT=10000
+    BIBLIOSTART=0
+    BIBLIOEND=$lastbiblionumber
+fi
+if [[ $INCREMENT =~ ^10*$ ]]
+then
+else
+    echo "The first argument (INCREMENT) must be 1 or a multiple of 10"
+    exit 2
+fi
+if [[ $BIBLIOSTART =~ ^[0-9]*$ ]]
+then
+else
+    echo "The second argument (BIBLIOSTART) must be an integer"
+    exit 2
+fi
+if [[ $BIBLIOEND =~ ^[0-9]*$ ]]
+then
+else
+    echo "The third argument (BIBLIOEND) must be an integer"
+    exit 2
+fi
+if [ $BIBLIOSTART -lt $BIBLIOEND ]
+then
+else
+    echo "The second argument (BIBLIOSTART) must be lower than the third argument (BIBLIOEND)"
+    exit 2
+fi
+if [ $BIBLIOEND -lt $maxbiblionumber ]
+then
+else
+    echo "end"
+    exit 1
+fi
+    ls `dirname $0`/logs/ >/dev/null 2>&1
+    if [ $? != 0 ]
+    then
+        mkdir `dirname $0`/logs
+    else
+        rm `dirname $0`/logs/*
+    fi
+    #/home/koha/src/misc/migration_tools/rebuild_zebra.pl -r -b -v -x -nosanitize -length 1 -offset 1
+    for ((i=$BIBLIOSTART ; i<$BIBLIOEND ; i=i+$INCREMENT))
+    do
+        echo "I = " $i "with increment " $INCREMENT
+        `dirname $0`/rebuild_zebra.pl -b -v -x -nosanitize -d /tmp/rebuild -k -length $INCREMENT -offset $i > `dirname $0`/logs/rebuild$INCREMENT.$i.log 2> `dirname $0`/logs/rebuild$INCREMENT.$i.err
+        if (($INCREMENT >1 ));
+        then
+            if { grep -q "previous transaction" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ;
+            then
+                echo "I must split $i (increment $INCREMENT) because previous transaction didn't reach commit"
+                ((subincrement=$INCREMENT/10))
+                ((newBIBLIOEND=$i+$INCREMENT))
+                $0 $subincrement $i $newBIBLIOEND
+            elif { ! grep -q "Records: $INCREMENT" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ;
+            then
+                echo "I must split $i (increment $INCREMENT) because index was uncomplete, less than $INCREMENT records indexed"
+                ((subincrement=$INCREMENT/10))
+                ((newBIBLIOEND=$i+$INCREMENT))
+                $0 $subincrement $i $newBIBLIOEND
+            fi
+        fi
+    done
+exit 0
-- 
1.7.0.4


From januszop at gmail.com  Mon Feb  6 16:20:38 2012
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Mon,  6 Feb 2012 16:20:38 +0100
Subject: [Koha-patches] [PATCH] Bug 7502: Error in records.abs for
	marc21/biblios
Message-ID: <1328541638-31231-1-git-send-email-januszop@gmail.com>

There is an error in records.abs in marc21/biblios causing a zebra warning:

15:51:13-06/02 zebraidx(3276) [warn] Unknown register type: Subject
---
 etc/zebradb/marc_defs/marc21/biblios/record.abs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
index 6983230..b61903f 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -170,7 +170,7 @@ melm 611$a      Name-and-title,Subject,Subject:p
 melm 611$t      Name-and-title,Title,Subject,Subject:p
 melm 611$9      Koha-Auth-Number
 melm 611        Conference-name,Name,Subject,Subject:p
-melm 630$n      Thematic-number,Subject:Subject:p
+melm 630$n      Thematic-number,Subject,Subject:p
 melm 630$r      Music-key,Subject,Subject:p
 melm 630$9      Koha-Auth-Number
 melm 630        Subject,Subject:p
-- 
1.7.2.5


From adrien.saurat at biblibre.com  Mon Feb  6 17:09:37 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Mon,  6 Feb 2012 17:09:37 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6985 - remove kw,
	wrdl from the search results
Message-ID: <1328544577-8050-1-git-send-email-adrien.saurat@biblibre.com>

From: Liz Rea <wizzyrea at gmail.com>

To test:

* Apply patch
* Do a search in the OPAC, the result page should now say
  "Your search returned X results" instead of
  "Your search for "kw,wrdl:yyy" returned x results"
* Do a search that will have no results, kw,wrdl should not appear in the text.

Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Adrien Saurat <adrien.saurat at biblibre.com>
---
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 0ffb881..eb36f6f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -177,13 +177,13 @@
 </div>
 </div>
 <div id="breadcrumbs" class="yui-g">
-[% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>&ldquo;[% query_desc |html %] [% limit_desc |html %]&rdquo; </strong>returned [% total |html %] results. [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %]
+[% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>Your search returned [% total |html %] results.</strong> [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %]
 <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
 [% ELSE %]
 <strong>No Results Found!</strong>
 <p>
     [% IF ( searchdesc ) %]
-    No results match your search for <span style="font-weight: bold;">&ldquo;[% query_desc |html %] [% limit_desc |html %]&rdquo;</span> in [% LibraryName %] Catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
+    No results found for that in [% LibraryName %] Catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
     [% ELSE %]
     You did not specify any search criteria.
     [% END %]
-- 
1.7.4.1


From f.demians at tamil.fr  Mon Feb  6 20:04:33 2012
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Mon,  6 Feb 2012 20:04:33 +0100
Subject: [Koha-patches] [PATCH] Bug 7505 Superlibrarian can't export all
	biblios when IndependantBranches is enabled
Message-ID: <1328555073-28355-1-git-send-email-f.demians@tamil.fr>

When a Koha user has superlibrarian permissions, and if
IndependantBranches is enabled, in Tools > Export bibliographic and
holdings, this user can't export all biblio records. He will just export
the biblio from the branch he belongs to.

This patch fix that.

To test:

  - Do a ALL records export as superlibrian on a multi-branches Koha instance
  - Examine the resulting MARC file with the tool of your choice (MArcEdit,
    yaz-marcdump, etc.)
  - You will see that 952/995 contains exlusively items from your branch (as
    Koha user)
---
 tools/export.pl |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/export.pl b/tools/export.pl
index 66763d6..d3d8646 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -47,11 +47,12 @@ my ($template, $loggedinuser, $cookie)
 
 	my $limit_ind_branch=(C4::Context->preference('IndependantBranches') &&
               C4::Context->userenv &&
-              C4::Context->userenv->{flags} % 2 !=1  &&
+              !(C4::Context->userenv->{flags} & 1) &&
               C4::Context->userenv->{branch}?1:0);
 	my $branches = GetBranches($limit_ind_branch);    
     my $branch                = $query->param("branch") || '';
-	if ( C4::Context->preference("IndependantBranches") ) {
+	if ( C4::Context->preference("IndependantBranches") &&
+         !(C4::Context->userenv->{flags} & 1) ) {
     	$branch = C4::Context->userenv->{'branch'};
 	}
 
-- 
1.7.8


From stephane.delaune at biblibre.com  Tue Feb  7 17:25:27 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Tue,  7 Feb 2012 17:25:27 +0100
Subject: [Koha-patches] [PATCH] Bug 5635: bulkmarcimport new parameters &
	features
Message-ID: <1328631927-19329-1-git-send-email-stephane.delaune@biblibre.com>

---
 C4/AuthoritiesMarc.pm                  |    4 +-
 misc/migration_tools/bulkmarcimport.pl |  216 ++++++++++++++++++++++++--------
 2 files changed, 166 insertions(+), 54 deletions(-)

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index b3c5070..80178b9 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -412,9 +412,9 @@ Get the record and tries to guess the adequate authtypecode from its content.
 =cut
 
 sub GuessAuthTypeCode {
-    my ($record) = @_;
+    my ($record, $heading_fields) = @_;
     return unless defined $record;
-my $heading_fields = {
+    $heading_fields //= {
     "MARC21"=>{
         '100'=>{authtypecode=>'PERSO_NAME'},
         '110'=>{authtypecode=>'CORPO_NAME'},
diff --git a/misc/migration_tools/bulkmarcimport.pl b/misc/migration_tools/bulkmarcimport.pl
index 70d5eb7..6efd1e0 100755
--- a/misc/migration_tools/bulkmarcimport.pl
+++ b/misc/migration_tools/bulkmarcimport.pl
@@ -24,16 +24,19 @@ use C4::Koha;
 use C4::Debug;
 use C4::Charset;
 use C4::Items;
+use YAML;
 use Unicode::Normalize;
 use Time::HiRes qw(gettimeofday);
 use Getopt::Long;
 use IO::File;
 use Pod::Usage;
 
-binmode STDOUT, ':encoding(UTF-8)';
+use open qw( :std :utf8 );
+binmode( STDOUT, ":utf8" );
 my ( $input_marc_file, $number, $offset) = ('',0,0);
 my ($version, $delete, $test_parameter, $skip_marc8_conversion, $char_encoding, $verbose, $commit, $fk_off,$format,$biblios,$authorities,$keepids,$match, $isbn_check, $logfile);
 my ($sourcetag,$sourcesubfield,$idmapfl);
+my ( $insert, $filters, $update, $all, $yamlfile, $authtypes );
 my $cleanisbn = 1;
 
 $|=1;
@@ -45,7 +48,7 @@ GetOptions(
     'o|offset:f' => \$offset,
     'h' => \$version,
     'd' => \$delete,
-    't' => \$test_parameter,
+    't|test' => \$test_parameter,
     's' => \$skip_marc8_conversion,
     'c:s' => \$char_encoding,
     'v:s' => \$verbose,
@@ -55,20 +58,34 @@ GetOptions(
     'k|keepids:s' => \$keepids,
     'b|biblios' => \$biblios,
     'a|authorities' => \$authorities,
+    'authtypes:s' => \$authtypes,
+    'filter=s@'     => \$filters,
+    'insert'        => \$insert,
+    'update'        => \$update,
+    'all'           => \$all,
     'match=s@'    => \$match,
     'i|isbn' => \$isbn_check,
     'x:s' => \$sourcetag,
     'y:s' => \$sourcesubfield,
     'idmap:s' => \$idmapfl,
     'cleanisbn!'     => \$cleanisbn,
+    'yaml:s'        => \$yamlfile,
 );
-$biblios=!$authorities||$biblios;
+$biblios ||= !$authorities;
+$insert  ||= !$update;
+
+if ($all) {
+    $insert = 1;
+    $update = 1;
+}
 
 if ($version || ($input_marc_file eq '')) {
     pod2usage( -verbose => 2 );
     exit;
 }
 
+my $heading_fields=get_heading_fields();
+
 if (defined $idmapfl) {
   open(IDMAP,">$idmapfl") or die "cannot open $idmapfl \n";
 }
@@ -139,7 +156,7 @@ $batch->warnings_off();
 $batch->strict_off();
 my $i=0;
 my $commitnum = $commit ? $commit : 50;
-
+my $yamlhash;
 
 # Skip file offset
 if ( $offset ) {
@@ -196,6 +213,7 @@ RECORD: while (  ) {
             next RECORD;            
         }
     }
+    SetUTF8Flag($record);
     my $isbn;
     # remove trailing - in isbn (only for biblios, of course)
     if ($biblios && $cleanisbn) {
@@ -209,45 +227,76 @@ RECORD: while (  ) {
     }
     my $id;
     # search for duplicates (based on Local-number)
-    if ($match){
-       require C4::Search;
-       my $query=build_query($match,$record);
-       my $server=($authorities?'authorityserver':'biblioserver');
-       my ($error, $results,$totalhits)=C4::Search::SimpleSearch( $query, 0, 3, [$server] );
-       die "unable to search the database for duplicates : $error" if (defined $error);
-       #warn "$query $server : $totalhits";
-       if ( @{$results} == 1 ){
-           my $marcrecord = MARC::File::USMARC::decode($results->[0]);
-	   	   $id=GetRecordId($marcrecord,$tagid,$subfieldid);
-       } 
-       elsif  ( @{$results} > 1){
-           $debug && warn "more than one match for $query";
-       } 
-       else {
-           $debug && warn "nomatch for $query";
-       }
+    my $originalid;
+    $originalid = GetRecordId( $record, $tagid, $subfieldid );
+    if ($match) {
+        require C4::Search;
+        my $query = build_query( $match, $record );
+        my $server = ( $authorities ? 'authorityserver' : 'biblioserver' );
+        $debug && warn $query;
+        my ( $error, $results, $totalhits ) = C4::Search::SimpleSearch( $query, 0, 3, [$server] );
+        die "unable to search the database for duplicates : $error" if ( defined $error );
+        $debug && warn "$query $server : $totalhits";
+        if ( $results && scalar(@$results) == 1 ) {
+            my $marcrecord = MARC::File::USMARC::decode( $results->[0] );
+            SetUTF8Flag($marcrecord);
+            $id = GetRecordId( $marcrecord, $tagid, $subfieldid );
+            if ( $authorities && $marcFlavour ) {
+                #Skip if authority in database is the same as the on in database
+                if ( $marcrecord->field('005')->data >= $record->field('005')->data ) {
+                    if ($yamlfile) {
+                        $yamlhash->{$originalid}->{'authid'} = $id;
+
+                        # On r??cup??re tous les souschamps des champs vedettes d'autorit??s
+                        my @subfields;
+                        foreach my $field ( $marcrecord->field("2..") ) {
+                            push @subfields, map { ( $_->[0] =~ /[a-z]/ ? $_->[1] : () ) } $field->subfields();
+                        }
+                        $yamlhash->{$originalid}->{'subfields'} = \@subfields;
+                    }
+                    next;
+                }
+            }
+        } elsif ( $results && scalar(@$results) > 1 ) {
+            $debug && warn "more than one match for $query";
+        } else {
+            $debug && warn "nomatch for $query";
+        }
     }
-	my $originalid;
-    if ($keepids){
-	  $originalid=GetRecordId($record,$tagid,$subfieldid);
-      if ($originalid){
-		 my $storeidfield;
-		 if (length($keepids)==3){
-		 	$storeidfield=MARC::Field->new($keepids,$originalid);
-		 }
-		 else  {
-			$storeidfield=MARC::Field->new(substr($keepids,0,3),"","",substr($keepids,3,1),$originalid);
-		 }
-         $record->insert_fields_ordered($storeidfield);
-	     $record->delete_field($record->field($tagid));
-      }
+    if ($keepids && $originalid) {
+            my $storeidfield;
+            if ( length($keepids) == 3 ) {
+                $storeidfield = MARC::Field->new( $keepids, $originalid );
+            } else {
+                $storeidfield = MARC::Field->new( substr( $keepids, 0, 3 ), "", "", substr( $keepids, 3, 1 ), $originalid );
+            }
+            $record->insert_fields_ordered($storeidfield);
+            $record->delete_field( $record->field($tagid) );
+    }
+    foreach my $stringfilter (@$filters) {
+        if ( length($stringfilter) == 3 ) {
+            foreach my $field ( $record->field($stringfilter) ) {
+                $record->delete_field($field);
+                $debug && warn "removed : ", $field->as_string;
+            }
+        } else {
+            my ( $removetag, $removesubfield, $removematch ) = ( $1, $2, $3 )
+              if $stringfilter =~ /([0-9]{3})([a-z0-9])(.*)/;
+            if ( ( $removetag > "010" ) && $removesubfield ) {
+                foreach my $field ( $record->field($removetag) ) {
+                    $field->delete_subfield( code => "$removesubfield", match => $removematch );
+                    $debug && warn "Potentially removed : ", $field->subfield($removesubfield);
+                }
+            }
+        }
     }
+
     unless ($test_parameter) {
         if ($authorities){
             use C4::AuthoritiesMarc;
-            my $authtypecode=GuessAuthTypeCode($record);
+            my $authtypecode=GuessAuthTypeCode($record, $heading_fields);
             my $authid= ($id?$id:GuessAuthId($record));
-            if ($authid && GetAuthority($authid)){
+            if ($authid && GetAuthority($authid) && $update ){
             ## Authority has an id and is in database : Replace
                 eval { ( $authid ) = ModAuthority($authid,$record, $authtypecode) };
                 if ($@){
@@ -280,6 +329,14 @@ RECORD: while (  ) {
 					printlog({id=>$originalid||$id||$authid, op=>"insert",status=>"ok"}) if ($logfile);
 				}
  	        }
+            if ($yamlfile) {
+            $yamlhash->{$originalid}->{'authid'} = $authid;
+            my @subfields;
+            foreach my $field ( $record->field("2..") ) {
+                push @subfields, map { ( $_->[0] =~ /[a-z]/ ? $_->[1] : () ) } $field->subfields();
+            }
+            $yamlhash->{$originalid}->{'subfields'} = \@subfields;
+            }
         }
         else {
             my ( $biblionumber, $biblioitemnumber, $itemnumbers_ref, $errors_ref );
@@ -303,20 +360,33 @@ RECORD: while (  ) {
 			}
 					# create biblio, unless we already have it ( either match or isbn )
             if ($biblionumber) {
-				eval{$biblioitemnumber=GetBiblioData($biblionumber)->{biblioitemnumber};}
-			}
-			else 
-			{
-                eval { ( $biblionumber, $biblioitemnumber ) = AddBiblio($record, '', { defer_marc_save => 1 }) };
+                eval{$biblioitemnumber=GetBiblioData($biblionumber)->{biblioitemnumber};};
+                if ($update) {
+                    eval { ( $biblionumber, $biblioitemnumber ) = ModBiblio( $record, $biblionumber, GetFrameworkcode($biblionumber) ) };
+                    if ($@) {
+                        warn "ERROR: Edit biblio $biblionumber failed: $@\n";
+                        printlog( { id => $id || $originalid || $biblionumber, op => "update", status => "ERROR" } ) if ($logfile);
+                        next RECORD;
+                    } else {
+                        printlog( { id => $id || $originalid || $biblionumber, op => "update", status => "ok" } ) if ($logfile);
+                    }
+                } else {
+                    printlog( { id => $id || $originalid || $biblionumber, op => "insert", status => "warning : already in database" } ) if ($logfile);
+                }
+            } else {
+                if ($insert) {
+                    eval { ( $biblionumber, $biblioitemnumber ) = AddBiblio( $record, '', { defer_marc_save => 1 } ) };
+                    if ($@) {
+                        warn "ERROR: Adding biblio $biblionumber failed: $@\n";
+                        printlog( { id => $id || $originalid || $biblionumber, op => "insert", status => "ERROR" } ) if ($logfile);
+                        next RECORD;
+                    } else {
+                        printlog( { id => $id || $originalid || $biblionumber, op => "insert", status => "ok" } ) if ($logfile);
+                    }
+                } else {
+                    printlog( { id => $id || $originalid || $biblionumber, op => "update", status => "warning : not in database" } ) if ($logfile);
+                }
             }
-            if ( $@ ) {
-                warn "ERROR: Adding biblio $biblionumber failed: $@\n";
-				printlog({id=>$id||$originalid||$biblionumber, op=>"insert",status=>"ERROR"}) if ($logfile);
-                next RECORD;
-            } 
- 			else{
-				printlog({id=>$id||$originalid||$biblionumber, op=>"insert",status=>"ok"}) if ($logfile);
-			}
             eval { ( $itemnumbers_ref, $errors_ref ) = AddItemBatchFromMarc( $record, $biblionumber, $biblioitemnumber, '' ); };
             if ( $@ ) {
                 warn "ERROR: Adding items to bib $biblionumber failed: $@\n";
@@ -335,6 +405,7 @@ RECORD: while (  ) {
             if ($#{ $errors_ref } > -1) { 
                 report_item_errors($biblionumber, $errors_ref);
             }
+            $yamlhash->{$originalid} = $biblionumber if ($yamlfile);
         }
         $dbh->commit() if (0 == $i % $commitnum);
     }
@@ -358,6 +429,10 @@ if ($logfile){
   print $loghandle "$i MARC records done in $timeneeded seconds\n";
   $loghandle->close;
 }
+if ($yamlfile) {
+    open YAML, "> $yamlfile" or die "cannot open $yamlfile \n";
+    print YAML Dump($yamlhash);
+}
 exit 0;
 
 sub GetRecordId{
@@ -412,9 +487,22 @@ sub report_item_errors {
 }
 sub printlog{
 	my $logelements=shift;
-	print $loghandle join (";",@$logelements{qw<id op status>}),"\n";
+    print $loghandle join( ";", map { defined $_ ? $_ : "" } @$logelements{qw<id op status>} ), "\n";
 }
+sub get_heading_fields{
+    my $headingfields;
+    if ($authtypes){
+        $headingfields=YAML::LoadFile($authtypes);
 
+        $headingfields={C4::Context->preference('marcflavour')=>$headingfields};
+        $debug && warn YAML::Dump($headingfields);
+    }
+    unless ($headingfields){
+        $headingfields=$dbh->selectall_hashref("SELECT auth_tag_to_report, authtypecode from auth_types",'auth_tag_to_report',{Slice=>{}});
+        $headingfields={C4::Context->preference('marcflavour')=>$headingfields};
+    }
+    return $headingfields;
+}
 
 =head1 NAME
 
@@ -476,7 +564,7 @@ The I<NUMBER> of records to wait before performing a 'commit' operation
 
 File logs actions done for each record and their status into file
 
-=item B<-t>
+=item B<-t, -test>
 
 Test mode: parses the file, saying what he would do, but doing nothing.
 
@@ -499,6 +587,30 @@ biblioitems, items
 
 Input file I<FORMAT>: I<MARCXML> or I<ISO2709> (defaults to ISO2709)
 
+=item B<-authtypes>
+
+file yamlfile with authoritiesTypes and distinguishable record field in order
+to store the correct authtype
+
+=item B<-yaml>
+
+yaml file  format a yaml file with ids
+keepids field store ids in field (usefull for authorities,
+where 001 contains the authid for Koha, that can contain a very valuable
+info for authorities coming from LOC or BNF. useless for biblios probably
+
+=item B<-insert>
+
+if set, only insert when possible
+
+=item B<-update>
+
+if set, only updates (any biblio should have a matching record)
+
+=item B<-all>
+
+if set, do whatever is required
+
 =item B<-k, -keepids>=<FIELD>
 
 Field store ids in I<FIELD> (usefull for authorities, where 001 contains the
-- 
1.7.0.4


From srdjan at catalyst.net.nz  Wed Feb  8 03:12:56 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed,  8 Feb 2012 15:12:56 +1300
Subject: [Koha-patches] [PATCH] bug_7458: A call number plugin
In-Reply-To: <bug 7458>
References: <bug 7458>
Message-ID: <1328667176-13294-1-git-send-email-srdjan@catalyst.net.nz>

---
 cataloguing/value_builder/callnumber-KU.pl |  135 ++++++++++++++++++++++++++++
 1 files changed, 135 insertions(+), 0 deletions(-)
 create mode 100755 cataloguing/value_builder/callnumber-KU.pl

diff --git a/cataloguing/value_builder/callnumber-KU.pl b/cataloguing/value_builder/callnumber-KU.pl
new file mode 100755
index 0000000..8c4b1b7
--- /dev/null
+++ b/cataloguing/value_builder/callnumber-KU.pl
@@ -0,0 +1,135 @@
+#!/usr/bin/perl
+
+# Copyright 2012 CatalystIT Ltd
+#
+# 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 C4::Auth;
+use CGI;
+use C4::Context;
+
+=head1 DESCRIPTION
+
+Is used for callnumber computation.
+
+User must supply a letter prefix (unspecified length) followed by an empty space followed by a "number".
+"Number" is 4 character long, and is either a number sequence which is 01 padded.
+If input does not conform with this format any processing is omitted.
+
+Some examples of legal values that trigger auto allocation:
+
+AAA 0  - returns first unused number AAA 0xxx starting with AAA 0001
+BBB 12 - returns first unused number BBB 12xx starting with BBB 1201
+CCC QW - returns first unused number CCC QWxx starting with CCC QW01
+
+=cut
+
+sub plugin_parameters {
+}
+
+sub plugin_javascript {
+    my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
+    my $res="
+    <script type='text/javascript'>
+        function Focus$field_number() {
+            return 1;
+        }
+
+        function Blur$field_number() {
+                return 1;
+        }
+
+        function Clic$field_number() {
+                var code = document.getElementById('$field_number');
+                var url = '../cataloguing/plugin_launcher.pl?plugin_name=callnumber-KU.pl&code=' + code.value;
+                var blurcallbackcallnumber = {
+                    success: function(o) {
+                        var field = document.getElementById('$field_number');
+                        field.value = o.responseText;
+                        return 1;
+                    }
+                }
+                var transaction = YAHOO.util.Connect.asyncRequest('GET',url, blurcallbackcallnumber, null);
+            return 1;
+        }
+    </script>
+    ";
+
+    return ($field_number,$res);
+}
+
+my $BASE_CALLNUMBER_RE = qr/^(\w+) (\w+)$/;
+sub plugin {
+    my ($input) = @_;
+    my $code = $input->param('code');
+
+    my ($template, $loggedinuser, $cookie) = get_template_and_user({
+        template_name   => "cataloguing/value_builder/ajax.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => {editcatalogue => '*'},
+        debug           => 1,
+    });
+
+    my $ret;
+    my ($alpha, $num) = ($code =~ $BASE_CALLNUMBER_RE);
+    if (defined $num) { # otherwise no point
+        my ($num_alpha, $num_num) = ($num =~ m/^(\D+)?(\d+)?$/);
+        $num_alpha ||= '';
+        my $pad_len = 4 - length($num);
+        
+        if ($pad_len > 0) {
+            my $num_padded = $num_num;
+            $num_padded .= "0" x ($pad_len - 1) if $pad_len > 1;
+            $num_padded .= "1";
+            my $padded = "$alpha $num_alpha" . $num_padded;
+
+            my $dbh = C4::Context->dbh;
+            if ( my $first = $dbh->selectrow_array("SELECT itemcallnumber
+                                                    FROM items
+                                                    WHERE itemcallnumber = ?", undef, $padded) ) {
+                my $icn = $dbh->selectcol_arrayref("SELECT itemcallnumber
+                                                    FROM items
+                                                    WHERE itemcallnumber LIKE ?
+                                                      AND itemcallnumber >   ?
+                                                    ORDER BY itemcallnumber", undef, "$alpha $num_alpha%", $first);
+                my $next = $num_padded + 1;
+                my $len = length($num_padded);
+                foreach (@$icn) {
+                    my ($num1) = ( m/(\d+)$/o );
+                    if ($num1 > $next) { # a hole in numbering found, stop
+                        last;
+                    }
+                    $next++;
+                }
+                $ret = "$alpha $num_alpha" . sprintf("%0${len}d", $next) if length($next) <= $len; # no overflow
+            }
+            else {
+                $ret = $padded;
+            }
+        }
+    }
+    
+    $template->param(
+        return => $ret || $code
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
+}
+
+1;
-- 
1.6.5


From srdjan at catalyst.net.nz  Wed Feb  8 03:24:29 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed,  8 Feb 2012 15:24:29 +1300
Subject: [Koha-patches] [PATCH] bug_7509: Added index on items itemcallnumber
In-Reply-To: <bug 7509>
References: <bug 7509>
Message-ID: <1328667869-13890-1-git-send-email-srdjan@catalyst.net.nz>

---
 installer/data/mysql/kohastructure.sql |    1 +
 installer/data/mysql/updatedatabase.pl |    8 ++++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 37113c2..34bf1d6 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1045,6 +1045,7 @@ CREATE TABLE `items` ( -- holdings/item information
   KEY `itembibnoidx` (`biblionumber`),
   KEY `homebranch` (`homebranch`),
   KEY `holdingbranch` (`holdingbranch`),
+  KEY (itemcallnumber),
   CONSTRAINT `items_ibfk_1` FOREIGN KEY (`biblioitemnumber`) REFERENCES `biblioitems` (`biblioitemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `items_ibfk_2` FOREIGN KEY (`homebranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE,
   CONSTRAINT `items_ibfk_3` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..dc79bd9 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4663,6 +4663,14 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     SetVersion($DBversion);
 }
+
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE items ADD KEY (itemcallnumber)"
+    print "Upgrade to $DBversion done (Added index on items.itemcallnumber)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
-- 
1.6.5


From stephane.delaune at biblibre.com  Wed Feb  8 12:13:27 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Wed,  8 Feb 2012 12:13:27 +0100
Subject: [Koha-patches] [PATCH 1/2] bug 6919 - implements XSLTResultsDisplay
	and adding both unimarc and marc21 xslt
Message-ID: <1328699608-4554-1-git-send-email-stephane.delaune@biblibre.com>

From: Alex Arnaud <alex.arnaud at biblibre.com>

---
 C4/Search.pm                                       |   13 +-
 .../prog/en/modules/catalogue/results.tt           |    4 +
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    | 1021 ++++++++++++++++++++
 .../prog/en/xslt/UNIMARCslim2intranetResults.xsl   |   69 ++
 4 files changed, 1106 insertions(+), 1 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl

diff --git a/C4/Search.pm b/C4/Search.pm
index e86bb26..43e7b8a 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1775,7 +1775,18 @@ sub searchResults {
             push @available_items_loop, $available_items->{$key}
         }
 
-         # if biblio level itypes are used and itemtype is notforloan, it can't be reserved either
+        # XSLT processing of some stuff
+	use C4::Charset;
+	SetUTF8Flag($marcrecord);
+	$debug && warn $marcrecord->as_formatted;
+	my $interface = $search_context eq 'opac' ? 'OPAC' : '';
+	if (!$scan && C4::Context->preference($interface . "XSLTResultsDisplay")) {
+            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, 'Results',
+                                                                $search_context, 1);
+	    # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs
+        }
+
+        # if biblio level itypes are used and itemtype is notforloan, it can't be reserved either
         if (!C4::Context->preference("item-level_itypes")) {
             if ($itemtypes{ $oldbiblio->{itemtype} }->{notforloan}) {
                 $can_place_holds = 0;
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 1931227..d558795 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -453,6 +453,9 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                 <input type="checkbox" class="selection" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" style="display:none" />
                             </td>
                             <td>
+			    [% IF ( SEARCH_RESULT.XSLTResultsRecord ) %]
+				[% SEARCH_RESULT.XSLTResultsRecord %]
+			    [% ELSE %]
                                 <p>[% SEARCH_RESULT.result_number %].
                                  [% biblionumber = SEARCH_RESULT.biblionumber %]
 
@@ -509,6 +512,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                 [% END %]
 
                                 [% END %]
+                                [% END %]
                                   <p class="hold">[% IF ( SEARCH_RESULT.norequests ) %]
                                   <span class="noholdstext">No holds allowed</span>
                               [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
new file mode 100644
index 0000000..38565bc
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -0,0 +1,1021 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<xsl:stylesheet version="1.0"
+  xmlns:marc="http://www.loc.gov/MARC21/slim"
+  xmlns:items="http://www.koha-community.org/items"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="marc items">
+    <xsl:import href="MARC21slimUtils.xsl"/>
+    <xsl:output method = "xml" indent="yes" omit-xml-declaration = "yes" />
+    <xsl:key name="item-by-status" match="items:item" use="items:status"/>
+    <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
+
+    <xsl:template match="/">
+            <xsl:apply-templates/>
+    </xsl:template>
+    <xsl:template match="marc:record">
+
+        <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
+        <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
+
+    <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
+    <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>
+    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
+    <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
+    <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
+    <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
+        <xsl:variable name="leader" select="marc:leader"/>
+        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
+        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
+        <xsl:variable name="leader19" select="substring($leader,20,1)"/>
+        <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
+        <xsl:variable name="isbn" select="marc:datafield[@tag=020]/marc:subfield[@code='a']"/>
+        <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
+        <xsl:variable name="typeOf008">
+            <xsl:choose>
+                <xsl:when test="$leader19='a'">ST</xsl:when>
+                <xsl:when test="$leader6='a'">
+                    <xsl:choose>
+                        <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">BK</xsl:when>
+                        <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">CR</xsl:when>
+                    </xsl:choose>
+                </xsl:when>
+                <xsl:when test="$leader6='t'">BK</xsl:when>
+                <xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
+                <xsl:when test="$leader6='m'">CF</xsl:when>
+                <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
+                <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
+                <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"/>
+        <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"/>
+        <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"/>
+        <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"/>
+        <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"/>
+        <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
+        <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"/>
+        <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
+        <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"/>
+
+        <xsl:variable name="physicalDescription">
+            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']">
+                reformatted digital
+            </xsl:if>
+            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='b']">
+                digitized microfilm
+            </xsl:if>
+            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='d']">
+                digitized other analog
+            </xsl:if>
+
+            <xsl:variable name="check008-23">
+                <xsl:if test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='CR' or $typeOf008='MX'">
+                    <xsl:value-of select="true()"></xsl:value-of>
+                </xsl:if>
+            </xsl:variable>
+            <xsl:variable name="check008-29">
+                <xsl:if test="$typeOf008='MP' or $typeOf008='VM'">
+                    <xsl:value-of select="true()"></xsl:value-of>
+                </xsl:if>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')">
+                    braille
+                </xsl:when>
+                <xsl:when test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='CR') and ($controlField008-23=' ' or $controlField008='r'))">
+                    print
+                </xsl:when>
+                <xsl:when test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
+                    electronic
+                </xsl:when>
+                <xsl:when test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
+                    microfiche
+                </xsl:when>
+                <xsl:when test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
+                    microfilm
+                </xsl:when>
+            </xsl:choose>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='b']">
+                chip cartridge
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
+                magnetic disc
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='m']">
+                magneto-optical disc
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
+		available online
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
+                tape cartridge
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='f']">
+                tape cassette
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='h']">
+                tape reel
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
+                kit
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
+                atlas
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='g']">
+                diagram
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
+                map
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
+                model
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='k']">
+                profile
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
+                remote-sensing image
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='s']">
+                section
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='y']">
+                view
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='a']">
+                aperture card
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='e']">
+                microfiche
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='f']">
+                microfiche cassette
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='b']">
+                microfilm cartridge
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='c']">
+                microfilm cassette
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='d']">
+                microfilm reel
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='g']">
+                microopaque
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='c']">
+                film cartridge
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='f']">
+                film cassette
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='r']">
+                film reel
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
+                collage
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
+                photomechanical print
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='g']">
+                photonegative
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='h']">
+                photoprint
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
+                print
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='l']">
+                technical drawing
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
+                filmslip
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='c']">
+                filmstrip cartridge
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='o']">
+                filmstrip roll
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='f']">
+                other filmstrip type
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
+                transparency
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='r'][substring(text(),2,1)='r']">
+                remote-sensing image
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='e']">
+                cylinder
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='q']">
+                roll
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='g']">
+                sound cartridge
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='s']">
+                sound cassette
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
+                sound-tape reel
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='i']">
+                sound-track film
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='w']">
+                wire recording
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='c']">
+                braille
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='b']">
+                combination
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='a']">
+                moon
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='d']">
+                tactile, with no writing system
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='c']">
+                braille
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
+                regular print
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='d']">
+                text in looseleaf binder
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='c']">
+                videocartridge
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='f']">
+                videocassette
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
+                videoreel
+            </xsl:if>
+<!--
+            <xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)>1]">
+                    <xsl:value-of select="."></xsl:value-of>
+            </xsl:for-each>
+            <xsl:for-each select="marc:datafield[@tag=300]">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abce</xsl:with-param>
+                    </xsl:call-template>
+            </xsl:for-each>
+-->
+        </xsl:variable>
+
+        <!-- Title Statement: Alternate Graphic Representation (MARC 880) -->
+        <xsl:if test="$display880">
+           <xsl:call-template name="m880Select">
+              <xsl:with-param name="basetags">245</xsl:with-param>
+              <xsl:with-param name="codes">abhfgknps</xsl:with-param>
+              <xsl:with-param name="bibno"><xsl:value-of  select="$biblionumber"/></xsl:with-param>
+           </xsl:call-template>
+        </xsl:if>
+
+	<a><xsl:attribute name="href">/cgi-bin/koha/catalogue/detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute><xsl:attribute name="class">title</xsl:attribute>
+
+        <xsl:if test="marc:datafield[@tag=245]">
+        <xsl:for-each select="marc:datafield[@tag=245]">
+            <xsl:variable name="title">
+                     <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">a</xsl:with-param>
+                    </xsl:call-template>
+                    <xsl:if test="marc:subfield[@code='b']">
+                        <xsl:text> </xsl:text>
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">b</xsl:with-param>
+                        </xsl:call-template>
+                    </xsl:if>
+                    <xsl:if test="marc:subfield[@code='h']">
+                        <xsl:text> </xsl:text>
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">h</xsl:with-param>
+                        </xsl:call-template>
+                    </xsl:if>
+                <xsl:text> </xsl:text>
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">fgknps</xsl:with-param>
+                     </xsl:call-template>
+            </xsl:variable>
+            <xsl:variable name="titleChop">
+                <xsl:call-template name="chopPunctuation">
+                    <xsl:with-param name="chopString">
+                        <xsl:value-of select="$title"/>
+                    </xsl:with-param>
+                </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$titleChop"/>
+        </xsl:for-each>
+        </xsl:if>
+    </a>
+    <p>
+
+    <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
+    <xsl:if test="$display880">
+      <xsl:call-template name="m880Select">
+      <xsl:with-param name="basetags">100,110,111,700,710,711</xsl:with-param>
+      <xsl:with-param name="codes">abc</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+
+    <xsl:choose>
+    <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
+
+    by <span class="author">
+        <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
+            <xsl:choose>
+            <xsl:when test="position()=last()">
+                <xsl:call-template name="nameABCDQ"/>.
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:call-template name="nameABCDQ"/>;
+            </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+
+        <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
+            <xsl:choose>
+            <xsl:when test="position()=1">
+		<xsl:text> -- </xsl:text>
+            </xsl:when>
+            </xsl:choose>
+            <xsl:choose>
+            <xsl:when test="position()=last()">
+                <xsl:call-template name="nameABCDN"/> 
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:call-template name="nameABCDN"/>;
+            </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+
+        <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
+            <xsl:choose>
+            <xsl:when test="position()=1">
+		<xsl:text> -- </xsl:text>
+            </xsl:when>
+            </xsl:choose>
+            <xsl:choose>
+            <xsl:when test="marc:subfield[@code='n']">
+               <xsl:text> </xsl:text>
+               <xsl:call-template name="subfieldSelect">
+                  <xsl:with-param name="codes">n</xsl:with-param> 
+               </xsl:call-template>
+               <xsl:text> </xsl:text>
+            </xsl:when>
+            </xsl:choose>
+            <xsl:choose>
+            <xsl:when test="position()=last()">
+                <xsl:call-template name="nameACDEQ"/>.
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:call-template name="nameACDEQ"/>;
+            </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+    </span>
+    </xsl:when>
+    </xsl:choose>
+    </p>
+
+    <xsl:if test="marc:datafield[@tag=250]">
+	<span class="results_summary">
+    <span class="label">Edition: </span>
+            <xsl:for-each select="marc:datafield[@tag=250]">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">ab</xsl:with-param>
+                    </xsl:call-template>
+            </xsl:for-each>
+	</span>
+    </xsl:if>
+
+    <span class="results_summary">
+    <xsl:if test="$typeOf008!=''">
+        <span class="label">Type: </span>
+            <xsl:choose>
+                <xsl:when test="$leader19='a'"> Set</xsl:when>
+                <xsl:when test="$leader6='a'">
+                    <xsl:choose>
+                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"> Book</xsl:when>
+                        <xsl:when test="$leader7='i' or $leader7='s'"> Continuing Resource</xsl:when>
+                        <xsl:when test="$leader7='a' or $leader7='b'"> Article</xsl:when>
+                    </xsl:choose>
+                </xsl:when>
+                <xsl:when test="$leader6='t'"> Book</xsl:when>
+		<xsl:when test="$leader6='o'"> Kit</xsl:when>
+		<xsl:when test="$leader6='p'"> Mixed Materials</xsl:when>
+                <xsl:when test="$leader6='m'"> Computer File</xsl:when>
+                <xsl:when test="$leader6='e' or $leader6='f'"> Map</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"> Visual Material</xsl:when>
+                <xsl:when test="$leader6='c' or $leader6='d'"> Score</xsl:when>
+                <xsl:when test="$leader6='i'"> Sound</xsl:when>
+                <xsl:when test="$leader6='j'"> Music</xsl:when>
+            </xsl:choose>
+    </xsl:if>
+    <xsl:if test="string-length(normalize-space($physicalDescription))">
+        <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of>
+    </xsl:if>
+
+    <xsl:if test="$controlField008-21 or $controlField008-22 or $controlField008-24 or $controlField008-26 or $controlField008-29 or $controlField008-34 or $controlField008-33 or $controlField008-30-31 or $controlField008-33">
+
+        <xsl:if test="$typeOf008='CR'">
+        <xsl:if test="$controlField008-21 and $controlField008-21 !='|' and $controlField008-21 !=' '">
+	    <span class="label">; Type of continuing resource: </span>
+        </xsl:if>
+            <xsl:choose>
+                <xsl:when test="$controlField008-21='l'">
+                    loose-leaf
+                </xsl:when>
+                <xsl:when test="$controlField008-21='m'">
+                    series
+                </xsl:when>
+                <xsl:when test="$controlField008-21='n'">
+                    newspaper
+                </xsl:when>
+                <xsl:when test="$controlField008-21='p'">
+                    periodical
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+        <xsl:if test="$typeOf008='BK' or $typeOf008='CR'">
+        <xsl:if test="contains($controlField008-24,'abcdefghijklmnopqrstvwxyz')">
+        <span class="label">; Nature of contents: </span>
+        </xsl:if>
+            <xsl:choose>
+                <xsl:when test="contains($controlField008-24,'a')">
+                    abstract or summary
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'b')">
+		    bibliography
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'c')">
+                    catalog
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'d')">
+                    dictionary
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'e')">
+                    encyclopedia
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'f')">
+                    handbook
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'g')">
+                    legal article
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'i')">
+                    index
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'k')">
+                    discography
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'l')">
+                    legislation
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'m')">
+                    theses
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'n')">
+                    survey of literature
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'o')">
+                    review
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'p')">
+                    programmed text
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'q')">
+                    filmography
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'r')">
+                    directory
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'s')">
+                    statistics
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'v')">
+                    legal case and case notes
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'w')">
+                    law report or digest
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'z')">
+                    treaty
+                </xsl:when>
+            </xsl:choose>
+            <xsl:choose>
+                <xsl:when test="$controlField008-29='1'">
+                    conference publication
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+        <xsl:if test="$typeOf008='CF'">
+            <xsl:if test="$controlField008-26='a' or $controlField008-26='e' or $controlField008-26='f' or $controlField008-26='g'">
+            <span class="label">; Type of computer file: </span>
+            </xsl:if>
+            <xsl:choose>
+                <xsl:when test="$controlField008-26='a'">
+                    numeric data
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+        <xsl:if test="$typeOf008='BK'">
+            <xsl:if test="(substring($controlField008,25,1)='j') or (substring($controlField008,25,1)='1') or ($controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d')">
+            <span class="label">; Nature of contents: </span>
+            </xsl:if>
+            <xsl:if test="substring($controlField008,25,1)='j'">
+                patent
+            </xsl:if>
+            <xsl:if test="substring($controlField008,31,1)='1'">
+                festschrift
+            </xsl:if>
+
+            <xsl:if test="$controlField008-33 and $controlField008-33!='|' and $controlField008-33!='u' and $controlField008-33!=' '">
+            <span class="label">; Literary form: </span>
+            </xsl:if>
+            <xsl:choose>
+                <xsl:when test="$controlField008-33='0'">
+                    not fiction
+                </xsl:when>
+                <xsl:when test="$controlField008-33='1'">
+                    fiction
+                </xsl:when> 
+                <xsl:when test="$controlField008-33='e'">
+                    essay
+                </xsl:when>
+                <xsl:when test="$controlField008-33='d'">
+                    drama
+                </xsl:when>
+                <xsl:when test="$controlField008-33='c'">
+                    comic strip
+                </xsl:when>
+                <xsl:when test="$controlField008-33='l'">
+                    fiction
+                </xsl:when>
+                <xsl:when test="$controlField008-33='h'">
+                    humor, satire
+                </xsl:when>
+                <xsl:when test="$controlField008-33='i'">
+                    letter
+                </xsl:when>
+                <xsl:when test="$controlField008-33='f'">
+                    novel
+                </xsl:when>
+                <xsl:when test="$controlField008-33='j'">
+                    short story
+                </xsl:when>
+                <xsl:when test="$controlField008-33='s'">
+                    speech
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if> 
+        <xsl:if test="$typeOf008='MU' and $controlField008-30-31 and $controlField008-30-31!='||' and $controlField008-30-31!='  '">
+            <span class="label">; Literary form: </span> <!-- Literary text for sound recordings -->
+            <xsl:if test="contains($controlField008-30-31,'b')">
+                biography
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'c')">
+                conference publication
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'d')">
+                drama
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'e')">
+                essay
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'f')">
+                fiction
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'o')">
+                folktale
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'h')">
+                history
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'k')">
+                humor, satire
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'m')">
+                memoir
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'p')">
+                poetry
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'r')">
+                rehearsal
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'g')">
+                reporting
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'s')">
+                sound
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'l')">
+                speech
+            </xsl:if>
+        </xsl:if>
+        <xsl:if test="$typeOf008='VM'">
+            <span class="label">; Type of visual material: </span>
+            <xsl:choose>
+                <xsl:when test="$controlField008-33='a'">
+                    art original
+                </xsl:when>
+                <xsl:when test="$controlField008-33='b'">
+                    kit
+                </xsl:when>
+                <xsl:when test="$controlField008-33='c'">
+                    art reproduction
+                </xsl:when>
+                <xsl:when test="$controlField008-33='d'">
+                    diorama
+                </xsl:when>
+                <xsl:when test="$controlField008-33='f'">
+                    filmstrip
+                </xsl:when>
+                <xsl:when test="$controlField008-33='g'">
+                    legal article
+                </xsl:when>
+                <xsl:when test="$controlField008-33='i'">
+                    picture
+                </xsl:when>
+                <xsl:when test="$controlField008-33='k'">
+                    graphic
+                </xsl:when>
+                <xsl:when test="$controlField008-33='l'">
+                    technical drawing
+                </xsl:when>
+                <xsl:when test="$controlField008-33='m'">
+                    motion picture
+                </xsl:when>
+                <xsl:when test="$controlField008-33='n'">
+                    chart
+                </xsl:when>
+                <xsl:when test="$controlField008-33='o'">
+                    flash card
+                </xsl:when>
+                <xsl:when test="$controlField008-33='p'">
+                    microscope slide
+                </xsl:when>
+                <xsl:when test="$controlField008-33='q' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2
+,1)='q']">
+                    model
+                </xsl:when>
+                <xsl:when test="$controlField008-33='r'">
+                    realia
+                </xsl:when>
+                <xsl:when test="$controlField008-33='s'">
+                    slide
+                </xsl:when>
+                <xsl:when test="$controlField008-33='t'">
+                    transparency
+                </xsl:when>
+                <xsl:when test="$controlField008-33='v'">
+                    videorecording
+                </xsl:when>
+                <xsl:when test="$controlField008-33='w'">
+                    toy
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+	</xsl:if>
+
+    <xsl:if test="($typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM') and ($controlField008-22='a' or $controlField008-22='b' or $controlField008-22='c' or $controlField008-22='d' or $controlField008-22='e' or $controlField008-22='g' or $controlField008-22='j' or $controlField008-22='f')">
+        <span class="label">; Audience: </span>
+        <xsl:choose>
+            <xsl:when test="$controlField008-22='a'">
+             Preschool;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='b'">
+             Primary;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='c'">
+             Pre-adolescent;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='d'">
+             Adolescent;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='e'">
+             Adult;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='g'">
+             General;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='j'">
+             Juvenile;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='f'">
+             Specialized;
+            </xsl:when>
+            </xsl:choose>
+    </xsl:if>
+<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
+	</span>
+
+    <!-- Publisher Statement: Alternate Graphic Representation (MARC 880) -->
+    <xsl:if test="$display880">
+      <xsl:call-template name="m880Select">
+        <xsl:with-param name="basetags">260</xsl:with-param>
+        <xsl:with-param name="codes">abcg</xsl:with-param>
+        <xsl:with-param name="class">results_summary</xsl:with-param>
+        <xsl:with-param name="label">Publisher: </xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+        
+    <xsl:if test="marc:datafield[@tag=260]">
+	<span class="results_summary">
+    <span class="label">Publisher: </span> 
+            <xsl:for-each select="marc:datafield[@tag=260]">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abcg</xsl:with-param>
+                    </xsl:call-template>
+            </xsl:for-each>
+	</span>
+    </xsl:if>
+
+    <!-- Other Title  Statement: Alternate Graphic Representation (MARC 880) -->
+    <xsl:if test="$display880">
+       <xsl:call-template name="m880Select">
+         <xsl:with-param name="basetags">246</xsl:with-param>
+         <xsl:with-param name="codes">ab</xsl:with-param>
+         <xsl:with-param name="class">results_summary</xsl:with-param>
+         <xsl:with-param name="label">Other Title: </xsl:with-param>
+       </xsl:call-template>
+    </xsl:if>
+        
+    <xsl:if test="marc:datafield[@tag=246]">
+	<span class="results_summary">
+    <span class="label">Other title: </span>
+            <xsl:for-each select="marc:datafield[@tag=246]">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">ab</xsl:with-param>
+                    </xsl:call-template>
+                    <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+            </xsl:for-each>
+	</span>
+    </xsl:if>
+    <xsl:if test="marc:datafield[@tag=856]">
+         <span class="results_summary">
+			   <span class="label">Online Access: </span>
+                            <xsl:for-each select="marc:datafield[@tag=856]">
+                            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
+				   <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+                                    <xsl:choose>
+                                     <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+                                    </xsl:when>
+                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
+                                        <xsl:call-template name="subfieldSelect">                        
+                                        <xsl:with-param name="codes">y3z</xsl:with-param>                    
+                                        </xsl:call-template>
+                                    </xsl:when>
+                                    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
+					<xsl:choose>
+					<xsl:when test="$URLLinkText!=''">
+						<xsl:value-of select="$URLLinkText"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text>Click here to access online</xsl:text>
+					</xsl:otherwise>
+					</xsl:choose>
+                                    </xsl:when>
+                                    </xsl:choose>
+                                    </a>
+                                    <xsl:choose>
+                                    <xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
+                                    <xsl:otherwise> | </xsl:otherwise>
+                                    </xsl:choose>
+                            </xsl:for-each>
+                            </span>
+                        </xsl:if>
+                        <span class="results_summary" id="availability">
+                        <span class="label">Availability: </span>
+                        <xsl:choose>
+				   <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
+                        <xsl:choose>
+                            <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
+                            <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
+                            <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
+                                <xsl:call-template select="marc:datafield[@tag=$AlternateHoldingsField]" name="subfieldSelect">
+                                    <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
+                                    <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
+                                </xsl:call-template>
+                            </xsl:for-each>
+                            (<xsl:value-of select="$AlternateHoldingsCount"/>)
+                            </xsl:when>
+                            <xsl:otherwise>No copies available </xsl:otherwise>
+                        </xsl:choose>
+				   </xsl:when>
+                   <xsl:when test="count(key('item-by-status', 'available'))>0">
+                   <span class="available">
+                       <b><xsl:text>Copies available for loan: </xsl:text></b>
+                       <xsl:variable name="available_items"
+                           select="key('item-by-status', 'available')"/>
+                       <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+                           <xsl:value-of select="items:homebranch"/>
+						   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
+                           <xsl:text> (</xsl:text>
+                           <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
+                           <xsl:text>)</xsl:text>
+<xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+                       </xsl:for-each>
+                   </span>
+                   </xsl:when>
+				   </xsl:choose>
+
+                   <xsl:choose> <xsl:when test="count(key('item-by-status', 'available'))>0">
+                       <xsl:choose><xsl:when test="count(key('item-by-status', 'reference'))>0">
+                            <br/>
+                       </xsl:when></xsl:choose>
+                   </xsl:when> </xsl:choose>
+
+                   <xsl:choose>
+                   <xsl:when test="count(key('item-by-status', 'reference'))>0">
+                   <span class="available">
+                       <b><xsl:text>Copies available for reference: </xsl:text></b>
+                       <xsl:variable name="reference_items"
+                           select="key('item-by-status', 'reference')"/>
+                       <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+                           <xsl:value-of select="items:homebranch"/>
+						   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
+                           <xsl:text> (</xsl:text>
+                           <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
+                           <xsl:text>)</xsl:text>
+                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+                       </xsl:for-each>
+                   </span>
+                   </xsl:when>
+                   </xsl:choose>
+
+                   <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
+                   <span class="unavailable">
+                       <xsl:text>Checked out (</xsl:text>
+                       <xsl:value-of select="count(key('item-by-status', 'Checked out'))"/>
+                       <xsl:text>). </xsl:text>
+				   </span>
+                   </xsl:if>
+                   <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
+                   <span class="unavailable">
+                       <xsl:text>Withdrawn (</xsl:text>
+                       <xsl:value-of select="count(key('item-by-status', 'Withdrawn'))"/>
+                       <xsl:text>). </xsl:text>                   </span>
+				   </xsl:if>
+                    <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
+                   <span class="unavailable">
+                       <xsl:text>Lost (</xsl:text>
+                       <xsl:value-of select="count(key('item-by-status', 'Lost'))"/>
+                       <xsl:text>). </xsl:text>                   </span>
+				   </xsl:if>
+                    <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
+                   <span class="unavailable">
+                       <xsl:text>Damaged (</xsl:text>
+                       <xsl:value-of select="count(key('item-by-status', 'Damaged'))"/>
+                       <xsl:text>). </xsl:text>                   </span>
+                   </xsl:if>
+                    <xsl:if test="count(key('item-by-status', 'On order'))>0">
+                   <span class="unavailable">
+                       <xsl:text>On order (</xsl:text>
+                       <xsl:value-of select="count(key('item-by-status', 'On order'))"/>
+                       <xsl:text>). </xsl:text>                   </span>
+                   </xsl:if>
+                    <xsl:if test="count(key('item-by-status', 'In transit'))>0">
+                   <span class="unavailable">
+                       <xsl:text>In transit (</xsl:text>
+                       <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
+                       <xsl:text>). </xsl:text>                   </span>
+                   </xsl:if>
+                    <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
+                   <span class="unavailable">
+                       <xsl:text>On hold (</xsl:text>
+                       <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
+                       <xsl:text>). </xsl:text>                   </span>
+                   </xsl:if>
+               </span>
+    </xsl:template>
+
+    <xsl:template name="nameABCDQ">
+            <xsl:call-template name="chopPunctuation">
+                <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">aq</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:with-param>
+                <xsl:with-param name="punctuation">
+                    <xsl:text>:,;/ </xsl:text>
+                </xsl:with-param>
+            </xsl:call-template>
+        <xsl:call-template name="termsOfAddress"/>
+    </xsl:template>
+
+    <xsl:template name="nameABCDN">
+        <xsl:for-each select="marc:subfield[@code='a']">
+                <xsl:call-template name="chopPunctuation">
+                    <xsl:with-param name="chopString" select="."/>
+                </xsl:call-template>
+        </xsl:for-each>
+        <xsl:for-each select="marc:subfield[@code='b']">
+                <xsl:value-of select="."/>
+        </xsl:for-each>
+        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
+                <xsl:call-template name="subfieldSelect">
+                    <xsl:with-param name="codes">cdn</xsl:with-param>
+                </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="nameACDEQ">
+            <xsl:call-template name="subfieldSelect">
+                <xsl:with-param name="codes">acdeq</xsl:with-param>
+            </xsl:call-template>
+    </xsl:template>
+
+    <xsl:template name="termsOfAddress">
+        <xsl:if test="marc:subfield[@code='b' or @code='c']">
+            <xsl:call-template name="chopPunctuation">
+                <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">bc</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:with-param>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="nameDate">
+        <xsl:for-each select="marc:subfield[@code='d']">
+            <xsl:call-template name="chopPunctuation">
+                <xsl:with-param name="chopString" select="."/>
+            </xsl:call-template>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template name="role">
+        <xsl:for-each select="marc:subfield[@code='e']">
+                    <xsl:value-of select="."/>
+        </xsl:for-each>
+        <xsl:for-each select="marc:subfield[@code='4']">
+                    <xsl:value-of select="."/>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template name="specialSubfieldSelect">
+        <xsl:param name="anyCodes"/>
+        <xsl:param name="axis"/>
+        <xsl:param name="beforeCodes"/>
+        <xsl:param name="afterCodes"/>
+        <xsl:variable name="str">
+            <xsl:for-each select="marc:subfield">
+                <xsl:if test="contains($anyCodes, @code) or (contains($beforeCodes, at code) and following-sibling::marc:subfield[@code=$axis]) or (contains($afterCodes, at code) and preceding-sibling::marc:subfield[@code=$axis])">
+                    <xsl:value-of select="text()"/>
+                    <xsl:text> </xsl:text>
+                </xsl:if>
+            </xsl:for-each>
+        </xsl:variable>
+        <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
+    </xsl:template>
+
+    <xsl:template name="subtitle">
+        <xsl:if test="marc:subfield[@code='b']">
+                <xsl:call-template name="chopPunctuation">
+                    <xsl:with-param name="chopString">
+                        <xsl:value-of select="marc:subfield[@code='b']"/>
+
+                        <!--<xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">b</xsl:with-param>                                 
+                        </xsl:call-template>-->
+                    </xsl:with-param>
+                </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="chopBrackets">
+        <xsl:param name="chopString"></xsl:param>
+        <xsl:variable name="string">
+            <xsl:call-template name="chopPunctuation">
+                <xsl:with-param name="chopString" select="$chopString"></xsl:with-param>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:if test="substring($string, 1,1)='['">
+            <xsl:value-of select="substring($string,2, string-length($string)-2)"></xsl:value-of>
+        </xsl:if>
+        <xsl:if test="substring($string, 1,1)!='['">
+            <xsl:value-of select="$string"></xsl:value-of>
+        </xsl:if>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
new file mode 100644
index 0000000..88c9026
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
+<xsl:stylesheet version="1.0"
+  xmlns:marc="http://www.loc.gov/MARC21/slim"
+  xmlns:items="http://www.koha.org/items"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="marc items">
+<xsl:import href="UNIMARCslimUtils.xsl"/>
+<xsl:output method = "xml" indent="yes" omit-xml-declaration = "yes" />
+<xsl:key name="item-by-status" match="items:item" use="items:status"/>
+<xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
+
+<xsl:template match="/">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="marc:record">
+  <xsl:variable name="leader" select="marc:leader"/>
+  <xsl:variable name="leader6" select="substring($leader,7,1)"/>
+  <xsl:variable name="leader7" select="substring($leader,8,1)"/>
+  <xsl:variable name="biblionumber" select="marc:controlfield[@tag=001]"/>
+  <xsl:variable name="isbn" select="marc:datafield[@tag=010]/marc:subfield[@code='a']"/>
+     	
+  <xsl:if test="marc:datafield[@tag=200]">
+    <xsl:for-each select="marc:datafield[@tag=200]">
+      	<a><xsl:attribute name="href">/cgi-bin/koha/catalogue/detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/>
+           </xsl:attribute>
+        <xsl:variable name="title" select="marc:subfield[@code='a']"/>
+        <xsl:variable name="ntitle"
+             select="translate($title, '&#x0098;&#x009C;&#xC29C;&#xC29B;&#xC298;&#xC288;&#xC289;','')"/>
+        <xsl:value-of select="$ntitle" />
+      </a>
+      <xsl:if test="marc:subfield[@code='e']">
+        <xsl:text> : </xsl:text>
+        <xsl:value-of select="marc:subfield[@code='e']"/>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='b']">
+        <xsl:text> [</xsl:text>
+        <xsl:value-of select="marc:subfield[@code='b']"/>
+        <xsl:text>]</xsl:text>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='h']">
+        <xsl:text> : </xsl:text>
+        <xsl:value-of select="marc:subfield[@code='h']"/>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='i']">
+        <xsl:text> : </xsl:text>
+        <xsl:value-of select="marc:subfield[@code='i']"/>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='f']">
+        <xsl:text> / </xsl:text>
+        <xsl:value-of select="marc:subfield[@code='f']"/>
+      </xsl:if>
+      <xsl:if test="marc:subfield[@code='g']">
+        <xsl:text> ; </xsl:text>
+        <xsl:value-of select="marc:subfield[@code='g']"/>
+      </xsl:if>
+      <xsl:text> </xsl:text>
+    </xsl:for-each>
+  </xsl:if>
+
+  <xsl:call-template name="tag_4xx" />
+
+  <xsl:call-template name="tag_210" />
+
+  <xsl:call-template name="tag_215" />
+
+</xsl:template>
+</xsl:stylesheet>
-- 
1.7.0.4


From stephane.delaune at biblibre.com  Wed Feb  8 12:13:28 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Wed,  8 Feb 2012 12:13:28 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 4032:XSLT systempreference takes a
	path to file rather than YesNo
In-Reply-To: <1328699608-4554-1-git-send-email-stephane.delaune@biblibre.com>
References: <1328699608-4554-1-git-send-email-stephane.delaune@biblibre.com>
Message-ID: <1328699608-4554-2-git-send-email-stephane.delaune@biblibre.com>

---
 C4/Search.pm                                       |    6 +-
 C4/VirtualShelves/Page.pm                          |    2 +-
 C4/XSLT.pm                                         |   80 ++++++++++++++-----
 catalogue/detail.pl                                |    2 +-
 installer/data/mysql/sysprefs.sql                  |    8 +-
 installer/data/mysql/updatedatabase.pl             |   30 +++++++
 .../prog/en/modules/admin/preferences/opac.pref    |   14 ++--
 .../en/modules/admin/preferences/staff_client.pref |   14 ++--
 opac/opac-detail.pl                                |    2 +-
 9 files changed, 110 insertions(+), 48 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 43e7b8a..5910707 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1781,8 +1781,7 @@ sub searchResults {
 	$debug && warn $marcrecord->as_formatted;
 	my $interface = $search_context eq 'opac' ? 'OPAC' : '';
 	if (!$scan && C4::Context->preference($interface . "XSLTResultsDisplay")) {
-            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, 'Results',
-                                                                $search_context, 1);
+            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, $interface."XSLTResultsDisplay", 1);
 	    # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs
         }
 
@@ -1850,8 +1849,7 @@ sub searchResults {
             $oldbiblio->{XSLTResultsRecord}
               = XSLTParse4Display($oldbiblio->{biblionumber},
                                   $marcrecord,
-                                  'Results',
-                                  $search_context,
+                                  "OPACXSLTResultsDisplay",
                                   1, # clean up the problematic ampersand entities that Zebra outputs
                                   \@hiddenitems
                                 );
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index cfa4f60..0f52a14 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -208,7 +208,7 @@ sub shelfpage ($$$$$) {
                     my $biblionumber = $this_item->{'biblionumber'};
                     my $record = GetMarcBiblio($biblionumber);
                     $this_item->{XSLTBloc} =
-                        XSLTParse4Display($biblionumber, $record, 'Results', 'opac')
+                        XSLTParse4Display($biblionumber, $record, "OPACXSLTResultsDisplay")
                             if C4::Context->preference("OPACXSLTResultsDisplay") && $type eq 'opac';
 
                     # the virtualshelfcontents table does not store these columns nor are they retrieved from the items
diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 06dfaf4..31039a5 100644
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -3,6 +3,7 @@ package C4::XSLT;
 # <jmf at liblime dot com>
 # Parts Copyright Katrin Fischer 2011
 # Parts Copyright ByWater Solutions 2011
+# Parts Copyright Biblibre 2012
 #
 # This file is part of Koha.
 #
@@ -32,6 +33,7 @@ use C4::Reserves;
 use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
+use LWP::Simple;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -41,6 +43,7 @@ BEGIN {
     @ISA = qw(Exporter);
     @EXPORT = qw(
         &XSLTParse4Display
+        &GetURI
     );
 }
 
@@ -50,6 +53,19 @@ C4::XSLT - Functions for displaying XSLT-generated content
 
 =head1 FUNCTIONS
 
+=head2 GetURI
+
+GetURI file and returns the xslt as a string
+
+=cut
+
+sub GetURI {
+    my ($uri) = @_;
+    my $string;
+    $string = get $uri ;
+    return $string;
+}
+
 =head2 transformMARCXML4XSLT
 
 Replaces codes with authorized values in a MARC::Record object
@@ -121,8 +137,39 @@ sub getAuthorisedValues4MARCSubfields {
 my $stylesheet;
 
 sub XSLTParse4Display {
-    my ( $biblionumber, $orig_record, $xsl_suffix, $interface, $fixamps, $hidden_items ) = @_;
-    $interface = 'opac' unless $interface;
+    my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items ) = @_;
+    my $xslfilename = C4::Context->preference($xslsyspref);
+    if ( $xslfilename =~ /^\s*"?default"?\s*$/i ) {
+        if ($xslsyspref eq "XSLTDetailsDisplay") {
+            $xslfilename = C4::Context->config('intrahtdocs') .
+                        '/' . C4::Context->preference("template") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2intranetDetail.xsl";
+        } elsif ($xslsyspref eq "XSLTResultsDisplay") {
+            $xslfilename = C4::Context->config('intrahtdocs') .
+                        '/' . C4::Context->preference("template") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2intranetResults.xsl";
+        } elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {
+            $xslfilename = C4::Context->config('opachtdocs') .
+                        '/' . C4::Context->preference("opacthemes") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2OPACDetail.xsl";
+        } elsif ($xslsyspref eq "OPACXSLTResultsDisplay") {
+            $xslfilename = C4::Context->config('opachtdocs') .
+                        '/' . C4::Context->preference("opacthemes") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2OPACResults.xsl";
+        }
+    }
     # grab the XML, run it through our stylesheet, push it out to the browser
     my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
     #return $record->as_formatted();
@@ -153,29 +200,20 @@ sub XSLTParse4Display {
     # don't die when you find &, >, etc
     $parser->recover_silently(0);
     my $source = $parser->parse_string($xmlrecord);
-    unless ( $stylesheet ) {
+    unless ( $stylesheet->{$xslfilename} ) {
         my $xslt = XML::LibXSLT->new();
-        my $xslfile;
-        if ($interface eq 'intranet') {
-            $xslfile = C4::Context->config('intrahtdocs') . 
-                      '/' . C4::Context->preference("template") . 
-                      '/' . C4::Templates::_current_language() .
-                      '/xslt/' .
-                      C4::Context->preference('marcflavour') .
-                      "slim2intranet$xsl_suffix.xsl";
+        my $style_doc;
+        if ( $xslfilename =~ /^https?:\/\// ) {
+            my $xsltstring = GetURI($xslfilename);
+            $style_doc = $parser->parse_string($xsltstring);
         } else {
-            $xslfile = C4::Context->config('opachtdocs') . 
-                      '/' . C4::Context->preference("opacthemes") . 
-                      '/' . C4::Templates::_current_language() .
-                      '/xslt/' .
-                      C4::Context->preference('marcflavour') .
-                      "slim2OPAC$xsl_suffix.xsl";
+            use Cwd;
+            $style_doc = $parser->parse_file($xslfilename);
         }
-        my $style_doc = $parser->parse_file($xslfile);
-        $stylesheet = $xslt->parse_stylesheet($style_doc);
+        $stylesheet->{$xslfilename} = $xslt->parse_stylesheet($style_doc);
     }
-    my $results = $stylesheet->transform($source);
-    my $newxmlrecord = $stylesheet->output_string($results);
+    my $results      = $stylesheet->{$xslfilename}->transform($source);
+    my $newxmlrecord = $stylesheet->{$xslfilename}->output_string($results);
     return $newxmlrecord;
 }
 
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index db38551..219d0f5 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -84,7 +84,7 @@ my $marcflavour  = C4::Context->preference("marcflavour");
 # XSLT processing of some stuff
 if (C4::Context->preference("XSLTDetailsDisplay") ) {
     $template->param('XSLTDetailsDisplay' =>'1',
-        'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail','intranet') );
+        'XSLTBloc' => XSLTParse4Display($biblionumber, $record, "XSLTDetailsDisplay") );
 }
 
 $template->param( 'SpineLabelShowPrintOnBibDetails' => C4::Context->preference("SpineLabelShowPrintOnBibDetails") );
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 5e3d79d..4c06fe0 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -218,10 +218,10 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
 
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OPACShelfBrowser','1','','Enable/disable Shelf Browser on item details page. WARNING: this feature is very resource consuming on collections with large numbers of items.','YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
-('OPACXSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC','YesNo'),
-('OPACXSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC','YesNo'),
-('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),
-('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');
+('OPACXSLTDetailsDisplay','','','Enable XSL stylesheet control over details page display on OPAC','Free'),
+('OPACXSLTResultsDisplay','','','Enable XSL stylesheet control over results page display on OPAC','Free'),
+('XSLTDetailsDisplay','','','Enable XSL stylesheet control over details page display on intranet','Free'),
+('XSLTResultsDisplay','','','Enable XSL stylesheet control over results page display on intranet','Free');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..96f6241 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4663,6 +4663,36 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     SetVersion($DBversion);
 }
+
+$DBversion = "XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    my $countXSLTDetailsDisplay = 0;
+    my $valueXSLTDetailsDisplay = "";
+    my $valueXSLTResultsDisplay = "";
+    my $valueOPACXSLTDetailsDisplay = "";
+    my $valueOPACXSLTResultsDisplay = "";
+    #the line below test if database comes from a BibLibre's branch
+    $countXSLTDetailsDisplay = $dbh->do('SELECT 1 FROM `systempreferences` WHERE `variable`="IntranetXSLTDetailsDisplay"');
+    if ($countXSLTDetailsDisplay > 0)
+    {
+        #the two lines below will only be used to update the databases from the BibLibre's branch. They will not affect the others
+        $dbh->do(q|UPDATE `systempreferences` SET `variable`="XSLTDetailsDisplay" WHERE `variable`="IntranetXSLTDetailsDisplay"|);
+        $dbh->do(q|UPDATE `systempreferences` SET `variable`="XSLTResultsDisplay" WHERE `variable`="IntranetXSLTResultsDisplay"|);
+    }
+    else
+    {
+        $valueXSLTDetailsDisplay = "default" if (C4::Context->preference("XSLTDetailsDisplay"));
+        $valueXSLTResultsDisplay = "default" if (C4::Context->preference("XSLTResultsDisplay"));
+        $valueOPACXSLTDetailsDisplay = "default" if (C4::Context->preference("OPACXSLTDetailsDisplay"));
+        $valueOPACXSLTResultsDisplay = "default" if (C4::Context->preference("OPACXSLTResultsDisplay"));
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueXSLTDetailsDisplay\" WHERE variable='XSLTDetailsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueXSLTResultsDisplay\" WHERE variable='XSLTResultsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTDetailsDisplay\" WHERE variable='OPACXSLTDetailsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTResultsDisplay\" WHERE variable='OPACXSLTResultsDisplay'");
+    }
+    print "XSLT systempreference takes a path to file rather than YesNo\n";
+    SetVersion($DBversion);
+}
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index d6ae2b2..bb6b74e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -48,17 +48,15 @@ OPAC:
                   no: Show
             - lost items on search and detail pages.
         -
-            - Show biblio records on OPAC result page
+            - 'Display OPAC results using XSLT stylesheet at: '
             - pref: OPACXSLTResultsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
+            - '<br />Options:<br />- leave empty for "no xslt"<br />- enter "default" for the default one<br />- put a path to define a xslt file<br />- put an URL for an external specific stylesheet.'
         -
-            - Show item details pages on the OPAC
+            - 'Display OPAC details using XSLT stylesheet at: '
             - pref: OPACXSLTDetailsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
+            - '<br />Options:<br />- leave empty for "no xslt"<br />- enter "default" for the default one<br />- put a path to define a xslt file<br />- put an URL for an external specific stylesheet.'
         -
             - On pages displayed with XSLT stylesheets on the OPAC,
             - pref: DisplayOPACiconsXSLT
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
index df0a434..008ef5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
@@ -51,17 +51,15 @@ Staff Client:
               class: url
             - for the Staff Client's favicon. (This should be a complete URL, starting with <code>http://</code>.)
         -
-            - Show biblio records on result page in the staff client
+            - 'Display results in the staff client using XSLT stylesheet at: '
             - pref: XSLTResultsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
+            - '<br />Options:<br />- leave empty for "no xslt"<br />- enter "default" for the default one<br />- put a path to define a xslt file<br />- put an URL for an external specific stylesheet.'
         -
-            - Show item details pages in the staff client
+            - 'Display details in the staff client using XSLT stylesheet at: '
             - pref: XSLTDetailsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
+            - '<br />Options:<br />- leave empty for "no xslt"<br />- enter "default" for the default one<br />- put a path to define a xslt file<br />- put an URL for an external specific stylesheet.'
         -
             - Use the Yahoo UI libraries
             - pref: yuipath
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index c4d8218..4c2fa7c 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -79,7 +79,7 @@ SetUTF8Flag($record);
 
 # XSLT processing of some stuff
 if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
-    $template->param( 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail', 'opac') );
+    $template->param( 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, "OPACXSLTDetailsDisplay" ) );
 }
 
 
-- 
1.7.0.4


From oleonard at myacpl.org  Wed Feb  8 17:29:58 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  8 Feb 2012 11:29:58 -0500
Subject: [Koha-patches] [PATCH] Bug 6919 - Follow-up - Implementing
	XSLTResultsDisplay
Message-ID: <1328718598-5548-1-git-send-email-oleonard@myacpl.org>

- Adding search result numbering to match non-XSLT
  results display.
- Copying author handling (with link to author search) from
  OPAC detail XSL.
- Copying physical description output from OPAC detail XSL.
- Copying ISBN output from OPAC detail XSL.
- Removing availability output (which had been copied from
  the OPAC) because it is redundant in the staff client.
- Removing duplicate inclusion of JS highlight plugin on
  results page.
- Updating highlight JS to make it compatible with XSLT
  results.
---
 .../prog/en/modules/catalogue/results.tt           |   12 +-
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |  243 +++++++-------------
 2 files changed, 92 insertions(+), 163 deletions(-)

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 d558795..50c842e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -1,7 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.highlight-3.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
@@ -86,6 +85,7 @@ $(".addtocart").show();
     $("#selection_ops").show();
     $(".selection").show();
     [% IF ( query_desc ) %]
+    toHighlight = $("p,span.results_summary,a.title");
         var query_desc = "[% query_desc |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
         q_array = query_desc.split(" ");
         highlightOn();
@@ -94,17 +94,18 @@ $(".addtocart").show();
     [% END %]
 });
 
-function highlightOff() {
-    $("p").removeHighlight();
+
+[% IF ( query_desc ) %]function highlightOff() {
+    toHighlight.removeHighlight();
     $(".highlight_toggle").toggle();
 }
 function highlightOn() {
     var x;
     for (x in q_array) {
-        $("p").highlight(q_array[x]);
+        toHighlight.highlight(q_array[x]);
     }
     $(".highlight_toggle").toggle();
-}
+}[% END %]
 
 function selectAll () {
     $(".selection").attr("checked", "checked");
@@ -454,6 +455,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                             </td>
                             <td>
 			    [% IF ( SEARCH_RESULT.XSLTResultsRecord ) %]
+                [% SEARCH_RESULT.result_number %].
 				[% SEARCH_RESULT.XSLTResultsRecord %]
 			    [% ELSE %]
                                 <p>[% SEARCH_RESULT.result_number %].
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
index c398a23..da6edb9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -21,7 +21,7 @@
 
     <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
     <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>
-    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
+    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
     <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
     <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
     <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
@@ -30,7 +30,6 @@
         <xsl:variable name="leader7" select="substring($leader,8,1)"/>
         <xsl:variable name="leader19" select="substring($leader,20,1)"/>
         <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
-        <xsl:variable name="isbn" select="marc:datafield[@tag=020]/marc:subfield[@code='a']"/>
         <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
         <xsl:variable name="typeOf008">
             <xsl:choose>
@@ -324,7 +323,6 @@
         </xsl:for-each>
         </xsl:if>
     </a>
-    <p>
 
     <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
     <xsl:if test="$display880">
@@ -336,63 +334,95 @@
 
     <xsl:choose>
     <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
+    <p class="author">by
+    <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
+    <a>
+    <xsl:choose>
+        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
+            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
+        </xsl:otherwise>
+    </xsl:choose>
+    <xsl:call-template name="nameABCDQ"/></a>
+    <xsl:choose>
+    <xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+    </xsl:for-each>
 
-    by <span class="author">
-        <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
-            <xsl:choose>
-            <xsl:when test="position()=last()">
-                <xsl:call-template name="nameABCDQ"/>.
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="nameABCDQ"/>;
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
+    <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
+    <a>
+    <xsl:choose>
+        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
+            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
+        </xsl:otherwise>
+    </xsl:choose>
+    <xsl:call-template name="nameABCDN"/></a>
+    <xsl:choose><xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+    </xsl:for-each>
 
-        <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
-            <xsl:choose>
-            <xsl:when test="position()=1">
-		<xsl:text> -- </xsl:text>
-            </xsl:when>
-            </xsl:choose>
-            <xsl:choose>
-            <xsl:when test="position()=last()">
-                <xsl:call-template name="nameABCDN"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="nameABCDN"/>;
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
+    <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
+        <xsl:choose>
+        <xsl:when test="marc:subfield[@code='n']">
+           <xsl:text> </xsl:text>
+           <xsl:call-template name="subfieldSelect">
+              <xsl:with-param name="codes">n</xsl:with-param>                              </xsl:call-template>
+           <xsl:text> </xsl:text>
+        </xsl:when>
+        </xsl:choose>
+    <a>
+    <xsl:choose>
+        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
+            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
+        </xsl:otherwise>
+    </xsl:choose>
+    <xsl:call-template name="nameACDEQ"/></a>
+    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
 
-        <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
-            <xsl:choose>
-            <xsl:when test="position()=1">
-		<xsl:text> -- </xsl:text>
-            </xsl:when>
-            </xsl:choose>
-            <xsl:choose>
-            <xsl:when test="marc:subfield[@code='n']">
-               <xsl:text> </xsl:text>
-               <xsl:call-template name="subfieldSelect">
-                  <xsl:with-param name="codes">n</xsl:with-param>
-               </xsl:call-template>
-               <xsl:text> </xsl:text>
-            </xsl:when>
-            </xsl:choose>
-            <xsl:choose>
-            <xsl:when test="position()=last()">
-                <xsl:call-template name="nameACDEQ"/>.
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="nameACDEQ"/>;
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
-    </span>
+    </xsl:for-each>
+    </p>
     </xsl:when>
     </xsl:choose>
-    </p>
+
+    <xsl:if test="marc:datafield[@tag=300]">
+    <span class="results_summary description"><span class="label">Description: </span>
+        <xsl:for-each select="marc:datafield[@tag=300]">
+            <xsl:call-template name="chopPunctuation">
+              <xsl:with-param name="chopString">
+                <xsl:call-template name="subfieldSelect">
+                    <xsl:with-param name="codes">abceg</xsl:with-param>
+                </xsl:call-template>
+               </xsl:with-param>
+           </xsl:call-template>
+                <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+        </xsl:for-each>
+    </span>
+   </xsl:if>
+
+    <xsl:if test="marc:datafield[@tag=020]">
+    <span class="results_summary isbn"><span class="label">ISBN: </span>
+    <xsl:for-each select="marc:datafield[@tag=020]">
+    <xsl:variable name="isbn" select="marc:subfield[@code='a']"/>
+            <xsl:value-of select="marc:subfield[@code='a']"/>
+            <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+    </xsl:for-each>
+    </span>
+    </xsl:if>
+
+    <xsl:if test="marc:datafield[@tag=022]">
+    <span class="results_summary issn"><span class="label">ISSN: </span>
+    <xsl:for-each select="marc:datafield[@tag=022]">
+            <xsl:value-of select="marc:subfield[@code='a']"/>
+            <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+    </xsl:for-each>
+    </span>
+    </xsl:if>
 
     <xsl:if test="marc:datafield[@tag=250]">
 	<span class="results_summary">
@@ -803,109 +833,6 @@
                             </xsl:for-each>
                             </span>
                         </xsl:if>
-                        <span class="results_summary" id="availability">
-                        <span class="label">Availability: </span>
-                        <xsl:choose>
-				   <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
-                        <xsl:choose>
-                            <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
-                            <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
-                            <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
-                                <xsl:call-template select="marc:datafield[@tag=$AlternateHoldingsField]" name="subfieldSelect">
-                                    <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
-                                    <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
-                                </xsl:call-template>
-                            </xsl:for-each>
-                            (<xsl:value-of select="$AlternateHoldingsCount"/>)
-                            </xsl:when>
-                            <xsl:otherwise>No copies available </xsl:otherwise>
-                        </xsl:choose>
-				   </xsl:when>
-                   <xsl:when test="count(key('item-by-status', 'available'))>0">
-                   <span class="available">
-                       <b><xsl:text>Copies available for loan: </xsl:text></b>
-                       <xsl:variable name="available_items"
-                           select="key('item-by-status', 'available')"/>
-                       <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-                           <xsl:value-of select="items:homebranch"/>
-						   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
-                           <xsl:text> (</xsl:text>
-                           <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
-                           <xsl:text>)</xsl:text>
-<xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-                       </xsl:for-each>
-                   </span>
-                   </xsl:when>
-				   </xsl:choose>
-
-                   <xsl:choose> <xsl:when test="count(key('item-by-status', 'available'))>0">
-                       <xsl:choose><xsl:when test="count(key('item-by-status', 'reference'))>0">
-                            <br/>
-                       </xsl:when></xsl:choose>
-                   </xsl:when> </xsl:choose>
-
-                   <xsl:choose>
-                   <xsl:when test="count(key('item-by-status', 'reference'))>0">
-                   <span class="available">
-                       <b><xsl:text>Copies available for reference: </xsl:text></b>
-                       <xsl:variable name="reference_items"
-                           select="key('item-by-status', 'reference')"/>
-                       <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-                           <xsl:value-of select="items:homebranch"/>
-						   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
-                           <xsl:text> (</xsl:text>
-                           <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
-                           <xsl:text>)</xsl:text>
-                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-                       </xsl:for-each>
-                   </span>
-                   </xsl:when>
-                   </xsl:choose>
-
-                   <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Checked out (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Checked out'))"/>
-                       <xsl:text>). </xsl:text>
-				   </span>
-                   </xsl:if>
-                   <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Withdrawn (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Withdrawn'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-				   </xsl:if>
-                    <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Lost (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Lost'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-				   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Damaged (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Damaged'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'On order'))>0">
-                   <span class="unavailable">
-                       <xsl:text>On order (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'On order'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'In transit'))>0">
-                   <span class="unavailable">
-                       <xsl:text>In transit (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
-                   <span class="unavailable">
-                       <xsl:text>On hold (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-               </span>
     </xsl:template>
 
     <xsl:template name="nameABCDQ">
-- 
1.7.3


From srdjan at catalyst.net.nz  Thu Feb  9 01:29:40 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu,  9 Feb 2012 13:29:40 +1300
Subject: [Koha-patches] [PATCH] bug_7201: Holds reports: add copynumber and
	enumchron
In-Reply-To: <bug 7201>
References: <bug 7201>
Message-ID: <1328747380-10744-1-git-send-email-srdjan@catalyst.net.nz>

---
 circ/pendingreserves.pl                            |    8 +++++++-
 circ/view_holdsqueue.pl                            |    2 +-
 circ/waitingreserves.pl                            |    2 ++
 .../prog/en/modules/circ/pendingreserves.tt        |    8 ++++++++
 .../prog/en/modules/circ/view_holdsqueue.tt        |    6 +++++-
 .../prog/en/modules/circ/waitingreserves.tt        |    8 ++++++++
 6 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index cf71094..8235cac 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -134,13 +134,16 @@ if ( $run_report ) {
             GROUP_CONCAT(DISTINCT reserves.branchcode 
                     ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
             items.holdingbranch as branch,
-            items.itemcallnumber,
             GROUP_CONCAT(DISTINCT items.itype 
                     ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype,
             GROUP_CONCAT(DISTINCT items.location 
                     ORDER BY items.itemnumber SEPARATOR '<br/>') l_location,
             GROUP_CONCAT(DISTINCT items.itemcallnumber 
                     ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
+            GROUP_CONCAT(DISTINCT items.enumchron 
+                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
+            GROUP_CONCAT(DISTINCT items.copynumber
+                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
             items.itemnumber,
             notes,
             notificationdate,
@@ -159,6 +162,7 @@ if ( $run_report ) {
     WHERE
     reserves.found IS NULL
     $sqldatewhere
+    AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)
     AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
     AND issues.itemnumber IS NULL
     AND reserves.priority <> 0 
@@ -200,6 +204,8 @@ if ( $run_report ) {
                 holdingbranch    => $data->{l_holdingbranch},
                 branch           => $data->{l_branch},
                 itemcallnumber   => $data->{l_itemcallnumber},
+                enumchron        => $data->{l_enumchron},
+		copyno           => $data->{l_copynumber},
                 notes            => $data->{notes},
                 notificationdate => $data->{notificationdate},
                 reminderdate     => $data->{reminderdate},
diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 3023cdf..4b51423 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -81,7 +81,7 @@ sub GetHoldsQueueItems {
 	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
+	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)
diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 128d1eb..039a0d0 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -129,6 +129,8 @@ foreach my $num (@getreserves) {
     $getreserv{'homebranch'}     = $gettitle->{'homebranch'};
     $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
     $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
+    $getreserv{'enumchron'}      = $gettitle->{'enumchron'};
+    $getreserv{'copynumber'}     = $gettitle->{'copynumber'};
     if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
         $getreserv{'dotransfer'} = 1;
     }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 5668a75..497e5d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -72,6 +72,12 @@ $.tablesorter.addParser({
 				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=call&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
         <th>
+            Available Copy No
+        </th>
+        <th>
+            Available Enumeration
+        </th>
+        <th>
             Available Itypes
 				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=itype&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
@@ -131,6 +137,8 @@ $.tablesorter.addParser({
             [% END %]
             <td><p>[% reserveloo.holdingbranch %]</p></td>
             <td><p>[% reserveloo.itemcallnumber %]</p></td>
+				<td><p>[% reserveloo.copyno %]</p></td> 
+        <td><p>[% reserveloo.enumchron %]</p></td>
 				<td><p>[% reserveloo.itype %]</p></td> 
 				<td><p>[% reserveloo.location %]</p></td>
             <td width="15%">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 8f0d9cb..d9ba8fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -46,6 +46,8 @@ $(document).ready(function() {
         <th class="hq-title">Title</th>
         <th class="hq-collection">Collection</th>
         <th class="hq-callnumber">Call Number</th>
+        <th class="hq-copynumber">Copy Number</th>
+        <th class="hq-enumchron">Enumeration</th>
         <th class="hq-barcode">Barcode</th>
         <th class="hq-patron">Patron</th>
         <th class="hq-sendto">Send To</th>
@@ -65,7 +67,9 @@ $(document).ready(function() {
 			</div>
 			</td>
             <td class="hq-collection">[% itemsloo.ccode %]</td>
-            <td class="hq-callnumber">[% itemsloo.location %] [% itemsloo.itemcallnumber %] [% itemsloo.enumchron %]</td>
+            <td class="hq-callnumber">[% itemsloo.location %] [% itemsloo.itemcallnumber %]</td>
+            <td class="hq-copynumber">[% itemsloo.copynumber %]</td>
+            <td class="hq-enumchron">[% itemsloo.enumchron %]</td>
             <td class="hq-barcode">
                 [% IF ( itemsloo.item_level_request ) %]
 			<em>Only Item:</em> <strong>[% itemsloo.barcode %]</strong>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 7ecc3a1..d5b7bbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -79,6 +79,8 @@ $.tablesorter.addParser({
                     <th>Title</th>
                     <th>Patron</th>
                     <th>Location</th>
+                    <th>Copy Number</th>
+                    <th>Enumeration</th>
                     <th>Action</th>
                </tr></thead>
                <tbody>[% FOREACH reserveloo IN reserveloop %]
@@ -95,6 +97,8 @@ $.tablesorter.addParser({
                         [% reserveloo.borrowermail %]</a>[% END %]
                     </td>
                     <td>[% reserveloo.homebranch %]<br />[% reserveloo.itemcallnumber %]</td>
+                    <td>[% reserveloo.copynumber %]</td>
+                    <td>[% reserveloo.enumchron %]</td>
                     <td>
                         <form name="cancelReserve" action="waitingreserves.pl" method="post">
                             <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernum %]" />
@@ -124,6 +128,8 @@ $.tablesorter.addParser({
                     <th>Title</th>
                     <th>Patron</th>
                     <th>Location</th>
+                    <th>Copy Number</th>
+                    <th>Enumeration</th>
                     <th>Action</th>
                </tr></thead>
                <tbody>[% FOREACH overloo IN overloop %]
@@ -139,6 +145,8 @@ $.tablesorter.addParser({
         [% overloo.borrowermail %]</a>[% END %]
                     </td>
                     <td>[% overloo.homebranch %] [% overloo.itemcallnumber %]</td>
+                    <td>[% overloo.copynumber %]</td>
+                    <td>[% overloo.enumchron %]</td>
                     <td><form name="cancelReserve" action="waitingreserves.pl" method="post">
                             <input type="hidden" name="borrowernumber" value="[% overloo.borrowernum %]" />
                             <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" />
-- 
1.6.5


From srdjan at catalyst.net.nz  Thu Feb  9 02:09:54 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu,  9 Feb 2012 14:09:54 +1300
Subject: [Koha-patches] [PATCH] bug_7477: Copy holidays from one branch to
	another
In-Reply-To: <bug 7477>
References: <bug 7477>
Message-ID: <1328749794-12002-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Calendar.pm                                     |  103 ++++++++++++++------
 .../prog/en/modules/tools/holidays.tt              |   15 +++
 tools/copy-holidays.pl                             |   40 ++++++++
 3 files changed, 129 insertions(+), 29 deletions(-)
 create mode 100755 tools/copy-holidays.pl

diff --git a/C4/Calendar.pm b/C4/Calendar.pm
index dc9037b..d13d238 100644
--- a/C4/Calendar.pm
+++ b/C4/Calendar.pm
@@ -20,34 +20,11 @@ use warnings;
 use vars qw($VERSION @EXPORT);
 
 use Carp;
-use Date::Calc qw( Date_to_Days );
+use Date::Calc qw( Date_to_Days Today);
 
 use C4::Context;
 
-BEGIN {
-    # set the version for version checking
-    $VERSION = 3.01;
-    require Exporter;
-    @EXPORT = qw(
-        &get_week_days_holidays
-        &get_day_month_holidays
-        &get_exception_holidays 
-        &get_single_holidays
-        &insert_week_day_holiday
-        &insert_day_month_holiday
-        &insert_single_holiday
-        &insert_exception_holiday
-        &ModWeekdayholiday
-        &ModDaymonthholiday
-        &ModSingleholiday
-        &ModExceptionholiday
-        &delete_holiday
-        &isHoliday
-        &addDate
-        &daysBetween
-    );
-}
-
+use constant ISO_DATE_FORMAT => "%04d-%02d-%02d";
 =head1 NAME
 
 C4::Calendar::Calendar - Koha module dealing with holidays.
@@ -123,7 +100,7 @@ sub _init {
         $exception_holidays{"$year/$month/$day"}{title} = $title;
         $exception_holidays{"$year/$month/$day"}{description} = $description;
         $exception_holidays{"$year/$month/$day"}{date} = 
-		sprintf("%04d-%02d-%02d", $year, $month, $day);
+		sprintf(ISO_DATE_FORMAT, $year, $month, $day);
     }
     $self->{'exception_holidays'} = \%exception_holidays;
 
@@ -133,7 +110,7 @@ sub _init {
         $single_holidays{"$year/$month/$day"}{title} = $title;
         $single_holidays{"$year/$month/$day"}{description} = $description;
         $single_holidays{"$year/$month/$day"}{date} = 
-		sprintf("%04d-%02d-%02d", $year, $month, $day);
+		sprintf(ISO_DATE_FORMAT, $year, $month, $day);
     }
     $self->{'single_holidays'} = \%single_holidays;
     return $self;
@@ -218,9 +195,11 @@ sub insert_week_day_holiday {
     my $self = shift @_;
     my %options = @_;
 
+    my $weekday = $options{weekday} or croak "No weekday";
+
     my $dbh = C4::Context->dbh();
     my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (id,branchcode,weekday,day,month,title,description) values ( '',?,?,NULL,NULL,?,? )"); 
-	$insertHoliday->execute( $self->{branchcode}, $options{weekday},$options{title}, $options{description});
+	$insertHoliday->execute( $self->{branchcode}, $weekday, $options{title}, $options{description});
     $self->{'week_days_holidays'}->{$options{weekday}}{title} = $options{title};
     $self->{'week_days_holidays'}->{$options{weekday}}{description} = $options{description};
     return $self;
@@ -283,6 +262,9 @@ sub insert_single_holiday {
     my $self = shift @_;
     my %options = @_;
     
+    @options{qw(year month day)} = ( $options{date} =~ m/(\d+)-(\d+)-(\d+)/o )
+      if $options{date} && !$options{day};
+
 	my $dbh = C4::Context->dbh();
     my $isexception = 0;
     my $insertHoliday = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
@@ -318,6 +300,9 @@ sub insert_exception_holiday {
     my $self = shift @_;
     my %options = @_;
 
+    @options{qw(year month day)} = ( $options{date} =~ m/(\d+)-(\d+)-(\d+)/o )
+      if $options{date} && !$options{day};
+
     my $dbh = C4::Context->dbh();
     my $isexception = 1;
     my $insertException = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
@@ -567,6 +552,66 @@ sub isHoliday {
 
 }
 
+=head2 copy_to_branch
+
+    $calendar->copy_to_branch($target_branch)
+
+=cut
+
+sub copy_to_branch {
+    my ($self, $target_branch) = @_;
+
+    croak "No target_branch" unless $target_branch;
+
+    my $target_calendar = C4::Calendar->new(branchcode => $target_branch);
+
+    my ($y, $m, $d) = Today();
+    my $today = sprintf ISO_DATE_FORMAT, $y,$m,$d;
+
+    my $wdh = $self->get_week_days_holidays;
+    $target_calendar->insert_week_day_holiday( weekday => $_, %{ $wdh->{$_} } )
+      foreach keys %$wdh;
+    $target_calendar->insert_day_month_holiday(%$_)
+      foreach values %{ $self->get_day_month_holidays };
+    $target_calendar->insert_exception_holiday(%$_)
+      foreach grep { $_->{date} gt $today } values %{ $self->get_exception_holidays };
+    $target_calendar->insert_single_holiday(%$_)
+      foreach grep { $_->{date} gt $today } values %{ $self->get_single_holidays };
+
+    return 1;
+}
+
+=head2 daysBetween
+
+    my $daysBetween = $calendar->daysBetween($startdate, $enddate)
+
+C<$startdate> and C<$enddate> are C4::Dates objects that define the interval.
+
+Returns the number of non-holiday days in the interval.
+useDaysMode syspref has no effect here.
+=cut
+
+sub daysBetween ($$$) {
+    my $self      = shift or return undef;
+    my $startdate = shift or return undef;
+    my $enddate   = shift or return undef;
+	my ($yearFrom,$monthFrom,$dayFrom) = split("-",$startdate->output('iso'));
+	my ($yearTo,  $monthTo,  $dayTo  ) = split("-",  $enddate->output('iso'));
+	if (Date_to_Days($yearFrom,$monthFrom,$dayFrom) > Date_to_Days($yearTo,$monthTo,$dayTo)) {
+		return 0;
+		# we don't go backwards  ( FIXME - handle this error better )
+	}
+    my $count = 0;
+    while (1) {
+        ($yearFrom != $yearTo or $monthFrom != $monthTo or $dayFrom != $dayTo) or last; # if they all match, it's the last day
+        unless ($self->isHoliday($dayFrom, $monthFrom, $yearFrom)) {
+            $count++;
+        }
+        ($yearFrom, $monthFrom, $dayFrom) = &Date::Calc::Add_Delta_Days($yearFrom, $monthFrom, $dayFrom, 1);
+    }
+    return($count);
+}
+
 =head2 addDate
 
     my ($day, $month, $year) = $calendar->addDate($date, $offset)
@@ -601,7 +646,7 @@ sub addDate {
 	} else { ## ($daysMode eq 'Days') 
         ($year, $month, $day) = &Date::Calc::Add_Delta_Days($year, $month, $day, $offset );
     }
-    return(C4::Dates->new( sprintf("%04d-%02d-%02d",$year,$month,$day),'iso'));
+    return(C4::Dates->new( sprintf(ISO_DATE_FORMAT,$year,$month,$day),'iso'));
 }
 
 =head2 daysBetween
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index 686e3af..6ee87df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -388,6 +388,21 @@
 
 
 </div>
+
+<div style="margin-top: 2em;">
+<form action="copy-holidays.pl" method="post">
+	<input type="hidden" name="from_branchcode" value="[% branch %]" /> 
+  <label for="branchcode">Copy holidays to:</label>
+  <select id="branchcode" name="branchcode">
+    <option value=""></option>
+    [% FOREACH branchloo IN branchloop %]
+    <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
+    [% END %]
+  </select>
+	<input type="submit" value="Copy" />
+</form>
+</div>
+	
 </div>
 <div class="yui-u">
 <div class="help">
diff --git a/tools/copy-holidays.pl b/tools/copy-holidays.pl
new file mode 100755
index 0000000..9de4b8c
--- /dev/null
+++ b/tools/copy-holidays.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+# Copyright 2012 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.
+
+use strict;
+use warnings;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+
+
+use C4::Calendar;
+
+my $input               = new CGI;
+my $dbh                 = C4::Context->dbh();
+
+my $branchcode          = $input->param('branchcode');
+my $from_branchcode     = $input->param('from_branchcode');
+
+C4::Calendar->new(branchcode => $from_branchcode)->copy_to_branch($branchcode) if $from_branchcode && $branchcode;
+
+print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=".($branchcode || $from_branchcode));
+
-- 
1.6.5


From srdjan at catalyst.net.nz  Thu Feb  9 02:30:56 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu,  9 Feb 2012 14:30:56 +1300
Subject: [Koha-patches] [PATCH] bug_7477: Copy holidays from one branch to
	another
In-Reply-To: <bug 7477>
References: <bug 7477>
Message-ID: <1328751056-13423-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Calendar.pm                                     |  107 ++++++++++++++------
 .../prog/en/modules/tools/holidays.tt              |   15 +++
 tools/copy-holidays.pl                             |   40 +++++++
 3 files changed, 131 insertions(+), 31 deletions(-)
 create mode 100755 tools/copy-holidays.pl

diff --git a/C4/Calendar.pm b/C4/Calendar.pm
index dc9037b..741ee40 100644
--- a/C4/Calendar.pm
+++ b/C4/Calendar.pm
@@ -20,34 +20,11 @@ use warnings;
 use vars qw($VERSION @EXPORT);
 
 use Carp;
-use Date::Calc qw( Date_to_Days );
+use Date::Calc qw( Date_to_Days Today);
 
 use C4::Context;
 
-BEGIN {
-    # set the version for version checking
-    $VERSION = 3.01;
-    require Exporter;
-    @EXPORT = qw(
-        &get_week_days_holidays
-        &get_day_month_holidays
-        &get_exception_holidays 
-        &get_single_holidays
-        &insert_week_day_holiday
-        &insert_day_month_holiday
-        &insert_single_holiday
-        &insert_exception_holiday
-        &ModWeekdayholiday
-        &ModDaymonthholiday
-        &ModSingleholiday
-        &ModExceptionholiday
-        &delete_holiday
-        &isHoliday
-        &addDate
-        &daysBetween
-    );
-}
-
+use constant ISO_DATE_FORMAT => "%04d-%02d-%02d";
 =head1 NAME
 
 C4::Calendar::Calendar - Koha module dealing with holidays.
@@ -123,7 +100,7 @@ sub _init {
         $exception_holidays{"$year/$month/$day"}{title} = $title;
         $exception_holidays{"$year/$month/$day"}{description} = $description;
         $exception_holidays{"$year/$month/$day"}{date} = 
-		sprintf("%04d-%02d-%02d", $year, $month, $day);
+		sprintf(ISO_DATE_FORMAT, $year, $month, $day);
     }
     $self->{'exception_holidays'} = \%exception_holidays;
 
@@ -133,7 +110,7 @@ sub _init {
         $single_holidays{"$year/$month/$day"}{title} = $title;
         $single_holidays{"$year/$month/$day"}{description} = $description;
         $single_holidays{"$year/$month/$day"}{date} = 
-		sprintf("%04d-%02d-%02d", $year, $month, $day);
+		sprintf(ISO_DATE_FORMAT, $year, $month, $day);
     }
     $self->{'single_holidays'} = \%single_holidays;
     return $self;
@@ -218,11 +195,13 @@ sub insert_week_day_holiday {
     my $self = shift @_;
     my %options = @_;
 
+    my $weekday = $options{weekday} or croak "No weekday";
+
     my $dbh = C4::Context->dbh();
     my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (id,branchcode,weekday,day,month,title,description) values ( '',?,?,NULL,NULL,?,? )"); 
-	$insertHoliday->execute( $self->{branchcode}, $options{weekday},$options{title}, $options{description});
-    $self->{'week_days_holidays'}->{$options{weekday}}{title} = $options{title};
-    $self->{'week_days_holidays'}->{$options{weekday}}{description} = $options{description};
+	$insertHoliday->execute( $self->{branchcode}, $weekday, $options{title}, $options{description});
+    $self->{'week_days_holidays'}->{$weekday}{title} = $options{title};
+    $self->{'week_days_holidays'}->{$weekday}{description} = $options{description};
     return $self;
 }
 
@@ -283,6 +262,9 @@ sub insert_single_holiday {
     my $self = shift @_;
     my %options = @_;
     
+    @options{qw(year month day)} = ( $options{date} =~ m/(\d+)-(\d+)-(\d+)/o )
+      if $options{date} && !$options{day};
+
 	my $dbh = C4::Context->dbh();
     my $isexception = 0;
     my $insertHoliday = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
@@ -318,6 +300,9 @@ sub insert_exception_holiday {
     my $self = shift @_;
     my %options = @_;
 
+    @options{qw(year month day)} = ( $options{date} =~ m/(\d+)-(\d+)-(\d+)/o )
+      if $options{date} && !$options{day};
+
     my $dbh = C4::Context->dbh();
     my $isexception = 1;
     my $insertException = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
@@ -567,6 +552,66 @@ sub isHoliday {
 
 }
 
+=head2 copy_to_branch
+
+    $calendar->copy_to_branch($target_branch)
+
+=cut
+
+sub copy_to_branch {
+    my ($self, $target_branch) = @_;
+
+    croak "No target_branch" unless $target_branch;
+
+    my $target_calendar = C4::Calendar->new(branchcode => $target_branch);
+
+    my ($y, $m, $d) = Today();
+    my $today = sprintf ISO_DATE_FORMAT, $y,$m,$d;
+
+    my $wdh = $self->get_week_days_holidays;
+    $target_calendar->insert_week_day_holiday( weekday => $_, %{ $wdh->{$_} } )
+      foreach keys %$wdh;
+    $target_calendar->insert_day_month_holiday(%$_)
+      foreach values %{ $self->get_day_month_holidays };
+    $target_calendar->insert_exception_holiday(%$_)
+      foreach grep { $_->{date} gt $today } values %{ $self->get_exception_holidays };
+    $target_calendar->insert_single_holiday(%$_)
+      foreach grep { $_->{date} gt $today } values %{ $self->get_single_holidays };
+
+    return 1;
+}
+
+=head2 daysBetween
+
+    my $daysBetween = $calendar->daysBetween($startdate, $enddate)
+
+C<$startdate> and C<$enddate> are C4::Dates objects that define the interval.
+
+Returns the number of non-holiday days in the interval.
+useDaysMode syspref has no effect here.
+=cut
+
+sub daysBetween ($$$) {
+    my $self      = shift or return undef;
+    my $startdate = shift or return undef;
+    my $enddate   = shift or return undef;
+	my ($yearFrom,$monthFrom,$dayFrom) = split("-",$startdate->output('iso'));
+	my ($yearTo,  $monthTo,  $dayTo  ) = split("-",  $enddate->output('iso'));
+	if (Date_to_Days($yearFrom,$monthFrom,$dayFrom) > Date_to_Days($yearTo,$monthTo,$dayTo)) {
+		return 0;
+		# we don't go backwards  ( FIXME - handle this error better )
+	}
+    my $count = 0;
+    while (1) {
+        ($yearFrom != $yearTo or $monthFrom != $monthTo or $dayFrom != $dayTo) or last; # if they all match, it's the last day
+        unless ($self->isHoliday($dayFrom, $monthFrom, $yearFrom)) {
+            $count++;
+        }
+        ($yearFrom, $monthFrom, $dayFrom) = &Date::Calc::Add_Delta_Days($yearFrom, $monthFrom, $dayFrom, 1);
+    }
+    return($count);
+}
+
 =head2 addDate
 
     my ($day, $month, $year) = $calendar->addDate($date, $offset)
@@ -601,7 +646,7 @@ sub addDate {
 	} else { ## ($daysMode eq 'Days') 
         ($year, $month, $day) = &Date::Calc::Add_Delta_Days($year, $month, $day, $offset );
     }
-    return(C4::Dates->new( sprintf("%04d-%02d-%02d",$year,$month,$day),'iso'));
+    return(C4::Dates->new( sprintf(ISO_DATE_FORMAT,$year,$month,$day),'iso'));
 }
 
 =head2 daysBetween
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index 686e3af..6ee87df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -388,6 +388,21 @@
 
 
 </div>
+
+<div style="margin-top: 2em;">
+<form action="copy-holidays.pl" method="post">
+	<input type="hidden" name="from_branchcode" value="[% branch %]" /> 
+  <label for="branchcode">Copy holidays to:</label>
+  <select id="branchcode" name="branchcode">
+    <option value=""></option>
+    [% FOREACH branchloo IN branchloop %]
+    <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
+    [% END %]
+  </select>
+	<input type="submit" value="Copy" />
+</form>
+</div>
+	
 </div>
 <div class="yui-u">
 <div class="help">
diff --git a/tools/copy-holidays.pl b/tools/copy-holidays.pl
new file mode 100755
index 0000000..9de4b8c
--- /dev/null
+++ b/tools/copy-holidays.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+# Copyright 2012 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.
+
+use strict;
+use warnings;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+
+
+use C4::Calendar;
+
+my $input               = new CGI;
+my $dbh                 = C4::Context->dbh();
+
+my $branchcode          = $input->param('branchcode');
+my $from_branchcode     = $input->param('from_branchcode');
+
+C4::Calendar->new(branchcode => $from_branchcode)->copy_to_branch($branchcode) if $from_branchcode && $branchcode;
+
+print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=".($branchcode || $from_branchcode));
+
-- 
1.6.5


From stephane.delaune at biblibre.com  Thu Feb  9 11:03:54 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Thu,  9 Feb 2012 11:03:54 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 7460: followup : Add template
	toolkit's FILTER html_line_break on staff details description's tab
Message-ID: <1328781834-5622-1-git-send-email-stephane.delaune@biblibre.com>

---
 .../prog/en/modules/catalogue/detail.tt            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 6046768..c035217 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -435,7 +435,7 @@ function verify_images() {
 
 [% IF ( MARCNOTES ) %]
     [% FOREACH MARCNOTE IN MARCNOTES %]
-    <p>[% MARCNOTE.marcnote %]</p>
+    <p>[% MARCNOTE.marcnote FILTER html_line_break %]</p>
     [% END %]
     [% ELSE %]
     [% IF ( notes ) %]
-- 
1.7.0.4


From gcollum at gmail.com  Thu Feb  9 22:29:53 2012
From: gcollum at gmail.com (Garry Collum)
Date: Thu,  9 Feb 2012 16:29:53 -0500
Subject: [Koha-patches] [PATCH] Bug 7517: Patron category types not
	displaying <optgroup> in dropdown.
Message-ID: <1328822993-7304-1-git-send-email-gcollum@gmail.com>

The patron category drop-down box does not display the general category groups as it once did. This patch fixes the display of the optgroups and a couple of minor XHTML errors.

To test. Before applying the patch, go to a patron record. Edit the patron.  Select the category drop-down in Library Management to see if the general categories appear.
After the patch is applied the dropdown will show the categories.  'Child' - child categories, 'Adult' - adult categories, etc.
---
 .../prog/en/modules/members/memberentrygen.tt      |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 02d39f5..ed8263c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -988,12 +988,12 @@
         [% FOREACH typeloo IN typeloop %]
 			[% FOREACH categoryloo IN typeloo.categoryloop %]
 				[% IF ( loop.first ) %]
-					[% IF ( categoryloo.typename_C ) %]<optgroup label="Child">[% END %]
-					[% IF ( categoryloo.typename_A ) %]<optgroup label="Adult">[% END %]
-					[% IF ( categoryloo.typename_S ) %]<optgroup label="Staff">[% END %]
-					[% IF ( categoryloo.typename_I ) %]<optgroup label="Organization">[% END %]
-					[% IF ( categoryloo.typename_P ) %]<optgroup label="Professional">[% END %]
-					[% IF ( categoryloo.typename_X ) %]<optgroup label="Statistical">[% END %]
+					[% IF ( typeloo.typename_C ) %]<optgroup label="Child">[% END %]
+					[% IF ( typeloo.typename_A ) %]<optgroup label="Adult">[% END %]
+					[% IF ( typeloo.typename_S ) %]<optgroup label="Staff">[% END %]
+					[% IF ( typeloo.typename_I ) %]<optgroup label="Organization">[% END %]
+					[% IF ( typeloo.typename_P ) %]<optgroup label="Professional">[% END %]
+					[% IF ( typeloo.typename_X ) %]<optgroup label="Statistical">[% END %]
 			    [% END %]
 				[% IF ( categoryloo.categorycodeselected ) %]
                <option value="[% categoryloo.categorycode %]" selected="selected">[% categoryloo.categoryname %]</option>
@@ -1264,7 +1264,7 @@
 				[% IF opduplicate %]
 				    <input type="text" name="datedebarred" id="debarred" class="debarred" value="[% datedebarred %]" onclick="this.value=''" />
 				[% ELSE %]
-				    <input type="text" name="datedebarred" id="debarred" class="debarred" value="[% datedebarred %]" />
+				    <input type="text" name="datedebarred" id="datedebarred" class="debarred" value="[% datedebarred %]" />
 				[% END %]
 				<img src="[% themelang %]/lib/calendar/cal.gif" id="debarred_button" alt="Show Calendar" />
 		         <script language="JavaScript" type="text/javascript">
@@ -1281,7 +1281,7 @@
 			       [% IF ( opduplicate ) %] 
 			           <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
 			       [% ELSE %]
-				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" ">[% debarredcomment %]</textarea> 
+				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea> 
 			       [% END %]
 	        </li>
 
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Fri Feb 10 01:13:10 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Fri, 10 Feb 2012 13:13:10 +1300
Subject: [Koha-patches] [PATCH] bug_7477: Copy holidays from one branch to
	another
In-Reply-To: <bug 7477>
References: <bug 7477>
Message-ID: <1328832790-15173-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Calendar.pm                                     |  108 ++++++++++++++------
 .../prog/en/modules/tools/holidays.tt              |   15 +++
 tools/copy-holidays.pl                             |   40 +++++++
 3 files changed, 132 insertions(+), 31 deletions(-)
 create mode 100755 tools/copy-holidays.pl

diff --git a/C4/Calendar.pm b/C4/Calendar.pm
index dc9037b..8ad363f 100644
--- a/C4/Calendar.pm
+++ b/C4/Calendar.pm
@@ -20,34 +20,11 @@ use warnings;
 use vars qw($VERSION @EXPORT);
 
 use Carp;
-use Date::Calc qw( Date_to_Days );
+use Date::Calc qw( Date_to_Days Today);
 
 use C4::Context;
 
-BEGIN {
-    # set the version for version checking
-    $VERSION = 3.01;
-    require Exporter;
-    @EXPORT = qw(
-        &get_week_days_holidays
-        &get_day_month_holidays
-        &get_exception_holidays 
-        &get_single_holidays
-        &insert_week_day_holiday
-        &insert_day_month_holiday
-        &insert_single_holiday
-        &insert_exception_holiday
-        &ModWeekdayholiday
-        &ModDaymonthholiday
-        &ModSingleholiday
-        &ModExceptionholiday
-        &delete_holiday
-        &isHoliday
-        &addDate
-        &daysBetween
-    );
-}
-
+use constant ISO_DATE_FORMAT => "%04d-%02d-%02d";
 =head1 NAME
 
 C4::Calendar::Calendar - Koha module dealing with holidays.
@@ -123,7 +100,7 @@ sub _init {
         $exception_holidays{"$year/$month/$day"}{title} = $title;
         $exception_holidays{"$year/$month/$day"}{description} = $description;
         $exception_holidays{"$year/$month/$day"}{date} = 
-		sprintf("%04d-%02d-%02d", $year, $month, $day);
+		sprintf(ISO_DATE_FORMAT, $year, $month, $day);
     }
     $self->{'exception_holidays'} = \%exception_holidays;
 
@@ -133,7 +110,7 @@ sub _init {
         $single_holidays{"$year/$month/$day"}{title} = $title;
         $single_holidays{"$year/$month/$day"}{description} = $description;
         $single_holidays{"$year/$month/$day"}{date} = 
-		sprintf("%04d-%02d-%02d", $year, $month, $day);
+		sprintf(ISO_DATE_FORMAT, $year, $month, $day);
     }
     $self->{'single_holidays'} = \%single_holidays;
     return $self;
@@ -218,11 +195,14 @@ sub insert_week_day_holiday {
     my $self = shift @_;
     my %options = @_;
 
+    my $weekday = $options{weekday};
+    croak "Invalid weekday $weekday" unless $weekday =~ m/^[0-6]$/;
+
     my $dbh = C4::Context->dbh();
     my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (id,branchcode,weekday,day,month,title,description) values ( '',?,?,NULL,NULL,?,? )"); 
-	$insertHoliday->execute( $self->{branchcode}, $options{weekday},$options{title}, $options{description});
-    $self->{'week_days_holidays'}->{$options{weekday}}{title} = $options{title};
-    $self->{'week_days_holidays'}->{$options{weekday}}{description} = $options{description};
+	$insertHoliday->execute( $self->{branchcode}, $weekday, $options{title}, $options{description});
+    $self->{'week_days_holidays'}->{$weekday}{title} = $options{title};
+    $self->{'week_days_holidays'}->{$weekday}{description} = $options{description};
     return $self;
 }
 
@@ -283,6 +263,9 @@ sub insert_single_holiday {
     my $self = shift @_;
     my %options = @_;
     
+    @options{qw(year month day)} = ( $options{date} =~ m/(\d+)-(\d+)-(\d+)/o )
+      if $options{date} && !$options{day};
+
 	my $dbh = C4::Context->dbh();
     my $isexception = 0;
     my $insertHoliday = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
@@ -318,6 +301,9 @@ sub insert_exception_holiday {
     my $self = shift @_;
     my %options = @_;
 
+    @options{qw(year month day)} = ( $options{date} =~ m/(\d+)-(\d+)-(\d+)/o )
+      if $options{date} && !$options{day};
+
     my $dbh = C4::Context->dbh();
     my $isexception = 1;
     my $insertException = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
@@ -567,6 +553,66 @@ sub isHoliday {
 
 }
 
+=head2 copy_to_branch
+
+    $calendar->copy_to_branch($target_branch)
+
+=cut
+
+sub copy_to_branch {
+    my ($self, $target_branch) = @_;
+
+    croak "No target_branch" unless $target_branch;
+
+    my $target_calendar = C4::Calendar->new(branchcode => $target_branch);
+
+    my ($y, $m, $d) = Today();
+    my $today = sprintf ISO_DATE_FORMAT, $y,$m,$d;
+
+    my $wdh = $self->get_week_days_holidays;
+    $target_calendar->insert_week_day_holiday( weekday => $_, %{ $wdh->{$_} } )
+      foreach keys %$wdh;
+    $target_calendar->insert_day_month_holiday(%$_)
+      foreach values %{ $self->get_day_month_holidays };
+    $target_calendar->insert_exception_holiday(%$_)
+      foreach grep { $_->{date} gt $today } values %{ $self->get_exception_holidays };
+    $target_calendar->insert_single_holiday(%$_)
+      foreach grep { $_->{date} gt $today } values %{ $self->get_single_holidays };
+
+    return 1;
+}
+
+=head2 daysBetween
+
+    my $daysBetween = $calendar->daysBetween($startdate, $enddate)
+
+C<$startdate> and C<$enddate> are C4::Dates objects that define the interval.
+
+Returns the number of non-holiday days in the interval.
+useDaysMode syspref has no effect here.
+=cut
+
+sub daysBetween ($$$) {
+    my $self      = shift or return undef;
+    my $startdate = shift or return undef;
+    my $enddate   = shift or return undef;
+	my ($yearFrom,$monthFrom,$dayFrom) = split("-",$startdate->output('iso'));
+	my ($yearTo,  $monthTo,  $dayTo  ) = split("-",  $enddate->output('iso'));
+	if (Date_to_Days($yearFrom,$monthFrom,$dayFrom) > Date_to_Days($yearTo,$monthTo,$dayTo)) {
+		return 0;
+		# we don't go backwards  ( FIXME - handle this error better )
+	}
+    my $count = 0;
+    while (1) {
+        ($yearFrom != $yearTo or $monthFrom != $monthTo or $dayFrom != $dayTo) or last; # if they all match, it's the last day
+        unless ($self->isHoliday($dayFrom, $monthFrom, $yearFrom)) {
+            $count++;
+        }
+        ($yearFrom, $monthFrom, $dayFrom) = &Date::Calc::Add_Delta_Days($yearFrom, $monthFrom, $dayFrom, 1);
+    }
+    return($count);
+}
+
 =head2 addDate
 
     my ($day, $month, $year) = $calendar->addDate($date, $offset)
@@ -601,7 +647,7 @@ sub addDate {
 	} else { ## ($daysMode eq 'Days') 
         ($year, $month, $day) = &Date::Calc::Add_Delta_Days($year, $month, $day, $offset );
     }
-    return(C4::Dates->new( sprintf("%04d-%02d-%02d",$year,$month,$day),'iso'));
+    return(C4::Dates->new( sprintf(ISO_DATE_FORMAT,$year,$month,$day),'iso'));
 }
 
 =head2 daysBetween
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index 686e3af..6ee87df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -388,6 +388,21 @@
 
 
 </div>
+
+<div style="margin-top: 2em;">
+<form action="copy-holidays.pl" method="post">
+	<input type="hidden" name="from_branchcode" value="[% branch %]" /> 
+  <label for="branchcode">Copy holidays to:</label>
+  <select id="branchcode" name="branchcode">
+    <option value=""></option>
+    [% FOREACH branchloo IN branchloop %]
+    <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
+    [% END %]
+  </select>
+	<input type="submit" value="Copy" />
+</form>
+</div>
+	
 </div>
 <div class="yui-u">
 <div class="help">
diff --git a/tools/copy-holidays.pl b/tools/copy-holidays.pl
new file mode 100755
index 0000000..9de4b8c
--- /dev/null
+++ b/tools/copy-holidays.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+# Copyright 2012 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.
+
+use strict;
+use warnings;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+
+
+use C4::Calendar;
+
+my $input               = new CGI;
+my $dbh                 = C4::Context->dbh();
+
+my $branchcode          = $input->param('branchcode');
+my $from_branchcode     = $input->param('from_branchcode');
+
+C4::Calendar->new(branchcode => $from_branchcode)->copy_to_branch($branchcode) if $from_branchcode && $branchcode;
+
+print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=".($branchcode || $from_branchcode));
+
-- 
1.6.5


From srdjan at catalyst.net.nz  Fri Feb 10 02:04:33 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Fri, 10 Feb 2012 14:04:33 +1300
Subject: [Koha-patches] [PATCH] bug 6039: Cancel All waiting holds button
In-Reply-To: <bug 6039>
References: <bug 6039>
Message-ID: <1328835873-25196-1-git-send-email-srdjan@catalyst.net.nz>

TransferWhenCancelAllWaitingHolds syspref
---
 circ/waitingreserves.pl                            |  102 +++++++++++++-------
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    8 ++
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 .../prog/en/modules/circ/waitingreserves.tt        |   20 +++-
 5 files changed, 100 insertions(+), 37 deletions(-)

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 128d1eb..17b7be6 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -46,6 +46,7 @@ my $borrowernumber = $input->param('borrowernumber');
 my $fbr            = $input->param('fbr') || '';
 my $tbr            = $input->param('tbr') || '';
 my $all_branches   = $input->param('allbranches') || '';
+my $cancelall      = $input->param('cancelall');
 
 my $cancel;
 
@@ -62,42 +63,23 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 my $default = C4::Context->userenv->{'branch'};
 
+my $transfer_when_cancel_all = C4::Context->preference('TransferWhenCancelAllWaitingHolds');
+$template->param( TransferWhenCancelAllWaitingHolds => 1 ) if $transfer_when_cancel_all;
+
+my @cancel_result;
 # if we have a return from the form we launch the subroutine CancelReserve
 if ($item) {
-    my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber );
-    # if we have a result
-    if ($nextreservinfo) {
-        my $borrowerinfo = GetMemberDetails( $nextreservinfo );
-        my $iteminfo = GetBiblioFromItemNumber($item);
-        if ( $messages->{'transfert'} ) {
-            $template->param(
-                messagetransfert => $messages->{'transfert'},
-                branchname       => GetBranchName($messages->{'transfert'}),
-            );
-        }
-
-        $template->param(
-            message             => 1,
-            nextreservnumber    => $nextreservinfo,
-            nextreservsurname   => $borrowerinfo->{'surname'},
-            nextreservfirstname => $borrowerinfo->{'firstname'},
-            nextreservitem      => $item,
-            nextreservtitle     => $iteminfo->{'title'},
-            waiting             => ($messages->{'waiting'}) ? 1 : 0,
-        );
-    }
-
-# 	if the document is not in his homebranch location and there is not reservation after, we transfer it
-    if ($fbr ne $tbr  and not $nextreservinfo) {
-        ModItemTransfer( $item, $fbr, $tbr );
-    }
+    my $res = cancel( $item, $borrowernumber, $fbr, $tbr );
+    push @cancel_result, $res if $res;
 }
+
 if ( C4::Context->preference('IndependantBranches') ) {
     undef $all_branches;
 } else {
-    $template->param( all_branches_link => $input->url . '?allbranches=1&' . $input->query_string )
+    $template->param( all_branches_link => $input->url . '?allbranches=1' )
       unless $all_branches;
 }
+$template->param( all_branches => 1 ) if $all_branches;
 
 my (@reservloop, @overloop);
 my ($reservcount, $overcount);
@@ -107,8 +89,24 @@ my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch(
 my $today = Date_to_Days(&Today);
 foreach my $num (@getreserves) {
     next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
-    my %getreserv;
-    my $gettitle     = GetBiblioFromItemNumber( $num->{'itemnumber'} );
+
+    my $itemnumber = $num->{'itemnumber'};
+    my $gettitle     = GetBiblioFromItemNumber( $itemnumber );
+    my $borrowernum = $num->{'borrowernumber'};
+    my $holdingbranch = $gettitle->{'holdingbranch'};
+    my $homebranch = $gettitle->{'homebranch'};
+
+    if ($cancelall) {
+        my $res = cancel( $itemnumber, $borrowernum, $holdingbranch, $homebranch, !$transfer_when_cancel_all );
+        push @cancel_result, $res if $res;
+        next;
+    }
+
+    my %getreserv = (
+        itemnumber => $itemnumber,
+        borrowernum => $borrowernum,
+    );
+
     # fix up item type for display
     $gettitle->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $gettitle->{'itype'} : $gettitle->{'itemtype'};
     my $getborrower = GetMember(borrowernumber => $num->{'borrowernumber'});
@@ -122,17 +120,15 @@ foreach my $num (@getreserves) {
 
     $getreserv{'itemtype'}       = $itemtypeinfo->{'description'};
     $getreserv{'title'}          = $gettitle->{'title'};
-    $getreserv{'itemnumber'}     = $gettitle->{'itemnumber'};
     $getreserv{'biblionumber'}   = $gettitle->{'biblionumber'};
     $getreserv{'barcode'}        = $gettitle->{'barcode'};
     $getreserv{'branchname'}     = GetBranchName($gettitle->{'homebranch'});
     $getreserv{'homebranch'}     = $gettitle->{'homebranch'};
     $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
     $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
-    if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
+    if ( $homebranch ne $holdingbranch ) {
         $getreserv{'dotransfer'} = 1;
     }
-    $getreserv{'borrowernum'}       = $getborrower->{'borrowernumber'};
     $getreserv{'borrowername'}      = $getborrower->{'surname'};
     $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'};
     $getreserv{'borrowerphone'}     = $getborrower->{'phone'};
@@ -150,6 +146,7 @@ foreach my $num (@getreserves) {
     
 }
 
+$template->param(cancel_result => \@cancel_result) if @cancel_result;
 $template->param(
     reserveloop => \@reservloop,
     reservecount => $reservcount,
@@ -161,3 +158,42 @@ $template->param(
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
+
+exit;
+
+sub cancel {
+    my ($item, $borrowernumber, $fbr, $tbr, $skip_transfers ) = @_;
+
+    my $transfer = $fbr ne $tbr; # XXX && !$nextreservinfo;
+
+    return if $transfer && $skip_transfers;
+
+    my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber );
+
+# 	if the document is not in his homebranch location and there is not reservation after, we transfer it
+    if ($transfer && !$nextreservinfo) {
+        ModItemTransfer( $item, $fbr, $tbr );
+    }
+    # if we have a result
+    if ($nextreservinfo) {
+        my %res;
+        my $borrowerinfo = GetMemberDetails( $nextreservinfo );
+        my $iteminfo = GetBiblioFromItemNumber($item);
+        if ( $messages->{'transfert'} ) {
+            $res{messagetransfert} = $messages->{'transfert'};
+            $res{branchname}       = GetBranchName($messages->{'transfert'});
+        }
+
+        $res{message}             = 1;
+        $res{nextreservnumber}    = $nextreservinfo;
+        $res{nextreservsurname}   = $borrowerinfo->{'surname'};
+        $res{nextreservfirstname} = $borrowerinfo->{'firstname'};
+        $res{nextreservitem}      = $item;
+        $res{nextreservtitle}     = $iteminfo->{'title'};
+        $res{waiting}             = $messages->{'waiting'} ? 1 : 0;
+
+        return \%res;
+    }
+
+    return;
+}
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 5e3d79d..d9e04d5 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -330,6 +330,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('EasyAnalyticalRecords','0','If on, display in the catalogue screens tools to easily setup analytical record relationships','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CircAutoPrintQuickSlip', '1', 'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window or Clear the screen.',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TransferWhenCancelAllWaitingHolds','0','Transfer items when cancelling all waiting holds',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACLocalCoverImages','0','Display local cover images on OPAC search and details pages.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('LocalCoverImages','0','Display local cover images on intranet details pages.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllowMultipleCovers','0','Allow multiple cover images to be attached to each bibliographic record.','1','YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..ef81848 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4663,6 +4663,14 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     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('TransferWhenCancelAllWaitingHolds','0','Transfer items when cancelling all waiting holds',NULL,'YesNo')");
+    print "Upgrade to $DBversion done (Add sysprefs to control transfer when cancel all waiting holds)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
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 30bcb9b..7d7d682 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
@@ -317,6 +317,12 @@ Circulation:
                   yes: Enable
                   no:  "Don't enable"
             - "the ability to place holds on multiple biblio from the search results"	    
+        -
+            - pref: TransferWhenCancelAllWaitingHolds
+              choices:
+                  yes: Transfer
+                  no: "Don't transfer"
+            - items when cancelling all waiting holds.
     Fines Policy:
         -
             - Calculate fines based on days overdue
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 7ecc3a1..c141ae7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -44,7 +44,8 @@ $.tablesorter.addParser({
             View all branches</a></span>
             [% END %]
         </h2>
-        [% IF ( messagetransfert ) %]
+    [% IF ( cancel_result ) %]
+        [% IF ( cancel_result.messagetransfert ) %]
             <div>
                 <h2>Hold find for ([% nextreservtitle %]), must be transferred</h2>
                 <p>This hold placed by : <b> [% nextreservsurname %] [% nextreservfirstname %]</b> at the library : <b> [% branchname %] </b>, Please transfer this hold.
@@ -54,7 +55,7 @@ $.tablesorter.addParser({
                 </form>
             </div>
         [% END %]
-        [% IF ( waiting ) %]
+        [% IF ( cancel_result.waiting ) %]
             <div id="bloc25">
                 <h2>This hold is waiting</h2>
                 <p>This hold ([% nextreservtitle %]) was placed by <b> : [% nextreservsurname %] [% nextreservfirstname %]</b>,
@@ -65,7 +66,7 @@ $.tablesorter.addParser({
                 </form>
             </div>
         [% END %]
-        [% UNLESS ( message ) %]
+    [% ELSE %]
         <div id="resultlist" class="toptabs">
             <ul>
                 <li><a href="/cgi-bin/koha/circ/waitingreserves.pl#holdswaiting">[% reservecount %] Hold(s) waiting</a></li>
@@ -117,7 +118,18 @@ $.tablesorter.addParser({
         </div>
         <div id="holdsover">
                 <p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p>
-                [% IF ( overloop ) %]
+               [% IF ( overloop ) %]
+               <p>
+               <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
+                   <input type="hidden" name="cancelall" value="1" />
+                   <input type="hidden" name="allbranches" value="[% allbranches %]" />
+                   <input type="submit" value="Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %]All" />
+               </form>
+               [% UNLESS TransferWhenCancelAllWaitingHolds %]
+               Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref)
+               [% END %]
+               </p>
+               <br/>
                <table id="holdso">
                <thead><tr>
                     <th>Available since</th>
-- 
1.6.5


From robin at catalyst.net.nz  Fri Feb 10 02:32:58 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Fri, 10 Feb 2012 14:32:58 +1300
Subject: [Koha-patches] [PATCH] Bug 7238 - make packages deal with SIP config
Message-ID: <1328837578-9617-1-git-send-email-robin@catalyst.net.nz>

This moves the SIP config to the templates directory (on package
building) in anticipation of making it configurable with package tools.
Prevents it being installed into /etc.
---
 debian/rules                   |    1 +
 debian/templates/SIPconfig.xml |   84 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 0 deletions(-)
 create mode 100644 debian/templates/SIPconfig.xml

diff --git a/debian/rules b/debian/rules
index 64a1790..7fed07e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ override_dh_gencontrol:
 override_dh_auto_install:
 	dh_auto_install
 	rm $(TMP)/etc/koha/README.txt
+	rm $(TMP)/etc/koha/SIPconfig.xml
 	rm -r $(TMP)/usr/share/koha/doc
 	rm -r $(TMP)/var/run
 	rm -r $(TMP)/var/lock
diff --git a/debian/templates/SIPconfig.xml b/debian/templates/SIPconfig.xml
new file mode 100644
index 0000000..f229b9a
--- /dev/null
+++ b/debian/templates/SIPconfig.xml
@@ -0,0 +1,84 @@
+<acsconfig xmlns="http://openncip.org/acs-config/1.0/">
+<!-- above address gets nothing, it's just a namespace -->
+  <error-detect enabled="true" />
+
+<!--
+  Set Net::Server::PreFork runtime parameters 
+  syslog_ident will identify SIP2 Koha server entries in syslog
+  For OpenSolaris, add: syslog_logsock=stream
+-->
+  <server-params
+    min_servers='1'
+    min_spare_servers='0' 
+    log_file='Sys::Syslog'
+    syslog_ident='koha_sip'
+    syslog_facility='local6'
+  />
+  
+  <listeners>
+<!-- vestigial HTTP, never implemented: just use the OPAC!
+	<service
+      port="0:8080/tcp"
+      transport="http"
+      protocol="NCIP/1.0" />
+-->
+    <service
+      port="8023/tcp"
+      transport="telnet"
+      protocol="SIP/2.00"
+      timeout="60" />
+
+    <service
+      port="127.0.0.1:6001/tcp"
+      transport="RAW" 
+      protocol="SIP/2.00"
+      timeout="60" />
+  </listeners>
+
+  <accounts>
+      <login id="term1"  password="term1" delimiter="|" error-detect="enabled" institution="CPL" />
+      <login id="koha"   password="koha"  delimiter="|" error-detect="enabled" institution="kohalibrary" />
+      <login id="koha2"  password="koha" institution="kohalibrary2" />
+      <login id="lpl-sc" password="1234" institution="LPL" />
+      <login id="lpl-sc-beacock" password="xyzzy"
+             delimiter="|" error-detect="enabled" institution="LPL" />
+  </accounts>
+
+<!--
+Institution tags are for enabled branches.  There needs to be one
+institution stanza for each institution named in the accounts above.
+The implementation attribute is actually used to find the code to run,
+in our case "ILS".
+-->
+
+<institutions>
+    <institution id="MAIN" implementation="ILS" parms="">
+          <policy checkin="true" renewal="true" checkout="true"
+	  	  status_update="false" offline="false"
+		  timeout="100"
+	  	  retries="5" />
+    </institution>
+    <institution id="CPL" implementation="ILS" parms="">
+          <policy checkin="true" renewal="true" checkout="true"
+	  	  status_update="false" offline="false"
+		  timeout="25"
+	  	  retries="5" />
+    </institution>
+    <institution id="kohalibrary" implementation="ILS" parms="">
+          <policy checkin="true" renewal="false" checkout="true"
+	  	  status_update="false" offline="false"
+		  timeout="100"
+	  	  retries="5" />
+    </institution>
+    <institution id="kohalibrary2" implementation="ILS" parms="">
+          <policy checkin="true" renewal="false" checkout="true"
+		  timeout="100"
+	  	  retries="3" />
+    </institution>
+    <institution id="LPL" implementation="ILS">
+          <policy checkin="true" renewal="false" checkout="true"
+		  timeout="100"
+	  	  retries="5" />
+    </institution>
+</institutions>
+</acsconfig>
-- 
1.7.5.4


From robin at catalyst.net.nz  Fri Feb 10 02:35:27 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Fri, 10 Feb 2012 14:35:27 +1300
Subject: [Koha-patches] [PATCH] Bug 7519 - show patron's street number in
	search results
Message-ID: <1328837727-9724-1-git-send-email-robin@catalyst.net.nz>

When searching for a patron in the staff client, their address is shown.
However, the street number component isn't included. This includes it.
---
 .../prog/en/modules/members/member.tt              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index f625220..c3f3909 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -62,7 +62,7 @@
 							<td>[% resultsloo.cardnumber %]</td>
 							<td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resultsloo.borrowernumber %]">
                             [% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber %]</a> <br />
-                            [% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %]  [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %]</td>
+                            [% IF ( resultsloo.streetnumber ) %][% resultsloo.streetnumber %] [% END %][% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %]  [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %]</td>
 							<td>[% resultsloo.category_description %] ([% resultsloo.category_type %])</td>
 							<td>[% resultsloo.branchcode %]</td>
 							<td>[% resultsloo.dateexpiry %]</td>
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Fri Feb 10 09:01:22 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Fri, 10 Feb 2012 21:01:22 +1300
Subject: [Koha-patches] [PATCH] bug_7520: Created
	opac/advanced_search_types.json
In-Reply-To: <bug 7520>
References: <bug 7520>
Message-ID: <1328860882-15641-1-git-send-email-srdjan@catalyst.net.nz>

Returns json of AdvancedSearchTypes (collection codes or itemtypes).
Useful for dynamic gbuilding of the search forms.
---
 opac/advanced_search_types.json |   62 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100755 opac/advanced_search_types.json

diff --git a/opac/advanced_search_types.json b/opac/advanced_search_types.json
new file mode 100755
index 0000000..b0e963c
--- /dev/null
+++ b/opac/advanced_search_types.json
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+# Copyright 2012 CatalystIT Ltd
+#
+# 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 opac/itemtypes.json
+
+Returns json list of itemtype, description. Suitable for building drop down lists.
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use JSON;
+
+use C4::Koha;
+use C4::Context;
+use C4::Auth;
+
+my $input       = new CGI;
+my ($borrowernumber, $cookie, $sessionID) = checkauth($input, 0, {}, "opac");
+
+my $dbh = C4::Context->dbh;
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
+my ($ccl, @typesloop);
+if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
+    my $itemtypes = GetItemTypes;
+    my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
+    @typesloop = map {
+        code        => $_,
+        description => $itemtypes->{$_}->{'description'},
+        imageurl    => getitemtypeimagelocation( 'opac', $itemtypes->{$_}->{'imageurl'} ),
+    }, sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes;
+    $ccl = "$itype_or_itemtype,phr";
+} else {
+    my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
+    @typesloop = map {
+        code        => $_->{authorised_value},
+        description => $_->{'lib'},
+        imageurl    => getitemtypeimagelocation( 'opac', $_->{'imageurl'} ),
+    }, @$advsearchtypes;
+    $ccl = $advanced_search_types;
+}
+
+print $input->header('application/json');
+print to_json({ ccl => $advanced_search_types, types => \@typesloop });
-- 
1.6.5


From jonathan.druart at biblibre.com  Fri Feb 10 10:00:37 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Fri, 10 Feb 2012 10:00:37 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7154: Modification in borrower
	attributes
Message-ID: <1328864437-4232-1-git-send-email-jonathan.druart@biblibre.com>

* group some attributes for a more friendly display

* allow a link between a borrower category and an attribute to display
  it only for the specified category

* Attr classes filled with AV 'PA_CLASS' category (you have to create AV
  with a new category 'PA_CLASS' to fill class list)

this patch add 2 fields in borrower_attribute_types :
    category_type
    class
---
 C4/Members/AttributeTypes.pm                       |   83 +++++++++-
 C4/Members/Attributes.pm                           |    4 +-
 admin/patron-attr-types.pl                         |   41 +++++-
 installer/data/mysql/kohastructure.sql             |    2 +
 installer/data/mysql/updatedatabase.pl             |   10 ++
 .../prog/en/modules/admin/patron-attr-types.tt     |   73 +++++++--
 .../prog/en/modules/members/memberentrygen.tt      |  172 ++++++++++++--------
 .../prog/en/modules/members/moremember.tt          |   43 ++++--
 members/memberentry.pl                             |   21 ++-
 members/moremember.pl                              |   21 ++-
 10 files changed, 358 insertions(+), 112 deletions(-)

diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm
index e36557b..8c96e54 100644
--- a/C4/Members/AttributeTypes.pm
+++ b/C4/Members/AttributeTypes.pm
@@ -70,7 +70,7 @@ If $all_fields is true, then each hashref also contains the other fields from bo
 
 sub GetAttributeTypes {
     my ($all) = @_;
-    my $select = $all ? '*' : 'code, description';
+    my $select = $all ? '*' : 'code, description, class';
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare("SELECT $select FROM borrower_attribute_types ORDER by code");
     $sth->execute();
@@ -120,6 +120,9 @@ sub new {
     $self->{'staff_searchable'} = 0;
     $self->{'display_checkout'} = 0;
     $self->{'authorised_value_category'} = '';
+    $self->{'category_code'} = '';
+    $self->{'category_description'} = '';
+    $self->{'class'} = '';
 
     bless $self, $class;
     return $self;
@@ -140,11 +143,15 @@ sub fetch {
     my $self = {};
     my $dbh = C4::Context->dbh();
 
-    my $sth = $dbh->prepare_cached("SELECT * FROM borrower_attribute_types WHERE code = ?");
+    my $sth = $dbh->prepare_cached("
+        SELECT borrower_attribute_types.*, categories.description AS category_description
+        FROM borrower_attribute_types
+        LEFT JOIN categories ON borrower_attribute_types.category_code=categories.categorycode
+        WHERE code =?");
     $sth->execute($code);
     my $row = $sth->fetchrow_hashref;
     $sth->finish();
-    return undef unless defined $row;    
+    return undef unless defined $row;
 
     $self->{'code'}                      = $row->{'code'};
     $self->{'description'}               = $row->{'description'};
@@ -155,6 +162,9 @@ sub fetch {
     $self->{'staff_searchable'}          = $row->{'staff_searchable'};
     $self->{'display_checkout'}          = $row->{'display_checkout'};
     $self->{'authorised_value_category'} = $row->{'authorised_value_category'};
+    $self->{'category_code'}             = $row->{'category_code'};
+    $self->{'category_description'}      = $row->{'category_description'};
+    $self->{'class'}                     = $row->{'class'};
 
     bless $self, $class;
     return $self;
@@ -185,14 +195,16 @@ sub store {
                                          password_allowed = ?,
                                          staff_searchable = ?,
                                          authorised_value_category = ?,
-                                         display_checkout = ?
+                                         display_checkout = ?,
+                                         category_code = ?,
+                                         class = ?
                                      WHERE code = ?");
     } else {
         $sth = $dbh->prepare_cached("INSERT INTO borrower_attribute_types 
                                         (description, repeatable, unique_id, opac_display, password_allowed,
-                                         staff_searchable, authorised_value_category, display_checkout, code)
+                                         staff_searchable, authorised_value_category, display_checkout, category_code, class, code)
                                         VALUES (?, ?, ?, ?, ?,
-                                                ?, ?, ?, ?)");
+                                                ?, ?, ?, ?, ?, ?)");
     }
     $sth->bind_param(1, $self->{'description'});
     $sth->bind_param(2, $self->{'repeatable'});
@@ -202,7 +214,9 @@ sub store {
     $sth->bind_param(6, $self->{'staff_searchable'});
     $sth->bind_param(7, $self->{'authorised_value_category'});
     $sth->bind_param(8, $self->{'display_checkout'});
-    $sth->bind_param(9, $self->{'code'});
+    $sth->bind_param(9, $self->{'category_code'} || undef);
+    $sth->bind_param(10, $self->{'class'});
+    $sth->bind_param(11, $self->{'code'});
     $sth->execute;
 
 }
@@ -341,6 +355,61 @@ sub authorised_value_category {
     @_ ? $self->{'authorised_value_category'} = shift : $self->{'authorised_value_category'};
 }
 
+=head2 category_code
+
+=over 4
+
+my $category_code = $attr_type->category_code();
+$attr_type->category_code($category_code);
+
+=back
+
+Accessor.
+
+=cut
+
+sub category_code {
+    my $self = shift;
+    @_ ? $self->{'category_code'} = shift : $self->{'category_code'};
+}
+
+=head2 category_description
+
+=over 4
+
+my $category_description = $attr_type->category_description();
+$attr_type->category_description($category_description);
+
+=back
+
+Accessor.
+
+=cut
+
+sub category_description {
+    my $self = shift;
+    @_ ? $self->{'category_description'} = shift : $self->{'category_description'};
+}
+
+=head2 class
+
+=over 4
+
+my $class = $attr_type->class();
+$attr_type->class($class);
+
+=back
+
+Accessor.
+
+=cut
+
+sub class {
+    my $self = shift;
+    @_ ? $self->{'class'} = shift : $self->{'class'};
+}
+
+
 =head2 delete
 
   $attr_type->delete();
diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm
index 4ae5600..137b11e 100644
--- a/C4/Members/Attributes.pm
+++ b/C4/Members/Attributes.pm
@@ -72,7 +72,7 @@ sub GetBorrowerAttributes {
     my $opac_only = @_ ? shift : 0;
 
     my $dbh = C4::Context->dbh();
-    my $query = "SELECT code, description, attribute, lib, password, display_checkout
+    my $query = "SELECT code, description, attribute, lib, password, display_checkout, category_type, class
                  FROM borrower_attributes
                  JOIN borrower_attribute_types USING (code)
                  LEFT JOIN authorised_values ON (category = authorised_value_category AND attribute = authorised_value)
@@ -90,6 +90,8 @@ sub GetBorrowerAttributes {
             value_description => $row->{'lib'},  
             password          => $row->{'password'},
             display_checkout  => $row->{'display_checkout'},
+            category_type     => $row->{'category_type'},
+            class             => $row->{'class'},
         }
     }
     return \@results;
diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl
index 29a0d90..13b92ee 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -22,10 +22,13 @@
 use strict;
 use warnings;
 use CGI;
+use List::MoreUtils qw/uniq/;
+
 use C4::Auth;
 use C4::Context;
 use C4::Output;
 use C4::Koha;
+use C4::Members qw/GetBorrowercategoryList/;
 use C4::Members::AttributeTypes;
 
 my $script_name = "/cgi-bin/koha/admin/patron-attr-types.pl";
@@ -82,8 +85,10 @@ sub add_attribute_type_form {
     $template->param(
         attribute_type_form => 1,
         confirm_op => 'add_attribute_type_confirmed',
+        categories => GetBorrowercategoryList,
     );
     authorised_value_category_list($template);
+    pa_classes($template);
 }
 
 sub error_add_attribute_type_form {
@@ -110,6 +115,9 @@ sub error_add_attribute_type_form {
         $template->param(display_checkout_checked => 'checked="checked"');
     }
 
+    $template->param( category_code => $input->param('category_code') );
+    $template->param( class => $input->param('class') );
+
     $template->param(
         attribute_type_form => 1,
         confirm_op => 'add_attribute_type_confirmed',
@@ -152,6 +160,8 @@ sub add_update_attribute_type {
     $attr_type->password_allowed($password_allowed);
     my $display_checkout = $input->param('display_checkout');
     $attr_type->display_checkout($display_checkout);
+    $attr_type->category_code($input->param('category_code'));
+    $attr_type->class($input->param('class'));
 
     if ($op eq 'edit') {
         $template->param(edited_attribute_type => $attr_type->code());
@@ -209,6 +219,7 @@ sub edit_attribute_type_form {
 
     $template->param(code => $code);
     $template->param(description => $attr_type->description());
+    $template->param(class => $attr_type->class());
 
     if ($attr_type->repeatable()) {
         $template->param(repeatable_checked => 1);
@@ -231,20 +242,39 @@ sub edit_attribute_type_form {
         $template->param(display_checkout_checked => 'checked="checked"');
     }
     authorised_value_category_list($template, $attr_type->authorised_value_category());
+    pa_classes( $template, $attr_type->class );
+
+    $template->param ( category_code => $attr_type->category_code );
+    $template->param ( category_description => $attr_type->category_description );
 
     $template->param(
         attribute_type_form => 1,
         edit_attribute_type => 1,
         confirm_op => 'edit_attribute_type_confirmed',
+        categories => GetBorrowercategoryList,
     );
 
 }
 
 sub patron_attribute_type_list {
     my $template = shift;
-    
+
     my @attr_types = C4::Members::AttributeTypes::GetAttributeTypes();
-    $template->param(available_attribute_types => \@attr_types);
+    my @classes = uniq( map {$_->{class}} @attr_types );
+    @classes = sort @classes;
+
+    my @attributes_loop;
+    for my $class (@classes) {
+        my @items;
+        for my $attr (@attr_types) {
+            push @items, $attr if $attr->{class} eq $class
+        }
+        push @attributes_loop, {
+            class => $class,
+            items => \@items
+        };
+    }
+    $template->param(available_attribute_types => \@attributes_loop);
     $template->param(display_list => 1);
 }
 
@@ -261,3 +291,10 @@ sub authorised_value_category_list {
     }
     $template->param(authorised_value_categories => \@list);
 }
+
+sub pa_classes {
+    my $template = shift;
+    my $selected = @_ ? shift : '';
+
+    $template->param(classes_val_loop => GetAuthorisedValues( 'PA_CLASS', $selected ) );
+}
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 37113c2..3ab9937 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -286,6 +286,8 @@ CREATE TABLE `borrower_attribute_types` ( -- definitions for custom patron field
   `staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff client (1 for yes, 0 for no)
   `authorised_value_category` varchar(10) default NULL, -- foreign key from authorised_values that links this custom field to an authorized value category
   `display_checkout` tinyint(1) NOT NULL default 0,-- defines if this field displays in checkout screens
+  `category_type` VARCHAR(1) NOT NULL DEFAULT '',-- defines a category for an attribute_type
+  `class` VARCHAR(255) NOT NULL DEFAULT '',-- defines a class for an attribute_type
   PRIMARY KEY  (`code`),
   KEY `auth_val_cat_idx` (`authorised_value_category`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..6d08cd9 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4663,6 +4663,16 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     SetVersion($DBversion);
 }
+
+$DBversion = "3.07.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN category_code VARCHAR(10) NULL DEFAULT NULL AFTER `display_checkout`");
+    $dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN class VARCHAR(255)  NOT NULL DEFAULT '' AFTER `category_type`");
+    $dbh->do("ALTER TABLE borrower_attribute_types ADD CONSTRAINT category_code_fk FOREIGN KEY (category_code) REFERENCES categories(categorycode)");
+    print "Upgrade to $DBversion done (New fields category_type and class in borrower_attribute_types table)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index b8a8e3e..f6f76c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -186,6 +186,34 @@ function CheckAttributeTypeForm(f) {
                   to be chosen from the authorized value list.  However, an authorized value list is not 
                   enforced during batch patron import.</span>
         </li>
+        <li>
+            <label for="category">Category: </label>
+            <select name="category_code" id="category">
+                <option value=""></option>
+                [% FOREACH cat IN categories %]
+                    [% IF ( cat.categorycode == category_code ) %]<option value="[% cat.categorycode %]" selected="selected">[% cat.description %]</option>[% ELSE %]<option value="[% cat.categorycode %]">[% cat.description %]</option>[% END %]
+                [% END %]
+            </select>
+            <span>Please let blank if you want these attributs to be for all types of patron. Else, select one type.</span>
+        </li>
+        <li>
+            <label for="class">Class: </label>
+            <select name="class">
+                <option value="" />
+                [% FOREACH class IN classes_val_loop %]
+                    [% IF ( class.selected ) %]
+                        <option value="[% class.authorised_value %]" selected="selected">
+                            [% class.lib %]
+                        </option>
+                    [% ELSE %]
+                        <option value="[% class.authorised_value %]" >
+                            [% class.lib %]
+                        </option>
+                    [% END %]
+                [% END %]
+            </select>
+            <span>Group attributes types with a block title (based on Authorised values category 'PA_CLASS')</span>
+        </li>
     </ol>
   </fieldset>
   <fieldset class="action">
@@ -248,23 +276,36 @@ function CheckAttributeTypeForm(f) {
 <div class="dialog message">Could not delete patron attribute type &quot;[% ERROR_delete_not_found %]&quot; 
     &mdash; it was already absent from the database.</div>
 [% END %]
-[% IF ( available_attribute_types ) %]<table>
-  <tr>
-    <th>Code</th>
-    <th>Description</th>
-    <th>Actions</th>
-  </tr>
-  [% FOREACH available_attribute_type IN available_attribute_types %]
-  <tr>
-    <td>[% available_attribute_type.code |html %]</td>
-    <td>[% available_attribute_type.description %]</td>
-    <td>
-      <a href="[% available_attribute_type.script_name %]?op=edit_attribute_type&amp;code=[% available_attribute_type.code |html %]">Edit</a>
-      <a href="[% available_attribute_type.script_name %]?op=delete_attribute_type&amp;code=[% available_attribute_type.code |html %]">Delete</a>
-    </td>
-  </tr>
+[% IF ( available_attribute_types ) %]
+  [% FOREACH attribute IN available_attribute_types %]
+    [% IF attribute.class %]
+        <h4>[% attribute.class %]</h4>
+    [% END %]
+    <table class="patron_attributes_types">
+      <thead>
+        <tr>
+          <th>Code</th>
+          <th>Description</th>
+          <th>Actions</th>
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH item IN attribute.items %]
+          <tr>
+            <td>[% item.code |html %]</td>
+            <td>[% item.description %]</td>
+            <td>
+              <a href="[% item.script_name %]?op=edit_attribute_type&amp;code=[% item.code |html %]">Edit</a>
+              <a href="[% item.script_name %]?op=delete_attribute_type&amp;code=[% item.code |html %]">Delete</a>
+            </td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
   [% END %]
-</table>[% ELSE %]<p>There are no saved patron attribute types.</p>[% END %]
+[% ELSE %]
+  <p>There are no saved patron attribute types.</p>
+[% END %]
 
 <div class="pages">[% pagination_bar %]</div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 02d39f5..eda8ff3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -23,6 +23,16 @@
             document.form.state.value=RegExp.$3;
             document.form.country.value=RegExp.$4;
         });
+
+        [% IF categorycode %]
+            update_category_code( "[% categorycode %]" );
+        [% ELSE %]
+            if ( $("#categorycode").length > 0 ){
+                var category_code = $("#categorycode").find("option:selected").val();
+                update_category_code( category_code );
+            }
+        [% END %]
+
     });
 
     function clear_entry(node) {
@@ -51,6 +61,26 @@
         $("select#patron_attr_" + newId, clone).attr('value','');
         original.parentNode.insertBefore(clone, original.nextSibling);
     }
+
+    function update_category_code(category_code) {
+        if ( $(category_code).is("select") ) {
+            category_code = $("#categorycode").find("option:selected").val();
+        }
+        var mytables = $(".attributes_table>tbody");
+
+        mytables.find("tr").each(function(){
+            $(this).hide()
+        });
+
+        mytables.find("tr[data-category_code="+category_code+"]").each(function(){
+            $(this).show();
+        });
+        mytables.find("tr[data-category_code='']").each(function(){
+            $(this).show();
+        });
+
+    }
+
 		var MSG_SEPARATOR = _("Separator must be / in field ");
         var MSG_INCORRECT_DAY = _("Invalid day entered in field ");
         var MSG_INCORRECT_MONTH = _("Invalid month entered in field ");
@@ -984,25 +1014,25 @@
         [% END %]
     <li>
         <label for="categorycode">Category: </label>
-        <select id="categorycode" name="categorycode">
+        <select id="categorycode" name="categorycode" onchange="update_category_code(this);">
         [% FOREACH typeloo IN typeloop %]
-			[% FOREACH categoryloo IN typeloo.categoryloop %]
-				[% IF ( loop.first ) %]
-					[% IF ( categoryloo.typename_C ) %]<optgroup label="Child">[% END %]
-					[% IF ( categoryloo.typename_A ) %]<optgroup label="Adult">[% END %]
-					[% IF ( categoryloo.typename_S ) %]<optgroup label="Staff">[% END %]
-					[% IF ( categoryloo.typename_I ) %]<optgroup label="Organization">[% END %]
-					[% IF ( categoryloo.typename_P ) %]<optgroup label="Professional">[% END %]
-					[% IF ( categoryloo.typename_X ) %]<optgroup label="Statistical">[% END %]
-			    [% END %]
-				[% IF ( categoryloo.categorycodeselected ) %]
-               <option value="[% categoryloo.categorycode %]" selected="selected">[% categoryloo.categoryname %]</option>
-				[% ELSE %]
-<option value="[% categoryloo.categorycode %]">[% categoryloo.categoryname %]</option>
-				[% END %]
-				[% IF ( loop.last ) %]
-			        </optgroup>
-				[% END %]
+            [% FOREACH categoryloo IN typeloo.categoryloop %]
+                [% IF ( loop.first ) %]
+                    [% IF ( categoryloo.typename_C ) %]<optgroup label="Child"        value="C">[% END %]
+                    [% IF ( categoryloo.typename_A ) %]<optgroup label="Adult"        value="A">[% END %]
+                    [% IF ( categoryloo.typename_S ) %]<optgroup label="Staff"        value="S">[% END %]
+                    [% IF ( categoryloo.typename_I ) %]<optgroup label="Organization" value="I">[% END %]
+                    [% IF ( categoryloo.typename_P ) %]<optgroup label="Professional" value="P">[% END %]
+                    [% IF ( categoryloo.typename_X ) %]<optgroup label="Statistical"  value="X">[% END %]
+                [% END %]
+                [% IF ( categoryloo.categorycodeselected ) %]
+                    <option value="[% categoryloo.categorycode %]" selected="selected" data-typename="[% typeloo.typename %]">[% categoryloo.categoryname %]</option>
+                [% ELSE %]
+                    <option value="[% categoryloo.categorycode %]" data-typename="[% typeloo.typename %]">[% categoryloo.categoryname %]</option>
+                [% END %]
+                [% IF ( loop.last ) %]
+                    </optgroup>
+                [% END %]
             [% END %]
        [% END %]
        </select>
@@ -1281,7 +1311,7 @@
 			       [% IF ( opduplicate ) %] 
 			           <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
 			       [% ELSE %]
-				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" ">[% debarredcomment %]</textarea> 
+				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" >[% debarredcomment %]</textarea>
 			       [% END %]
 	        </li>
 
@@ -1296,55 +1326,67 @@
   <fieldset class="rows" id="memberentry_patron_attributes">
     <input type="hidden" name="setting_extended_patron_attributes" value="1" />
     <legend>Additional attributes and identifiers</legend>
-    <table>
-        <tr>
-            <th>Type</th>
-            <th colspan="2">Value</th>
-        </tr>
-        [% FOREACH patron_attribute IN patron_attributes %]
-        <tr>
-            <td>[% patron_attribute.code %] ([% patron_attribute.description %])
-            </td>
-            <td>
-                <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" />
-                [% IF ( patron_attribute.use_dropdown ) %]
-                    <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">
-                        <option value="" />
-                        [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
-                            [% IF ( auth_val_loo.selected ) %]
-                                <option value="[% auth_val_loo.authorised_value %]" selected="selected">
-                                    [% auth_val_loo.lib %]
-                                </option>
+    [% FOREACH pa_loo IN patron_attributes %]
+        [% IF pa_loo.class %]
+            <h4>[% pa_loo.class %]</h4>
+            <table id=aai_[% pa_loo.class %] class="attributes_table">
+        [% ELSE %]
+            <table id="aai" class="attributes_table">
+        [% END %]
+        <thead>
+            <tr>
+                <th>Type</th>
+                <th colspan="2">Value</th>
+            </tr>
+        </thead>
+        <tbody>
+            [% FOREACH patron_attribute IN pa_loo.items %]
+                <tr data-category_code="[% patron_attribute.category_code %]">
+                    <td>
+                        [% patron_attribute.code %] ([% patron_attribute.description %])
+                    </td>
+                    <td>
+                        <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" />
+                        [% IF ( patron_attribute.use_dropdown ) %]
+                            <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">
+                                <option value="" />
+                                [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
+                                    [% IF ( auth_val_loo.selected ) %]
+                                        <option value="[% auth_val_loo.authorised_value %]" selected="selected">
+                                            [% auth_val_loo.lib %]
+                                        </option>
+                                    [% ELSE %]
+                                        <option value="[% auth_val_loo.authorised_value %]" >
+                                            [% auth_val_loo.lib %]
+                                        </option>
+                                    [% END %]
+                                [% END %]
+                            </select>
+                        [% ELSE %]
+                            [% IF ( opduplicate ) %]
+                            <input type="text" maxlength="64" value="[% patron_attribute.value %]"
+                                   id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]" onclick="this.value=''" />
                             [% ELSE %]
-                                <option value="[% auth_val_loo.authorised_value %]" >
-                                    [% auth_val_loo.lib %]
-                                </option>
+                            <input type="text" maxlength="64" value="[% patron_attribute.value %]"
+                                   id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]" />
                             [% END %]
                         [% END %]
-                    </select>
-                [% ELSE %]
-                    [% IF ( opduplicate ) %]
-                    <input type="text" maxlength="64" value="[% patron_attribute.value %]"
-                           id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]" onclick="this.value=''" />
-                    [% ELSE %]
-                    <input type="text" maxlength="64" value="[% patron_attribute.value %]"
-                           id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]" />
-                    [% END %]
-                [% END %]
-                [% IF ( patron_attribute.password_allowed ) %]
-                    (Password: <input type="password" maxlength="64" value="[% patron_attribute.password %]"
-                           id="[% patron_attribute.form_id %]_password" name="[% patron_attribute.form_id %]_password" />)
-                [% END %]
-            </td>
-            <td>
-                <a href="#" onclick="clear_entry(this); return false;">Clear</a>
-                [% IF ( patron_attribute.repeatable ) %]
-                <a href="#" onclick="clone_entry(this); return false;">New</a>
-                [% END %]
-            </td>
-        </tr>
-        [% END %]
-    </table>
+                        [% IF ( patron_attribute.password_allowed ) %]
+                            (Password: <input type="password" maxlength="64" value="[% patron_attribute.password %]"
+                                   id="[% patron_attribute.form_id %]_password" name="[% patron_attribute.form_id %]_password" />)
+                        [% END %]
+                    </td>
+                    <td>
+                        <a href="#" onclick="clear_entry(this); return false;">Clear</a>
+                        [% IF ( patron_attribute.repeatable ) %]
+                        <a href="#" onclick="clone_entry(this); return false;">New</a>
+                        [% END %]
+                    </td>
+                </tr>
+            [% END %]
+        </tbody>
+        </table>
+    [% END %]
   </fieldset>
 [% END %][% END %][% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index c3d7063..3bd1203 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -285,22 +285,35 @@ function validate1(date) {
 [% UNLESS ( no_patron_attribute_types ) %]
 <div id="patron-extended-attributes" style="padding-top: 1em;">
 <h3>Additional attributes and identifiers</h3>
-<table>
-    <tr>
-        <th>Type</th>
-        <th>Value</th>
-    </tr>
-    [% FOREACH extendedattribute IN extendedattributes %]
-    <tr>
-        <td>[% extendedattribute.code %] ([% extendedattribute.description %])</td>
-        <td>[% extendedattribute.value %]
-            [% IF ( extendedattribute.value_description ) %]
-                ([% extendedattribute.value_description %])
-            [% END %]
-        </td>
-    </tr>
+[% FOREACH attribute IN attributes_loop %]
+    [% IF attribute.class %]
+        <h4>[% attribute.class %]</h4>
+        <table id=aai_[% attribute.class %]>
+    [% ELSE %]
+        <table id="aai">
     [% END %]
-</table>
+        <thead>
+            <tr>
+                <th>Type</th>
+                <th>Description</th>
+                <th>Value</th>
+            </tr>
+        </thead>
+        <tbody>
+        [% FOREACH item IN attribute.items %]
+            <tr>
+                <td>[% item.code %]</td>
+                <td>[% item.description %]</td>
+                <td>[% item.value %]
+                    [% IF ( item.value_description ) %]
+                        ([% item.value_description %])
+                    [% END %]
+                </td>
+            </tr>
+        [% END %]
+        </tbody>
+    </table>
+[% END %]
 </div>
 <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=4">Edit</a></div>
 [% END %]
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 6de07bf..4969f40 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -25,6 +25,7 @@ use warnings;
 # external modules
 use CGI;
 # use Digest::MD5 qw(md5_base64);
+use List::MoreUtils qw/uniq/;
 
 # internal modules
 use C4::Auth;
@@ -414,6 +415,9 @@ if ($op eq 'add'){
 if ($op eq "modify")  {
     $template->param( updtype => 'M',modify => 1 );
     $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1) unless $step;
+    if ( $step == 4 ) {
+        $template->param( category_type => $borrower_data->{'categorycode'} );
+    }
 }
 if ( $op eq "duplicate" ) {
     $template->param( updtype => 'I' );
@@ -755,6 +759,8 @@ sub patron_attributes_form {
         return;
     }
     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
+    my @classes = uniq( map {$_->{class}} @$attributes );
+    @classes = sort @classes;
 
     # map patron's attributes into a more convenient structure
     my %attr_hash = ();
@@ -764,14 +770,17 @@ sub patron_attributes_form {
 
     my @attribute_loop = ();
     my $i = 0;
+    my %items_by_class;
     foreach my $type_code (map { $_->{code} } @types) {
         my $attr_type = C4::Members::AttributeTypes->fetch($type_code);
         my $entry = {
+            class             => $attr_type->class(),
             code              => $attr_type->code(),
             description       => $attr_type->description(),
             repeatable        => $attr_type->repeatable(),
             password_allowed  => $attr_type->password_allowed(),
             category          => $attr_type->authorised_value_category(),
+            category_code     => $attr_type->category_code(),
             password          => '',
         };
         if (exists $attr_hash{$attr_type->code()}) {
@@ -786,8 +795,7 @@ sub patron_attributes_form {
                 }
                 $i++;
                 $newentry->{form_id} = "patron_attr_$i";
-                #use Data::Dumper; die Dumper($entry) if  $entry->{use_dropdown};
-                push @attribute_loop, $newentry;
+                push @{$items_by_class{$attr_type->class()}}, $newentry;
             }
         } else {
             $i++;
@@ -797,9 +805,16 @@ sub patron_attributes_form {
                 $newentry->{auth_val_loop} = GetAuthorisedValues($attr_type->authorised_value_category());
             }
             $newentry->{form_id} = "patron_attr_$i";
-            push @attribute_loop, $newentry;
+            push @{$items_by_class{$attr_type->class()}}, $newentry;
+        }
+    }
+    while ( my ($class, @items) = each %items_by_class ) {
+        push @attribute_loop, {
+            class => $class,
+            items => @items
         }
     }
+
     $template->param(patron_attributes => \@attribute_loop);
 
 }
diff --git a/members/moremember.pl b/members/moremember.pl
index c477100..e3f8e87 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -252,7 +252,6 @@ my $issuecount     = @{$issue};
 my $relissuecount  = @{$relissue};
 my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
 my $today       = POSIX::strftime("%Y-%m-%d", localtime);	# iso format
-my @issuedata;
 my @borrowers_with_issues;
 my $overdues_exist = 0;
 my $totalprice = 0;
@@ -432,11 +431,27 @@ my $branch=C4::Context->userenv->{'branch'};
 $template->param(%$data);
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = GetBorrowerAttributes($borrowernumber);
+    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
+    my @classes = uniq( map {$_->{class}} @$attributes );
+    @classes = sort @classes;
+
+    my @attributes_loop;
+    for my $class (@classes) {
+        my @items;
+        for my $attr (@$attributes) {
+            push @items, $attr if $attr->{class} eq $class
+        }
+        push @attributes_loop, {
+            class => $class,
+            items => \@items
+        };
+    }
+
     $template->param(
         ExtendedPatronAttributes => 1,
-        extendedattributes => $attributes
+        attributes_loop => \@attributes_loop
     );
+
     my @types = C4::Members::AttributeTypes::GetAttributeTypes();
     if (scalar(@types) == 0) {
         $template->param(no_patron_attribute_types => 1);
-- 
1.7.7.3


From jonathan.druart at biblibre.com  Fri Feb 10 10:25:32 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Fri, 10 Feb 2012 10:25:32 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH_1/1=5D_=5BSIGNED-OFF=5D_Bug_534?=
	=?utf-8?q?6=3A_Small_display_changes?=
Message-ID: <1328865932-5495-1-git-send-email-jonathan.druart@biblibre.com>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

Changing display from:
Suggested by Admin, Koha (from suggestion #2)

To:
Suggested by: Admin, Koha (suggestion #2)

Adding some missing parentheses and deleting some additional spaces.

Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
---
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    5 ++---
 .../prog/en/modules/acqui/neworderempty.tt         |    4 ++--
 .../prog/en/modules/acqui/orderreceive.tt          |    4 ++--
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   10 ++++------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 1632278..abfa675 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -285,9 +285,8 @@
                                     [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
                                     [% IF ( books_loo.suggestionid ) %]
                                         <br/>
-                                        Suggested by [% books_loo.surnamesuggestedby %]
-                                        [% IF ( books_loo.firstnamesuggestedby ) %],?[% books_loo.firstnamesuggestedby %] [% END %]
-                                        (from <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]">suggestion #[% books_loo.suggestionid %]</a>)
+                                        Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %],?[% books_loo.firstnamesuggestedby %] [% END %]
+                                        (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]">suggestion #[% books_loo.suggestionid %]</a>)
                                     [% END %]
                             </p>
                             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 6a6fc65..a3bfa67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -315,8 +315,8 @@ $(document).ready(function()
         <legend>Suggestion</legend>
         <ol>
           <li>
-            <span class="label">Suggested by </span>
-            [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %],?[% firstnamesuggestedby %][% END %] (from <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid %]">suggestion #[% suggestionid %]</a>)
+            <span class="label">Suggested by: </span>
+            [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %],?[% firstnamesuggestedby %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid %]">suggestion #[% suggestionid %]</a>)
           </li>
         </ol>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index fe8287d..f06d353 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -41,8 +41,8 @@
         <legend>Suggestion</legend>
         <ol>
           <li>
-            <span class="label">Suggested by </span>
-            [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %],?[% firstnamesuggestedby %][% END %] (from <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid %]">suggestion #[% suggestionid %]</a>)
+            <span class="label">Suggested by: </span>
+            [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %],?[% firstnamesuggestedby %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid %]">suggestion #[% suggestionid %]</a>)
           </li>
         </ol>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 34a55b0..8e45870 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -243,9 +243,8 @@
                 [% IF ( loop_order.publishercode ) %]<br />Publisher :[% loop_order.publishercode %][% END %]
                 [% IF ( loop_order.suggestionid ) %]
                     <br/>
-                    Suggested by [% loop_order.surnamesuggestedby %]
-                    [% IF ( loop_order.firstnamesuggestedby ) %],?[% loop_order.firstnamesuggestedby %] [% END %]
-                    (from <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid %]">suggestion #[% loop_order.suggestionid %]</a>)
+                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %],?[% loop_order.firstnamesuggestedby %] [% END %]
+                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid %]">suggestion #[% loop_order.suggestionid %]</a>)
                 [% END %]
                 </td>
                 <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
@@ -369,9 +368,8 @@
                 [% IF ( loop_receive.publishercode ) %]<br />Publisher :[% loop_receive.publishercode %][% END %]
                 [% IF ( loop_receive.suggestionid ) %]
                     <br/>
-                    Suggested by [% loop_receive.surnamesuggestedby %]
-                    [% IF ( loop_receive.firstnamesuggestedby ) %],?[% loop_receive.firstnamesuggestedby %] [% END %]
-                    (from <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_receive.suggestionid %]">suggestion #[% loop_receive.suggestionid %]</a>
+                    Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %],?[% loop_receive.firstnamesuggestedby %] [% END %]
+                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_receive.suggestionid %]">suggestion #[% loop_receive.suggestionid %]</a>)
                 [% END %]
                 </td>
                 <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
-- 
1.7.7.3


From jonathan.druart at biblibre.com  Fri Feb 10 11:19:56 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Fri, 10 Feb 2012 11:19:56 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 6751: Adds a link "Export checkin
	barcodes" in readingrec
Message-ID: <1328869196-8963-1-git-send-email-jonathan.druart@biblibre.com>

to export a file containing a list of checkin barcode for the current day.

Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
---
 .../prog/en/modules/members/readingrec.tt          |    5 ++++
 members/readingrec.pl                              |   23 +++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index 36f8937..245dece 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -29,6 +29,11 @@
 [% IF ( loop_reading ) %]
 <form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
 
+<p><a href="readingrec.pl?borrowernumber=[% borrowernumber %]&amp;op=export_barcodes">Export checkin barcodes</a></p>
+<div id="pagertable_readingrec">
+[% INCLUDE 'table-pager.inc' perpage='20' %]
+</div>
+
 <table id="table_readingrec">
 <thead>
     <th>Date</th>
diff --git a/members/readingrec.pl b/members/readingrec.pl
index c4a8237..d285850 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -29,7 +29,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Members;
 use C4::Branch;
-use List::MoreUtils qw/any/;
+use List::MoreUtils qw/any uniq/;
 
 use C4::Dates qw/format_date/;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
@@ -64,6 +64,9 @@ my $limit = 0;
 my ( $issues ) = GetAllIssues($borrowernumber,$order,$limit);
 
 my @loop_reading;
+my @barcodes;
+my $today = C4::Dates->new();
+$today = $today->output("iso");
 
 foreach my $issue (@{$issues}){
  	my %line;
@@ -80,6 +83,24 @@ foreach my $issue (@{$issues}){
 	$line{barcode}         = $issue->{'barcode'};
 	$line{volumeddesc}     = $issue->{'volumeddesc'};
 	push(@loop_reading,\%line);
+    if (($input->param('op') eq 'export_barcodes') and ($today eq $issue->{'returndate'})) {
+        push( @barcodes, $issue->{'barcode'} );
+    }
+}
+
+if ($input->param('op') eq 'export_barcodes') {
+    my $borrowercardnumber = GetMember( borrowernumber => $borrowernumber )->{'cardnumber'} ;
+    my $delimiter = ":";
+    $delimiter = "\n";
+    binmode( STDOUT, ":encoding(UTF-8)");
+    print $input->header(
+        -type       => 'application/octet-stream',
+        -charset    => 'utf-8',
+        -attachment => "$today-$borrowercardnumber-checkinexport.txt"
+    );
+    my $content = join($delimiter, uniq(@barcodes));
+    print $content;
+    exit;
 }
 
 if ( $data->{'category_type'} eq 'C') {
-- 
1.7.7.3


From stephane.delaune at biblibre.com  Fri Feb 10 12:09:16 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Fri, 10 Feb 2012 12:09:16 +0100
Subject: [Koha-patches] [PATCH 3/3] Bug 7286: followup fix rebuild_zebra.pl
	to add rebuild_zebra_sliced.zsh
Message-ID: <1328872156-4761-1-git-send-email-stephane.delaune@biblibre.com>

---
 misc/migration_tools/rebuild_zebra_sliced.zsh |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra_sliced.zsh b/misc/migration_tools/rebuild_zebra_sliced.zsh
index b6af48c..9a40252 100755
--- a/misc/migration_tools/rebuild_zebra_sliced.zsh
+++ b/misc/migration_tools/rebuild_zebra_sliced.zsh
@@ -20,6 +20,7 @@
 INCREMENT=$1
 BIBLIOSTART=$2
 BIBLIOEND=$3
+TEMPDIRECTORY=$4
 
 #echo " | $INCREMENT , $BIBLIOSTART , $BIBLIOEND | ";
 # this script rebuild the zebra index recursively
@@ -52,15 +53,21 @@ $sthlastbiblionumber->execute();
 my ( $lastbiblionumber ) = $sthlastbiblionumber->fetchrow_array; print $lastbiblionumber;'`
 #echo $lastbiblionumber;
 let "maxbiblionumber = $lastbiblionumber + 1"
-if [ $# = 2 ]
+if [ $# = 3 ]
 then
+    TEMPDIRECTORY=/tmp/rebuild
+elif [ $# = 2 ]
+then
+    TEMPDIRECTORY=/tmp/rebuild
     BIBLIOEND=$lastbiblionumber
 elif [ $# = 1 ]
 then
+    TEMPDIRECTORY=/tmp/rebuild
     BIBLIOSTART=0
     BIBLIOEND=$lastbiblionumber
 elif [ $# = 0 ]
 then
+    TEMPDIRECTORY=/tmp/rebuild
     INCREMENT=10000
     BIBLIOSTART=0
     BIBLIOEND=$lastbiblionumber
@@ -102,11 +109,21 @@ fi
     else
         rm `dirname $0`/logs/*
     fi
+    ls $TEMPDIRECTORY >/dev/null 2>&1
+    if [ $? != 0 ]
+    then
+        mkdir $TEMPDIRECTORY
+        if [ $? != 0 ]
+        then
+            echo "can't create dir $TEMPDIRECTORY"
+            exit 2
+        fi
+    fi
     #/home/koha/src/misc/migration_tools/rebuild_zebra.pl -r -b -v -x -nosanitize -length 1 -offset 1
     for ((i=$BIBLIOSTART ; i<$BIBLIOEND ; i=i+$INCREMENT))
     do
         echo "I = " $i "with increment " $INCREMENT
-        `dirname $0`/rebuild_zebra.pl -b -v -x -nosanitize -d /tmp/rebuild -k -length $INCREMENT -offset $i > `dirname $0`/logs/rebuild$INCREMENT.$i.log 2> `dirname $0`/logs/rebuild$INCREMENT.$i.err
+        `dirname $0`/rebuild_zebra.pl -b -v -x -nosanitize -d $TEMPDIRECTORY -k -length $INCREMENT -offset $i > `dirname $0`/logs/rebuild$INCREMENT.$i.log 2> `dirname $0`/logs/rebuild$INCREMENT.$i.err
         if (($INCREMENT >1 ));
         then
             if { grep -q "previous transaction" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ;
-- 
1.7.0.4


From jonathan.druart at biblibre.com  Fri Feb 10 11:59:29 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Fri, 10 Feb 2012 11:59:29 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH_1/1=5D_Bug_7289=3A_Adds_edition?=
	=?utf-8?q?statement_field_in_neworderempty?=
Message-ID: <1328871570-10771-1-git-send-email-jonathan.druart@biblibre.com>

---
 acqui/addorder.pl                                  |    1 +
 acqui/neworderempty.pl                             |    1 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../marc21/optional/marc21_fastadd_framework.sql   |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++------
 .../mandatory/unimarc_framework_DEFAULT.sql        |    2 +-
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../marc21/optional/marc21_fastadd_framework.sql   |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++------
 .../Obligatoire/marc21_framework_DEFAULT.sql       |    2 +-
 .../Optionnel/marc21_simple_bib_frameworks.sql     |   16 ++++++------
 .../Obligatoire/framework_DEFAULT.sql              |    2 +-
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../marc21/optional/marc21_fastadd_framework.sql   |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../marc21/optional/marc21_fastadd_framework.sql   |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../marc21/optional/marc21_fastadd_framework.sql   |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++------
 installer/data/mysql/updatedatabase.pl             |   24 ++++++++++++++++++++
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    2 +
 .../prog/en/modules/acqui/neworderempty.tt         |   10 ++++++++
 26 files changed, 108 insertions(+), 70 deletions(-)

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 121d20d..279084b 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -206,6 +206,7 @@ if ( $orderinfo->{quantity} ne '0' ) {
                 "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
                 "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
                 "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
+                "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "",
             });
 
         # create the record in catalogue, with framework ''
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 459dfe8..9d88e26 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -376,6 +376,7 @@ $template->param(
     title            => $data->{'title'},
     author           => $data->{'author'},
     publicationyear  => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'},
+    editionstatement => $data->{'editionstatement'},
     budget_loop      => $budget_loop,
     isbn             => $data->{'isbn'},
     seriestitle      => $data->{'seriestitle'},
diff --git a/installer/data/Pg/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/Pg/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index 5ebbb1f..3c9156d 100644
--- a/installer/data/Pg/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/Pg/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -1002,7 +1002,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
diff --git a/installer/data/Pg/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/Pg/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index 277c48c..ee3e9f1 100644
--- a/installer/data/Pg/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/Pg/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -1026,7 +1026,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
@@ -4944,7 +4944,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
@@ -8861,7 +8861,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
@@ -12778,7 +12778,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
@@ -16693,7 +16693,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
@@ -20608,7 +20608,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
@@ -24525,7 +24525,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
@@ -28437,7 +28437,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index b81bd2b..62c64ad 100644
--- a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -1005,7 +1005,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_fastadd_framework.sql b/installer/data/mysql/en/marcflavour/marc21/optional/marc21_fastadd_framework.sql
index 0ba4025..40180d0 100644
--- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_fastadd_framework.sql
+++ b/installer/data/mysql/en/marcflavour/marc21/optional/marc21_fastadd_framework.sql
@@ -74,7 +74,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('245','s','Version','Version',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
-		('250','a','Edition statement','Edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
+		('250','a','Edition statement','Edition statement',0,0,'biblioitems.editionstatement',0,'','','',0,0,'FA',NULL,'',''),
 		('250','b','Remainder of edition statement','Remainder of edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index 7cee9c8..2a1d37e 100644
--- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -1030,7 +1030,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
@@ -4959,7 +4959,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
@@ -8887,7 +8887,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
@@ -12815,7 +12815,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
@@ -16741,7 +16741,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
@@ -20667,7 +20667,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
@@ -24595,7 +24595,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
@@ -28518,7 +28518,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
index b3c0f4b..02093d3 100644
--- a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
+++ b/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
@@ -438,7 +438,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('200', 'i', 'Name of a Part', 'Name of a Part', 0, 0, '', 2, '', '', '', 0, 0, '', '', '', NULL),
 		('200', 'v', 'Volume Designation', 'Volume Designation', 0, 0, '', 2, '', '', '', 0, 0, '', '', '', NULL),
 		('200', 'z', 'Language of Paralel Title Proper', 'Language of Paralel Title Proper', 0, 0, '', 2, '', '', '', 0, 0, '', '', '', NULL),
-		('205', 'a', 'Edition Statement', 'Edition Statement', 0, 0, '', 2, '', '', '', 0, 0, '', '', '', NULL),
+		('205', 'a', 'Edition Statement', 'Edition Statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', 0, 0, '', '', '', NULL),
 		('205', 'b', 'Issue Statement', 'Issue Statement', 0, 0, '', 2, '', '', '', 0, 0, '', '', '', NULL),
 		('205', 'd', 'Parallel Edition Statement', 'Parallel Edition Statement', 0, 0, '', 2, '', '', '', 0, 0, '', '', '', NULL),
 		('205', 'f', 'Statement of Responsibility Relating to Edition', 'Statement of Responsibility Relating to Edition', 0, 0, '', 2, '', '', '', 0, 0, '', '', '', NULL),
diff --git a/installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index b976ea6..552ab82 100644
--- a/installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -1005,7 +1005,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
diff --git a/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_fastadd_framework.sql b/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_fastadd_framework.sql
index 0ba4025..40180d0 100644
--- a/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_fastadd_framework.sql
+++ b/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_fastadd_framework.sql
@@ -74,7 +74,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('245','s','Version','Version',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
-		('250','a','Edition statement','Edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
+		('250','a','Edition statement','Edition statement',0,0,'biblioitems.editionstatement',0,'','','',0,0,'FA',NULL,'',''),
 		('250','b','Remainder of edition statement','Remainder of edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
diff --git a/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index 8db6fe9..2d9a7fd 100644
--- a/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -1031,7 +1031,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
@@ -4958,7 +4958,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
@@ -8884,7 +8884,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
@@ -12810,7 +12810,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
@@ -16734,7 +16734,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
@@ -20658,7 +20658,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
@@ -24584,7 +24584,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
@@ -28505,7 +28505,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql b/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
index a5212ab..e967f24 100644
--- a/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
@@ -1005,7 +1005,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
diff --git a/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql b/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
index 3c96826..1c66be7 100644
--- a/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
@@ -1030,7 +1030,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
@@ -4957,7 +4957,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
@@ -8883,7 +8883,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
@@ -12809,7 +12809,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
@@ -16733,7 +16733,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
@@ -20657,7 +20657,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
@@ -24583,7 +24583,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
@@ -28504,7 +28504,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/fr-FR/marcflavour/unimarc_lecture_pub/Obligatoire/framework_DEFAULT.sql b/installer/data/mysql/fr-FR/marcflavour/unimarc_lecture_pub/Obligatoire/framework_DEFAULT.sql
index 63be2d6..789b015 100644
--- a/installer/data/mysql/fr-FR/marcflavour/unimarc_lecture_pub/Obligatoire/framework_DEFAULT.sql
+++ b/installer/data/mysql/fr-FR/marcflavour/unimarc_lecture_pub/Obligatoire/framework_DEFAULT.sql
@@ -1156,7 +1156,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES ('200', 'i', 'titre partie', '', 1, 0, 'biblio.unititle', 0, '', '', '', 0, -1, '', '', '', NULL);
 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES ('200', 'v', 'num?ro de volume', '', 0, 0, '', -1, '', '', '', 0, 0, '', '', '', NULL);
 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES ('200', 'z', 'langue du titre parall?le', '', 0, 0, '', -1, '', '', '', 0, 0, '', '', '', NULL);
-INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES ('205', 'a', 'mention d''?dition', '', 0, 0, '', -1, '', '', '', 0, 0, '', '', '', NULL);
+INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES ('205', 'a', 'mention d''?dition', '', 0, 0, 'biblioitems.editionstatement', -1, '', '', '', 0, 0, '', '', '', NULL);
 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES ('205', 'b', 'mention de parution', '', 1, 0, '', -1, '', '', '', 0, 0, '', '', '', NULL);
 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES ('205', 'd', 'mention parall?le d''?dition', '', 1, 0, '', -1, '', '', '', 0, 0, '', '', '', NULL);
 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES ('205', 'f', 'mention de responsabilit? relative ? l''?dition', '', 1, 0, '', -1, '', '', '', 0, 0, '', '', '', NULL);
diff --git a/installer/data/mysql/it-IT/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/it-IT/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index ff3f7e5..913d23f 100644
--- a/installer/data/mysql/it-IT/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/it-IT/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -1005,7 +1005,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
diff --git a/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_fastadd_framework.sql b/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_fastadd_framework.sql
index 0ba4025..40180d0 100644
--- a/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_fastadd_framework.sql
+++ b/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_fastadd_framework.sql
@@ -74,7 +74,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('245','s','Version','Version',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
-		('250','a','Edition statement','Edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
+		('250','a','Edition statement','Edition statement',0,0,'biblioitems.editionstatement',0,'','','',0,0,'FA',NULL,'',''),
 		('250','b','Remainder of edition statement','Remainder of edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
diff --git a/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index cc0e64e..0744263 100644
--- a/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -1030,7 +1030,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
@@ -4953,7 +4953,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
@@ -8875,7 +8875,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
@@ -12797,7 +12797,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
@@ -16717,7 +16717,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
@@ -20637,7 +20637,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
@@ -24559,7 +24559,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
@@ -28476,7 +28476,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index 035bf2b..b299f50 100644
--- a/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -1005,7 +1005,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
diff --git a/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_fastadd_framework.sql b/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_fastadd_framework.sql
index 45c2fda..1ec4d52 100644
--- a/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_fastadd_framework.sql
+++ b/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_fastadd_framework.sql
@@ -74,7 +74,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('245','s','Version','Version',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
-		('250','a','Edition statement','Edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
+		('250','a','Edition statement','Edition statement',0,0,'biblioitems.editionstatement',0,'','','',0,0,'FA',NULL,'',''),
 		('250','b','Remainder of edition statement','Remainder of edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
diff --git a/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index 8e9d6e2..b34566d 100644
--- a/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -1029,7 +1029,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
@@ -4955,7 +4955,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
@@ -8880,7 +8880,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
@@ -12805,7 +12805,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
@@ -16728,7 +16728,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
@@ -20651,7 +20651,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
@@ -24576,7 +24576,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
@@ -28496,7 +28496,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index 1721533..92963bc 100644
--- a/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -1004,7 +1004,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, '', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, '', '', '', NULL),
diff --git a/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_fastadd_framework.sql b/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_fastadd_framework.sql
index 36a435c..e8d5bf3 100644
--- a/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_fastadd_framework.sql
+++ b/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_fastadd_framework.sql
@@ -74,7 +74,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('245','s','Version','Version',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('250','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
-		('250','a','Edition statement','Edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
+		('250','a','Edition statement','Edition statement',0,0,'biblioitems.editionstatement',0,'','','',0,0,'FA',NULL,'',''),
 		('250','b','Remainder of edition statement','Remainder of edition statement',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','6','Linkage','Linkage',0,0,'',0,'','','',0,0,'FA',NULL,'',''),
 		('260','8','Field link and sequence number','Field link and sequence number',1,0,'',0,'','','',0,0,'FA',NULL,'',''),
diff --git a/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index a42d3ea..6d55c12 100644
--- a/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -1030,7 +1030,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'BKS', '', '', NULL),
@@ -4957,7 +4957,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'CF', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'CF', '', '', NULL),
@@ -8883,7 +8883,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SR', '', '', NULL),
@@ -12809,7 +12809,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'VR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'VR', '', '', NULL),
@@ -16733,7 +16733,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'AR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'AR', '', '', NULL),
@@ -20657,7 +20657,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'KT', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'KT', '', '', NULL),
@@ -24583,7 +24583,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'IR', '', '', NULL),
@@ -28504,7 +28504,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('247', 'x', 'International Standard Serial Number', 'International Standard Serial Number', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('250', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
-		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
+		('250', 'a', 'Edition statement', 'Edition statement', 0, 0, 'biblioitems.editionstatement', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('250', 'b', 'Remainder of edition statement', 'Remainder of edition statement', 0, 0, '', 2, '', '', '', NULL, -1, 'SER', '', '', NULL),
 		('254', '6', 'Linkage', 'Linkage', 0, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
 		('254', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 2, '', '', '', NULL, -6, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..d66bc7c 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4663,6 +4663,30 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     SetVersion($DBversion);
 }
+
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    my $sth = $dbh->prepare(q|
+        SELECT COUNT(*) FROM marc_subfield_structure where kohafield="biblioitems.editionstatement"
+        |);
+    $sth->execute;
+    my $already_exists = $sth->fetchrow;
+    if ( not $already_exists ) {
+        my $field = C4::Context->preference("marcflavour") eq "UNIMARC" ? "205" : "250";
+        my $subfield = "a";
+        my $sth = $dbh->prepare( q|
+            UPDATE marc_subfield_structure SET kohafield = "biblioitems.editionstatement"
+            WHERE tagfield = ? AND tagsubfield = ?
+        |);
+        $sth->execute( $field, $subfield );
+        print "Upgrade to $DBversion done (Added a mapping for biblioitems.editionstatement.)\n";
+    } else {
+        print "Upgrade to $DBversion done (Added a mapping for biblioitems.editionstatement (already exists, nothing todo).)\n";
+    }
+    SetVersion($DBversion);
+}
+
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index aaea6c0..4633d03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -283,6 +283,7 @@
                                     [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
                                     [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
                                     [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
+                                    [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
                             </p>
                             </td>
                         <td class="number">[% books_loo.rrp %]</td>
@@ -363,6 +364,7 @@
                         [% IF ( order.issn ) %] - [% order.issn %][% END %]
                         [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
                         [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
+                        [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
                       </p>
                     </td>
                     <td><p>[% order.rrp %]</p></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index e1dbbde..d335bdb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -266,6 +266,16 @@ $(document).ready(function()
         </li>
         <li>
             [% IF ( biblionumber ) %]
+            <span class="label">Edition: </span>
+                <input type="hidden" size="20" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %]
+
+            [% ELSE %]
+            <label for="editionstatement">Edition: </label>
+                <input type="text" size="20" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />
+            [% END %]
+        </li>
+        <li>
+            [% IF ( biblionumber ) %]
             <span class="label">Publication year: </span>
                 <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
             [% ELSE %]
-- 
1.7.7.3


From gcollum at gmail.com  Sat Feb 11 18:58:45 2012
From: gcollum at gmail.com (Garry Collum)
Date: Sat, 11 Feb 2012 12:58:45 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 7530: Missing <li> tag in
	circ-menu.inc
Message-ID: <1328983125-1129-1-git-send-email-gcollum@gmail.com>

The address information of circ-menu.inc is not contained in <li> tags, this patch fixes it.
---
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 6ae7cb6..00dc445 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -22,7 +22,7 @@
     [% ELSE %]
             <li><span class="empty" id="noadressstored">No address stored.</span></li>
     [% END %]
-    [% IF ( city ) %]
+    <li>[% IF ( city ) %]
             [% city %][% IF ( state ) %], [% state %][% END %]
 	    [% zipcode %][% IF ( country ) %], [% country %][% END %]
     [% ELSE %]
-- 
1.7.5.4


From robin at catalyst.net.nz  Sun Feb 12 03:20:59 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Sun, 12 Feb 2012 15:20:59 +1300
Subject: [Koha-patches] [PATCH] Bug 7409 - add unzip and perl-doc
	dependencies to package
Message-ID: <1329013259-1312-1-git-send-email-robin@catalyst.net.nz>

---
 debian/control    |    3 ++-
 debian/control.in |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index e0827f9..ec8a751 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,6 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libgraphics-magick-perl,
  libgravatar-url-perl,
  libhtml-scrubber-perl,
- libhtml-template-pro-perl,
  libhttp-oai-perl,
  libjson-perl,
  liblingua-stem-perl,
@@ -94,9 +93,11 @@ Depends: ${misc:Depends}, ${koha:Depends},
  libjs-jquery,
  libjs-yui,
  mysql-client,
+ perl-doc,
  pwgen,
  sudo,
  tinymce2, 
+ unzip,
  xmlstarlet,
  yaz
 Suggests: mysql-server
diff --git a/debian/control.in b/debian/control.in
index 5cafcb4..24549b9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -21,9 +21,11 @@ Depends: ${misc:Depends}, ${koha:Depends},
  libjs-jquery,
  libjs-yui,
  mysql-client,
+ perl-doc,
  pwgen,
  sudo,
  tinymce2, 
+ unzip,
  xmlstarlet,
  yaz
 Suggests: mysql-server
-- 
1.7.5.4


From robin at catalyst.net.nz  Sun Feb 12 04:48:39 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Sun, 12 Feb 2012 16:48:39 +1300
Subject: [Koha-patches] [PATCH] Bug 7532 - remove dependency on Date::ICal
Message-ID: <1329018519-2466-1-git-send-email-robin@catalyst.net.nz>

This removes the dependency on Date::ICal (which is largely
unmaintained) and replaces it with DateTime::Format::ICal which can do
the same job. It also updates all the docs and installation scripts to
handle this change.

Note that this causes a minor behaviour change: previously the generated
times were converted to UTC, now they are left "floating" (that is, have
no timezone attached) and so will appear as the local time when imported
into a calendar. I don't anticipate this'll cause any issues however.
---
 C4/Installer/PerlDependencies.pm          |   10 +++---
 INSTALL.fedora7                           |    3 +-
 debian/control                            |    3 +-
 install_misc/debian.packages              |    2 +-
 install_misc/install_koha_on_fresh_debian |    2 +-
 install_misc/ubuntu.packages              |    2 +-
 install_misc/ubuntu_maverick.packages     |    2 +-
 opac/opac-ics.pl                          |   39 +++++++++++++++--------------
 8 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index 939ed10..0a888a8 100644
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -259,11 +259,6 @@ our $PERL_DEPS = {
         'required' => '1',
         'min_ver'  => '5.43'
     },
-    'Date::ICal' => {
-        'usage'    => 'Core',
-        'required' => '1',
-        'min_ver'  => '1.72'
-    },
     'MARC::Crosswalk::DublinCore' => {
         'usage'    => 'Core',
         'required' => '1',
@@ -484,6 +479,11 @@ our $PERL_DEPS = {
         'required' => '1',
         'min_ver'  => '1.03',
     },
+    'DateTime::Format::ICal' => {
+        'usage'    => 'Core',
+        'required' => '1',
+        'min_ver'  => '0.09',
+      },
 };
 
 1;
diff --git a/INSTALL.fedora7 b/INSTALL.fedora7
index 6694eb7..5e5f0d4 100644
--- a/INSTALL.fedora7
+++ b/INSTALL.fedora7
@@ -746,6 +746,8 @@ Net::Z3950::ZOOM
 Net::LDAP::Filter
 HTML::Template::Pro
 Data::ICal
+DateTime
+DateTime::Format::ICal
 GD::Barcode::UPCE
 Algorithm::CheckDigits::M43_001
 Biblio::EndnoteStyle
@@ -753,7 +755,6 @@ Schedule::At
 Barcode::Code128
 CGI::Session
 Class::Factory::Util
-Date::ICal
 Date::Manip
 Lingua::Stem
 List::MoreUtils
diff --git a/debian/control b/debian/control
index e0827f9..0a20874 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libclass-factory-util-perl,
  libdata-ical-perl,
  libdate-calc-perl,
- libdate-ical-perl,
  libdate-manip-perl,
+ libdatetime-format-ical-perl,
  libdatetime-perl,
  libdbd-mysql-perl,
  libdbd-sqlite2-perl,
@@ -31,7 +31,6 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libgraphics-magick-perl,
  libgravatar-url-perl,
  libhtml-scrubber-perl,
- libhtml-template-pro-perl,
  libhttp-oai-perl,
  libjson-perl,
  liblingua-stem-perl,
diff --git a/install_misc/debian.packages b/install_misc/debian.packages
index 8c33960..6be4daa 100644
--- a/install_misc/debian.packages
+++ b/install_misc/debian.packages
@@ -17,8 +17,8 @@ libcgi-session-serialize-yaml-perl install
 libclass-factory-util-perl	install
 libdata-ical-perl	install
 libdate-calc-perl install
-libdate-ical-perl	install
 libdate-manip-perl install
+libdatetime-format-ical-perl    install
 libdatetime-format-mail-perl install
 libdatetime-format-strptime-perl	install
 libdatetime-format-w3cdtf-perl	install
diff --git a/install_misc/install_koha_on_fresh_debian b/install_misc/install_koha_on_fresh_debian
index 6ff1e14..d4b313b 100644
--- a/install_misc/install_koha_on_fresh_debian
+++ b/install_misc/install_koha_on_fresh_debian
@@ -440,8 +440,8 @@ mysql-server
 libcgi-session-perl
 libdate-calc-perl
 libdate-manip-perl
-libdate-ical-perl
 libdatetime-format-mail-perl
+libdatetime-format-ical-perl
 liblingua-stem-perl
 libdatetime-format-strptime-perl
 libdatetime-format-w3cdtf-perl
diff --git a/install_misc/ubuntu.packages b/install_misc/ubuntu.packages
index 93a0844..f211769 100644
--- a/install_misc/ubuntu.packages
+++ b/install_misc/ubuntu.packages
@@ -56,9 +56,9 @@ libcgi-session-serialize-yaml-perl	install
 libclass-factory-util-perl		install
 libdata-ical-perl			install
 libdate-calc-perl			install
-libdate-ical-perl			install
 libdate-manip-perl			install
 libdatetime-perl			install
+libdatetime-format-ical-perl            install
 libdatetime-format-mail-perl		install
 libdatetime-format-strptime-perl	install
 libdatetime-format-w3cdtf-perl		install
diff --git a/install_misc/ubuntu_maverick.packages b/install_misc/ubuntu_maverick.packages
index fe04038..9b806bb 100644
--- a/install_misc/ubuntu_maverick.packages
+++ b/install_misc/ubuntu_maverick.packages
@@ -58,9 +58,9 @@ libcgi-session-serialize-yaml-perl	install
 libclass-factory-util-perl		install
 libdata-ical-perl			install
 libdate-calc-perl			install
-libdate-ical-perl			install
 libdate-manip-perl			install
 libdatetime-perl			install
+libdatetime-format-ical-perl            install
 libdatetime-format-mail-perl		install
 libdatetime-format-strptime-perl	install
 libdatetime-format-w3cdtf-perl		install
diff --git a/opac/opac-ics.pl b/opac/opac-ics.pl
index 5a8512a..337a939 100755
--- a/opac/opac-ics.pl
+++ b/opac/opac-ics.pl
@@ -25,7 +25,8 @@ use warnings;
 use CGI;
 use Data::ICal;
 use Data::ICal::Entry::Event;
-use Date::ICal;
+use DateTime;
+use DateTime::Format::ICal;
 use Date::Calc qw (Parse_Date);
 
 use C4::Auth;
@@ -60,28 +61,28 @@ foreach my $issue ( @$issues ) {
     my ($year,$month,$day)=Parse_Date($issue->{'date_due'});
     ($year,$month,$day)=split /-|\/|\.|:/,$issue->{'date_due'} unless ($year && $month);
 #    Decode_Date_EU2($string))
-    my $datestart = Date::ICal->new( 
-	day => $day, 
-	month => $month, 
-	year => $year,
-	hour => 9,
-	min => 0,
-	sec => 0
-    )->ical;
-    my $dateend = Date::ICal->new( 
-	day => $day, 
-	month => $month, 
-	year => $year,
-	hour => 10,
-	min => 0,
-	sec => 0
-    )->ical;
+    my $datestart = DateTime->new(
+        day    => $day,
+        month  => $month,
+        year   => $year,
+        hour   => 9,
+        minute => 0,
+        second => 0
+    );
+    my $dateend = DateTime->new(
+        day    => $day,
+        month  => $month,
+        year   => $year,
+        hour   => 10,
+        minute => 0,
+        second => 0
+    );
     $vevent->add_properties(
         summary => "$issue->{'title'} Due",
         description =>
 "Your copy of $issue->{'title'} barcode $issue->{'barcode'} is due back at the library today",
-        dtstart => $datestart,
-	dtend => $dateend,
+        dtstart => DateTime::Format::ICal->format_datetime($datestart),
+        dtend   => DateTime::Format::ICal->format_datetime($dateend),
     );
     $calendar->add_entry($vevent);
 }
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Mon Feb 13 05:35:25 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 13 Feb 2012 14:35:25 +1000
Subject: [Koha-patches] Patch 5668
Message-ID: <4F38930D.9060009@catalyst.net.nz>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5668-star-ratings-in-the-OPAC.patch
Type: text/x-patch
Size: 40868 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20120213/f3f9a74a/attachment-0001.bin>

From srdjan at catalyst.net.nz  Mon Feb 13 05:49:35 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 13 Feb 2012 14:49:35 +1000
Subject: [Koha-patches] Patch 5668
Message-ID: <4F38965F.4030603@catalyst.net.nz>



From srdjan at catalyst.net.nz  Mon Feb 13 05:50:29 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 13 Feb 2012 14:50:29 +1000
Subject: [Koha-patches] Patch 5668
Message-ID: <4F389695.2000105@catalyst.net.nz>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5668-star-ratings-in-the-OPAC.patch
Type: text/x-patch
Size: 38126 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20120213/4f024b0e/attachment-0001.bin>

From srdjan at catalyst.net.nz  Mon Feb 13 08:20:27 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Mon, 13 Feb 2012 20:20:27 +1300
Subject: [Koha-patches] [PATCH] bug_7520: Created
	opac/advanced_search_types.json
In-Reply-To: <bug 7520>
References: <bug 7520>
Message-ID: <1329117627-8793-1-git-send-email-srdjan@catalyst.net.nz>

Returns json of AdvancedSearchTypes (collection codes or itemtypes).
Useful for dynamic gbuilding of the search forms.
---
 opac/advanced_search_types.json |   62 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100755 opac/advanced_search_types.json

diff --git a/opac/advanced_search_types.json b/opac/advanced_search_types.json
new file mode 100755
index 0000000..45b557c
--- /dev/null
+++ b/opac/advanced_search_types.json
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+# Copyright 2012 CatalystIT Ltd
+#
+# 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 opac/itemtypes.json
+
+Returns json list of itemtype, description. Suitable for building drop down lists.
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use JSON;
+
+use C4::Koha;
+use C4::Context;
+use C4::Auth;
+
+my $input       = new CGI;
+checkauth($input, 0, {}, "opac") unless C4::Context->preference("OpacPublic");
+
+my $dbh = C4::Context->dbh;
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
+my ($ccl, @typesloop);
+if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
+    my $itemtypes = GetItemTypes;
+    my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
+    @typesloop = map {
+        code        => $_,
+        description => $itemtypes->{$_}->{'description'},
+        imageurl    => getitemtypeimagelocation( 'opac', $itemtypes->{$_}->{'imageurl'} ),
+    }, sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes;
+    $ccl = "$itype_or_itemtype,phr";
+} else {
+    my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
+    @typesloop = map {
+        code        => $_->{authorised_value},
+        description => $_->{'lib'},
+        imageurl    => getitemtypeimagelocation( 'opac', $_->{'imageurl'} ),
+    }, @$advsearchtypes;
+    $ccl = $advanced_search_types;
+}
+
+print $input->header('application/json');
+print to_json({ ccl => $advanced_search_types, types => \@typesloop });
-- 
1.6.5


From srdjan at catalyst.net.nz  Mon Feb 13 08:28:33 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Mon, 13 Feb 2012 20:28:33 +1300
Subject: [Koha-patches] [PATCH] bug_7520: Created
	opac/advanced_search_types.json
In-Reply-To: <bug 7520>
References: <bug 7520>
Message-ID: <1329118113-9132-1-git-send-email-srdjan@catalyst.net.nz>

Returns json of AdvancedSearchTypes (collection codes or itemtypes).
Useful for dynamic gbuilding of the search forms.
---
 opac/advanced_search_types.json |   62 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100755 opac/advanced_search_types.json

diff --git a/opac/advanced_search_types.json b/opac/advanced_search_types.json
new file mode 100755
index 0000000..14ccd83
--- /dev/null
+++ b/opac/advanced_search_types.json
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+# Copyright 2012 CatalystIT Ltd
+#
+# 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 opac/itemtypes.json
+
+Returns json list of itemtype, description. Suitable for building drop down lists.
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use JSON;
+
+use C4::Koha;
+use C4::Context;
+use C4::Auth;
+
+my $input       = new CGI;
+checkauth($input, !C4::Context->preference("OpacPublic"), {}, "opac");
+
+my $dbh = C4::Context->dbh;
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
+my ($ccl, @typesloop);
+if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
+    my $itemtypes = GetItemTypes;
+    my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
+    @typesloop = map {
+        code        => $_,
+        description => $itemtypes->{$_}->{'description'},
+        imageurl    => getitemtypeimagelocation( 'opac', $itemtypes->{$_}->{'imageurl'} ),
+    }, sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes;
+    $ccl = "$itype_or_itemtype,phr";
+} else {
+    my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
+    @typesloop = map {
+        code        => $_->{authorised_value},
+        description => $_->{'lib'},
+        imageurl    => getitemtypeimagelocation( 'opac', $_->{'imageurl'} ),
+    }, @$advsearchtypes;
+    $ccl = $advanced_search_types;
+}
+
+print $input->header('application/json');
+print to_json({ ccl => $advanced_search_types, types => \@typesloop });
-- 
1.6.5


From srdjan at catalyst.net.nz  Mon Feb 13 08:43:31 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Mon, 13 Feb 2012 20:43:31 +1300
Subject: [Koha-patches] [PATCH] bug 6372: moved background-job.inc to
	background-job-progressbar.js
In-Reply-To: <bug 6372>
References: <bug 6372>
Message-ID: <1329119011-9620-1-git-send-email-srdjan@catalyst.net.nz>

Check for div 0 when calculating percentage

---
 .../prog/en/includes/background-job.inc            |   91 --------------------
 .../prog/en/js/background-job-progressbar.js       |   84 ++++++++++++++++++
 .../prog/en/modules/offline_circ/process_koc.tt    |    2 +-
 .../prog/en/modules/test/progressbar.tt            |    2 +-
 .../prog/en/modules/tools/batchMod-del.tt          |    2 +-
 .../prog/en/modules/tools/batchMod-edit.tt         |    2 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |    2 +-
 .../prog/en/modules/tools/stage-marc-import.tt     |    2 +-
 tools/batchMod.pl                                  |   10 --
 9 files changed, 90 insertions(+), 107 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/background-job-progressbar.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
deleted file mode 100644
index b18d5ce..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-<!-- Background job progress indicator -->
-<script type="text/javascript">
-    //<![CDATA[
-    var backgroundJobProgressTimer = 0;
-    var jobID = '';
-    var savedForm;
-    var inBackgroundJobProgressTimer = false;
-    function updateJobProgress() {
-        if (inBackgroundJobProgressTimer) {
-            return;
-        }
-        inBackgroundJobProgressTimer = true;
-        $.getJSON("/cgi-bin/koha/tools/background-job-progress.pl?jobID=" + jobID, function(json) {
-            var percentage = Math.floor(100 * json.progress / json.job_size);
-            if (json.job_status == 'completed') {
-                percentage = 100;
-            }
-				var bgproperty = (parseInt(percentage/2)*3-300)+"px 0px";
-                $("#jobprogress").css("background-position",bgproperty);
-				$("#jobprogresspercent").text(percentage);
-
-            if (percentage == 100) {
-                clearInterval(backgroundJobProgressTimer); // just in case form submission fails
-                completeJob();
-            }
-            inBackgroundJobProgressTimer = false;
-        });
-    }
-
-    function completeJob() {
-        savedForm.completedJobID.value = jobID;
-        savedForm.submit();
-    }
-
-    // submit a background job with data
-    // supplied from form f and activate
-    // progress indicator
-    function submitBackgroundJob(f) {
-        // check for background field
-        if (f.runinbackground) {
-            // set value of this hidden field for 
-            // use by CGI script
-            savedForm = f;
-            f.mainformsubmit.disabled = true;
-            f.runinbackground.value = 'true';
-
-            // gather up form submission
-            var inputs = [];
-            $(':input', f).each(function() {
-                if (this.type == 'radio' || this.type == 'checkbox') {
-                    if (this.checked) {
-                        inputs.push(this.name + '=' + escape(this.value));
-                    }
-                } else if (this.type == 'button') {
-                    ; // do nothing
-                } else {
-                    inputs.push(this.name + '=' + escape(this.value));
-                }
-                
-            });
-
-            // and submit the request
-			$("#jobpanel").show();
-            $("#jobstatus").show();
-            $.ajax({
-                data: inputs.join('&'),
-                url: f.action,
-                dataType: 'json',
-		        type: 'post',
-                success: function(json) {
-                    jobID = json.jobID;
-                    inBackgroundJobProgressTimer = false;
-                    backgroundJobProgressTimer = setInterval("updateJobProgress()", 500);
-                },
-                error: function(xml, textStatus) {
-                    alert(_('Failed to submit form: ') + textStatus);
-                }
-
-            });
-
-        } else {
-            // background job support not enabled,
-            // so just do a normal form submission
-            f.submit();
-        }
-        
-        return false;
-
-    }
-    //]]>
-</script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/background-job-progressbar.js b/koha-tmpl/intranet-tmpl/prog/en/js/background-job-progressbar.js
new file mode 100644
index 0000000..27ecfcd
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/background-job-progressbar.js
@@ -0,0 +1,84 @@
+var backgroundJobProgressTimer = 0;
+var jobID = '';
+var savedForm;
+var inBackgroundJobProgressTimer = false;
+function updateJobProgress() {
+    if (inBackgroundJobProgressTimer) {
+        return;
+    }
+    inBackgroundJobProgressTimer = true;
+    $.getJSON("/cgi-bin/koha/tools/background-job-progress.pl?jobID=" + jobID, function(json) {
+        var percentage = json.job_status == 'completed' ? 100 :
+                            json.job_size > 0              ? Math.floor(100 * json.progress / json.job_size) :
+                            100;
+        var bgproperty = (parseInt(percentage/2)*3-300)+"px 0px";
+        $("#jobprogress").css("background-position",bgproperty);
+        $("#jobprogresspercent").text(percentage);
+
+        if (percentage == 100) {
+            clearInterval(backgroundJobProgressTimer); // just in case form submission fails
+            completeJob();
+        }
+        inBackgroundJobProgressTimer = false;
+    });
+}
+
+function completeJob() {
+    savedForm.completedJobID.value = jobID;
+    savedForm.submit();
+}
+
+// submit a background job with data
+// supplied from form f and activate
+// progress indicator
+function submitBackgroundJob(f) {
+    // check for background field
+    if (f.runinbackground) {
+        // set value of this hidden field for 
+        // use by CGI script
+        savedForm = f;
+        f.mainformsubmit.disabled = true;
+        f.runinbackground.value = 'true';
+
+        // gather up form submission
+        var inputs = [];
+        $(':input', f).each(function() {
+            if (this.type == 'radio' || this.type == 'checkbox') {
+                if (this.checked) {
+                    inputs.push(this.name + '=' + escape(this.value));
+                }
+            } else if (this.type == 'button') {
+                ; // do nothing
+            } else {
+                inputs.push(this.name + '=' + escape(this.value));
+            }
+            
+        });
+
+        // and submit the request
+        $("#jobpanel").show();
+        $("#jobstatus").show();
+        $.ajax({
+            data: inputs.join('&'),
+            url: f.action,
+            dataType: 'json',
+            type: 'post',
+            success: function(json) {
+                jobID = json.jobID;
+                inBackgroundJobProgressTimer = false;
+                backgroundJobProgressTimer = setInterval("updateJobProgress()", 500);
+            },
+            error: function(xml, textStatus) {
+                alert('Failed to submit form: ' + textStatus);
+            }
+
+        });
+
+    } else {
+        // background job support not enabled,
+        // so just do a normal form submission
+        f.submit();
+    }
+    
+    return false;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
index 6a66b6a..d5e7918 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Circulation &rsaquo; Offline Circulation File Upload</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'file-upload.inc' %]
-[% INCLUDE 'background-job.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt
index e4cedc8..e63627d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Tools &rsaquo; Stage MARC Records For Import</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'file-upload.inc' %]
-[% INCLUDE 'background-job.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
 <style type="text/css">
 	#uploadpanel,#fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
 	#fileuploadstatus,#jobstatus { margin:.4em; }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index 21013f5..203a4a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Tools &rsaquo; Batch item deletion</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'background-job.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/pages/batchMod.css" />
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script src="[% themelang %]/lib/yui/cookie/cookie-min.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index 461b6bc..4358c41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Tools &rsaquo; Batch item modification</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'background-job.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/pages/batchMod.css" />
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script src="[% themelang %]/lib/yui/cookie/cookie-min.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index 526f8c9..88cb033 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -6,7 +6,7 @@
 </title>
 [% INCLUDE 'greybox.inc' %]
 [% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'background-job.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 $(document).ready(function(){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
index fc6db51..0cf2ebd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Tools &rsaquo; Stage MARC Records For Import</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'file-upload.inc' %]
-[% INCLUDE 'background-job.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
 <style type="text/css">
 	#uploadpanel,#fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
 	#fileuploadstatus,#jobstatus { margin:.4em; }
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 4910dbd..a50d38b 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -120,12 +120,10 @@ if ($op eq "action") {
 	# Job size is the number of items we have to process
 	my $job_size = scalar(@itemnumbers);
 	my $job = undef;
-	my $callback = sub {};
 
 	# If we asked for background processing
 	if ($runinbackground) {
 	    $job = put_in_background($job_size);
-	    $callback = progress_callback($job, $dbh);
 	}
 
 	# For each item
@@ -579,13 +577,5 @@ sub put_in_background {
     return $job;
 }
 
-sub progress_callback {
-    my $job = shift;
-    my $dbh = shift;
-    return sub {
-        my $progress = shift;
-        $job->progress($progress);
-    }
-}
 
 
-- 
1.6.5


From srdjan at catalyst.net.nz  Mon Feb 13 08:59:31 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Mon, 13 Feb 2012 20:59:31 +1300
Subject: [Koha-patches] [PATCH] bug_7520: Created
	opac/advanced_search_types.json
In-Reply-To: <bug 7520>
References: <bug 7520>
Message-ID: <1329119971-10096-1-git-send-email-srdjan@catalyst.net.nz>

Returns json of AdvancedSearchTypes (collection codes or itemtypes).
Useful for dynamic gbuilding of the search forms.
---
 opac/advanced_search_types.json |   62 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100755 opac/advanced_search_types.json

diff --git a/opac/advanced_search_types.json b/opac/advanced_search_types.json
new file mode 100755
index 0000000..14ccd83
--- /dev/null
+++ b/opac/advanced_search_types.json
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+# Copyright 2012 CatalystIT Ltd
+#
+# 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 opac/itemtypes.json
+
+Returns json list of itemtype, description. Suitable for building drop down lists.
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use JSON;
+
+use C4::Koha;
+use C4::Context;
+use C4::Auth;
+
+my $input       = new CGI;
+checkauth($input, C4::Context->preference("OpacPublic"), {}, "opac");
+
+my $dbh = C4::Context->dbh;
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
+my ($ccl, @typesloop);
+if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
+    my $itemtypes = GetItemTypes;
+    my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
+    @typesloop = map {
+        code        => $_,
+        description => $itemtypes->{$_}->{'description'},
+        imageurl    => getitemtypeimagelocation( 'opac', $itemtypes->{$_}->{'imageurl'} ),
+    }, sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes;
+    $ccl = "$itype_or_itemtype,phr";
+} else {
+    my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
+    @typesloop = map {
+        code        => $_->{authorised_value},
+        description => $_->{'lib'},
+        imageurl    => getitemtypeimagelocation( 'opac', $_->{'imageurl'} ),
+    }, @$advsearchtypes;
+    $ccl = $advanced_search_types;
+}
+
+print $input->header('application/json');
+print to_json({ ccl => $advanced_search_types, types => \@typesloop });
-- 
1.6.5


From jonathan.druart at biblibre.com  Mon Feb 13 15:45:50 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Mon, 13 Feb 2012 15:45:50 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7291: Adds new field
	aqbooksellers.deliverytime
Message-ID: <1329144350-24084-1-git-send-email-jonathan.druart@biblibre.com>

New field deliverytime in aqbooksellers table. It is an estimated
delivery time for orders (in days).
You can set this delay on the supplier modification page.
It is used in the late orders search.

The order estimated date is the aqbasket.closedate +
aqbooksellers.deliverytime

If you set a delay, the query check if closedate <= today - delay

If you set a "delivery time from" and a "delivery time to", the query check if
$delivery_time_from <= aqbooksellers.deliverytime is not NULL and if
closedate + deliverytime >= $delivery_time_to
if there is not a time_to then $delivery_time_to = the current date.
---
 C4/Acquisition.pm                                  |   28 ++++++++-
 C4/Bookseller.pm                                   |   61 +++++++++++++++-----
 acqui/basket.pl                                    |   12 ++++
 acqui/lateorders.pl                                |   21 +++++--
 acqui/supplier.pl                                  |    2 +
 acqui/updatesupplier.pl                            |    1 +
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |    8 +++
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    1 +
 .../prog/en/modules/acqui/lateorders.tt            |   40 ++++++++++++-
 .../prog/en/modules/acqui/supplier.tt              |    8 +++
 11 files changed, 157 insertions(+), 26 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 0a96a02..c6220c1 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -1438,13 +1438,15 @@ sub GetLateOrders {
     my $delay      = shift;
     my $supplierid = shift;
     my $branch     = shift;
+    my $estimateddeliverydatefrom = shift;
+    my $estimateddeliverydateto = shift;
 
     my $dbh = C4::Context->dbh;
 
     #BEWARE, order of parenthesis and LEFT JOIN is important for speed
     my $dbdriver = C4::Context->config("db_scheme") || "mysql";
 
-    my @query_params = ($delay);	# delay is the first argument regardless
+    my @query_params = ();
     my $select = "
     SELECT aqbasket.basketno,
         aqorders.ordernumber,
@@ -1460,6 +1462,7 @@ sub GetLateOrders {
         biblio.author, biblio.title,
         biblioitems.publishercode AS publisher,
         biblioitems.publicationyear,
+        ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate,
     ";
     my $from = "
     FROM
@@ -1473,6 +1476,7 @@ sub GetLateOrders {
             OR datereceived IS NULL
             OR aqorders.quantityreceived < aqorders.quantity
         )
+        AND aqbasket.closedate IS NOT NULL
         AND (aqorders.datecancellationprinted IS NULL OR aqorders.datecancellationprinted='0000-00-00')
     ";
     my $having = "";
@@ -1482,7 +1486,10 @@ sub GetLateOrders {
         (aqorders.quantity - IFNULL(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
         DATEDIFF(CURDATE( ),closedate) AS latesince
         ";
-        $from .= " AND (closedate <= DATE_SUB(CURDATE( ),INTERVAL ? DAY)) ";
+        if ( defined $delay ) {
+            $from .= " AND (closedate <= DATE_SUB(CURDATE( ),INTERVAL ? DAY)) " ;
+            push @query_params, $delay;
+        }
         $having = "
         HAVING quantity          <> 0
             AND unitpricesupplier <> 0
@@ -1495,7 +1502,10 @@ sub GetLateOrders {
                 aqorders.quantity * aqorders.rrp AS subtotal,
                 (CURDATE - closedate)            AS latesince
         ";
-        $from .= " AND (closedate <= (CURDATE -(INTERVAL ? DAY)) ";
+        if ( defined $delay ) {
+            $from .= " AND (closedate <= (CURDATE -(INTERVAL ? DAY)) ";
+            push @query_params, $delay;
+        }
     }
     if (defined $supplierid) {
         $from .= ' AND aqbasket.booksellerid = ? ';
@@ -1505,6 +1515,18 @@ sub GetLateOrders {
         $from .= ' AND borrowers.branchcode LIKE ? ';
         push @query_params, $branch;
     }
+    if ( defined $estimateddeliverydatefrom ) {
+        $from .= '
+            AND aqbooksellers.deliverytime IS NOT NULL
+            AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) >= ?';
+        push @query_params, $estimateddeliverydatefrom;
+    }
+    if ( defined $estimateddeliverydatefrom and defined $estimateddeliverydateto ) {
+        $from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= ?';
+        push @query_params, $estimateddeliverydateto;
+    } elsif ( defined $estimateddeliverydatefrom ) {
+        $from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CURDATE()';
+    }
     if (C4::Context->preference("IndependantBranches")
             && C4::Context->userenv
             && C4::Context->userenv->{flags} != 1 ) {
diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index 6a91f99..f4db133 100644
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -99,19 +99,48 @@ Searches for suppliers with late orders.
 =cut
 
 sub GetBooksellersWithLateOrders {
-    my $delay = shift;
-    my $dbh   = C4::Context->dbh;
-
-    # TODO delay should be verified
-    my $query_string =
-      "SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
-    FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
-    LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
-    WHERE (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY)
-    AND (datereceived = '' OR datereceived IS NULL))";
-
-    my $sth = $dbh->prepare($query_string);
-    $sth->execute;
+    my ( $delay, $branch, $estimateddeliverydatefrom, $estimateddeliverydateto ) = @_;    # FIXME: Branch argument unused.
+    my $dbh = C4::Context->dbh;
+
+    # FIXME NOT quite sure that this operation is valid for DBMs different from Mysql, HOPING so
+    # should be tested with other DBMs
+
+    my $strsth;
+    my @query_params = ();
+    my $dbdriver = C4::Context->config("db_scheme") || "mysql";
+    $strsth = "
+        SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
+        FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
+        LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
+        WHERE 
+            ( datereceived = ''
+            OR datereceived IS NULL
+            OR aqorders.quantityreceived < aqorders.quantity
+            )
+            AND aqorders.rrp <> 0
+            AND aqorders.ecost <> 0
+            AND aqorders.quantity - IFNULL(aqorders.quantityreceived,0) <> 0
+            AND aqbasket.closedate IS NOT NULL
+    ";
+    if ( defined $delay ) {
+        $strsth .= " AND (closedate <= DATE_SUB(CURDATE( ),INTERVAL ? DAY)) ";
+        push @query_params, $delay;
+    }
+    if ( defined $estimateddeliverydatefrom ) {
+        $strsth .= '
+            AND aqbooksellers.deliverytime IS NOT NULL
+            AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) >= ?';
+        push @query_params, $estimateddeliverydatefrom;
+    }
+    if ( defined $estimateddeliverydatefrom and defined $estimateddeliverydateto ) {
+        $strsth .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= ?';
+        push @query_params, $estimateddeliverydateto;
+    } elsif ( defined $estimateddeliverydatefrom ) {
+        $strsth .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CURDATE()';
+    }
+
+    my $sth = $dbh->prepare($strsth);
+    $sth->execute( @query_params );
     my %supplierlist;
     while ( my ( $id, $name ) = $sth->fetchrow ) {
         $supplierlist{$id} = $name;
@@ -198,7 +227,7 @@ sub ModBookseller {
             contphone=?,contfax=?,contaltphone=?,contemail=?,
             contnotes=?,active=?,listprice=?, invoiceprice=?,
             gstreg=?,listincgst=?,invoiceincgst=?,
-            discount=?,notes=?,gstrate=?
+            discount=?,notes=?,gstrate=?,deliverytime=?
         WHERE id=?';
     my $sth = $dbh->prepare($query);
     $sth->execute(
@@ -215,7 +244,9 @@ sub ModBookseller {
         $data->{'invoiceprice'}, $data->{'gstreg'},
         $data->{'listincgst'},   $data->{'invoiceincgst'},
         $data->{'discount'},     $data->{'notes'},
-        $data->{'gstrate'},      $data->{'id'}
+        $data->{'gstrate'},
+        $data->{deliverytime},
+        $data->{'id'}
     );
     return;
 }
diff --git a/acqui/basket.pl b/acqui/basket.pl
index c528156..5a1c01f 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -34,6 +34,8 @@ use C4::Debug;
 use C4::Biblio;
 use C4::Members qw/GetMember/;  #needed for permissions checking for changing basketgroup of a basket
 use C4::Items;
+use Date::Calc qw/Add_Delta_Days/;
+
 =head1 NAME
 
 basket.pl
@@ -212,6 +214,15 @@ if ( $op eq 'delete_confirm' ) {
         }
         unshift( @$basketgroups, \%emptygroup );
     }
+
+    # if the basket is closed, calculate estimated delivery date
+    my $estimateddeliverydate;
+    if( $basket->{closedate} ) {
+        my ($year, $month, $day) = ($basket->{closedate} =~ /(\d+)-(\d+)-(\d+)/);
+        ($year, $month, $day) = Add_Delta_Days($year, $month, $day, $bookseller->{deliverytime});
+        $estimateddeliverydate = "$year-$month-$day";
+    }
+
     # if new basket, pre-fill infos
     $basket->{creationdate} = ""            unless ( $basket->{creationdate} );
     $basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
@@ -359,6 +370,7 @@ my $total_est_gste;
         authorisedby         => $basket->{authorisedby},
         authorisedbyname     => $basket->{authorisedbyname},
         closedate            => C4::Dates->new($basket->{closedate},'iso')->output,
+        estimateddeliverydate => C4::Dates->new( $estimateddeliverydate, 'iso' )->output,
         active               => $bookseller->{'active'},
         booksellerid         => $bookseller->{'id'},
         name                 => $bookseller->{'name'},
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 55031ec..60dba97 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -66,14 +66,14 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
 
 my $supplierid = $input->param('supplierid') || undef; # we don't want "" or 0
 my $delay      = $input->param('delay');
+my $estimateddeliverydatefrom = $input->param('estimateddeliverydatefrom');
+my $estimateddeliverydateto   = $input->param('estimateddeliverydateto');
 my $branch     = $input->param('branch');
 my $op         = $input->param('op');
 
 my @errors = ();
-$delay = 30 unless defined $delay;
-unless ($delay =~ /^\d{1,3}$/) {
-	push @errors, {delay_digits => 1, bad_delay => $delay};
-	$delay = 30;	#default value for delay
+if ( defined $delay and not $delay =~ /^\d{1,3}$/ ) {
+    push @errors, {delay_digits => 1, bad_delay => $delay};
 }
 
 if ($op and $op eq "send_alert"){
@@ -92,7 +92,13 @@ if ($op and $op eq "send_alert"){
     }
 }
 
-my %supplierlist = GetBooksellersWithLateOrders($delay);
+my %supplierlist = GetBooksellersWithLateOrders(
+    $delay,
+    $branch,
+    C4::Dates->new($estimateddeliverydatefrom)->output("iso"),
+    C4::Dates->new($estimateddeliverydateto)->output("iso")
+);
+
 my (@sloopy);	# supplier loop
 foreach (keys %supplierlist){
 	push @sloopy, (($supplierid and $supplierid eq $_ )            ? 
@@ -103,7 +109,7 @@ $template->param(SUPPLIER_LOOP => \@sloopy);
 $template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid);
 $template->param(SupplierId=>$supplierid) if ($supplierid);
 
-my @lateorders = GetLateOrders($delay,$supplierid,$branch);
+my @lateorders = GetLateOrders( $delay, $supplierid, $branch, $estimateddeliverydatefrom, $estimateddeliverydateto );
 
 my $total;
 foreach (@lateorders){
@@ -121,7 +127,10 @@ $template->param(ERROR_LOOP => \@errors) if (@errors);
 $template->param(
 	lateorders => \@lateorders,
 	delay => $delay,
+    estimateddeliverydatefrom => $estimateddeliverydatefrom,
+    estimateddeliverydateto   => $estimateddeliverydateto,
 	total => $total,
 	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 3faa560..8ceef42 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -109,6 +109,7 @@ if ( $op eq 'display' ) {
         listincgst    => $supplier->{'listincgst'},
         invoiceincgst => $supplier->{'invoiceincgst'},
         discount      => $supplier->{'discount'},
+        deliverytime  => $supplier->{deliverytime},
         invoiceprice  => $supplier->{'invoiceprice'},
         listprice     => $supplier->{'listprice'},
         GST           => $tax_rate,
@@ -171,6 +172,7 @@ if ( $op eq 'display' ) {
         invoiceincgst => $supplier->{'invoiceincgst'},
         gstrate       => $gstrate,
         discount      => $supplier->{'discount'},
+        deliverytime  => $supplier->{deliverytime},
         loop_currency => $loop_currency,
         GST           => $tax_rate,
         enter         => 1,
diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index bd59c6b..8f8d237 100755
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -107,6 +107,7 @@ if ($gstrate eq '') {
     $data{'gstrate'} = $input->param('gstrate')/100;
 }
 $data{'discount'}=$input->param('discount');
+$data{deliverytime} = $input->param('deliverytime');
 $data{'active'}=$input->param('status');
 if($data{'name'}) {
 	if ($data{'id'}){
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 37113c2..40f2916 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2495,6 +2495,7 @@ CREATE TABLE `aqbooksellers` ( -- information about the vendors listed in acquis
   `gstrate` decimal(6,4) default NULL, -- the tax rate the library is charged
   `discount` float(6,4) default NULL, -- discount offered on all items ordered from this vendor
   `fax` varchar(50) default NULL, -- vendor fax number
+  `deliverytime` int(11) default NULL, -- vendor delivery time
   PRIMARY KEY  (`id`),
   KEY `listprice` (`listprice`),
   KEY `invoiceprice` (`invoiceprice`),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..fede7c1 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4663,6 +4663,14 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     SetVersion($DBversion);
 }
+
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE aqbooksellers ADD deliverytime INT DEFAULT NULL");
+    print "Upgrade to $DBversion done (Add deliverytime field in aqbooksellers table)";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index aaea6c0..e4ee782 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -180,6 +180,7 @@
                 [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span>  [% authorisedbyname %]</li>[% END %]
                 [% IF ( creationdate ) %]<li><span class="label">Opened on:</span>  [% creationdate %]</li>[% END %]
                 [% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate %]</li>[% END %]
+                [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate %]</li>[% END %]
 
                 </ol>
                 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 3eaf8a6..7ce8de3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -2,6 +2,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
+[% INCLUDE 'calendar.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
@@ -60,6 +61,7 @@ $(document).ready(function() {
     <table id="late_orders">
         <tr>
             <th>Order Date</th>
+            <th>Estimated delivery date</th>
             <th>Vendor</th>
             <th>Information</th>
             <th>Total cost</th>
@@ -81,6 +83,9 @@ $(document).ready(function() {
                 ([% lateorder.latesince %] days)
             </td>
             <td>
+                [% lateorder.estimateddeliverydate %]
+            </td>
+            <td>
                 [% lateorder.supplier %]
             </td>
             <td>
@@ -117,7 +122,7 @@ $(document).ready(function() {
         [% END %]
         <tr> 
             <th>Total</th>
-            <th colspan="2">&nbsp;</th>
+            <th colspan="3">&nbsp;</th>
             <th>[% total %]</th>
             <th>&nbsp;</th>
             <th>&nbsp;</th>
@@ -140,7 +145,38 @@ $(document).ready(function() {
 [% FOREACH ERROR_LOO IN ERROR_LOOP %]
 [% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.</p>[% END %]
 [% END %]
-<ol><li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay %]" /> days ago</li>
+<ol>
+    <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay %]" /> days ago</li>
+    <li><label for="delay">Estimated Delivery date from: </label>
+        <input type="text" size="10" id="estimateddeliverydatefrom" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom %]" />
+        <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
+        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+    </li>
+    <li><label for="delay">To: </label>
+        <input type="text" size="10" id="estimateddeliverydateto" name="estimateddeliverydateto" value="[% estimateddeliverydateto %]" />
+        <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" />
+        <script type="text/javascript">
+            // return true if the date is blocked.
+            function disable_from(date) {var limit = get_Calendar_limit(date,'estimateddeliverydatefrom'); return (limit && limit < date);}
+            function disable_to(date) {var limit = get_Calendar_limit(date,'estimateddeliverydateto'); return (limit && limit < date);}
+            Calendar.setup({
+                inputField : "estimateddeliverydatefrom",
+                ifFormat : "[% DHTMLcalendar_dateformat %]",
+                button : "openCalendarFrom",
+                disableFunc : disable_from,
+                dateStatusFunc : disable_from
+            });
+            Calendar.setup({
+                inputField : "estimateddeliverydateto",
+                ifFormat : "[% DHTMLcalendar_dateformat %]",
+                button : "openCalendarTo",
+                disableFunc : disable_to,
+                dateStatusFunc : disable_to
+             });
+        </script>
+        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+    </li>
+
 	<li><label for="supplierid">Vendor:</label>
 		<select id="supplierid" size="1" tabindex="" name="supplierid">
 			<option value=""/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index f30d839..6413534 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -137,6 +137,10 @@ if (f.company.value == "") {
             <li><label for="discount">Discount</label>
                 <input type="text" size="6" id="discount" name="discount" value="[% discount %]" />%</li>
             <li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="6" value="[% gstrate %]"/>% (leave blank for default tax of [% default_gst_rate %]%)</li>
+            <li>
+                <label for="deliverytime">Delivery time</label>
+                <input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime %]" /> days
+            </li>
             <li><label for="notes">Notes</label>
                 <textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>
         </fieldset>
@@ -197,6 +201,10 @@ if (f.company.value == "") {
                 [% discount %] %</p>
             <p><strong>Tax rate: </strong>
                 [% GST %]%[% UNLESS ( default_tax ) %] (default)[% END %]</p>
+            [% IF deliverytime.defined %]
+                <p><strong>Delivery time: </strong>
+                    [% deliverytime %] days</p>
+            [% END %]
             [% IF ( notes ) %]<p><strong>Notes: </strong>
                 [% notes %]</p>[% END %]
         </div>
-- 
1.7.7.3


From stephane.delaune at biblibre.com  Mon Feb 13 17:01:56 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Mon, 13 Feb 2012 17:01:56 +0100
Subject: [Koha-patches] [PATCH 1/2] Bug 7246 add offset/length and where
	options to rebuild_zebra
Message-ID: <1329148917-4823-1-git-send-email-stephane.delaune@biblibre.com>

From: Paul Poulain <paul.poulain at biblibre.com>

This patch reimplement a feature that is on biblibre/master for Koha-community/master

It adds 4 parameters:
* offset = the offset of record. Say 1000 to start rebuilding at the 1000th record of your database
* length = how many records to export. Say 400 to export only 400 records
* where = add a where clause to rebuild only a given itemtype, or anything you want to filter on

Another improvement resulting from offset & length limit is the rebuild_zebra_sliced.zsh
that will be submitted in another patch.
rebuild_zebra_sliced will slice your all database in small chunks, and, if something went wrong for a given slice, will slice the slice, and repeat, until you reach a slice size of 1, showing which record is wrong in your database.

Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Removed mention of -l option for limiting number of items exported, as requested
by QA manager. This can be re-added in a later patch.
---
 misc/migration_tools/rebuild_zebra.pl |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 31e8125..655b6d4 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -34,6 +34,9 @@ my $want_help;
 my $as_xml;
 my $process_zebraqueue;
 my $do_not_clear_zebraqueue;
+my $length;
+my $where;
+my $offset;
 my $verbose_logging = 0;
 my $zebraidx_log_opt = " -v none,fatal,warn ";
 my $result = GetOptions(
@@ -51,7 +54,10 @@ my $result = GetOptions(
 	'x'				=> \$as_xml,
     'y'             => \$do_not_clear_zebraqueue,
     'z'             => \$process_zebraqueue,
-    'v+'            => \$verbose_logging,
+    'where:s'        => \$where,
+    'length:i'        => \$length,
+    'offset:i'      => \$offset,
+    'v+'             => \$verbose_logging,
 );
 
 
@@ -294,13 +300,21 @@ sub select_all_records {
 }
 
 sub select_all_authorities {
-    my $sth = $dbh->prepare("SELECT authid FROM auth_header");
+    my $strsth=qq{SELECT authid FROM auth_header};
+    $strsth.=qq{ WHERE $where } if ($where);
+    $strsth.=qq{ LIMIT $length } if ($length && !$offset);
+    $strsth.=qq{ LIMIT $offset,$length } if ($length && $offset);
+    my $sth = $dbh->prepare($strsth);
     $sth->execute();
     return $sth;
 }
 
 sub select_all_biblios {
-    my $sth = $dbh->prepare("SELECT biblionumber FROM biblioitems ORDER BY biblionumber");
+    my $strsth = qq{ SELECT biblionumber FROM biblioitems };
+    $strsth.=qq{ WHERE $where } if ($where);
+    $strsth.=qq{ LIMIT $length } if ($length && !$offset);
+    $strsth.=qq{ LIMIT $offset,$length } if ($offset);
+    my $sth = $dbh->prepare($strsth);
     $sth->execute();
     return $sth;
 }
@@ -639,7 +653,14 @@ Parameters:
                             warnings and errors from the indexing are shown.
                             Use log level 2 (-v -v) to include all Zebra logs.
 
-    -munge-config           Deprecated option to try
+    --length   1234         how many biblio you want to export
+    --offset 1243           offset you want to start to
+                                example: --offset 500 --length=500 will result in a LIMIT 500,1000 (exporting 1000 records, starting by the 500th one)
+                                note that the numbers are NOT related to biblionumber, that's the intended behaviour.
+    --where                 let you specify a WHERE query, like itemtype='BOOK'
+                            or something like that
+
+    --munge-config          Deprecated option to try
                             to fix Zebra config files.
     --help or -h            show this message.
 _USAGE_
-- 
1.7.0.4


From stephane.delaune at biblibre.com  Mon Feb 13 17:01:57 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Mon, 13 Feb 2012 17:01:57 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 7286: fix rebuild_zebra.pl to add
	rebuild_zebra_sliced.zsh
In-Reply-To: <1329148917-4823-1-git-send-email-stephane.delaune@biblibre.com>
References: <1329148917-4823-1-git-send-email-stephane.delaune@biblibre.com>
Message-ID: <1329148917-4823-2-git-send-email-stephane.delaune@biblibre.com>

---
 misc/migration_tools/rebuild_zebra_sliced.zsh |  174 +++++++++++++++++++++++++
 1 files changed, 174 insertions(+), 0 deletions(-)
 create mode 100755 misc/migration_tools/rebuild_zebra_sliced.zsh

diff --git a/misc/migration_tools/rebuild_zebra_sliced.zsh b/misc/migration_tools/rebuild_zebra_sliced.zsh
new file mode 100755
index 0000000..c015343
--- /dev/null
+++ b/misc/migration_tools/rebuild_zebra_sliced.zsh
@@ -0,0 +1,174 @@
+#!/usr/bin/zsh
+
+# 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.
+
+
+INCREMENT=$1
+BIBLIOSTART=$2
+BIBLIOEND=$3
+TEMPDIRECTORY=$4
+RMLOGS=$5
+
+#echo " | $INCREMENT , $BIBLIOSTART , $BIBLIOEND , $TEMPDIRECTORY , $RMLOGS | ";
+# this script rebuild the zebra index recursively
+# INCREMENT specify how many records we must try at once
+# BIBLIOSTART is the record number to BIBLIOSTART on
+# BIBLIOEND is the record number to BIBLIOEND on, if it's greater than the last biblionumber it will be redefine
+# TEMPDIRECTORY define a temporary directory to rebuild_zebra
+# RMLOGS is used to remove files into logs/, it's use and define by script itself so you have not to define it
+# At the BIBLIOEND of each "chunk", this script checks if the indexing process has been OK
+# if it hasn't, the slice is splitted in 10, and the reindexing is called again on each smaller chunk
+# if the increment goes to 1, it means we tried to reindex 1 by 1, and the failing indexing concern wrong records
+
+# the logs are stored in a directory called logs/ that must be a subdirectory of reindex.zsh
+
+# at the BIBLIOEND of the script, just type :
+#grep -l "previous transaction" `ls rebuild1.*.err`
+# the result contains all the biblios that have not been indexed
+# WARNING : the numbers are not the biblionumber but the record number, they can be reached by :
+# SELECT biblionumber FROM biblio LIMIT YourNumberHere,1;
+
+# EXAMPLE to run the script on a 800 000 biblios database :
+# ./reindex.zsh 50000 0 800000
+# will reindex the DB, BIBLIOSTARTing with chunks of 50k biblios
+#if { grep -E "previous transaction" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ; then
+
+lastbiblionumber=`perl -e '#!/usr/bin/perl
+use C4::Context;
+my $dbh = C4::Context->dbh;
+my $querylastbiblionumber = "SELECT max(biblionumber) FROM biblio;";
+my $sthlastbiblionumber   = $dbh->prepare($querylastbiblionumber);
+$sthlastbiblionumber->execute();
+my ( $lastbiblionumber ) = $sthlastbiblionumber->fetchrow_array; print $lastbiblionumber;'`
+#echo $lastbiblionumber;
+let "maxbiblionumber = $lastbiblionumber + 1"
+if [ $# = 4 ]
+then
+    RMLOGS=yes
+elif [ $# = 3 ]
+then
+    RMLOGS=yes
+    TEMPDIRECTORY=/tmp/rebuild
+elif [ $# = 2 ]
+then
+    RMLOGS=yes
+    TEMPDIRECTORY=/tmp/rebuild
+    BIBLIOEND=$lastbiblionumber
+elif [ $# = 1 ]
+then
+    RMLOGS=yes
+    TEMPDIRECTORY=/tmp/rebuild
+    BIBLIOSTART=0
+    BIBLIOEND=$lastbiblionumber
+elif [ $# = 0 ]
+then
+    RMLOGS=yes
+    TEMPDIRECTORY=/tmp/rebuild
+    INCREMENT=10000
+    BIBLIOSTART=0
+    BIBLIOEND=$lastbiblionumber
+fi
+if [[ $INCREMENT =~ ^10*$ ]]
+then
+else
+    echo "The first argument (INCREMENT) must be 1 or a multiple of 10"
+    exit 2
+fi
+if [[ $BIBLIOSTART =~ ^[0-9]*$ ]]
+then
+else
+    echo "The second argument (BIBLIOSTART) must be an integer"
+    exit 2
+fi
+if [[ $BIBLIOEND =~ ^[0-9]*$ ]]
+then
+else
+    echo "The third argument (BIBLIOEND) must be an integer"
+    exit 2
+fi
+if [ $BIBLIOSTART -ge $BIBLIOEND ]
+then
+    echo "The second argument (BIBLIOSTART) must be lower than the third argument (BIBLIOEND)"
+    exit 2
+fi
+if [[ $maxbiblionumber =~ ^[0-9]*$ ]]
+then
+else
+    echo "error : last biblionumber is not an integer"
+    exit 2
+fi
+if [ $BIBLIOEND -gt $lastbiblionumber ];
+then
+    BIBLIOEND=$lastbiblionumber
+fi
+ls `dirname $0`/logs/ >/dev/null 2>&1
+if [ $? != 0 ]
+then
+    mkdir `dirname $0`/logs
+else
+    if [ $RMLOGS = "yes" ]
+    then
+        rm `dirname $0`/logs/*
+    fi
+fi
+ls $TEMPDIRECTORY >/dev/null 2>&1
+if [ $? != 0 ]
+then
+    mkdir $TEMPDIRECTORY
+    if [ $? != 0 ]
+    then
+        echo "can't create dir $TEMPDIRECTORY"
+        exit 2
+    fi
+fi
+#/home/koha/src/misc/migration_tools/rebuild_zebra.pl -r -b -v -x -nosanitize -length 1 -offset 1
+for ((i=$BIBLIOSTART ; i<=$BIBLIOEND ; i=i+$INCREMENT))
+do
+    echo "I = " $i "with increment " $INCREMENT
+    #echo "BIBLIOSTART $BIBLIOSTART INCREMENT $INCREMENT BIBLIOEND $BIBLIOEND i $i"
+    #echo "`dirname $0`/rebuild_zebra.pl -b -v -x -nosanitize -d $TEMPDIRECTORY -k -length $INCREMENT -offset $i -v log"
+    `dirname $0`/rebuild_zebra.pl -b -v -v -x -nosanitize -d $TEMPDIRECTORY -k -length $INCREMENT -offset $i > `dirname $0`/logs/rebuild$INCREMENT.$i.log 2> `dirname $0`/logs/rebuild$INCREMENT.$i.err
+    if (($INCREMENT >1 ));
+    then
+        if { grep -q "previous transaction" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ;
+        then
+            echo "I must split $i (increment $INCREMENT) because previous transaction didn't reach commit"
+            ((subincrement=$INCREMENT/10))
+            if (($i+$INCREMENT >= $BIBLIOEND ));
+            then
+                ((newBIBLIOEND=$BIBLIOEND))
+            else
+                ((newBIBLIOEND=$i+$INCREMENT))
+            fi
+            echo "$0 $subincrement $i $newBIBLIOEND $TEMPDIRECTORY no"
+            $0 $subincrement $i $newBIBLIOEND $TEMPDIRECTORY no
+        elif { ! grep -q "Records: $INCREMENT" `dirname $0`/logs/rebuild$INCREMENT.$i.err } ;
+        then
+            echo "I must split $i (increment $INCREMENT) because index was uncomplete, less than $INCREMENT records indexed"
+            ((subincrement=$INCREMENT/10))
+            if (($i+$INCREMENT >= $BIBLIOEND ));
+            then
+                ((newBIBLIOEND=$BIBLIOEND))
+            else
+                ((newBIBLIOEND=$i+$INCREMENT))
+            fi
+            echo "$0 $subincrement $i $newBIBLIOEND $TEMPDIRECTORY no"
+            $0 $subincrement $i $newBIBLIOEND $TEMPDIRECTORY no
+        fi
+    fi
+done
+exit 0
-- 
1.7.0.4


From robin at catalyst.net.nz  Wed Feb 15 00:38:32 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Wed, 15 Feb 2012 12:38:32 +1300
Subject: [Koha-patches] [PATCH] Bug 7540 - add id values to the legends in
	the patron entry form
Message-ID: <1329262712-22397-1-git-send-email-robin@catalyst.net.nz>

This adds the following IDs to the legends in the patron entry form:
 main_address_lgd contact_lgd alt_address_lgd alt_contact_lgd
 library_management_lgd library_setup_lgd opac_staff_login_lgd
 patron_messaging_prefs_lgd

With these in place, then jquery like:
$(document).ready(function(){
        $('#main_address_lgd').text('Postal Address');
        $('#alt_address_lgd').text('Residential Address');
});
in intranetuserjs can be used to rename things to taste.
---
 .../prog/en/modules/members/memberentrygen.tt      |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 34fef89..7377ec6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -184,7 +184,7 @@
 [% IF ( step_1 ) %]
 [%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
 	<fieldset class="rows" id="memberentry_identity">
-		<legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
+		<legend id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
 		<ol>
 		[% UNLESS ( I ) %]
         [% UNLESS notitle %]
@@ -424,7 +424,7 @@
 [% END %]
 [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
 <fieldset class="rows">
-    <legend>Main address</legend><ol>
+    <legend id="main_address_lgd">Main address</legend><ol>
         [% UNLESS nostreetnumber %]
     <li>
       [% IF ( mandatorystreetnumber ) %]
@@ -566,7 +566,7 @@
 
 [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
   <fieldset class="rows" id="memberentry_contact">
-    <legend>Contact</legend><ol>
+    <legend id="contact_lgd">Contact</legend><ol>
         [% UNLESS nophone %]
       <li>
       [% IF ( mandatoryphone ) %] 
@@ -675,7 +675,7 @@
 
     [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
 		<fieldset class="rows" id="memberentry_address">
-		<legend>Alternate address</legend><ol>
+		<legend id="alt_address_lgd">Alternate address</legend><ol>
         [% UNLESS noB_address %]
 			<li>
 				[% IF ( mandatoryB_address ) %]
@@ -814,7 +814,7 @@
 [% IF ( step_2 ) %]
     [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
 		<fieldset class="rows" id="memberentry_altaddress">       
-		    <legend>Alternate Contact</legend><ol>
+		    <legend id="alt_contact_lgd">Alternate Contact</legend><ol>
         [% UNLESS noaltcontactsurname %]
 			<li>
 			    [% IF ( mandatoryaltcontactsurname ) %]
@@ -959,7 +959,7 @@
 [% IF ( step_3 ) %]
 
   <fieldset class="rows" id="memberentry_library_management">
-    <legend>Library Management</legend><ol>
+    <legend id="library_management_lgd">Library Management</legend><ol>
         [% UNLESS nocardnumber %]
    <li> [% IF ( mandatorycardnumber ) %]
       <label for="cardnumber" class="required">
@@ -1051,7 +1051,7 @@
   </fieldset>
     [% UNLESS nodateenrolled && nodateexpiry &&  noopacnote && noborrowernotes %]
 	<fieldset class="rows" id="memberentry_subscription">
-	<legend>Library set-up</legend><ol>
+	<legend id="library_setup_lgd">Library set-up</legend><ol>
         [% UNLESS nodateenrolled %]
 		<li>
 			[% IF ( mandatorydateenrolled ) %]
@@ -1148,7 +1148,7 @@
 
     [% UNLESS nouserid && nopassword %]
 	<fieldset class="rows" id="memberentry_userid">
-		<legend>OPAC/Staff Login</legend><ol>
+		<legend id="opac_staff_login_lgd">OPAC/Staff Login</legend><ol>
         [% UNLESS nouserid %]
 		<li>
 			[% IF ( mandatoryuserid ) %]
@@ -1442,7 +1442,7 @@
     </script>
     [% END %]
     <input type="hidden" name="setting_messaging_prefs" value="1" />
-    <legend>Patron messaging preferences</legend>
+    <legend id="patron_messaging_prefs_lgd">Patron messaging preferences</legend>
     [% IF type_only %]
         <i>If no preferences are selected, the default preferences for the category chosen will be applied on save, otherwise your selection here is saved</i>
     [% END %]
-- 
1.7.5.4


From jonathan.druart at biblibre.com  Wed Feb 15 12:45:56 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Wed, 15 Feb 2012 12:45:56 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 6751: Followup: Move export action
	into the "More" toolbar
Message-ID: <1329306356-15167-1-git-send-email-jonathan.druart@biblibre.com>

---
 .../prog/en/includes/circ-toolbar.inc              |    9 +++++++--
 .../prog/en/modules/help/members/readingrec.tt     |    4 +++-
 .../prog/en/modules/members/readingrec.tt          |    1 -
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index a4acfdf..2b2e996 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -33,6 +33,10 @@ function update_child() {
 [% END %]
 }
 
+function export_barcodes() {
+    window.open('/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]&amp;op=export_barcodes');
+}
+
 	// prepare DOM for YUI Toolbar
 
 	 $(document).ready(function() {
@@ -65,8 +69,9 @@ function update_child() {
 			{ text: _("Renew Patron"),  onclick: { fn: confirm_reregistration } },
 			{ text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS CAN_user_permissions %], disabled: true[% END %]},
             { text: _("Delete"), [% UNLESS CAN_user_borrowers %]disabled: true, [% END %] onclick: { fn: confirm_deletion } },
-			{ text: _("Update Child to Adult Patron") , onclick: { fn: update_child }[% UNLESS is_child %], disabled: true[% END %]}
-		];
+            { text: _("Update Child to Adult Patron") , onclick: { fn: update_child }[% UNLESS is_child %], disabled: true[% END %]},
+            { text: _("Export today checkin barcodes"), onclick: { fn: export_barcodes }}
+        ];
 
 	    new YAHOO.widget.Button({
 	        type: "menu",
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
index 6e9a837..804fdfe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
@@ -4,6 +4,8 @@
 
 <p>The circulation history tab will appear if you have set the intranetreadinghistory preference to allow it to appear. If you have the OPACPrivacy system preference set to 'Allow' and the patron has decided that the library cannot keep this information this tab will only show currently checked out items.</p>
 
+<p>You can export the today checkin barcodes by clinking on the link above the table. It simply generates a list of barcodes.</p>
+
 <p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
 
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index 245dece..0b31878 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -29,7 +29,6 @@
 [% IF ( loop_reading ) %]
 <form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
 
-<p><a href="readingrec.pl?borrowernumber=[% borrowernumber %]&amp;op=export_barcodes">Export checkin barcodes</a></p>
 <div id="pagertable_readingrec">
 [% INCLUDE 'table-pager.inc' perpage='20' %]
 </div>
-- 
1.7.7.3


From nengard at bywatersolutions.com  Wed Feb 15 20:49:09 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 15 Feb 2012 14:49:09 -0500
Subject: [Koha-patches] [PATCH] Bug 7545: Can't edit items
Message-ID: <1329335349-2605-1-git-send-email-nengard@bywatersolutions.com>

This patch makes it so that you can click 'edit items' and actually
edit items.
---
 cataloguing/additem.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 248c0de..4bf06b5 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -32,6 +32,7 @@ use C4::Branch; # XXX subfield_is_koha_internal_p
 use C4::ClassSource;
 use C4::Dates;
 use List::MoreUtils qw/any/;
+use C4::Search;
 
 use MARC::File::XML;
 use URI::Escape;
-- 
1.7.2.3


From wizzyrea at gmail.com  Wed Feb 15 21:15:46 2012
From: wizzyrea at gmail.com (Liz Rea)
Date: Wed, 15 Feb 2012 14:15:46 -0600
Subject: [Koha-patches] [PATCH 2/2] Bug 7546 - cannot view subscription
	detail
Message-ID: <1329336946-18460-1-git-send-email-wizzyrea@gmail.com>

This patch adds back a C4::Search removed from auth.pm during the denesting effort.
---
 serials/subscription-detail.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 8e7f418..32c5240 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -24,6 +24,7 @@ use C4::Dates qw/format_date/;
 use C4::Serials;
 use C4::Output;
 use C4::Context;
+use C4::Search;
 use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
 use Carp;
 
-- 
1.7.5.4


From wizzyrea at gmail.com  Wed Feb 15 21:27:00 2012
From: wizzyrea at gmail.com (Liz Rea)
Date: Wed, 15 Feb 2012 14:27:00 -0600
Subject: [Koha-patches] [PATCH] Bug 7546 - cannot view subscription detail
Message-ID: <1329337620-18872-1-git-send-email-wizzyrea@gmail.com>

This patch adds back a C4::Search removed from auth.pm during the denesting effort.
---
 serials/subscription-detail.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 8e7f418..c7fd4e0 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -24,6 +24,7 @@ use C4::Dates qw/format_date/;
 use C4::Serials;
 use C4::Output;
 use C4::Context;
+use C4::Search qw/enabled_staff_search_views/;
 use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
 use Carp;
 
-- 
1.7.5.4


From wizzyrea at gmail.com  Thu Feb 16 03:23:09 2012
From: wizzyrea at gmail.com (Liz Rea)
Date: Wed, 15 Feb 2012 20:23:09 -0600
Subject: [Koha-patches] [PATCH 2/2] Bug 7318 - filtering patron card creator
	by category code does nothing
Message-ID: <1329358989-23988-1-git-send-email-wizzyrea@gmail.com>

This patch should fix the search issue - do note you have to use the *code* and not the *description*

To test:
* replicate the bug:
	* do a patron search in the patron card creator, with the sample data installed, for category code PT - you should get results from all category codes.
* Apply the patch
* do a patron search in the patron card creator, with the sample data installed, for category code PT
* you will get only results in patron category PT.
---
 patroncards/members-search.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/patroncards/members-search.pl b/patroncards/members-search.pl
index 276814a..6c27095 100755
--- a/patroncards/members-search.pl
+++ b/patroncards/members-search.pl
@@ -60,7 +60,7 @@ $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
 
 if ($member || $category) {
-    my $results = $category ? Search({''=>$member, category_type=>$category}, $orderby)
+    my $results = $category ? Search({''=>$member, categorycode=>$category}, $orderby)
                             : Search($member, $orderby);
     my $count = $results ? @$results : 0;
 
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Thu Feb 16 03:51:19 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu, 16 Feb 2012 15:51:19 +1300
Subject: [Koha-patches] [PATCH] bug_7001: Superlibrarian can edit/copy
	everything.
In-Reply-To: <bug 7001>
References: <bug 7001>
Message-ID: <1329360679-26966-1-git-send-email-srdjan@catalyst.net.nz>

Important when IndependantBranches is set to Yes.
---
 tools/letter.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/letter.pl b/tools/letter.pl
index 17c0e77..ae47810 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -95,7 +95,7 @@ my $content     = $input->param('content');
 my $op          = $input->param('op') || '';
 my $dbh = C4::Context->dbh;
 
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+my ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
     {
         template_name   => 'tools/letter.tmpl',
         query           => $input,
@@ -106,7 +106,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-my $my_branch = C4::Context->preference("IndependantBranches")
+my $my_branch = C4::Context->preference("IndependantBranches") && !$staffflags->{'superlibrarian'}
   ?  C4::Context->userenv()->{'branch'}
   : undef;
 # we show only the TMPL_VAR names $op
-- 
1.6.5


From magnus at enger.priv.no  Thu Feb 16 12:18:40 2012
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu, 16 Feb 2012 12:18:40 +0100
Subject: [Koha-patches] [PATCH] Bug 7537 - Implement TraceCompleteSubfields
	and TraceSubjectSubdivisions for NORMARC XSLT
Message-ID: <1329391120-2844-1-git-send-email-magnus@enger.priv.no>

As the title says, this patch implements TraceCompleteSubfields and
TraceSubjectSubdivisions for NORMARC XSLT, both for the OPAC and the
Intranet. This affects how clickable subject-links are constructed.

To test:

Find a record with a complex subject, like "Art -- United States".
MARC21 and NORMARC are very similar in how they handle subjects, so testing
on a MARC21 database should be OK.

Make sure you have these syspref settings:
- marcflavour = NORMARC
- XSLTDetailsDisplay = using XSLT stylesheets
- OPACXSLTDetailsDisplay = using XSLT stylesheets

Now try the different combinations of TraceCompleteSubfields and
TraceSubjectSubdivisions and check the format of the clickable links,
both in the OPAC and staff client. Here's what you should be seeing:

1.
TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Don't include
-> q=su:{Art}

2.
TraceCompleteSubfields   = Force
TraceSubjectSubdivisions = Don't include
-> q=su,complete-subfield:{Art}

3.
TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Include
-> q=(su:{Art}) and (su:{United%20States.})

4.
TraceCompleteSubfields   = Force
TraceSubjectSubdivisions = Include
-> q=(su,complete-subfield:{Art}) and (su,complete-subfield:{United States.})
---
 .../prog/en/xslt/NORMARCslim2intranetDetail.xsl    |   22 +++++++++++++++---
 .../prog/en/xslt/NORMARCslimUtils.xsl              |    4 ++-
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl        |   24 ++++++++++++++++---
 .../opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl    |    4 ++-
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
index 163ed29..b9f6da6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
@@ -15,6 +15,8 @@
 
         <!-- Sysprefs -->
         <xsl:variable name="OPACBaseURL" select="marc:sysprefs/marc:syspref[@name='OPACBaseURL']"/>
+        <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>
+        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
 
         <xsl:variable name="leader" select="marc:leader"/>
         <xsl:variable name="leader6" select="substring($leader,7,1)"/>
@@ -293,16 +295,27 @@
         </span>
         </xsl:if>
 
+        <!-- Subjects -->
+
         <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
-            <span class="results_summary"><span class="label">Emner: </span>
+            <span class="results_summary subjects"><span class="label">Emne(r): </span>
             <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
             <a>
             <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
+            <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
                 <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
             </xsl:when>
+            <xsl:when test="$TraceSubjectSubdivisions='1'">
+                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abcdvxyz</xsl:with-param>
+                        <xsl:with-param name="delimeter"> and </xsl:with-param>
+                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:{</xsl:with-param>
+                        <xsl:with-param name="suffix">})</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:attribute>
+            </xsl:when>
             <xsl:otherwise>
-                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=su:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
+                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:{<xsl:value-of select="marc:subfield[@code='a']"/>}</xsl:attribute>
             </xsl:otherwise>
             </xsl:choose>
             <xsl:call-template name="chopPunctuation">
@@ -313,7 +326,8 @@
                         <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
                     </xsl:call-template>
                 </xsl:with-param>
-            </xsl:call-template></a>
+            </xsl:call-template>
+            </a>
             <xsl:choose>
             <xsl:when test="position()=last()"></xsl:when>
             <xsl:otherwise> | </xsl:otherwise>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
index 7c2bf21..606727e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
@@ -24,13 +24,15 @@
 		<xsl:param name="delimeter"><xsl:text> </xsl:text></xsl:param>
 		<xsl:param name="subdivCodes"/>
 		<xsl:param name="subdivDelimiter"/>
+        <xsl:param name="prefix"/>
+        <xsl:param name="suffix"/>
 		<xsl:variable name="str">
 			<xsl:for-each select="marc:subfield">
 				<xsl:if test="contains($codes, @code)">
                     <xsl:if test="contains($subdivCodes, @code)">
                         <xsl:value-of select="$subdivDelimiter"/>
                     </xsl:if>
-					<xsl:value-of select="text()"/><xsl:value-of select="$delimeter"/>
+					<xsl:value-of select="$prefix"/><xsl:value-of select="text()"/><xsl:value-of select="$suffix"/><xsl:value-of select="$delimeter"/>
 				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
index 1a4e042..eefaddd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
@@ -15,6 +15,10 @@
     </xsl:template>
 
     <xsl:template match="marc:record">
+    
+        <!-- Sysprefs -->
+        <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>
+        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
 
         <xsl:variable name="leader" select="marc:leader"/>
         <xsl:variable name="leader6" select="substring($leader,7,1)"/>
@@ -298,16 +302,27 @@
         </span>
         </xsl:if>
 
+        <!-- Subjects -->
+        
         <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
-            <span class="results_summary"><span class="label">Emner: </span>
+            <span class="results_summary subjects"><span class="label">Emne(r): </span>
             <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
             <a>
             <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
+            <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
                 <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
             </xsl:when>
+            <xsl:when test="$TraceSubjectSubdivisions='1'">
+                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abcdvxyz</xsl:with-param>
+                        <xsl:with-param name="delimeter"> and </xsl:with-param>
+                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:{</xsl:with-param>
+                        <xsl:with-param name="suffix">})</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:attribute>
+            </xsl:when>
             <xsl:otherwise>
-                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
+                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:{<xsl:value-of select="marc:subfield[@code='a']"/>}</xsl:attribute>
             </xsl:otherwise>
             </xsl:choose>
             <xsl:call-template name="chopPunctuation">
@@ -318,7 +333,8 @@
                         <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
                     </xsl:call-template>
                 </xsl:with-param>
-            </xsl:call-template></a>
+            </xsl:call-template>
+            </a>
             <xsl:choose>
             <xsl:when test="position()=last()"></xsl:when>
             <xsl:otherwise> | </xsl:otherwise>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
index 31317b1..91a0437 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
@@ -25,13 +25,15 @@
 		<xsl:param name="delimeter"><xsl:text> </xsl:text></xsl:param>
 		<xsl:param name="subdivCodes"/>
 		<xsl:param name="subdivDelimiter"/>
+        <xsl:param name="prefix"/>
+        <xsl:param name="suffix"/>
 		<xsl:variable name="str">
 			<xsl:for-each select="marc:subfield">
 				<xsl:if test="contains($codes, @code)">
                     <xsl:if test="contains($subdivCodes, @code)">
                         <xsl:value-of select="$subdivDelimiter"/>
                     </xsl:if>
-					<xsl:value-of select="text()"/><xsl:value-of select="$delimeter"/>
+					<xsl:value-of select="$prefix"/><xsl:value-of select="text()"/><xsl:value-of select="$suffix"/><xsl:value-of select="$delimeter"/>
 				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
-- 
1.7.2.5


From colin.campbell at ptfs-europe.com  Thu Feb 16 12:18:26 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu, 16 Feb 2012 11:18:26 +0000
Subject: [Koha-patches] [PATCH] Bug 7546 Do not call routine as bareword
Message-ID: <1329391106-14676-1-git-send-email-colin.campbell@ptfs-europe.com>

Fixes compilation errors due to calling routine without parens
Also nothing was gained (and obfuscation added) by forcing
the return into a hash ref have changed variable to hash
tidied up the if else chain

These routines should be refactored out future
---
 serials/serials-edit.pl        |   13 +++++++------
 serials/subscription-detail.pl |   13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index 9ecd09f..12f568c 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -403,14 +403,15 @@ output_html_with_http_headers $query, $cookie, $template->output;
 
 sub get_default_view {
     my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
-    my $views = { C4::Search::enabled_staff_search_views };
-    if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
+    my %views       = C4::Search::enabled_staff_search_views();
+    if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) {
         return 'ISBDdetail';
-    } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+    }
+    elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) {
         return 'MARCdetail';
-    } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+    }
+    elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) {
         return 'labeledMARCdetail';
-    } else {
-        return 'detail';
     }
+    return 'detail';
 }
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 8e7f418..d267bc3 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -143,14 +143,15 @@ output_html_with_http_headers $query, $cookie, $template->output;
 
 sub get_default_view {
     my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
-    my $views = { C4::Search::enabled_staff_search_views };
-    if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
+    my %views       = C4::Search::enabled_staff_search_views();
+    if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) {
         return 'ISBDdetail';
-    } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+    }
+    elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) {
         return 'MARCdetail';
-    } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+    }
+    elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) {
         return 'labeledMARCdetail';
-    } else {
-        return 'detail';
     }
+    return 'detail';
 }
-- 
1.7.7.6


From M.de.Rooy at rijksmuseum.nl  Thu Feb 16 12:30:09 2012
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 16 Feb 2012 11:30:09 +0000
Subject: [Koha-patches] [PATCH] 7310a: DB revision for Improving list
	permissions
In-Reply-To: <1329391509-14665-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1329391509-14665-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA31044AF109@S-MAIL-1B.rijksmuseum.intra>

DB revision for improving list permissions.
Adds new table virtualshelfshares for maintaining shared private lists.
Adds three columns to virtualshelves for permissions per list.
Adds column borrowernumber to virtualshelfcontents.

Feb 16, 2012: Rebased.
---
 installer/data/mysql/updatedatabase.pl |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 0ef0b1f..9a21bef 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4684,6 +4684,31 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.07.99.XXX"; #FIXME
+if ( C4::Context->preference("Version") lt TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE virtualshelves MODIFY COLUMN owner int"); #should have been int already (fk to borrowers)
+    $dbh->do("ALTER TABLE virtualshelves ADD COLUMN allow_add tinyint(1) DEFAULT 1, ADD COLUMN allow_delete_own tinyint(1) DEFAULT 1, ADD COLUMN allow_delete_other tinyint(1) DEFAULT 0");
+    $dbh->do("UPDATE virtualshelves SET allow_add=1, allow_delete_own=1, allow_delete_other=0 WHERE category=1");
+    $dbh->do("UPDATE virtualshelves SET allow_add=1, allow_delete_own=1, allow_delete_other=1 WHERE category=2"); #former behavior
+    $dbh->do("UPDATE virtualshelves SET allow_add=1, allow_delete_own=1, allow_delete_other=1 WHERE category=3");
+    $dbh->do("UPDATE virtualshelves SET category=2 WHERE category=3");
+
+    $dbh->do("ALTER TABLE virtualshelfcontents ADD COLUMN borrowernumber int");
+    $dbh->do("UPDATE virtualshelfcontents co LEFT JOIN virtualshelves sh USING (shelfnumber) SET co.borrowernumber=sh.owner");
+
+    $dbh->do("CREATE TABLE virtualshelfshares
+	(id int AUTO_INCREMENT PRIMARY KEY, shelfnumber int NOT NULL,
+	borrowernumber int, invitekey varchar(10), sharedate datetime,
+	CONSTRAINT `virtualshelfshares_ibfk_1` FOREIGN KEY (`shelfnumber`) REFERENCES `virtualshelves` (`shelfnumber`) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAllowPublicListCreation',1,'If set, allows opac users to create public lists',NULL,'YesNo');");
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAllowSharingPrivateLists',0,'If set, allows opac users to share private lists with other patrons',NULL,'YesNo');");
+
+    print "Upgrade to $DBversion done (BZ7310: Improving list permissions)\n";
+    print "NOTE: If you want to make your public lists read-only, please check the permissions on list level or run a sql update statement on the virtualshelves table just like the ones in the updatedatabase script.\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Thu Feb 16 12:30:21 2012
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 16 Feb 2012 11:30:21 +0000
Subject: [Koha-patches] [PATCH] 7310a: Improving list permissions: Changing
 Koha SQL structure
In-Reply-To: <1329391515-14695-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1329391515-14695-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA31044AF117@S-MAIL-1B.rijksmuseum.intra>

Modifying Koha structure for improving list permissions.
Adds new table virtualshelfshares for maintaining shared private lists.
Adds three columns to virtualshelves for permissions per list.
Adds column borrowernumber to virtualshelfcontents.
---
 installer/data/mysql/kohastructure.sql |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 37113c2..b1fbc01 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1979,10 +1979,13 @@ DROP TABLE IF EXISTS `virtualshelves`;  CREATE TABLE `virtualshelves` ( -- information about lists (or virtual shelves) 
   `shelfnumber` int(11) NOT NULL auto_increment, -- unique identifier assigned by Koha
   `shelfname` varchar(255) default NULL, -- name of the list
-  `owner` varchar(80) default NULL, -- foriegn key linking to the borrowers table (using borrowernumber) for the creator of this list
-  `category` varchar(1) default NULL, -- type of list (public [2], private [1] or open [3])
+  `owner` int default NULL, -- foreign key linking to the borrowers 
+ table (using borrowernumber) for the creator of this list (changed 
+ from varchar(80) to int)  `category` varchar(1) default NULL, -- type 
+ of list (private [1], public [2])
   `sortfield` varchar(16) default NULL, -- the field this list is sorted on
   `lastmodified` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time the list was last modified
+  `allow_add` tinyint(1) default 1, -- permission for adding entries to 
+ list  `allow_delete_own` tinyint(1) default 1, -- permission for 
+ deleting entries frm list that you added yourself  
+ `allow_delete_other` tinyint(1) default 0, -- permission for deleting 
+ entries from list that another person added
   PRIMARY KEY  (`shelfnumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -1996,6 +1999,7 @@ CREATE TABLE `virtualshelfcontents` ( -- information about the titles in a list
   `biblionumber` int(11) NOT NULL default 0, -- foreign key linking to the biblio table, defines the bib record that has been added to the list
   `flags` int(11) default NULL,
   `dateadded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- date and time this bib record was added to the list
+  `borrowernumber` int, -- borrower number that created this list entry 
+ (only the first one is saved: no need for use in/as key)
   KEY `shelfnumber` (`shelfnumber`),
   KEY `biblionumber` (`biblionumber`),
   CONSTRAINT `virtualshelfcontents_ibfk_1` FOREIGN KEY (`shelfnumber`) REFERENCES `virtualshelves` (`shelfnumber`) ON DELETE CASCADE ON UPDATE CASCADE, @@ -2003,6 +2007,20 @@ CREATE TABLE `virtualshelfcontents` ( -- information about the titles in a list

 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
+-- Table structure for table `virtualshelfshares`
+--
+
+DROP TABLE IF EXISTS `virtualshelfshares`; CREATE TABLE 
+`virtualshelfshares` ( --shared private lists
+  `id` int AUTO_INCREMENT PRIMARY KEY,  --unique key
+  `shelfnumber` int NOT NULL,  -- foreign key for virtualshelves
+  `borrowernumber` int,  -- borrower that accepted access to this list
+  `invitekey` varchar(10), -- temporary string used in accepting the 
+invitation to access thist list; not-empty means that the invitation 
+has not been accepted yet
+  `sharedate` datetime,  -- date of invitation or acceptance of 
+invitation
+  CONSTRAINT `virtualshelfshares_ibfk_1` FOREIGN KEY (`shelfnumber`) 
+REFERENCES `virtualshelves` (`shelfnumber`) ON DELETE CASCADE ON UPDATE 
+CASCADE,
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
 -- Table structure for table `z3950servers`
 --
 
--
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Thu Feb 16 12:30:32 2012
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 16 Feb 2012 11:30:32 +0000
Subject: [Koha-patches] [PATCH] 7310a: Improving lists permissions -- New
	prefs
In-Reply-To: <1329391523-14724-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1329391523-14724-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA31044AF122@S-MAIL-1B.rijksmuseum.intra>

Adds two new preferences to OPAC/Policy tab.
---
 .../prog/en/modules/admin/preferences/opac.pref    |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index be86733..39e9199 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -369,7 +369,21 @@ OPAC:
             - pref: OpacHiddenItems
               type: textarea
               class: code
-            - Allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.
+            - Allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations
+        -
+            - pref: OpacAllowPublicListCreation
+              default: 1
+              choices:
+                  no: "Don't allow"
+                  yes: Allow
+            - opac users to create public lists
+        -
+            - pref: OpacAllowSharingPrivateLists
+              default: 0
+              choices:
+                  no: "Don't allow"
+                  yes: Allow
+            - opac users to share private lists with other patrons. This feature is not active yet but will be released soon
 
     Privacy:
         -
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Thu Feb 16 12:30:42 2012
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 16 Feb 2012 11:30:42 +0000
Subject: [Koha-patches] [PATCH] 7310b: Code changes for Improving list
	permissions
In-Reply-To: <1329391530-14753-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1329391530-14753-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA31044AF12E@S-MAIL-1B.rijksmuseum.intra>

This lays the foundation for further changes for report 7310.
Implements following points from the wiki page List permissions:
1) Preference that controls if users may create public lists in opac.
2) New add/delete own/delete other permissions per list.

Code has been changed (in some cases refactored). New permissions are not yet visible; with this patch current functionality is kept as much as possible while resolving several issues, improving permissions and extending the code for further developments (using the new permissions and sharing lists).
---
 C4/Auth.pm                                         |   61 +--
 C4/VirtualShelves.pm                               |  594 +++++++++++---------
 C4/VirtualShelves/Page.pm                          |  143 +++--
 catalogue/search.pl                                |   24 +-
 .../en/modules/virtualshelves/addbybiblionumber.tt |   36 +-
 .../prog/en/modules/virtualshelves/shelves.tt      |   28 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |   24 +-
 .../prog/en/modules/opac-addbybiblionumber.tt      |   11 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |   26 +-
 opac/opac-addbybiblionumber.pl                     |  186 ++++---
 opac/opac-search.pl                                |   27 +-
 opac/opac-shelves.pl                               |    8 +-
 virtualshelves/addbybiblionumber.pl                |  243 ++++-----
 13 files changed, 754 insertions(+), 657 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index a855818..bda4855 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -171,21 +171,15 @@ sub get_template_and_user {
         $template->param( loggedinusername => $user );
         $template->param( sessionID        => $sessionID );
 
-        my ($total, $pubshelves, $barshelves) = C4::Context->get_shelves_userenv();
-        if (defined($pubshelves)) {
-            $template->param( pubshelves     => scalar @{$pubshelves},
-                              pubshelvesloop => $pubshelves,
-            );
-            $template->param( pubtotal   => $total->{'pubtotal'}, ) if ($total->{'pubtotal'} > scalar @{$pubshelves});
-        }
-        if (defined($barshelves)) {
-            $template->param( barshelves      => scalar @{$barshelves},
-                              barshelvesloop  => $barshelves,
-            );
-            $template->param( bartotal  => $total->{'bartotal'}, ) if ($total->{'bartotal'} > scalar @{$barshelves});
-        }
-
         $borrowernumber = getborrowernumber($user) if defined($user);
+        my ($total, $pubshelves, $barshelves) = C4::VirtualShelves::GetSomeShelfNames($borrowernumber, 'MASTHEAD');
+	$template->param(
+	    pubshelves     => $total->{pubtotal},
+	    pubshelvesloop => $pubshelves,
+	    barshelves      => $total->{bartotal},
+	    barshelvesloop  => $barshelves,
+	);
+
         require C4::Members;
         my ( $borr ) = C4::Members::GetMemberDetails( $borrowernumber );
         my @bordat;
@@ -303,14 +297,11 @@ sub get_template_and_user {
 
         $template->param( sessionID        => $sessionID );
         
-        my ($total, $pubshelves) = C4::Context->get_shelves_userenv();  # an anonymous user has no 'barshelves'...
-        if (defined $pubshelves) {
-            $template->param(   pubshelves      => scalar @{$pubshelves},
-                                pubshelvesloop  => $pubshelves,
-                            );
-            $template->param(   pubtotal        => $total->{'pubtotal'}, ) if ($total->{'pubtotal'} > scalar @{$pubshelves});
-        }
-
+        my ($total, $pubshelves) = C4::VirtualShelves::GetSomeShelfNames(undef, 'MASTHEAD');
+	$template->param(
+	    pubshelves     => $total->{pubtotal},
+	    pubshelvesloop => $pubshelves,
+	);
     }
  	# Anonymous opac search history
  	# If opac search history is enabled and at least one search has already been performed
@@ -879,22 +870,6 @@ sub checkauth {
 					$session->param('emailaddress'), $session->param('branchprinter')
 				);
 
-				# Grab borrower's shelves and public shelves and add them to the session
-				# $row_count determines how many records are returned from the db query
-				# and the number of lists to be displayed of each type in the 'Lists' button drop down
-				my $row_count = 10; # FIXME:This probably should be a syspref
-				my ($total, $totshelves, $barshelves, $pubshelves);
-				($barshelves, $totshelves) = C4::VirtualShelves::GetRecentShelves(1, $row_count, $borrowernumber);
-				$total->{'bartotal'} = $totshelves;
-				($pubshelves, $totshelves) = C4::VirtualShelves::GetRecentShelves(2, $row_count, undef);
-				$total->{'pubtotal'} = $totshelves;
-				$session->param('barshelves', $barshelves);
-				$session->param('pubshelves', $pubshelves);
-				$session->param('totshelves', $total);
-
-				C4::Context::set_shelves_userenv('bar',$barshelves);
-				C4::Context::set_shelves_userenv('pub',$pubshelves);
-				C4::Context::set_shelves_userenv('tot',$total);
 			}
         	else {
             	if ($userid) {
@@ -908,16 +883,6 @@ sub checkauth {
             # anonymous sessions are created only for the OPAC
 			$debug and warn "Initiating an anonymous session...";
 
-			# Grab the public shelves and add to the session...
-			my $row_count = 20; # FIXME:This probably should be a syspref
-			my ($total, $totshelves, $pubshelves);
-			($pubshelves, $totshelves) = C4::VirtualShelves::GetRecentShelves(2, $row_count, undef);
-			$total->{'pubtotal'} = $totshelves;
-			$session->param('pubshelves', $pubshelves);
-			$session->param('totshelves', $total);
-			C4::Context::set_shelves_userenv('pub',$pubshelves);
-			C4::Context::set_shelves_userenv('tot',$total);
-
 			# setting a couple of other session vars...
 			$session->param('ip',$session->remote_addr());
 			$session->param('lasttime',time());
diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index c74ecb3..266e5fb 100644
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -28,6 +28,11 @@ use Carp;
 use C4::Context;
 use C4::Debug;
 
+use constant SHELVES_MASTHEAD_MAX => 10; #number under Lists button in masthead
+use constant SHELVES_COMBO_MAX => 10; #add to combo in search
+use constant SHELVES_MGRPAGE_MAX => 20; #managing page
+use constant SHELVES_POPUP_MAX => 40; #addbybiblio popup
+
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
 BEGIN {
@@ -44,8 +49,7 @@ BEGIN {
             &GetBibliosShelves
 	);
         @EXPORT_OK = qw(
-            &GetShelvesSummary &GetRecentShelves &GetAllShelves
-            &RefreshShelvesSummary &SetShelvesLimit
+            &GetRecentShelves &GetAllShelves &ShelvesMax
         );
 }
 
@@ -54,7 +58,7 @@ my $dbh = C4::Context->dbh;
 
 =head1 NAME
 
-C4::VirtualShelves - Functions for manipulating Koha virtual virtualshelves
+C4::VirtualShelves - Functions for manipulating Koha virtual shelves
 
 =head1 SYNOPSIS
 
@@ -62,21 +66,24 @@ C4::VirtualShelves - Functions for manipulating Koha virtual virtualshelves
 
 =head1 DESCRIPTION
 
-This module provides functions for manipulating virtual virtualshelves,
-including creating and deleting virtualshelves, and adding and removing
-bibs to and from virtualshelves.
+This module provides functions for manipulating virtual shelves,
+including creating and deleting virtual shelves, and adding and removing
+bibs to and from virtual shelves.
 
 =head1 FUNCTIONS
 
 =head2 GetShelves
 
-  ($shelflist, $totshelves) = &GetShelves($mincategory, $row_count, $offset, $owner);
+  ($shelflist, $totshelves) = &GetShelves($category, $row_count, $offset, $owner);
   ($shelfnumber, $shelfhash) = each %{$shelflist};
 
 Returns the number of shelves specified by C<$row_count> and C<$offset> as well as the total
-number of shelves that meet the C<$owner> and C<$mincategory> criteria.  C<$mincategory>,
-C<$row_count>, and C<$offset> are required. C<$owner> must be supplied when C<$mincategory> == 1.
-When C<$mincategory> is 2 or 3, supply undef as argument for C<$owner>.
+number of shelves that meet the C<$owner> and C<$category> criteria.  C<$category>,
+C<$row_count>, and C<$offset> are required. C<$owner> must be supplied when C<$category> == 1.
+When C<$category> is 2, supply undef as argument for C<$owner>.
+
+This function is used by shelfpage in VirtualShelves/Page.pm when listing all shelves for lists management in opac or staff client. Order is by shelfname.
+
 C<$shelflist>is a reference-to-hash. The keys are the virtualshelves numbers (C<$shelfnumber>, above),
 and the values (C<$shelfhash>, above) are themselves references-to-hash, with the following keys:
 
@@ -94,35 +101,40 @@ The number of virtuals on that virtualshelves.
 
 =cut
 
-sub GetShelves ($$$$) {
-    my ($mincategory, $row_count, $offset, $owner) = @_;
-	my @params = ($owner, $mincategory, ($offset ? $offset : 0), $row_count);
-	my @params1 = ($owner, $mincategory);
-	if ($mincategory > 1) {
-		shift @params;
-		shift @params1;
-	}
-	my $total = _shelf_count($owner, $mincategory);
-    # grab only the shelves meeting the row_count/offset spec...
-    my $query = qq(
-        SELECT virtualshelves.shelfnumber, virtualshelves.shelfname,owner,surname,firstname,virtualshelves.category,virtualshelves.sortfield,
-               count(virtualshelfcontents.biblionumber) as count
-        FROM   virtualshelves
-            LEFT JOIN   virtualshelfcontents ON virtualshelves.shelfnumber = virtualshelfcontents.shelfnumber
-            LEFT JOIN   borrowers ON virtualshelves.owner = borrowers.borrowernumber );
-    $query .= ($mincategory == 1) ? "WHERE  owner=? AND category=?" : "WHERE category>=?";
-	$query .= qq(
-        GROUP BY virtualshelves.shelfnumber
-        ORDER BY virtualshelves.shelfname
-		LIMIT ?, ?);
+sub GetShelves {
+    my ($category, $row_count, $offset, $owner) = @_;
+    my @params;
+    my $total = _shelf_count($owner, $category);
+    my $query = qq{
+        SELECT vs.shelfnumber, vs.shelfname,vs.owner,
+        bo.surname,bo.firstname,vs.category,vs.sortfield,
+        count(vc.biblionumber) as count
+        FROM virtualshelves vs
+        LEFT JOIN borrowers bo ON vs.owner=bo.borrowernumber
+        LEFT JOIN virtualshelfcontents vc USING (shelfnumber) };
+    if($category==1) {
+        $query.= qq{
+            LEFT JOIN virtualshelfshares sh ON sh.shelfnumber=vs.shelfnumber
+            AND sh.borrowernumber=?
+	    WHERE category=1 AND (vs.owner=? OR sh.borrowernumber=?) };
+        @params= ($owner, $owner, $owner, $offset||0, $row_count);
+    }
+    else {
+        $query.= 'WHERE category=2 ';
+        @params= ($offset||0, $row_count);
+    }
+    $query.= qq{
+        GROUP BY vs.shelfnumber
+        ORDER BY vs.shelfname
+        LIMIT ?, ?};
+
     my $sth2 = $dbh->prepare($query);
     $sth2->execute(@params);
     my %shelflist;
-    while ( my ( $shelfnumber, $shelfname, $owner, $surname,
-           	$firstname,   $category,  $sortfield, $count ) = $sth2->fetchrow ) {
+    while( my ($shelfnumber, $shelfname, $owner, $surname, $firstname, $category, $sortfield, $count)= $sth2->fetchrow) {
         $shelflist{$shelfnumber}->{'shelfname'} = $shelfname;
         $shelflist{$shelfnumber}->{'count'}     = $count;
-        if($count eq 1){ $shelflist{$shelfnumber}->{'single'} = 1; }
+        $shelflist{$shelfnumber}->{'single'}    = $count==1;
         $shelflist{$shelfnumber}->{'sortfield'} = $sortfield;
         $shelflist{$shelfnumber}->{'category'}  = $category;
         $shelflist{$shelfnumber}->{'owner'}     = $owner;
@@ -132,87 +144,48 @@ sub GetShelves ($$$$) {
     return ( \%shelflist, $total );
 }
 
-=head2 GetShelvesSummary
-
-	($shelves, $total) = GetShelvesSummary($mincategory, $row_count, $offset, $owner)
-
-Returns the number of shelves specified by C<$row_count> and C<$offset> as well as the total
-number of shelves that meet the C<$owner> and/or C<$mincategory> criteria. C<$mincategory>,
-C<$row_count>, and C<$offset> are required. C<$owner> must be supplied when C<$mincategory> == 1.
-When C<$mincategory> is 2 or 3, supply undef as argument for C<$owner>.
-
-=cut
-
-sub GetShelvesSummary ($$$$) {
-    my ($mincategory, $row_count, $offset, $owner) = @_;
-	my @params = ($owner, $mincategory, ($offset ? $offset : 0), $row_count);
-	my @params1 = ($owner, $mincategory);
-	if ($mincategory > 1) {
-		shift @params;
-		shift @params1;
-	}
-	my $total = _shelf_count($owner, $mincategory);
-    # grab only the shelves meeting the row_count/offset spec...
-	my $query = qq(
-		SELECT
-			virtualshelves.shelfnumber,
-			virtualshelves.shelfname,
-			owner,
-			CONCAT(firstname, ' ', surname) AS name,
-			virtualshelves.category,
-			count(virtualshelfcontents.biblionumber) AS count
-		FROM   virtualshelves
-			LEFT JOIN  virtualshelfcontents ON virtualshelves.shelfnumber = virtualshelfcontents.shelfnumber
-			LEFT JOIN             borrowers ON virtualshelves.owner = borrowers.borrowernumber );
-    $query .= ($mincategory == 1) ? "WHERE  owner=? AND category=?" : "WHERE category>=?";
-	$query .= qq(
-		GROUP BY virtualshelves.shelfnumber
-		ORDER BY virtualshelves.category
-		DESC 
-		LIMIT ?, ?);
-	my $sth2 = $dbh->prepare($query);
-	$sth2->execute(@params);
-    my $shelves = $sth2->fetchall_arrayref({});
-    return ($shelves, $total);
-
-	# Probably NOT the final implementation since it is still bulky (repeated hash keys).
-	# might like an array of rows of delimited values:
-	# 1|2||0|blacklist|112
-	# 2|6|Josh Ferraro|51|en_fuego|106
-}
-
 =head2 GetRecentShelves
 
-	($shelflist, $total) = GetRecentShelves(1, $limit, $owner)
+	($shelflist, $total) = GetRecentShelves($category, $row_count, $owner, $adding_allowed)
 
-This function returns a reference to an array of hashrefs containing specified shelves sorted
-by the date the shelf was last modified in descending order limited to the number of records
-specified by C<$row_count>. If calling with C<$mincategory> other than 1, use undef as C<$owner>.
+This function returns a reference to an array of hashrefs containing specified shelves sorted by the date the shelf was last modified in descending order limited to the number of records specified by C<$row_count>.
+If row_count is undef, a default maximum of 100 lists is used.
+If calling with C<$category> other than 1, owner is ignored.
+If C<$adding_allowed> is 1, return only lists where user has permission to add entries.
 
-This function is intended to return a dataset reflecting the most recently active shelves for
-the submitted parameters.
+This function is intended to return a dataset reflecting the most recently active shelves for the submitted parameters.
 
 =cut
 
 sub GetRecentShelves {
-    my ($mincategory, $row_count, $owner) = @_;
-    my $total = _shelf_count($owner, $mincategory);
+    my ($category, $row_count, $owner, $adding_allowed) = @_;
+    my $total = _shelf_count($owner, $category);
     my @params;
-    my $selection;
-    if (defined $owner) {
-        @params = ($owner, $mincategory);
-        $selection = ' WHERE owner = ? AND category = ?';
-    } else {
-        @params = ( $mincategory);
-        $selection = ' WHERE category >= ? ';
+
+    my $query = 'SELECT vs.* FROM virtualshelves vs ';
+    if($category==1) {
+        $query.= qq{
+            LEFT JOIN virtualshelfshares sh ON sh.shelfnumber=vs.shelfnumber
+            AND sh.borrowernumber=?
+	    WHERE category=1 AND (vs.owner=? OR sh.borrowernumber=?) };
+        @params = ($owner, $owner, $owner);
     }
-    my $query = 'SELECT * FROM virtualshelves';
-    $query .= $selection;
-    $query .= ' ORDER BY lastmodified DESC';
+    else {
+	$query.='WHERE category=2 ';
+        @params = ();
+    }
+    if($adding_allowed) {
+	$query.= 'AND allow_add=1 ';
+    }
+    $query .= 'ORDER BY lastmodified DESC ';
     if ($row_count){
-	$query .= ' LIMIT ?';
+	$query .= 'LIMIT ?';
 	push @params,$row_count;
     }
+    elsif($total>SHELVES_COMBO_MAX) {
+	$query .= 'LIMIT '.SHELVES_COMBO_MAX;
+    }
+
     my $sth = $dbh->prepare($query);
     $sth->execute(@params);
     my $shelflist = $sth->fetchall_arrayref({});
@@ -221,10 +194,10 @@ sub GetRecentShelves {
 
 =head2 GetAllShelves
 
-    $shelflist = GetAllShelves($owner)
+    $shelflist = GetAllShelves($category, $owner)
 
-This function returns a reference to an array of hashrefs containing all shelves sorted
-by the shelf name.
+This function returns a reference to an array of hashrefs containing all shelves
+sorted by the shelf name.
 
 This function is intended to return a dataset reflecting all the shelves for
 the submitted parameters.
@@ -232,13 +205,62 @@ the submitted parameters.
 =cut
 
 sub GetAllShelves {
-    my ($category,$owner) = @_;
-    my $query = 'SELECT * FROM virtualshelves WHERE category = ? AND owner = ? ORDER BY shelfname ASC';
+    my ($category,$owner,$adding_allowed) = @_;
+    my @params;
+    my $query = 'SELECT vs.* FROM virtualshelves vs ';
+    if($category==1) {
+        $query.= qq{
+            LEFT JOIN virtualshelfshares sh ON sh.shelfnumber=vs.shelfnumber
+            AND sh.borrowernumber=?
+	    WHERE category=1 AND (vs.owner=? OR sh.borrowernumber=?) };
+        @params = ($owner, $owner, $owner);
+    }
+    else {
+	$query.='WHERE category=2 ';
+        @params = ();
+    }
+    $query.='AND allow_add=1 ' if $adding_allowed;
+    $query.= 'ORDER BY shelfname ASC';
     my $sth = $dbh->prepare( $query );
-    $sth->execute( $category, $owner );
+    $sth->execute(@params);
     return $sth->fetchall_arrayref({});
 }
 
+=head2 GetSomeShelfNames
+
+Returns shelf names and numbers for Add to combo of search results and Lists button of OPAC header.
+
+=cut
+
+sub GetSomeShelfNames {
+    my ($owner, $purpose, $adding_allowed)= @_;
+    my ($bar, $pub);
+
+    my $bquery = 'SELECT vs.shelfnumber, vs.shelfname FROM virtualshelves vs ';
+    my $limit= ShelvesMax($purpose);
+
+    my $qry1= $bquery."WHERE vs.category=2 ";
+    $qry1.= "AND allow_add=1 " if $adding_allowed;
+    $qry1.= "ORDER BY vs.lastmodified DESC LIMIT $limit";
+
+    unless($adding_allowed && (!defined($owner) || $owner<=0)) {
+      #if adding items, user should be known
+      $pub= $dbh->selectall_arrayref($qry1,{Slice=>{}});
+    }
+
+    if($owner) {
+      my $qry2= $bquery. qq{
+        LEFT JOIN virtualshelfshares sh ON sh.shelfnumber=vs.shelfnumber AND sh.borrowernumber=?
+        WHERE vs.category=1 AND (vs.owner=? OR sh.borrowernumber=?) };
+      $qry2.= "AND allow_add=1 " if $adding_allowed;
+      $qry2.= "ORDER BY vs.lastmodified DESC ";
+      $qry2.= "LIMIT $limit";
+      $bar= $dbh->selectall_arrayref($qry2,{Slice=>{}},($owner,$owner,$owner));
+    }
+
+    return ( { bartotal => $bar? scalar @$bar: 0, pubtotal => $pub? scalar @$pub: 0}, $pub, $bar);
+}
+
 =head2 GetShelf
 
   (shelfnumber,shelfname,owner,category,sortfield) = &GetShelf($shelfnumber);
@@ -322,50 +344,54 @@ sub GetShelfContents ($;$$$) {
 
 =head2 AddShelf
 
-  $shelfnumber = &AddShelf( $shelfname, $owner, $category);
+  $shelfnumber = &AddShelf($hashref, $owner);
 
-Creates a new virtual virtualshelves with name C<$shelfname>, owner C<$owner> and category
-C<$category>.
+Creates a new virtual shelf. Params passed in a hash like ModShelf.
 
 Returns a code to know what's happen.
-    * -1 : if this virtualshelves already exist.
+    * -1 : if this virtualshelves already exists.
     * $shelfnumber : if success.
 
 =cut
 
 sub AddShelf {
-    my ( $shelfname, $owner, $category, $sortfield ) = @_;
-    my $query = qq(
-        SELECT *
-        FROM   virtualshelves
-        WHERE  shelfname=? AND owner=?
-    );
+    my ($hashref, $owner)= @_;
+
+    #initialize missing hash values to silence warnings
+    foreach('shelfname','category', 'sortfield', 'allow_add', 'allow_delete_own', 'allow_delete_other' ) {
+        $hashref->{$_}= exists $hashref->{$_}? $hashref->{$_}||'': '';
+    }
+
+    return -1 unless _CheckShelfName($hashref->{shelfname}, $hashref->{category}, $owner, 0);
+
+    my $query = qq(INSERT INTO virtualshelves
+        (shelfname,owner,category,sortfield,allow_add,allow_delete_own,allow_delete_other)
+        VALUES (?,?,?,?,?,?,?));
+
     my $sth = $dbh->prepare($query);
-    $sth->execute($shelfname,$owner);
-    ( $sth->rows ) and return (-1);
-    $query = qq(
-        INSERT INTO virtualshelves
-            (shelfname,owner,category,sortfield)
-        VALUES (?,?,?,?)
-    );
-    $sth = $dbh->prepare($query);
-    $sth->execute( $shelfname, $owner, $category, $sortfield );
+    $sth->execute(
+	$hashref->{shelfname},
+	$owner,
+	$hashref->{category},
+	$hashref->{sortfield},
+	$hashref->{allow_add}||1,
+	$hashref->{allow_delete_own}||1,
+	$hashref->{allow_delete_other}||0 );
     my $shelfnumber = $dbh->{'mysql_insertid'};
-    return ($shelfnumber);
+    return $shelfnumber;
 }
 
 =head2 AddToShelf
 
-  &AddToShelf($biblionumber, $shelfnumber);
+  &AddToShelf($biblionumber, $shelfnumber, $borrower);
 
 Adds bib number C<$biblionumber> to virtual virtualshelves number
 C<$shelfnumber>, unless that bib is already on that shelf.
 
 =cut
 
-#'
 sub AddToShelf {
-    my ( $biblionumber, $shelfnumber ) = @_;
+    my ($biblionumber, $shelfnumber, $borrowernumber) = @_;
     return unless $biblionumber;
     my $query = qq(
         SELECT *
@@ -378,12 +404,10 @@ sub AddToShelf {
     ($sth->rows) and return undef;	# already on shelf
 	$query = qq(
 		INSERT INTO virtualshelfcontents
-			(shelfnumber, biblionumber, flags)
-		VALUES
-			(?, ?, 0)
-	);
+			(shelfnumber, biblionumber, flags, borrowernumber)
+		VALUES (?, ?, 0, ?));
 	$sth = $dbh->prepare($query);
-	$sth->execute( $shelfnumber, $biblionumber );
+	$sth->execute( $shelfnumber, $biblionumber, $borrowernumber);
 	$query = qq(UPDATE virtualshelves
 				SET lastmodified = CURRENT_TIMESTAMP
 				WHERE shelfnumber = ?);
@@ -393,51 +417,55 @@ sub AddToShelf {
 
 =head2 ModShelf
 
-ModShelf($shelfnumber, $hashref)
+my $result= ModShelf($shelfnumber, $hashref)
 
 Where $hashref->{column} = param
 
 Modify the value into virtualshelves table with values given 
 from hashref, which each key of the hashref should be
 the name of a column of virtualshelves.
+Fields like shelfnumber or owner cannot be changed.
+
+Returns 1 if the action seemed to be successful.
 
 =cut
 
 sub ModShelf {
-    my $shelfnumber = shift;
-    my $shelf = shift;
+    my ($shelfnumber,$hashref) = @_;
 
-    if (exists $shelf->{shelfnumber}) {
-        carp "Should not use ModShelf to change shelfnumber";
-        return;
-    }
-    unless (defined $shelfnumber and $shelfnumber =~ /^\d+$/) {
-        carp "Invalid shelfnumber passed to ModShelf: $shelfnumber";
-        return;
-    }
-
-	my $query = "UPDATE virtualshelves SET ";
-    my @bind_params = ();
-    my @set_clauses = ();
+    my $query= "SELECT * FROM virtualshelves WHERE shelfnumber=?";
+    my $sth = $dbh->prepare($query);
+    $sth->execute($shelfnumber);
+    my $oldrecord= $sth->fetchrow_hashref;
+    return 0 unless $oldrecord; #not found?
 
-	foreach my $column (keys %$shelf) {
-        push @set_clauses, "$column = ?";
-        push @bind_params, $shelf->{$column};
+    #initialize missing hash values to silence warnings
+    foreach('shelfname','category', 'sortfield', 'allow_add', 'allow_delete_own', 'allow_delete_other' ) {
+        $hashref->{$_}= exists $hashref->{$_}? $hashref->{$_}||'': '';
     }
 
-    if ($#set_clauses == -1) {
-        carp "No columns to update passed to ModShelf";
-        return;
+    #if name or category changes, the name should be tested
+    if($hashref->{shelfname} || $hashref->{category}) {
+        unless(_CheckShelfName(
+	    $hashref->{shelfname}||$oldrecord->{shelfname},
+	    $hashref->{category}||$oldrecord->{category},
+	    $oldrecord->{owner}, $shelfnumber )) {
+		return 0; #name check failed
+        }
     }
-    $query .= join(", ", @set_clauses);
-
-    $query .= " WHERE shelfnumber = ? ";
-    push @bind_params, $shelfnumber;
 
-    $debug and warn "ModShelf query:\n $query\n",
-	                "ModShelf query args: ", join(',', @bind_params), "\n";
-	my $sth = $dbh->prepare($query);
-   	$sth->execute( @bind_params );
+    #only the following fields from the hash may be changed
+    $query= "UPDATE virtualshelves SET shelfname=?, category=?, sortfield=?, allow_add=?, allow_delete_own=?, allow_delete_other=? WHERE shelfnumber=?";
+    $sth = $dbh->prepare($query);
+    $sth->execute(
+	$hashref->{shelfname}||$oldrecord->{shelfname},
+	$hashref->{category}||$oldrecord->{category},
+	$hashref->{sortfield}||$oldrecord->{sortfield},
+	$hashref->{allow_add}||$oldrecord->{allow_add},
+	$hashref->{allow_delete_own}||$oldrecord->{allow_delete_own},
+	$hashref->{allow_delete_other}||$oldrecord->{allow_delete_other},
+	$shelfnumber );
+    return $@? 0: 1;
 }
 
 =head2 ShelfPossibleAction
@@ -446,7 +474,11 @@ ShelfPossibleAction($loggedinuser, $shelfnumber, $action);
 
 C<$loggedinuser,$shelfnumber,$action>
 
-$action can be "view" or "manage".
+$action can be "view", "add", "delete", "manage", "new_public", "new_private".
+Note that add/delete here refers to adding/deleting entries from the list. Deleting the list itself falls under manage.
+new_public and new_private refers to creating a new public or private list.
+The distinction between deleting your own entries from the list or entries from
+others is made in DelFromShelf.
 
 Returns 1 if the user can do the $action in the $shelfnumber shelf.
 Returns 0 otherwise.
@@ -455,75 +487,114 @@ Returns 0 otherwise.
 
 sub ShelfPossibleAction {
     my ( $user, $shelfnumber, $action ) = @_;
-    my $query = qq(
-        SELECT owner,category
-        FROM   virtualshelves
-        WHERE  shelfnumber=?
-    );
+    $action= 'view' unless $action;
+    $user=0 unless $user;
+
+    if($action =~ /^new/) { #no shelfnumber needed
+        if($action eq 'new_private') {
+            return $user>0;
+        }
+        elsif($action eq 'new_public') {
+            return $user>0 && C4::Context->preference('OpacAllowPublicListCreation');
+        }
+        return 0;
+    }
+
+    return 0 unless defined($shelfnumber);
+
+    my $query = qq/
+        SELECT IFNULL(owner,0) AS owner, category, allow_add, allow_delete_own, allow_delete_other, IFNULL(sh.borrowernumber,0) AS borrowernumber
+        FROM virtualshelves vs
+        LEFT JOIN virtualshelfshares sh ON sh.shelfnumber=vs.shelfnumber
+        AND sh.borrowernumber=?
+        WHERE vs.shelfnumber=?
+    /;
     my $sth = $dbh->prepare($query);
-    $sth->execute($shelfnumber);
-    my ( $owner, $category ) = $sth->fetchrow;
-    require C4::Members;
-	my $borrower = C4::Members::GetMemberDetails($user);
-	return 0 if not defined($user);
-	return 1 if ( $category >= 3);							# open list
-    return 1 if (($category >= 2) and
-				defined($action) and $action eq 'view');	# public list, anybody can view
-    return 1 if (($category >= 2) and defined($user) and ($borrower->{authflags}->{superlibrarian} || $user == 0));	# public list, superlibrarian can edit/delete
-    return 1 if (defined($user)  and $owner  eq $user );	# user owns this list.  Check last.
+    $sth->execute($user, $shelfnumber);
+    my $shelf= $sth->fetchrow_hashref;
+
+    return 0 unless $shelf && ($shelf->{category}==2 || $shelf->{owner}==$user || $shelf->{borrowernumber}==$user);
+    if($action eq 'view') {
+	#already handled in the above condition
+	return 1;
+    }
+    elsif($action eq 'add') {
+	return 0 if $user<=0; #should be logged in
+	return 1 if $shelf->{allow_add}==1;
+    }
+    elsif($action eq 'delete') {
+        #this answer is just diplomatic: it says that you may be able to delete
+        #some items from that shelf
+        #it does not answer the question about a specific biblio
+        #DelFromShelf checks the situation per biblio
+	return 1 if $user>0 && ($shelf->{allow_delete_own}==1 || $shelf->{allow_delete_other}==1);
+    }
+    elsif($action eq 'manage') {
+	return 1 if $user && $shelf->{owner}==$user;
+    }
     return 0;
 }
 
 =head2 DelFromShelf
 
-  &DelFromShelf( $biblionumber, $shelfnumber);
+    $result= &DelFromShelf( $bibref, $shelfnumber, $user);
+
+Removes biblionumbers in passed arrayref from shelf C<$shelfnumber>.
+If the bib wasn't on that virtualshelves to begin with, nothing happens.
 
-Removes bib number C<$biblionumber> from virtual virtualshelves number
-C<$shelfnumber>. If the bib wasn't on that virtualshelves to begin with,
-nothing happens.
+Returns 0 if no items have been deleted.
 
 =cut
 
-#'
 sub DelFromShelf {
-    my ( $biblionumber, $shelfnumber ) = @_;
-    my $query = qq(
-        DELETE FROM virtualshelfcontents
-        WHERE  shelfnumber=? AND biblionumber=?
-    );
-    my $sth = $dbh->prepare($query);
-    $sth->execute( $shelfnumber, $biblionumber );
+    my ($bibref, $shelfnumber, $user) = @_;
+    my $query = qq(SELECT allow_delete_own, allow_delete_other FROM virtualshelves WHERE shelfnumber=?);
+    my $sth= $dbh->prepare($query);
+    $sth->execute($shelfnumber);
+    my ($del_own, $del_oth)= $sth->fetchrow;
+    my $r; my $t=0;
+
+    if($del_own) {
+        $query = qq(DELETE FROM virtualshelfcontents
+            WHERE shelfnumber=? AND biblionumber=? AND borrowernumber=?);
+        $sth= $dbh->prepare($query);
+	foreach my $biblionumber (@$bibref) {
+            $sth->execute($shelfnumber, $biblionumber, $user);
+	    $r= $sth->rows; #Expect -1, 0 or 1 (-1 means Don't know; count as 1)
+	    $t+= ($r==-1)? 1: $r;
+	}
+    }
+    if($del_oth) {
+        $query = qq(DELETE FROM virtualshelfcontents
+            WHERE shelfnumber=? AND biblionumber=? AND borrowernumber<>?);
+        $sth= $dbh->prepare($query);
+	foreach my $biblionumber (@$bibref) {
+            $sth->execute($shelfnumber, $biblionumber, $user);
+	    $r= $sth->rows;
+	    $t+= ($r==-1)? 1: $r;
+	}
+    }
+    return $t;
 }
 
-=head2 DelShelf (old version)
-
-  ($status, $msg) = &DelShelf($shelfnumber);
-
-Deletes virtual virtualshelves number C<$shelfnumber>. The virtualshelves must
-be empty.
-
-Returns a two-element array, where C<$status> is 0 if the operation
-was successful, or non-zero otherwise. C<$msg> is "Done" in case of
-success, or an error message giving the reason for failure.
-
-=head2 DelShelf (current version)
+=head2 DelShelf
 
   $Number = DelShelf($shelfnumber);
 
 This function deletes the shelf number, and all of it's content.
+Authorization to do so MUST have been checked before calling, while using
+ShelfPossibleAction with manage parameter.
 
 =cut
 
 sub DelShelf {
-	unless (@_) {
-		carp "DelShelf called without valid argument (shelfnumber)";
-		return undef;
-	}
-	my $sth = $dbh->prepare("DELETE FROM virtualshelves WHERE shelfnumber=?");
-	return $sth->execute(shift);
+    my ($shelfnumber)= @_;
+    return unless $shelfnumber && $shelfnumber =~ /^\d+$/;
+    my $sth = $dbh->prepare("DELETE FROM virtualshelves WHERE shelfnumber=?");
+    return $sth->execute($shelfnumber);
 }
 
-=head2 GetBibShelves
+=head2 GetBibliosShelves
 
 This finds all the public lists that this bib record is in.
 
@@ -536,65 +607,59 @@ sub GetBibliosShelves {
         SELECT vs.shelfname, vs.shelfnumber 
         FROM virtualshelves vs 
         JOIN virtualshelfcontents vc ON (vs.shelfnumber= vc.shelfnumber) 
-        WHERE vs.category != 1 
+        WHERE vs.category=2
         AND vc.biblionumber= ?
     ');
     $sth->execute( $biblionumber );
     return $sth->fetchall_arrayref({});
 }
 
-=head2 RefreshShelvesSummary
-
-	($total, $pubshelves, $barshelves) = RefreshShelvesSummary($sessionID, $loggedinuser, $row_count);
+=head2 ShelvesMax
 
-Updates the current session and userenv with the most recent shelves
+    $howmany= ShelvesMax($context);
 
-Returns the total number of shelves stored in the session/userenv along with two references each to an
-array of hashes, one containing the C<$loggedinuser>'s private shelves and one containing all public/open shelves.
-
-This function is used in conjunction with the 'Lists' button in masthead.inc.
+Tells how much shelves are shown in which context.
+POPUP refers to addbybiblionumber popup, MGRPAGE is managing page (in opac or
+staff), COMBO refers to the Add to-combo of search results. MASTHEAD is the
+main Koha toolbar with Lists button.
 
 =cut
 
-sub RefreshShelvesSummary ($$$) {
-	require C4::Auth;
-	my ($sessionID, $loggedinuser, $row_count) = @_;
-	my $session = C4::Auth::get_session($sessionID);
-	my ($total, $totshelves, $barshelves, $pubshelves);
-
-	($barshelves, $totshelves) = GetRecentShelves(1, $row_count, $loggedinuser);
-	$total->{'bartotal'} = $totshelves;
-	($pubshelves, $totshelves) = GetRecentShelves(2, $row_count, undef);
-	$total->{'pubtotal'} = $totshelves;
-
-	# Update the current session with the latest shelves...
-	$session->param('barshelves', $barshelves);
-	$session->param('pubshelves', $pubshelves);
-	$session->param('totshelves', $total);
-
-	# likewise the userenv...
-	C4::Context->set_shelves_userenv('bar',$barshelves);
-	C4::Context->set_shelves_userenv('pub',$pubshelves);
-	C4::Context::set_shelves_userenv('tot',$total);
-
-	return ($total, $pubshelves, $barshelves);
+sub ShelvesMax {
+  my $which= shift;
+  return SHELVES_POPUP_MAX if $which eq 'POPUP';
+  return SHELVES_MGRPAGE_MAX if $which eq 'MGRPAGE';
+  return SHELVES_COMBO_MAX if $which eq 'COMBO';
+  return SHELVES_MASTHEAD_MAX if $which eq 'MASTHEAD';
+  return SHELVES_MASTHEAD_MAX;
 }
 
 # internal subs
 
-sub _shelf_count ($$) {
-	my (@params) = @_;
-	# Find out how many shelves total meet the submitted criteria...
-	my $query = "SELECT count(*) FROM virtualshelves";
-	$query .= ($params[1] > 1) ? " WHERE category >= ?" : " WHERE  owner=? AND category=?";
-	shift @params if $params[1] > 1;
-	my $sth = $dbh->prepare($query);
-	$sth->execute(@params);
-	my $total = $sth->fetchrow;
-	return $total;
+sub _shelf_count {
+    my ($owner, $category) = @_;
+    my @params;
+    # Find out how many shelves total meet the submitted criteria...
+
+    my $query = "SELECT count(*) FROM virtualshelves vs ";
+    if($category==1) {
+        $query.= qq{
+            LEFT JOIN virtualshelfshares sh ON sh.shelfnumber=vs.shelfnumber
+            AND sh.borrowernumber=?
+	    WHERE category=1 AND (vs.owner=? OR sh.borrowernumber=?) };
+        @params= ($owner, $owner, $owner);
+    }
+    else {
+	$query.='WHERE category=2';
+        @params= ();
+    }
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@params);
+    my ($total)= $sth->fetchrow;
+    return $total;
 }
 
-sub _biblionumber_sth {
+sub _biblionumber_sth { #only used in obsolete sub below
     my ($shelf) = @_;
     my $query = 'select biblionumber from virtualshelfcontents where shelfnumber = ?';
     my $dbh = C4::Context->dbh;
@@ -605,7 +670,7 @@ sub _biblionumber_sth {
     $sth;
 }
 
-sub each_biblionumbers (&$) {
+sub each_biblionumbers (&$) { #OBSOLETE
     my ($code,$shelf) = @_;
     my $ref =  _biblionumber_sth($shelf)->fetchall_arrayref;
     map {
@@ -614,6 +679,25 @@ sub each_biblionumbers (&$) {
     } @$ref;
 }
 
+sub _CheckShelfName {
+    my ($name, $cat, $owner, $number)= @_;
+
+    my $query = qq(
+        SELECT DISTINCT shelfnumber
+        FROM   virtualshelves
+	LEFT JOIN virtualshelfshares sh USING (shelfnumber)
+        WHERE  shelfname=? AND shelfnumber<>?);
+    if($cat==1) {
+        $query.= ' AND (sh.borrowernumber=? OR owner=?) AND category=1';
+    }
+    else {
+        $query.= ' AND category=2';
+    }
+    my $sth = $dbh->prepare($query);
+    $sth->execute($cat==1? ($name, $number, $owner, $owner): ($name, $number));
+    return $sth->rows>0? 0: 1;
+}
+
 1;
 
 __END__
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index cfa4f60..fa480c8 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -22,8 +22,12 @@ package C4::VirtualShelves::Page;
 
 use strict;
 use warnings;
+
 use CGI;
-use C4::VirtualShelves qw/:DEFAULT RefreshShelvesSummary/;
+use Exporter;
+use Data::Dumper;
+
+use C4::VirtualShelves qw/:DEFAULT ShelvesMax/;
 use C4::Biblio;
 use C4::Items;
 use C4::Koha;
@@ -32,11 +36,11 @@ use C4::Members;
 use C4::Output;
 use C4::Dates qw/format_date/;
 use C4::Tags qw(get_tags);
-use Exporter;
-use Data::Dumper;
 use C4::Csv;
 use C4::XSLT;
 
+use constant VIRTUALSHELVES_COUNT => 20;
+
 use vars qw($debug @EXPORT @ISA $VERSION);
 
 BEGIN {
@@ -51,12 +55,15 @@ our %pages = (
     opac     => { redirect => '/cgi-bin/koha/opac-shelves.pl', },
 );
 
-sub shelfpage ($$$$$) {
+sub shelfpage {
     my ( $type, $query, $template, $loggedinuser, $cookie ) = @_;
     ( $pages{$type} ) or $type = 'opac';
     $query            or die "No query";
     $template         or die "No template";
-    $template->param(  loggedinuser => $loggedinuser  );
+    $template->param(
+	loggedinuser => $loggedinuser,
+	OpacAllowPublicListCreation => C4::Context->preference('OpacAllowPublicListCreation'),
+    );
     my $edit;
     my $shelves;
     my @paramsloop;
@@ -69,7 +76,7 @@ sub shelfpage ($$$$$) {
     my $marcflavour = C4::Context->preference("marcflavour");
 
     $shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') );
-    $shelflimit = $shelflimit || 20;
+    $shelflimit = $shelflimit || ShelvesMax('MGRPAGE');
     $shelfoffset   = ( $itemoff - 1 ) * $shelflimit;     # Sets the offset to begin retrieving items at
     $shelveslimit  = $shelflimit;                        # Limits number of shelves returned for a given query (row_count)
     $shelvesoffset = ( $shelfoff - 1 ) * $shelflimit;    # Sets the offset to begin retrieving shelves at (offset)
@@ -84,36 +91,51 @@ sub shelfpage ($$$$$) {
     }
     my $op = $query->param('op');
 
-    #    my $imgdir = getitemtypeimagesrc();
-    #    my $itemtypes = GetItemTypes();
-
     # the format of this is unindented for ease of diff comparison to the old script
     # Note: do not mistake the assignment statements below for comparisons!
     if ( $query->param('modifyshelfcontents') ) {
         my ( $shelfnumber, $barcode, $item, $biblio );
         if ( $shelfnumber = $query->param('viewshelf') ) {
-            if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ) ) {
-                if ( $barcode = $query->param('addbarcode') ) {
-                    $item = GetItem( 0, $barcode );
-                    if (defined $item && $item->{'itemnumber'}){
+            #add to shelf
+            if($barcode = $query->param('addbarcode') ) {
+                if(ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add')) {
+                    $item = GetItem( 0, $barcode);
+                    if (defined $item && $item->{'itemnumber'}) {
                         $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'} );
-                        AddToShelf( $biblio->{'biblionumber'}, $shelfnumber )
+                        AddToShelf( $biblio->{'biblionumber'}, $shelfnumber, $loggedinuser)
                           or push @paramsloop, { duplicatebiblio => $barcode };
-                    } else {
+                    }
+                    else {
                         push @paramsloop, { failgetitem => $barcode };
                     }
-                } else {
-                    ( grep { /REM-(\d+)/ } $query->param ) or push @paramsloop, { nobarcode => 1 };
-                    foreach ( $query->param ) {
+                }
+                else {
+                    push @paramsloop, { nopermission => $shelfnumber };
+                }
+            }
+            elsif(grep { /REM-(\d+)/ } $query->param) {
+            #remove item(s) from shelf
+                if(ShelfPossibleAction($loggedinuser, $shelfnumber, 'delete')) {
+                #This is just a general okay; DelFromShelf checks further
+                    my @bib;
+                    foreach($query->param) {
                         /REM-(\d+)/ or next;
-                        $debug and warn "SHELVES: user $loggedinuser removing item $1 from shelf $shelfnumber";
-                        DelFromShelf( $1, $shelfnumber );    # $1 is biblionumber
+                        push @bib, $1; #$1 is biblionumber
+                    }
+                    my $t= DelFromShelf(\@bib, $shelfnumber, $loggedinuser);
+                    if($t==0) {
+                        push @paramsloop, {nothingdeleted => $shelfnumber};
+                    }
+                    elsif($t<@bib) {
+                        push @paramsloop, {somedeleted => $shelfnumber};
                     }
                 }
-            } else {
-                push @paramsloop, { nopermission => $shelfnumber };
+                else {
+                    push @paramsloop, { nopermission => $shelfnumber };
+                }
             }
-        } else {
+        }
+        else {
             push @paramsloop, { noshelfnumber => 1 };
         }
     }
@@ -148,24 +170,31 @@ sub shelfpage ($$$$$) {
 
   SWITCH: {
         if ($op) {
-            unless ($okmanage) {
-                push @paramsloop, { nopermission => $shelfnumber };
-                last SWITCH;
-            }
+	    #Saving modified shelf
             if ( $op eq 'modifsave' ) {
+                unless ($okmanage) {
+                        push @paramsloop, { nopermission => $shelfnumber };
+                        last SWITCH;
+                }
                 my $shelf = {
                     'shelfname' => $query->param('shelfname'),
-                    'category'  => $query->param('category'),
                     'sortfield' => $query->param('sortfield'),
                 };
-
-                ModShelf( $shelfnumber, $shelf );
-
-            } elsif ( $op eq 'modif' ) {
+                if($query->param('category')) { #optional
+                    $shelf->{category}= $query->param('category');
+                }
+                unless(ModShelf($shelfnumber, $shelf )) {
+                  push @paramsloop, {modifyfailure => $shelf->{shelfname}};
+                  last SWITCH;
+                }
+            }
+	    #Editing a shelf
+	    elsif ( $op eq 'modif' ) {
                 my ( $shelfnumber2, $shelfname, $owner, $category, $sortfield ) = GetShelf($shelfnumber);
                 my $member = GetMember( 'borrowernumber' => $owner );
                 my $ownername = defined($member) ? $member->{firstname} . " " . $member->{surname} : '';
                 $edit = 1;
+                $sortfield='' unless $sortfield;
                 $template->param(
                     edit                => 1,
                     shelfnumber         => $shelfnumber2,
@@ -179,6 +208,8 @@ sub shelfpage ($$$$$) {
             }
             last SWITCH;
         }
+
+        #View a shelf
         if ( $shelfnumber = $query->param('viewshelf') ) {
             # explicitly fetch this shelf
             my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
@@ -247,21 +278,31 @@ sub shelfpage ($$$$$) {
                     authorsort          => $authorsort,
                     yearsort            => $yearsort,
                     manageshelf         => $manageshelf,
+                    allowremovingitems  => ShelfPossibleAction( $loggedinuser, $shelfnumber, 'delete'),
+                    allowaddingitem     => ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add'),
                     "category$category" => 1,
                     category            => $category,
                     itemsloop           => $items,
+                    showprivateshelves  => $category==1,
                 );
             } else {
                 push @paramsloop, { nopermission => $shelfnumber };
             }
             last SWITCH;
         }
+
         if ( $query->param('shelves') ) {
             my $stay = 1;
+
+	    #Add a shelf
             if ( my $newshelf = $query->param('addshelf') ) {
 
                 # note: a user can always add a new shelf
-                my $shelfnumber = AddShelf( $newshelf, $query->param('owner'), $query->param('category'), $query->param('sortfield') );
+                my $shelfnumber = AddShelf( {
+                    shelfname => $newshelf,
+                    sortfield => $query->param('sortfield'),
+                    category => $query->param('category') },
+                    $query->param('owner') );
                 $stay = 1;
                 if ( $shelfnumber == -1 ) {    #shelf already exists.
                     $showadd = 1;
@@ -272,6 +313,8 @@ sub shelfpage ($$$$$) {
                     exit;
                 }
             }
+
+	    #Deleting a shelf (asking for confirmation if it has entries)
             foreach ( $query->param() ) {
                 /DEL-(\d+)/ or next;
                 $delflag = 1;
@@ -313,7 +356,6 @@ sub shelfpage ($$$$$) {
                 }
                 push( @paramsloop, { delete_ok => $name } );
 
-                # print $query->redirect($pages{$type}->{redirect}); exit;
                 $stay = 0;
             }
             $showadd = 1;
@@ -323,7 +365,7 @@ sub shelfpage ($$$$$) {
             }
             last SWITCH;
         }
-    }
+    } # end of SWITCH block
 
     (@paramsloop) and $template->param( paramsloop => \@paramsloop );
     $showadd      and $template->param( showadd    => 1 );
@@ -337,7 +379,7 @@ sub shelfpage ($$$$$) {
         my %line;
         $shelflist->{$element}->{shelf} = $element;
         my $category  = $shelflist->{$element}->{'category'};
-        my $owner     = $shelflist->{$element}->{'owner'};
+        my $owner     = $shelflist->{$element}->{'owner'}||0;
         my $canmanage = ShelfPossibleAction( $loggedinuser, $element, 'manage' );
         my $sortfield = $shelflist->{$element}->{'sortfield'};
         if ( $sortfield ){
@@ -349,7 +391,7 @@ sub shelfpage ($$$$$) {
         }
         $shelflist->{$element}->{"viewcategory$category"} = 1;
         $shelflist->{$element}->{manageshelf} = $canmanage;
-        if ( $owner eq $loggedinuser or $canmanage ) {
+        if($canmanage || ($loggedinuser && $owner==$loggedinuser)) {
             $shelflist->{$element}->{'mine'} = 1;
         }
         my $member = GetMember( 'borrowernumber' => $owner );
@@ -393,28 +435,15 @@ sub shelfpage ($$$$$) {
         $template->param( seflag => 1 );
     }
 
-    #FIXME: This refresh really only needs to happen when there is a modification of some sort
-    #       to the shelves, but the above code is so convoluted in its handling of the various
-    #       options, it is easier to do this refresh every time C4::VirtualShelves::Page.pm is
-    #       called
-
-    my ( $total, $pubshelves, $barshelves ) = RefreshShelvesSummary( $query->cookie("CGISESSID"), $loggedinuser, ( $loggedinuser == -1 ? 20 : 10 ) );
-
-    if ( defined $barshelves ) {
-        $template->param(
-            barshelves     => scalar( @{ $barshelves } ),
+#Next call updates the shelves for the Lists button.
+#May not always be needed (when nothing changed), but doesn't take much.
+    my ($total, $pubshelves, $barshelves) = C4::VirtualShelves::GetSomeShelfNames($loggedinuser, 'MASTHEAD');
+    $template->param(
+            barshelves     => $total->{bartotal},
             barshelvesloop => $barshelves,
-        );
-        $template->param( bartotal => $total->{'bartotal'}, ) if ( $total->{'bartotal'} > scalar( @{ $barshelves } ) );
-    }
-
-    if ( defined $pubshelves ) {
-        $template->param(
-            pubshelves     => scalar( @{ $pubshelves } ),
+            pubshelves     => $total->{pubtotal},
             pubshelvesloop => $pubshelves,
-        );
-        $template->param( pubtotal => $total->{'pubtotal'}, ) if ( $total->{'pubtotal'} > scalar( @{ $pubshelves } ) );
-    }
+    );
 
     output_html_with_http_headers $query, $cookie, $template->output;
 }
diff --git a/catalogue/search.pl b/catalogue/search.pl
index 49e63bc..ff416b0 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -695,21 +695,13 @@ if ($query_desc || $limit_desc) {
 # VI. BUILD THE TEMPLATE
 
 # Build drop-down list for 'Add To:' menu...
-
-my $row_count = 10; # FIXME:This probably should be a syspref
-my ($pubshelves, $total) = GetRecentShelves(2, $row_count, undef);
-my ($barshelves, $total) = GetRecentShelves(1, $row_count, $borrowernumber);
-
-if (@{$pubshelves}) {
-        $template->param( addpubshelves     => scalar @{$pubshelves});
-        $template->param( addpubshelvesloop => $pubshelves);
-}
-
-if (@{$barshelves}) {
-        $template->param( addbarshelves     => scalar @{$barshelves});
-        $template->param( addbarshelvesloop => $barshelves);
-}
-
-
+my ($barshelves, $totalb) = GetRecentShelves(1, undef, $borrowernumber, 1);
+my ($pubshelves, $totalp) = GetRecentShelves(2, undef, undef, 1);
+$template->param(
+        addbarshelves     => $totalb,
+        addbarshelvesloop => $barshelves,
+	addpubshelves     => $totalp,
+	addpubshelvesloop => $pubshelves,
+	);
 
 output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
index 77468cc..4f92829 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
@@ -7,6 +7,13 @@
 </head>
 <body>
 
+[% UNLESS (authorized) %]
+    <p align="center">
+        [% IF (errcode==1) %]Could not make new shelf. Please check the name.<br/>[% END %]
+        [% IF (errcode==2) %]Sorry, you do not have permission to add items to this list.[% errcode %]<br/>[% END %]
+        <a href="javascript:self.close();">Close this window.</a>
+    </p>
+[% ELSE %]
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
                 [% IF ( multiple ) %]
@@ -29,11 +36,29 @@
 
 [% UNLESS ( shelfnumber ) %]
 
-[% IF ( CGIvirtualshelves ) %]    [% UNLESS ( newshelf ) %]
+[% UNLESS ( newshelf ) %]
      <fieldset class="rows">
 	<legend>Select an existing list</legend>
 	<ol>
-	    <li><label>Choose list</label>[% CGIvirtualshelves %]</li>
+	    <li>
+		<label>Choose list</label>
+		<select name="shelfnumber" id="shelfnumber">
+		[% IF ( privatevirtualshelves ) %]
+		<optgroup label="Private Lists">
+		[% FOREACH privatevirtualshelve IN privatevirtualshelves %]
+		<option value="[% privatevirtualshelve.shelfnumber %]">[% privatevirtualshelve.shelfname %]</option>
+		[% END %]
+		</optgroup>
+		[% END %]
+		[% IF ( publicvirtualshelves ) %]
+		<optgroup label="Public Lists">
+		[% FOREACH publicvirtualshelve IN publicvirtualshelves %]
+		<option value="[% publicvirtualshelve.shelfnumber %]">[% publicvirtualshelve.shelfname %]</option>
+		[% END %]
+		</optgroup>
+		[% END %]
+		</select>
+	    </li>
 	</ol>
 	[% FOREACH biblio IN biblios %]<input type="hidden" name="biblionumber" value="[% biblio.biblionumber %]" />[% END %]
 	[% UNLESS ( biblionumbers ) %]
@@ -43,9 +68,8 @@
 	[% END %]
 	</fieldset>
 
-	<p>... or...</p> [% END %]
-
-    [% END %]
+	<p>... or...</p>
+[% END %]
 
     <fieldset class="rows"><legend>Add to a new list:</legend>
 	<ol><li>
@@ -66,7 +90,6 @@
 	    <select name="category" id="category">
 		<option value="1">Private</option>
 		<option value="2">Public</option>
-		<option value="3">Open</option>
 	    </select>
 	</li></ol>
     </fieldset>
@@ -85,3 +108,4 @@
 </div>
 
 [% INCLUDE 'intranet-bottom.inc' %]
+[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index b054e09..389ce2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -24,7 +24,7 @@ $(document).ready(function(){
 
 	function confirmDelete(message){
 		if (window.confirm(message)) {
-		    location.href="/cgi-bin/koha/virtualshelves/shelves.pl?[% IF ( showprivateshelves ) %] display=privateshelves&[% END %]shelves=1&DEL-[% shelfnumber %]=1&shelfoff=[% shelfoff %]";
+		    location.href="/cgi-bin/koha/virtualshelves/shelves.pl?[% IF ( showprivateshelves ) %]display=privateshelves&[% END %]shelves=1&DEL-[% shelfnumber %]=1&shelfoff=[% shelfoff %]";
 		} else { 
 			return false;
 		}
@@ -162,7 +162,7 @@ function placeHold () {
  <fieldset>
   <legend>Contents of <i>[% shelfname | html %]</i></legend>
    
- [% IF ( manageshelf ) %]
+ [% IF ( itemsloop ) %]
      <p><span class="checkall"></span> |
      <span class="clearall"></span></p>
  [% END %]
@@ -170,7 +170,7 @@ function placeHold () {
  <div class="pages">[% pagination_bar %]</div>
     <table>
             <tr>
-                [% IF ( manageshelf ) %]<th class="checkall">&nbsp;</th>[% END %]
+                [% IF ( itemsloop ) %]<th class="checkall">&nbsp;</th>[% END %]
                 [% UNLESS ( item_level_itypes ) %]<th>Item Type</th>[% END %]
                 <th>Title</th>
                 <th>Author</th>
@@ -183,7 +183,7 @@ function placeHold () {
 			[% ELSE %]
 			<tr>
 			[% END %]
-			[% IF ( manageshelf ) %]
+			[% IF ( itemsloop ) %]
 			<td>
 				[% IF ( itemsloo.confirm ) %]
 				<input type="hidden"   name="CONFIRM-[% itemsloo.confirm %]" />
@@ -210,9 +210,9 @@ function placeHold () {
 			</tr>
 		[% END %]<!-- /itemsloop -->
     </table><fieldset class="action">
-        [% IF ( manageshelf ) %]
+        [% IF ( itemsloop ) %]
             <input type="button" id="placehold" style="display:none" onclick="placeHold(); return false;" value="Place Holds" />
-            <input type="submit" value="Remove selected records" onclick="return confirm(_('Are you sure you want to remove these records from the shelf?'));" />
+            [% IF ( allowremovingitems ) %]<input type="submit" value="Remove selected records" onclick="return confirm(_('Are you sure you want to remove these records from the shelf?'));" />[% END %]
             <input type="submit" value="Merge selected records" onclick="return MergeItems();" />
         [% END %]
  </fieldset>
@@ -223,7 +223,7 @@ function placeHold () {
    </div>
 [% END %]<!-- /viewshelf -->
 
-[% IF ( manageshelf ) %]
+[% IF ( allowaddingitem ) %]
 <div class="yui-g">
 <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post">
  <fieldset class="brief">
@@ -240,7 +240,7 @@ function placeHold () {
  </fieldset>
 </form>
 </div>
-[% END %]<!-- /manageshelf -->
+[% END %]<!-- /allowaddingitem -->
 
 [% IF ( debug ) %]
   [% IF ( edit ) %]<div>Edit is on ([% shelfname | html %])</div>[% END %]
@@ -269,7 +269,6 @@ function placeHold () {
 			<select name="category" id="category">
                   <option value="1">Private</option>
                   <option value="2">Public</option>
-                  <option value="3">Open</option>
 			</select></li></ol>
     [% END %]
 
@@ -299,11 +298,6 @@ function placeHold () {
 			[% ELSE %]
 				<option value="2">Public</option>
 			[% END %]
-			[% IF ( category3 ) %]
-				<option value="3" selected="selected">Open</option>
-			[% ELSE %]
-				<option value="3">Open</option>
-			[% END %]
 			</select></li></ol>
 	[% END %]
 
@@ -317,8 +311,8 @@ function placeHold () {
         <div class="help"><ul>
             <li>A <b>Private</b> List is managed by you and can be seen only by you.</li>
             <li> A <b>Public</b> List can be seen by everybody, but managed only by you.</li>
-            <li> A <b>Open</b> List can be seen and managed by everybody.</li>
-        </ul></div>
+        </ul>
+        </div>
     </div>
 </div>
 [% END %]<!-- /seflag -->
@@ -354,7 +348,6 @@ function placeHold () {
         <td>[% IF ( shelveslooppri.authorsort ) %]Author[% ELSIF ( shelveslooppri.yearsort ) %]Year[% ELSE %]Title[% END %]</td>
         <td>[% IF ( shelveslooppri.viewcategory1 ) %]Private[% END %]
 			[% IF ( shelveslooppri.viewcategory2 ) %]Public[% END %]
-			[% IF ( shelveslooppri.viewcategory3 ) %]Open[% END %]
 		</td>
         <td>
             [% IF ( shelveslooppri.mine ) %]
@@ -408,7 +401,6 @@ function placeHold () {
         <td>[% IF ( shelvesloo.authorsort ) %]Author[% ELSIF ( shelvesloo.yearsort ) %]Year[% ELSE %]Title[% END %]</td>
         <td>[% IF ( shelvesloo.viewcategory1 ) %]Private[% END %]
 			[% IF ( shelvesloo.viewcategory2 ) %]Public[% END %]
-			[% IF ( shelvesloo.viewcategory3 ) %]Open[% END %]
 		</td>
         <td>
             [% IF ( shelvesloo.manageshelf ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 0ffb881..ffd7e60 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -138,37 +138,27 @@
 			[% FOREACH pubshelvesloo IN pubshelvesloop %]
 			<li class="yuimenuitem"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% pubshelvesloo.shelfnumber %]&amp;sortfield=[% pubshelvesloo.sortfield %]">[% pubshelvesloo.shelfname |html %]</a></li>
 			[% END %]
+			<li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">[View All]</a></li>
 			</ul>   
 		[% ELSE %]
 			No Public Lists
 		[% END %]
-		[% IF ( pubtotal ) %]
-			<ul class="second-of-type">
-            <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">View all [% pubtotal %] public lists</a></li>
-			</ul>
-		[% END %]
   [% IF ( opacuserlogin ) %]
-    [% IF ( loggedinusername ) %]
-<h4>Your Lists</h4>
+	<h4>Your Lists</h4>
+	[% IF ( loggedinusername ) %]
 		[% IF ( barshelves ) %]
 			<ul class="first-of-type">
 			[% FOREACH barshelvesloo IN barshelvesloop %]
 			<li class="yuimenuitem"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% barshelvesloo.shelfnumber %]&amp;sortfield=[% barshelvesloo.sortfield %]">[% barshelvesloo.shelfname |html %]</a></li>
 			[% END %]
+			<li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[View All]</a></li>
 			</ul>   
 		[% ELSE %]
 			No Private Lists
 		[% END %]
-		[% IF ( bartotal ) %]
-			<ul class="second-of-type">
-            <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">View all [% bartotal %] of your private lists</a></li>
-			</ul>
-		[% END %]
-		<ul class="second-of-type">
-        <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl">Manage Lists</a></li>
-        </ul>
-    [% ELSE %]<ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Create Your Own Lists</a></li></ul>
-    [% END %]
+	[% ELSE %]
+		<ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Create Your Own Lists</a></li></ul>
+	[% END %]
   [% END %]
 	  </div>
 </div><!-- /listmenu /virtualshelves -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
index f6479f9..e9370c8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
@@ -64,7 +64,9 @@
 		<li><label for="category">Category:</label>
 		<select name="category" id="category">
 		<option value="1">Private</option>
-		<option value="2">Public</option>
+		[% IF (OpacAllowPublicListCreation) %]
+			<option value="2">Public</option>
+		[% END %]
 		</select></li></ol></fieldset>
 		[% FOREACH biblio IN biblios %] <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html%]" />[% END %]
 		<fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a></fieldset>
@@ -72,8 +74,11 @@
 	[% END %]
 [% ELSE %]
 	<p align="center">
-		This is not an open list.
-		Items cannot be added to it.
+	[% IF (errcode==1) %]
+	Could not create new list. Please check if the name is unique.
+	[% ELSE %]
+	Sorry, you cannot add items to this list.
+	[% END %]
 	</p>
 [% END %]
 <p align="center">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
index 908eb94..b3e1d8e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -175,6 +175,15 @@ $(function() {
                     [% IF ( paramsloo.unrecognized ) %]
                       <div class="dialog message">ERROR: List number [% paramsloo.unrecognized %] unrecognized.</div>
                     [% END %]
+                    [% IF ( paramsloo.modifyfailure) %]
+                      <div class="dialog message">ERROR: Shelf could not be renamed to [% paramsloo.modifyfailure %]. This name may not be unique for this type of list. Please check.</div>
+                    [% END %]
+                    [% IF ( paramsloo.nothingdeleted) %]
+                      <div class="dialog message">Warning: No items have been deleted from shelf [% paramsloo.nothingdeleted%]. Check your permissions for this list.</div>
+                    [% END %]
+                    [% IF ( paramsloo.somedeleted) %]
+                      <div class="dialog message">Warning: Not all items may have been deleted from shelf [% paramsloo.somedeleted%]. Check your permissions for this list.</div>
+                    [% END %]
                   </div>
                 </div>
               [% END %]<!-- /paramsloop -->
@@ -351,21 +360,20 @@ $(function() {
             [% END %]<!-- /viewshelf -->
 
 
-            [% IF ( manageshelf ) %]
-              <!-- Editing shelf -->
-              [% IF ( itemsloop ) %]
+            [% IF ( itemsloop && allowremovingitems ) %]
+                <form method="post" action="opac-shelves.pl">
                 <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
                 <input type="hidden" name="modifyshelfcontents" value="1" />
                 <input type="hidden" name="viewshelf" value="[% shelfnumber %]" /><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete(MSG_REMOVE_FROM_LIST)" />
-              [% ELSE %]
+                </form>
+            [% ELSIF ( !itemsloop && manageshelf ) %]
                 <form method="post" action="opac-shelves.pl">
                   <input type="hidden" name="DEL-[% shelfnumber %]" value="1" />
                   <input type="hidden" name="shelves" value="1" />
 		  <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
                   <input type="submit" class="icon delete" value="Delete this List" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
-              [% END %]
-            [% END %]
                 </form>
+            [% END %]
 
             
             [% IF ( edit ) %]
@@ -386,11 +394,13 @@ $(function() {
                         </select>
                       </li>
                       <li>
+			[% IF (OpacAllowPublicListCreation) %]
                         <label for="category">Category:</label>
                         <select name="category" id="category">
                           [% IF ( category1 ) %]<option value="1" selected="selected">Private</option>[% ELSE %]<option value="1">Private</option>[% END %]
                           [% IF ( category2 ) %]<option value="2" selected="selected">Public</option>[% ELSE %]<option value="2">Public</option>[% END %]
                         </select>
+			[% END %]
                       </li>
                     </ol>
                   </fieldset>
@@ -444,7 +454,6 @@ $(function() {
                               <td>
                                 [% IF ( shelveslooppri.viewcategory1 ) %]Private[% END %]
                                 [% IF ( shelveslooppri.viewcategory2 ) %]Public[% END %]
-                                [% IF ( shelveslooppri.viewcategory3 ) %]Open[% END %]
                               </td>
                               <td>
                               [% IF ( shelveslooppri.mine ) %]
@@ -511,7 +520,6 @@ $(function() {
                           <td>
                             [% IF ( shelvesloo.viewcategory1 ) %]Private[% END %]
                             [% IF ( shelvesloo.viewcategory2 ) %]Public[% END %]
-                            [% IF ( shelvesloo.viewcategory3 ) %]Open[% END %]
 	                      </td>
                           <td>
 							[% IF ( shelvesloo.mine ) %]
@@ -574,7 +582,9 @@ $(function() {
                         <label for="category">Category:</label>
                         <select name="category" id="category">
                           <option value="1">Private</option>
+			  [% IF (OpacAllowPublicListCreation) %]
                           <option value="2">Public</option>
+			  [% END %]
                         </select>
                       </li>
                     </ol>
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index 610b22e..9612533 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -25,26 +25,11 @@
 use strict;
 use warnings;
 
-use C4::Biblio;
 use CGI;
-use C4::VirtualShelves qw/:DEFAULT GetAllShelves RefreshShelvesSummary/;
-use C4::Auth;
+use C4::Biblio;
+use C4::VirtualShelves qw/:DEFAULT GetAllShelves/;
 use C4::Output;
-use C4::Auth qw/get_session/;
-use C4::Debug;
-
-#splits incoming biblionumber(s) to array and adds each to shelf.
-sub AddBibliosToShelf {
-    my ($shelfnumber, at biblionumber)=@_;
-
-    # multiple bibs might come in as '/' delimited string (from where, i don't see), or as array.
-    if (scalar(@biblionumber) == 1) {
-        @biblionumber = (split /\//,$biblionumber[0]);
-    }
-    for my $bib (@biblionumber){
-        AddToShelf($bib, $shelfnumber);
-    }
-}
+use C4::Auth;
 
 my $query        	= new CGI;
 my @biblionumber 	= $query->param('biblionumber');
@@ -53,6 +38,9 @@ my $newshelf 		= $query->param('newshelf');
 my $shelfnumber  	= $query->param('shelfnumber');
 my $newvirtualshelf	= $query->param('newvirtualshelf');
 my $category     	= $query->param('category');
+my $authorized          = 1;
+my $errcode		= 0;
+my @biblios;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -63,72 +51,120 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-if ($newvirtualshelf) {
-	$shelfnumber = AddShelf(  $newvirtualshelf, $loggedinuser, $category );
-	AddBibliosToShelf($shelfnumber, @biblionumber);
-	RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
-	print $query->header;
-	print "<html><meta http-equiv=\"refresh\" content=\"0;url=opac-shelves.pl?display=privateshelves\" /><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
-	exit;
+if( $newvirtualshelf) {
+    HandleNewVirtualShelf();
+    exit if $authorized;
+    ShowTemplate(); #error message
 }
+elsif($shelfnumber) {
+    HandleShelfNumber();
+    exit if $authorized;
+    ShowTemplate(); #error message
+}
+elsif($selectedshelf) {
+    HandleSelectedShelf();
+    LoadBib() if $authorized;
+    ShowTemplate();
+}
+else {
+    HandleSelect();
+    LoadBib() if $authorized;
+    ShowTemplate();
+}
+#end
 
-# verify user is authorized to perform the action on the shelf...
-my $authorized = 1;
-if ($selectedshelf) {
-	$authorized = 0 unless ShelfPossibleAction( $loggedinuser, $selectedshelf );
+sub AddBibliosToShelf {
+    #splits incoming biblionumber(s) to array and adds each to shelf.
+    my ($shelfnumber, at biblionumber)=@_;
+
+    #multiple bibs might come in as '/' delimited string (from where, i don't see), or as array.
+    if (scalar(@biblionumber) == 1) {
+        @biblionumber = (split /\//,$biblionumber[0]);
+    }
+    for my $bib (@biblionumber) {
+        AddToShelf($bib, $shelfnumber, $loggedinuser);
+    }
 }
 
-if ($shelfnumber && ($shelfnumber != -1)) {
-	AddBibliosToShelf($shelfnumber, at biblionumber);
-	RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
+sub HandleNewVirtualShelf {
+    if($authorized= ShelfPossibleAction($loggedinuser, undef, $category==1? 'new_private': 'new_public')) {
+	$shelfnumber = AddShelf( {
+            shelfname => $newvirtualshelf,
+            category => $category }, $loggedinuser);
+	if($shelfnumber == -1) {
+	    $authorized=0;
+	    $errcode=1;
+	    return;
+	}
+	AddBibliosToShelf($shelfnumber, @biblionumber);
+	#Reload the page where you came from
 	print $query->header;
-	print "<html><meta http-equiv=\"refresh\" content=\"0;url=opac-shelves.pl?display=privateshelves\" /><body onload=\"self.close();\"></body></html>";
-	exit;
+	print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
+    }
 }
-else {
-	if($selectedshelf){
-	# adding to specific shelf
-	my ( $singleshelf, $singleshelfname, $singlecategory ) = GetShelf( $query->param('selectedshelf') );
-				$template->param(
-				singleshelf 		=> 1,
-				shelfnumber         => $singleshelf,
-				shelfname           => $singleshelfname,
-				"category$singlecategory" => 1
-			);
-	} else {
 
-        my $privateshelves = GetAllShelves(1,$loggedinuser);
-        if(@{$privateshelves}){
-			$template->param (
-				privatevirtualshelves          => $privateshelves,
-				existingshelves => 1
-			);
-		}
-        my $publicshelves = GetAllShelves(2,$loggedinuser);
-        if(@{$publicshelves}){
-			$template->param (
-				publicvirtualshelves          => $publicshelves,
-				existingshelves => 1
-			);
-        }
+sub HandleShelfNumber {
+    if($authorized= ShelfPossibleAction($loggedinuser, $shelfnumber, 'add')) {
+	AddBibliosToShelf($shelfnumber, at biblionumber);
+	#Close this page and return
+	print $query->header;
+	print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"self.close();\"></body></html>";
+    }
+}
 
+sub HandleSelectedShelf {
+    if($authorized= ShelfPossibleAction( $loggedinuser, $selectedshelf, 'add')){
+        #adding to specific shelf
+        my ($singleshelf, $singleshelfname, $singlecategory)= GetShelf($query->param('selectedshelf'));
+        $template->param(
+	    singleshelf               => 1,
+	    shelfnumber               => $singleshelf,
+	    shelfname                 => $singleshelfname,
+	    "category$singlecategory" => 1
+        );
+    }
 }
-	my @biblios;
-	for my $bib (@biblionumber) {
-		my $data = GetBiblioData( $bib );
-		push(@biblios, 
-			{ biblionumber => $bib,
-			  title        => $data->{'title'},
-			  author       => $data->{'author'},
-			} );
-	}
-	$template->param (
-		newshelf => $newshelf,
-		multiple => (scalar(@biblios) > 1),
-		total    => scalar @biblios,
-		biblios  => \@biblios,
-		authorized	=> $authorized,
+
+sub HandleSelect {
+    return unless $authorized= $loggedinuser>0;
+    my $privateshelves = GetAllShelves(1,$loggedinuser);
+    if(@{$privateshelves}){
+        $template->param (
+	    privatevirtualshelves          => $privateshelves,
+	    existingshelves => 1
+	);
+    }
+    my $publicshelves = GetAllShelves(2,$loggedinuser);
+    if(@{$publicshelves}){
+        $template->param (
+	    publicvirtualshelves          => $publicshelves,
+	    existingshelves => 1
 	);
+    }
+}
+
+sub LoadBib {
+    for my $bib (@biblionumber) {
+        my $data = GetBiblioData( $bib );
+	push(@biblios,
+		{ biblionumber => $bib,
+		  title        => $data->{'title'},
+		  author       => $data->{'author'},
+	} );
+    }
+    $template->param(
+        multiple => (scalar(@biblios) > 1),
+	total    => scalar @biblios,
+	biblios  => \@biblios,
+    );
+}
 
-	output_html_with_http_headers $query, $cookie, $template->output;
+sub ShowTemplate {
+    $template->param (
+	newshelf => $newshelf||0,
+	authorized	=> $authorized,
+	errcode		=> $errcode,
+	OpacAllowPublicListCreation => C4::Context->preference('OpacAllowPublicListCreation'),
+    );
+    output_html_with_http_headers $query, $cookie, $template->output;
 }
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 87d2890..f19bc98 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -41,6 +41,7 @@ use URI::Escape;
 use Storable qw(thaw freeze);
 
 
+
 my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
 # create a new CGI object
 # FIXME: no_undef_params needs to be tested
@@ -718,24 +719,14 @@ if ($query_desc || $limit_desc) {
 
 # VI. BUILD THE TEMPLATE
 # Build drop-down list for 'Add To:' menu...
-my $session = get_session($cgi->cookie("CGISESSID"));
-my @addpubshelves;
-my $pubshelves = $session->param('pubshelves');
-my $barshelves = $session->param('barshelves');
-foreach my $shelf (@$pubshelves) {
-    next if ( ($shelf->{'owner'} != ($borrowernumber ? $borrowernumber : -1)) && ($shelf->{'category'} < 3) );
-    push (@addpubshelves, $shelf);
-}
-
-if (@addpubshelves) {
-    $template->param( addpubshelves     => scalar (@addpubshelves));
-    $template->param( addpubshelvesloop => \@addpubshelves);
-}
-
-if (defined $barshelves) {
-    $template->param( addbarshelves     => scalar (@$barshelves));
-    $template->param( addbarshelvesloop => $barshelves);
-}
+my ($totalref, $pubshelves, $barshelves)=
+	C4::VirtualShelves::GetSomeShelfNames($borrowernumber,'COMBO',1);
+$template->param(
+	addbarshelves     => $totalref->{bartotal},
+	addbarshelvesloop => $barshelves,
+	addpubshelves     => $totalref->{pubtotal},
+	addpubshelvesloop => $pubshelves,
+	);
 
 my $content_type = ($format eq 'rss' or $format eq 'atom') ? $format : 'html';
 
diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl
index f1b7f96..e17e95f 100755
--- a/opac/opac-shelves.pl
+++ b/opac/opac-shelves.pl
@@ -32,9 +32,5 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
     });
 $template->param(listsview => 1);
-# if $loggedinuser is not defined, set it to -1, which should
-# not correspond to any real borrowernumber.  
-# FIXME: this is a hack to temporarily avoid changing several
-#        routines in C4::VirtualShelves and C4::VirtualShelves::page
-#        to deal with lists accessed during an anonymous OPAC session
-shelfpage('opac', $query, $template, (defined($loggedinuser) ? $loggedinuser : -1), $cookie);
+
+shelfpage('opac', $query, $template, $loggedinuser, $cookie);
diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl
index 1dbffbb..00aa90b 100755
--- a/virtualshelves/addbybiblionumber.pl
+++ b/virtualshelves/addbybiblionumber.pl
@@ -59,44 +59,25 @@
 =cut
 
 use strict;
-#use warnings; FIXME - Bug 2505
-use C4::Biblio;
+use warnings;
+
 use CGI;
+use C4::Biblio;
 use C4::Output;
-use C4::VirtualShelves qw/:DEFAULT GetRecentShelves/;
-use C4::Circulation;
+use C4::VirtualShelves qw/:DEFAULT GetAllShelves/;
 use C4::Auth;
 
-# splits incoming biblionumber(s) to array and adds each to shelf.
-sub AddBibliosToShelf {
-    my ($shelfnumber, at biblionumber)=@_;
-
-    # multiple bibs might come in as '/' delimited string (from where, i don't see), or as array.
-    # (Note : they come in as '/' when added from the cart)
-    if (scalar(@biblionumber) == 1) {
-        @biblionumber = (split /\//,$biblionumber[0]);
-    }
-    for my $bib (@biblionumber){
-        AddToShelf($bib, $shelfnumber);
-    }
-}
 
 my $query           = new CGI;
-
-# If set, then single item case.
-my $biblionumber    = $query->param('biblionumber');
-
-# If set, then multiple item case.
-my @biblionumber   = $query->param('biblionumber');
-my $biblionumbers   = $query->param('biblionumbers');
-
+my @biblionumber    = HandleBiblioPars();
 my $shelfnumber     = $query->param('shelfnumber');
 my $newvirtualshelf = $query->param('newvirtualshelf');
 my $newshelf        = $query->param('newshelf');
 my $category        = $query->param('category');
 my $sortfield	    = $query->param('sortfield');
 my $confirmed       = $query->param('confirmed') || 0;
-
+my $authorized      = 1;
+my $errcode	    = 0;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -108,120 +89,122 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my @biblionumbers;
-if ($biblionumbers) {
-    @biblionumbers = split '/', $biblionumbers;
-} else {
-    @biblionumbers = (@biblionumber);
+if( $newvirtualshelf) {
+    HandleNewVirtualShelf();
+    exit if $authorized;
+    ShowTemplate(); #error message
+}
+elsif($shelfnumber && $confirmed) {
+    HandleShelfNumber();
+    exit if $authorized;
+    ShowTemplate(); #error message
+}
+elsif($shelfnumber) { #still needs confirmation
+    HandleSelectedShelf();
+    LoadBib() if $authorized;
+    ShowTemplate();
 }
-if (scalar(@biblionumber) == 1) {
-        @biblionumber = (split /\//,$biblionumber[0]);
+else {
+    HandleSelect();
+    LoadBib();
+    ShowTemplate();
 }
+#end
 
-$shelfnumber = AddShelf( $newvirtualshelf, $loggedinuser, $category, $sortfield ) if $newvirtualshelf;
-if ( $shelfnumber || ( $shelfnumber == -1 ) ) {    # the shelf already exist.
-
-    if ($confirmed == 1) {
-	AddBibliosToShelf($shelfnumber, at biblionumber);
-	print
-    "Content-Type: text/html\n\n<html><body onload=\"window.opener.location.reload(true);window.close()\"></body></html>";
-	exit;
-    } else {
-	my ( $singleshelf, $singleshelfname, $singlecategory ) = GetShelf( $query->param('shelfnumber') );
-	my @biblios;
-        for my $bib (@biblionumber) {
-	    my $data = GetBiblioData( $bib );
-            push(@biblios,
-                        { biblionumber => $bib,
-                          title        => $data->{'title'},
-                          author       => $data->{'author'},
-                        } );
-        }
-
-       	$template->param
-        (
-         biblionumber => \@biblionumber,
-         biblios      => \@biblios,
-         multiple     => (scalar(@biblionumber) > 1),
-         singleshelf  => 1,
-         shelfname    => $singleshelfname,
-         shelfnumber  => $singleshelf,
-         total        => scalar(@biblionumber),
-         confirm      => 1,
-        );
+sub HandleBiblioPars {
+    my @bib= $query->param('biblionumber');
+    if(@bib==0 && $query->param('biblionumbers')) {
+        my $str= $query->param('biblionumbers');
+        @bib= split '/', $str;
+    }
+    elsif(@bib==1 && $bib[0]=~/\//) {
+        @bib= split '/', $bib[0];
+    }
+    return @bib;
+}
+
+sub AddBibliosToShelf {
+    my ($shelfnumber, @biblionumber)=@_;
+    for my $bib (@biblionumber){
+        AddToShelf($bib, $shelfnumber, $loggedinuser);
+    }
+}
+
+sub HandleNewVirtualShelf {
+    $shelfnumber = AddShelf( {
+        shelfname => $newvirtualshelf,
+        sortfield => $sortfield,
+        category => $category }, $loggedinuser);
+    if($shelfnumber == -1) {
+	    $authorized=0;
+	    $errcode=1; #add failed
+	    return;
     }
+    AddBibliosToShelf($shelfnumber, @biblionumber);
+    #Reload the page where you came from
+    print $query->header;
+    print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
 }
-else {    # this shelf doesn't already exist.
-#    my $limit = 10;
-    my ($shelflist);
-    my @shelvesloop;
-    my %shelvesloop;
-
-    #grab each type of shelf, open (type 3) should not be limited by user.
-    foreach my $shelftype (1,2,3) {
-	    my ($shelflist) = GetRecentShelves($shelftype, undef, $shelftype == 3 ? undef : $loggedinuser);
-	    for my $shelf (@{ $shelflist }) {
-		    push(@shelvesloop, $shelf->{shelfnumber});
-		    $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname};
-	    }
+
+sub HandleShelfNumber {
+    if($authorized= ShelfPossibleAction($loggedinuser, $shelfnumber, 'add')) {
+	AddBibliosToShelf($shelfnumber, @biblionumber);
+	#Close this page and return
+	print $query->header;
+	print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"self.close();\"></body></html>";
+    }
+    else {
+	$errcode=2; #no perm
     }
+}
 
-    if( @shelvesloop ){
-        my $CGIvirtualshelves = CGI::scrolling_list
-          (
-           -name     => 'shelfnumber',
-           -values   => \@shelvesloop,
-           -labels   => \%shelvesloop,
-           -size     => 1,
-           -tabindex => '',
-           -multiple => 0
-          );
-        $template->param
-          (
-           CGIvirtualshelves => $CGIvirtualshelves,
-          );
+sub HandleSelectedShelf {
+    if($authorized= ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add')){
+        #confirm adding to specific shelf
+        my ($singleshelf, $singleshelfname, $singlecategory)= GetShelf($shelfnumber);
+        $template->param(
+	    singleshelf               => 1,
+	    shelfnumber               => $singleshelf,
+	    shelfname                 => $singleshelfname,
+	    "category$singlecategory" => 1
+        );
     }
-   	my @biblios;
-        for my $bib (@biblionumber) {
-	    my $data = GetBiblioData( $bib );
-            push(@biblios,
-                        { biblionumber => $bib,
-                          title        => $data->{'title'},
-                          author       => $data->{'author'},
-                        } );
-        }
+    else {
+	$errcode=2; #no perm
+    }
+}
+
+sub HandleSelect {
+    my $privateshelves = GetAllShelves(1,$loggedinuser);
+    my $publicshelves = GetAllShelves(2,$loggedinuser);
     $template->param(
-           newshelf     => $newshelf,
-	   biblios=>\@biblios,
-           multiple     => (scalar(@biblionumber) > 1),
-           total        => scalar(@biblionumber),
+	privatevirtualshelves => $privateshelves,
+	publicvirtualshelves  => $publicshelves,
     );
+}
 
-    unless (@biblionumbers) {
-        my ( $bibliocount, @biblios ) = GetBiblio($biblionumber);
-    
-        $template->param
-          (
-           biblionumber      => $biblionumber,
-           title             => $biblios[0]->{'title'},
-           author            => $biblios[0]->{'author'},
-          );
-    } else {
-        my @biblioloop = ();
-        foreach my $biblionumber (@biblionumbers) {
-            my ( $bibliocount, @biblios ) = GetBiblio($biblionumber);
-            my %biblioiter = (
-                              title=>$biblios[0]->{'title'},
-                              author=>$biblios[0]->{'author'}
-                             );
-            push @biblioloop, \%biblioiter;
-        }
-        $template->param
-          (
-           biblioloop => \@biblioloop,
-           biblionumbers => $biblionumbers
-          );
+sub LoadBib {
+    my @biblios;
+    for my $bib (@biblionumber) {
+        my $data = GetBiblioData($bib);
+	push(@biblios,
+		{ biblionumber => $bib,
+		  title        => $data->{'title'},
+		  author       => $data->{'author'},
+	} );
     }
-    
+    $template->param(
+        multiple => (scalar(@biblios) > 1),
+	total    => scalar @biblios,
+	biblios  => \@biblios,
+    );
+}
+
+sub ShowTemplate {
+    $template->param (
+	newshelf => $newshelf||0,
+	authorized	=> $authorized,
+	errcode		=> $errcode,
+    );
+    output_html_with_http_headers $query, $cookie, $template->output;
 }
-output_html_with_http_headers $query, $cookie, $template->output;
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Thu Feb 16 12:30:52 2012
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 16 Feb 2012 11:30:52 +0000
Subject: [Koha-patches] [PATCH] 7310b: Improving list permissions: Deleting
	patron
In-Reply-To: <1329391536-14782-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1329391536-14782-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA31044AF139@S-MAIL-1B.rijksmuseum.intra>

Implements following points from the wiki page List permissions:
5) Delete or move list information when deleting a patron.
---
 C4/VirtualShelves.pm    |   40 ++++++++++++++++++++++++++++++++++++++--
 members/deletemem.pl    |    2 ++
 tools/cleanborrowers.pl |    5 ++++-
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm index 266e5fb..b176d9d 100644
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -565,8 +565,10 @@ sub DelFromShelf {
 	}
     }
     if($del_oth) {
-        $query = qq(DELETE FROM virtualshelfcontents
-            WHERE shelfnumber=? AND biblionumber=? AND borrowernumber<>?);
+        #includes a check if borrowernumber is null (deleted patron)
+        $query = qq/DELETE FROM virtualshelfcontents
+            WHERE shelfnumber=? AND biblionumber=? AND
+            (borrowernumber IS NULL OR borrowernumber<>?)/;
         $sth= $dbh->prepare($query);
 	foreach my $biblionumber (@$bibref) {
             $sth->execute($shelfnumber, $biblionumber, $user); @@ -634,6 +636,40 @@ sub ShelvesMax {
   return SHELVES_MASTHEAD_MAX;
 }
 
+sub HandleDelBorrower {
+#when a member is deleted (DelMember in Members.pm), you should call me 
+first #this routine deletes/moves lists and entries for the deleted 
+member/borrower #you could just delete everything (and lose more than 
+you want) #instead we now try to save all public/shared stuff and keep others happy
+    my ($borrower)= @_;
+    my $query;
+    my $dbh = C4::Context->dbh;
+
+    #Delete shares of this borrower (not lists !)
+    $query="DELETE FROM virtualshelfshares WHERE borrowernumber=?";
+    $dbh->do($query,undef,($borrower));
+
+    #Delete private lists without owner that now have no shares anymore
+    $query="DELETE vs.* FROM virtualshelves vs LEFT JOIN virtualshelfshares sh USING (shelfnumber) WHERE category=1 AND vs.owner IS NULL AND sh.shelfnumber IS NULL";
+    $dbh->do($query);
+
+    #Change owner for private lists which have shares
+    $query="UPDATE virtualshelves LEFT JOIN virtualshelfshares sh USING (shelfnumber) SET owner=NULL where owner=? AND category=1 AND sh.borrowernumber IS NOT NULL";
+    $dbh->do($query,undef,($borrower));
+
+    #Delete unshared private lists
+    $query="DELETE FROM virtualshelves WHERE owner=? AND category=1";
+    $dbh->do($query,undef,($borrower));
+
+    #Handle public lists owned by borrower
+    $query="UPDATE virtualshelves SET owner=NULL WHERE owner=? AND category=2";
+    $dbh->do($query,undef,($borrower));
+
+    #Handle entries added by borrower to lists of others
+    $query="UPDATE virtualshelfcontents SET borrowernumber=NULL WHERE borrowernumber=?";
+    $dbh->do($query,undef,($borrower));
+}
+
 # internal subs
 
 sub _shelf_count {
diff --git a/members/deletemem.pl b/members/deletemem.pl index 924245a..a813cd6 100755
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -30,6 +30,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Members;
 use C4::Branch; # GetBranches
+use C4::VirtualShelves (); #no import
 
 my $input = new CGI;
 
@@ -117,6 +118,7 @@ output_html_with_http_headers $input, $cookie, $template->output;
 
 } else {
     MoveMemberToDeleted($member);
+    C4::VirtualShelves::HandleDelBorrower($member);
     DelMember($member);
     print $input->redirect("/cgi-bin/koha/members/members-home.pl");
 }
diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl index 4fde0f2..0b37c20 100755
--- a/tools/cleanborrowers.pl
+++ b/tools/cleanborrowers.pl
@@ -40,6 +40,7 @@ use C4::Output;
 use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Members;        # GetBorrowersWhoHavexxxBorrowed.
 use C4::Circulation;    # AnonymiseIssueHistory.
+use C4::VirtualShelves (); #no import
 use Date::Calc qw/Today Add_Delta_YM/;
 
 my $cgi = new CGI;
@@ -117,13 +118,15 @@ if ( $params->{'step3'} ) {
             my $i;
             for ( $i = 0 ; $i < $totalDel ; $i++ ) {
                 MoveMemberToDeleted( $membersToDelete->[$i]->{'borrowernumber'} );
+                
+ C4::VirtualShelves::HandleDelBorrower($membersToDelete->[$i]->{'borrow
+ ernumber'});
                 DelMember( $membersToDelete->[$i]->{'borrowernumber'} );
             }
         }
         else {    # delete completly.
             my $i;
             for ( $i = 0 ; $i < $totalDel ; $i++ ) {
-               DelMember($membersToDelete->[$i]->{'borrowernumber'});
+                C4::VirtualShelves::HandleDelBorrower($membersToDelete->[$i]->{'borrowernumber'});
+                DelMember($membersToDelete->[$i]->{'borrowernumber'});
             }
         }
         $template->param(
--
1.6.0.6


From jonathan.druart at biblibre.com  Thu Feb 16 13:07:30 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Thu, 16 Feb 2012 13:07:30 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7303: Adds unicity for budget and
	fund
Message-ID: <1329394050-15869-1-git-send-email-jonathan.druart@biblibre.com>

This patch adds a unique key on fields:
aqbudgets.budget_name
aqbudgets.budget_code
aqbudgetperiods.budget_period_description

To test, try to:
- create 2 budgets with same description
- create 2 funds with same name
- create 2 funds with same code

All of these cases should be generate an error
---
 admin/aqbudgetperiods.pl                           |   30 ++++++++++++--------
 admin/aqbudgets.pl                                 |    8 ++++-
 installer/data/mysql/kohastructure.sql             |   13 +++++---
 installer/data/mysql/updatedatabase.pl             |   25 ++++++++++++++++
 .../prog/en/modules/admin/aqbudgetperiods.tt       |    6 ++++
 .../prog/en/modules/admin/aqbudgets.tt             |    6 ++++
 6 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index 64b333a..5bda84a 100755
--- a/admin/aqbudgetperiods.pl
+++ b/admin/aqbudgetperiods.pl
@@ -69,8 +69,8 @@ my $budget_period_id     = $input->param('budget_period_id');
 my $op                   = $input->param('op')||"else";
 
 my $budget_period_hashref= $input->Vars;
-#my $sort1_authcat = $input->param('sort1_authcat');
-#my $sort2_authcat = $input->param('sort2_authcat');
+
+my $sql_error;
 
 my $pagesize    = 20;
 $searchfield =~ s/\,//g;
@@ -140,15 +140,18 @@ if ( $op eq 'add_form' ) {
 elsif ( $op eq 'add_validate' ) {
 ## add or modify a budget period (confirmation)
 
-	## update budget period data
-	if ( $budget_period_id ne '' ) {
-		$$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked);
-		my $status=ModBudgetPeriod($budget_period_hashref);
-	} 
-	else {    # ELSE ITS AN ADD
-		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
-	}
-	$op='else';
+    ## update budget period data
+    my $r;
+    if ( $budget_period_id ne '' ) {
+        $$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked);
+        $r = ModBudgetPeriod($budget_period_hashref);
+    } 
+    else {    # ELSE ITS AN ADD
+        $r = AddBudgetPeriod($budget_period_hashref);
+    }
+
+    $sql_error = 1 unless $r;
+    $op='else';
 }
 
 #--------------------------------------------------
@@ -267,5 +270,8 @@ elsif ( $op eq 'duplicate_budget' ){
 		pagination_bar		  => pagination_bar("aqbudgetperiods.pl",getnbpages(scalar(@$results),$pagesize),$page),
     );
 
-$template->param($op=>1);
+$template->param(
+    $op => 1,
+    sql_error => $sql_error,
+);
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index db99759..21d3b1e 100755
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -40,6 +40,7 @@ use C4::Debug;
 
 my $input = new CGI;
 my $dbh     = C4::Context->dbh;
+my $sql_error;
 
 my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
     {   template_name   => "admin/aqbudgets.tmpl",
@@ -217,11 +218,13 @@ if ($op eq 'add_form') {
     if ( $op eq 'delete_confirmed' ) {
         my $rc = DelBudget($budget_id);
     }elsif( $op eq 'add_validate' ) {
+        my $r;
         if ( defined $$budget_hash{budget_id} ) {
-            ModBudget( $budget_hash );
+            $r = ModBudget( $budget_hash );
         } else {
-            AddBudget( $budget_hash );
+            $r = AddBudget( $budget_hash );
         }
+        $sql_error = 1 unless $r;
     }
     my $branches = GetBranches();
     $template->param(
@@ -332,6 +335,7 @@ if ($op eq 'add_form') {
         period_alloc_total     => $num->format_price($period_alloc_total),
         base_spent_total       => $num->format_price($base_spent_total),
         branchloop             => \@branchloop2,
+        sql_error              => $sql_error,
     );
 
 } #---- END $OP eq DEFAULT
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 37113c2..f1ca330 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2510,8 +2510,8 @@ DROP TABLE IF EXISTS `aqbudgets`;
 CREATE TABLE `aqbudgets` (
   `budget_id` int(11) NOT NULL auto_increment,
   `budget_parent_id` int(11) default NULL,
-  `budget_code` varchar(30) default NULL,
-  `budget_name` varchar(80) default NULL,
+  `budget_code` varchar(30) NOT NULL,
+  `budget_name` varchar(80) NOT NULL,
   `budget_branchcode` varchar(10) default NULL,
   `budget_amount` decimal(28,6) NULL default '0.00',
   `budget_encumb` decimal(28,6) NULL default '0.00',
@@ -2523,7 +2523,9 @@ CREATE TABLE `aqbudgets` (
   `sort2_authcat` varchar(80) default NULL,
   `budget_owner_id` int(11) default NULL,
   `budget_permission` int(1) default '0',
-  PRIMARY KEY  (`budget_id`)
+  PRIMARY KEY  (`budget_id`),
+  UNIQUE KEY `uniq_budget_name_aqbudgets` (`budget_name`),
+  UNIQUE KEY `uniq_budget_code_aqbudgets` (`budget_code`
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -2538,12 +2540,13 @@ CREATE TABLE `aqbudgetperiods` (
   `budget_period_startdate` date NOT NULL,
   `budget_period_enddate` date NOT NULL,
   `budget_period_active` tinyint(1) default '0',
-  `budget_period_description` mediumtext,
+  `budget_period_description` varchar(255) NOT NULL,
   `budget_period_total` decimal(28,6),
   `budget_period_locked` tinyint(1) default NULL,
   `sort1_authcat` varchar(10) default NULL,
   `sort2_authcat` varchar(10) default NULL,
-  PRIMARY KEY  (`budget_period_id`)
+  PRIMARY KEY  (`budget_period_id`),
+  UNIQUE KEY `uniq_aqbudgetperiods` (`budget_period_description`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 0ef0b1f..bb26522 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4684,6 +4684,31 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.07.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do(q{
+        ALTER TABLE `aqbudgetperiods` MODIFY COLUMN `budget_period_description` VARCHAR(255)  CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+    });
+    $dbh->do(q{
+        ALTER TABLE `aqbudgetperiods` ADD UNIQUE ( budget_period_description);
+    });
+    $dbh->do(q{
+        ALTER TABLE `aqbudgets` MODIFY COLUMN `budget_name` VARCHAR(80)  CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+    });
+    $dbh->do(q{
+        ALTER TABLE `aqbudgets` MODIFY COLUMN `budget_code` VARCHAR(30)  CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+    });
+    $dbh->do(q{
+        ALTER TABLE `aqbudgets` ADD UNIQUE ( budget_name );
+    });
+    $dbh->do(q{
+        ALTER TABLE `aqbudgets` ADD UNIQUE ( budget_code );
+    });
+
+    print "Upgrade to $DBversion done (aqbudgets and aqbudgetperiods. Unique constraint on field.)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 29dcf7f..21af3f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -149,6 +149,12 @@
 <div id="yui-main">
 <div class="yui-b">
 
+[% IF ( sql_error ) %]
+    <div class="error">
+        This budget name already exists
+    </div>
+[% END %]
+
 [% INCLUDE 'budgets-admin-toolbar.inc' %]
 
 [% IF ( duplicate_form ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 12a70bc..bfbc923 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -155,6 +155,12 @@
 <div id="yui-main">
 <div class="yui-b" id="content">
 
+[% IF ( sql_error ) %]
+    <div class="error">
+        This fund name (or code) already exists
+    </div>
+[% END %]
+
 [% UNLESS ( delete_confirm ) %][% INCLUDE 'budgets-admin-toolbar.inc' %][% END %]
 [% IF ( else ) %]
 
-- 
1.7.7.3


From jonathan.druart at biblibre.com  Thu Feb 16 14:41:04 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Thu, 16 Feb 2012 14:41:04 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7302: Export basketgroup as CSV
Message-ID: <1329399664-20092-1-git-send-email-jonathan.druart@biblibre.com>

Adds new action export for basketgroup.
This action is available only if your basketgroup is closed.
This export generates a csv file with order informations.
---
 C4/Acquisition.pm                                  |   68 ++++++++++++++++++-
 acqui/basketgroup.pl                               |   12 +++-
 .../prog/en/modules/acqui/basketgroup.tt           |    7 ++-
 3 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 0a96a02..8821c04 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -29,9 +29,12 @@ use C4::Suggestions;
 use C4::Biblio;
 use C4::Debug;
 use C4::SQLHelper qw(InsertInTable);
+use C4::Bookseller qw(GetBookSellerFromId);
 
 use Time::localtime;
 use HTML::Entities;
+use Text::CSV::Encoded;
+use utf8;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -42,7 +45,7 @@ BEGIN {
     @ISA    = qw(Exporter);
     @EXPORT = qw(
         &GetBasket &NewBasket &CloseBasket &DelBasket &ModBasket
-	&GetBasketAsCSV
+        &GetBasketAsCSV &GetBasketGroupAsCSV
         &GetBasketsByBookseller &GetBasketsByBasketgroup
 
         &ModBasketHeader
@@ -233,7 +236,7 @@ sub GetBasketAsCSV {
     my $basket = GetBasket($basketno);
     my @orders = GetOrders($basketno);
     my $contract = GetContract($basket->{'contractnumber'});
-    my $csv = Text::CSV->new();
+    my $csv = Text::CSV::Encoded->new ({ encoding  => "utf8" });
     my $output; 
 
     # TODO: Translate headers
@@ -274,6 +277,60 @@ sub GetBasketAsCSV {
 }
 
 
+=head3 GetBasketGroupAsCSV
+
+=over 4
+
+&GetBasketGroupAsCSV($basketgroupid);
+
+Export a basket group as CSV
+
+=back
+
+=cut
+
+sub GetBasketGroupAsCSV {
+    my ($basketgroupid) = @_;
+    my $baskets = GetBasketsByBasketgroup($basketgroupid);
+
+    # TODO: Translate headers
+    my @headers = qw(booksellername bookselleraddress booksellerpostal accountnumber contractnumber contractname ordernumber entrydate isbn author title publishercode collectiontitle notes quantity rrp);
+
+    my $csv = Text::CSV::Encoded->new ({ encoding  => "utf8" });
+
+    my $output;
+    $csv->combine(@headers);
+    $output = $csv->string() . "\n";
+
+    for my $basket (@$baskets) {
+        my @orders     = GetOrders( $$basket{basketno} );
+        my $contract   = GetContract( $$basket{contractnumber} );
+        my $bookseller = GetBookSellerFromId( $$basket{booksellerid} );
+
+        my @rows;
+        foreach my $order (@orders) {
+            my @cols;
+            my $bd = GetBiblioData( $order->{'biblionumber'} );
+            push( @cols,
+                $bookseller->{name}, $bookseller->{address1}, $bookseller->{postal}, $bookseller->{accountnumber},
+                $contract->{contractnumber}, $contract->{contractname},
+                $order->{ordernumber},  $order->{entrydate}, $order->{isbn},
+                $bd->{author}, $bd->{title}, $bd->{publishercode}, $bd->{collectiontitle},
+                $order->{notes}, $order->{quantity}, $order->{rrp}, );
+            push( @rows, \@cols );
+        }
+
+        foreach my $row (@rows) {
+            $csv->combine(@$row);
+            $output .= $csv->string() . "\n";
+
+        }
+    }
+
+    return $output;
+
+}
+
 =head3 CloseBasketgroup
 
   &CloseBasketgroup($basketgroupno);
@@ -476,8 +533,11 @@ Returns a reference to all baskets that belong to basketgroup $basketgroupid.
 
 sub GetBasketsByBasketgroup {
     my $basketgroupid = shift;
-    my $query = "SELECT * FROM aqbasket
-                LEFT JOIN aqcontract USING(contractnumber) WHERE basketgroupid=?";
+    my $query = qq{
+        SELECT *, aqbasket.booksellerid as booksellerid
+        FROM aqbasket
+        LEFT JOIN aqcontract USING(contractnumber) WHERE basketgroupid=?
+    };
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare($query);
     $sth->execute($basketgroupid);
diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index d2e1856..babfd49 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -53,7 +53,7 @@ use C4::Output;
 use CGI;
 
 use C4::Bookseller qw/GetBookSellerFromId/;
-use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket/;
+use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV/;
 use C4::Bookseller qw/GetBookSellerFromId/;
 use C4::Branch qw/GetBranches/;
 use C4::Members qw/GetMember/;
@@ -277,7 +277,7 @@ sub printbasketgrouppdf{
 
 }
 
-my $op = $input->param('op');
+my $op = $input->param('op') || 'display';
 my $booksellerid = $input->param('booksellerid');
 $template->param(booksellerid => $booksellerid);
 
@@ -417,6 +417,14 @@ if ( $op eq "add" ) {
     
     printbasketgrouppdf($basketgroupid);
     exit;
+}elsif ( $op eq "export" ) {
+    my $basketgroupid = $input->param('basketgroupid');
+    print $input->header(
+        -type       => 'text/csv',
+        -attachment => 'basketgroup' . $basketgroupid . '.csv',
+    );
+    print GetBasketGroupAsCSV( $basketgroupid );
+    exit;
 }elsif( $op eq "delete"){
     my $basketgroupid = $input->param('basketgroupid');
     DelBasketgroup($basketgroupid);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index 2c29865..84ffc3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -285,7 +285,7 @@ function yuiToolbar() {
 		<table>
 			<thead>
 				<tr>
-					<th>Basket Group</th><th colspan="3">Action</th>
+					<th>Basket Group</th><th colspan="4">Action</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -293,7 +293,7 @@ function yuiToolbar() {
 				[% IF ( basketgroup.closed ) %]
 				<tr>
 				<td>
-					<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid[% basketgroup.id %]">[% IF ( basketgroup.name ) %]
+					<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]">[% IF ( basketgroup.name ) %]
 											[% basketgroup.name %]
 										[% ELSE %]
 											Basket group no. [% basketgroup.id %]
@@ -305,6 +305,9 @@ function yuiToolbar() {
 						<td>
 							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
 						</td>
+                    <td>
+                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
+                    </td>
 				</tr>
 				[% END %]
 				[% END %]
-- 
1.7.7.3


From julian.maurice at biblibre.com  Thu Feb 16 14:56:20 2012
From: julian.maurice at biblibre.com (julian.maurice at biblibre.com)
Date: Thu, 16 Feb 2012 14:56:20 +0100
Subject: [Koha-patches] [PATCH] Bug 6440: Implement OAI-PMH Sets
Message-ID: <1329400580-19491-1-git-send-email-julian.maurice@biblibre.com>

From: Julian Maurice <julian.maurice at biblibre.com>

New sql tables:
  - oai_sets: contains the list of sets, described by a spec and a name
  - oai_sets_descriptions: contains a list of descriptions for each set
  - oai_sets_mappings: conditions on marc fields to match for biblio to be
    in a set
  - oai_sets_biblios: list of biblionumbers for each set

New admin page: allow to configure sets:
  - Creation, deletion, modification of spec, name and descriptions
  - Define mappings which will be used for building oai sets

Implements OAI Sets in opac/oai.pl:
  - ListSets, ListIdentifiers, ListRecords, GetRecord

New script misc/migration_tools/build_oai_sets.pl:
  - Retrieve marcxml from all biblios and test if they belong to defined
    sets. The oai_sets_biblios table is then updated accordingly

New system preference OAI-PMH:AutoUpdateSets. If on, update sets
automatically when a biblio is created or updated.

Use OPACBaseURL in oai_dc xslt
---
 C4/Biblio.pm                                       |   12 +
 C4/OAI/Sets.pm                                     |  589 ++++++++++++++++++++
 admin/oai_set_mappings.pl                          |   86 +++
 admin/oai_sets.pl                                  |  102 ++++
 installer/data/mysql/atomicupdate/oai_sets.sql     |   35 ++
 installer/data/mysql/kohastructure.sql             |   49 ++
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   10 +
 .../intranet-tmpl/prog/en/includes/admin-menu.inc  |    1 +
 .../prog/en/modules/admin/admin-home.tt            |    2 +
 .../prog/en/modules/admin/oai_set_mappings.tt      |  103 ++++
 .../prog/en/modules/admin/oai_sets.tt              |  140 +++++
 .../en/modules/admin/preferences/web_services.pref |    6 +
 .../prog/en/modules/help/admin/oai_set_mappings.tt |   40 ++
 .../prog/en/modules/help/admin/oai_sets.tt         |   49 ++
 .../prog/en/xslt/UNIMARCslim2OAIDC.xsl             |   11 +-
 misc/migration_tools/build_oai_sets.pl             |  165 ++++++
 opac/oai.pl                                        |  233 ++++++--
 18 files changed, 1578 insertions(+), 56 deletions(-)
 create mode 100644 C4/OAI/Sets.pm
 create mode 100755 admin/oai_set_mappings.pl
 create mode 100755 admin/oai_sets.pl
 create mode 100644 installer/data/mysql/atomicupdate/oai_sets.sql
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
 create mode 100755 misc/migration_tools/build_oai_sets.pl

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 83fef13..0f33f80 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -35,6 +35,7 @@ use C4::Dates qw/format_date/;
 use C4::Log;    # logaction
 use C4::ClassSource;
 use C4::Charset;
+use C4::OAI::Sets;
 require C4::Heading;
 require C4::Serials;
 require C4::Items;
@@ -275,6 +276,11 @@ sub AddBiblio {
     # now add the record
     ModBiblioMarc( $record, $biblionumber, $frameworkcode ) unless $defer_marc_save;
 
+    # update OAI-PMH sets
+    if(C4::Context->preference("OAI-PMH:AutoUpdateSets")) {
+        C4::OAI::Sets::UpdateOAISetsBiblio($biblionumber, $record);
+    }
+
     logaction( "CATALOGUING", "ADD", $biblionumber, "biblio" ) if C4::Context->preference("CataloguingLog");
     return ( $biblionumber, $biblioitemnumber );
 }
@@ -346,6 +352,12 @@ sub ModBiblio {
     # modify the other koha tables
     _koha_modify_biblio( $dbh, $oldbiblio, $frameworkcode );
     _koha_modify_biblioitem_nonmarc( $dbh, $oldbiblio );
+
+    # update OAI-PMH sets
+    if(C4::Context->preference("OAI-PMH:AutoUpdateSets")) {
+        C4::OAI::Sets::UpdateOAISetsBiblio($biblionumber, $record);
+    }
+
     return 1;
 }
 
diff --git a/C4/OAI/Sets.pm b/C4/OAI/Sets.pm
new file mode 100644
index 0000000..8c28f7b
--- /dev/null
+++ b/C4/OAI/Sets.pm
@@ -0,0 +1,589 @@
+package C4::OAI::Sets;
+
+# Copyright 2011 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.
+
+=head1 NAME
+
+C4::OAI::Sets - OAI Sets management functions
+
+=head1 DESCRIPTION
+
+C4::OAI::Sets contains functions for managing storage and editing of OAI Sets.
+
+OAI Set description can be found L<here|http://www.openarchives.org/OAI/openarchivesprotocol.html#Set>
+
+=cut
+
+use Modern::Perl;
+use C4::Context;
+
+use vars qw(@ISA @EXPORT);
+
+BEGIN {
+    require Exporter;
+    @ISA = qw(Exporter);
+    @EXPORT = qw(
+        &GetOAISets &GetOAISet &GetOAISetBySpec &ModOAISet &DelOAISet &AddOAISet
+        &GetOAISetsMappings &GetOAISetMappings &ModOAISetMappings
+        &GetOAISetsBiblio &ModOAISetsBiblios &AddOAISetsBiblios
+        &CalcOAISetsBiblio &UpdateOAISetsBiblio
+    );
+}
+
+=head1 FUNCTIONS
+
+=head2 GetOAISets
+
+    $oai_sets = GetOAISets;
+
+GetOAISets return a array reference of hash references describing the sets.
+The hash references looks like this:
+
+    {
+        'name'         => 'set name',
+        'spec'         => 'set spec',
+        'descriptions' => [
+            'description 1',
+            'description 2',
+            ...
+        ]
+    }
+
+=cut
+
+sub GetOAISets {
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT * FROM oai_sets
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    my $results = $sth->fetchall_arrayref({});
+
+    $query = qq{
+        SELECT description
+        FROM oai_sets_descriptions
+        WHERE set_id = ?
+    };
+    $sth = $dbh->prepare($query);
+    foreach my $set (@$results) {
+        $sth->execute($set->{'id'});
+        my $desc = $sth->fetchall_arrayref({});
+        foreach (@$desc) {
+            push @{$set->{'descriptions'}}, $_->{'description'};
+        }
+    }
+
+    return $results;
+}
+
+=head2 GetOAISet
+
+    $set = GetOAISet($set_id);
+
+GetOAISet returns a hash reference describing the set with the given set_id.
+
+See GetOAISets to see what the hash looks like.
+
+=cut
+
+sub GetOAISet {
+    my ($set_id) = @_;
+
+    return unless $set_id;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT *
+        FROM oai_sets
+        WHERE id = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($set_id);
+    my $set = $sth->fetchrow_hashref;
+
+    $query = qq{
+        SELECT description
+        FROM oai_sets_descriptions
+        WHERE set_id = ?
+    };
+    $sth = $dbh->prepare($query);
+    $sth->execute($set->{'id'});
+    my $desc = $sth->fetchall_arrayref({});
+    foreach (@$desc) {
+        push @{$set->{'descriptions'}}, $_->{'description'};
+    }
+
+    return $set;
+}
+
+=head2 GetOAISetBySpec
+
+    my $set = GetOAISetBySpec($setSpec);
+
+Returns a hash describing the set whose spec is $setSpec
+
+=cut
+
+sub GetOAISetBySpec {
+    my $setSpec = shift;
+
+    return unless defined $setSpec;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT *
+        FROM oai_sets
+        WHERE spec = ?
+        LIMIT 1
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($setSpec);
+
+    return $sth->fetchrow_hashref;
+}
+
+=head2 ModOAISet
+
+    my $set = {
+        'id' => $set_id,                 # mandatory
+        'spec' => $spec,                 # mandatory
+        'name' => $name,                 # mandatory
+        'descriptions => \@descriptions, # optional, [] to remove descriptions
+    };
+    ModOAISet($set);
+
+ModOAISet modify a set in the database.
+
+=cut
+
+sub ModOAISet {
+    my ($set) = @_;
+
+    return unless($set && $set->{'spec'} && $set->{'name'});
+
+    if(!defined $set->{'id'}) {
+        warn "Set ID not defined, can't modify the set";
+        return;
+    }
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        UPDATE oai_sets
+        SET spec = ?,
+            name = ?
+        WHERE id = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($set->{'spec'}, $set->{'name'}, $set->{'id'});
+
+    if($set->{'descriptions'}) {
+        $query = qq{
+            DELETE FROM oai_sets_descriptions
+            WHERE set_id = ?
+        };
+        $sth = $dbh->prepare($query);
+        $sth->execute($set->{'id'});
+
+        if(scalar @{$set->{'descriptions'}} > 0) {
+            $query = qq{
+                INSERT INTO oai_sets_descriptions (set_id, description)
+                VALUES (?,?)
+            };
+            $sth = $dbh->prepare($query);
+            foreach (@{ $set->{'descriptions'} }) {
+                $sth->execute($set->{'id'}, $_) if $_;
+            }
+        }
+    }
+}
+
+=head2 DelOAISet
+
+    DelOAISet($set_id);
+
+DelOAISet remove the set with the given set_id
+
+=cut
+
+sub DelOAISet {
+    my ($set_id) = @_;
+
+    return unless $set_id;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        DELETE oai_sets, oai_sets_descriptions, oai_sets_mappings
+        FROM oai_sets
+          LEFT JOIN oai_sets_descriptions ON oai_sets_descriptions.set_id = oai_sets.id
+          LEFT JOIN oai_sets_mappings ON oai_sets_mappings.set_id = oai_sets.id
+        WHERE oai_sets.id = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($set_id);
+}
+
+=head2 AddOAISet
+
+    my $set = {
+        'id' => $set_id,                 # mandatory
+        'spec' => $spec,                 # mandatory
+        'name' => $name,                 # mandatory
+        'descriptions => \@descriptions, # optional
+    };
+    my $set_id = AddOAISet($set);
+
+AddOAISet adds a new set and returns its id, or undef if something went wrong.
+
+=cut
+
+sub AddOAISet {
+    my ($set) = @_;
+
+    return unless($set && $set->{'spec'} && $set->{'name'});
+
+    my $set_id;
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        INSERT INTO oai_sets (spec, name)
+        VALUES (?,?)
+    };
+    my $sth = $dbh->prepare($query);
+    if( $sth->execute($set->{'spec'}, $set->{'name'}) ) {
+        $set_id = $dbh->last_insert_id(undef, undef, 'oai_sets', undef);
+        if($set->{'descriptions'}) {
+            $query = qq{
+                INSERT INTO oai_sets_descriptions (set_id, description)
+                VALUES (?,?)
+            };
+            $sth = $dbh->prepare($query);
+            foreach( @{ $set->{'descriptions'} } ) {
+                $sth->execute($set_id, $_) if $_;
+            }
+        }
+    } else {
+        warn "AddOAISet failed";
+    }
+
+    return $set_id;
+}
+
+=head2 GetOAISetsMappings
+
+    my $mappings = GetOAISetsMappings;
+
+GetOAISetsMappings returns mappings for all OAI Sets.
+
+Mappings define how biblios are categorized in sets.
+A mapping is defined by three properties:
+
+    {
+        marcfield => 'XXX',     # the MARC field to check
+        marcsubfield => 'Y',    # the MARC subfield to check
+        marcvalue => 'zzzz',    # the value to check
+    }
+
+If defined in a set mapping, a biblio which have at least one 'Y' subfield of
+one 'XXX' field equal to 'zzzz' will belong to this set.
+If multiple mappings are defined in a set, the biblio will belong to this set
+if at least one condition is matched.
+
+GetOAISetsMappings returns a hashref of arrayrefs of hashrefs.
+The first hashref keys are the sets IDs, so it looks like this:
+
+    $mappings = {
+        '1' => [
+            {
+                marcfield => 'XXX',
+                marcsubfield => 'Y',
+                marcvalue => 'zzzz'
+            },
+            {
+                ...
+            },
+            ...
+        ],
+        '2' => [...],
+        ...
+    };
+
+=cut
+
+sub GetOAISetsMappings {
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT * FROM oai_sets_mappings
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+
+    my $mappings = {};
+    while(my $result = $sth->fetchrow_hashref) {
+        push @{ $mappings->{$result->{'set_id'}} }, {
+            marcfield => $result->{'marcfield'},
+            marcsubfield => $result->{'marcsubfield'},
+            marcvalue => $result->{'marcvalue'}
+        };
+    }
+
+    return $mappings;
+}
+
+=head2 GetOAISetMappings
+
+    my $set_mappings = GetOAISetMappings($set_id);
+
+Return mappings for the set with given set_id. It's an arrayref of hashrefs
+
+=cut
+
+sub GetOAISetMappings {
+    my ($set_id) = @_;
+
+    return unless $set_id;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT *
+        FROM oai_sets_mappings
+        WHERE set_id = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($set_id);
+
+    my @mappings;
+    while(my $result = $sth->fetchrow_hashref) {
+        push @mappings, {
+            marcfield => $result->{'marcfield'},
+            marcsubfield => $result->{'marcsubfield'},
+            marcvalue => $result->{'marcvalue'}
+        };
+    }
+
+    return \@mappings;
+}
+
+=head2 ModOAISetMappings {
+
+    my $mappings = [
+        {
+            marcfield => 'XXX',
+            marcsubfield => 'Y',
+            marcvalue => 'zzzz'
+        },
+        ...
+    ];
+    ModOAISetMappings($set_id, $mappings);
+
+ModOAISetMappings modifies mappings of a given set.
+
+=cut
+
+sub ModOAISetMappings {
+    my ($set_id, $mappings) = @_;
+
+    return unless $set_id;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        DELETE FROM oai_sets_mappings
+        WHERE set_id = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($set_id);
+
+    if(scalar @$mappings > 0) {
+        $query = qq{
+            INSERT INTO oai_sets_mappings (set_id, marcfield, marcsubfield, marcvalue)
+            VALUES (?,?,?,?)
+        };
+        $sth = $dbh->prepare($query);
+        foreach (@$mappings) {
+            $sth->execute($set_id, $_->{'marcfield'}, $_->{'marcsubfield'}, $_->{'marcvalue'});
+        }
+    }
+}
+
+=head2 GetOAISetsBiblio
+
+    $oai_sets = GetOAISetsBiblio($biblionumber);
+
+Return the OAI sets where biblio appears.
+
+Return value is an arrayref of hashref where each element of the array is a set.
+Keys of hash are id, spec and name
+
+=cut
+
+sub GetOAISetsBiblio {
+    my ($biblionumber) = @_;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT oai_sets.*
+        FROM oai_sets
+          LEFT JOIN oai_sets_biblios ON oai_sets_biblios.set_id = oai_sets.id
+        WHERE biblionumber = ?
+    };
+    my $sth = $dbh->prepare($query);
+
+    $sth->execute($biblionumber);
+    return $sth->fetchall_arrayref({});
+}
+
+=head2 DelOAISetsBiblio
+
+    DelOAISetsBiblio($biblionumber);
+
+Remove a biblio from all sets
+
+=cut
+
+sub DelOAISetsBiblio {
+    my ($biblionumber) = @_;
+
+    return unless $biblionumber;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        DELETE FROM oai_sets_biblios
+        WHERE biblionumber = ?
+    };
+    my $sth = $dbh->prepare($query);
+    return $sth->execute($biblionumber);
+}
+
+=head2 CalcOAISetsBiblio
+
+    my @sets = CalcOAISetsBiblio($record, $oai_sets_mappings);
+
+Return a list of set ids the record belongs to. $record must be a MARC::Record
+and $oai_sets_mappings (optional) must be a hashref returned by
+GetOAISetsMappings
+
+=cut
+
+sub CalcOAISetsBiblio {
+    my ($record, $oai_sets_mappings) = @_;
+
+    return unless $record;
+
+    $oai_sets_mappings ||= GetOAISetsMappings;
+
+    my @biblio_sets;
+    foreach my $set_id (keys %$oai_sets_mappings) {
+        foreach my $mapping (@{ $oai_sets_mappings->{$set_id} }) {
+            next if not $mapping;
+            my $field = $mapping->{'marcfield'};
+            my $subfield = $mapping->{'marcsubfield'};
+            my $value = $mapping->{'marcvalue'};
+
+            my @subfield_values = $record->subfield($field, $subfield);
+            if(0 < grep /^$value$/, @subfield_values) {
+                push @biblio_sets, $set_id;
+                last;
+            }
+        }
+    }
+    return @biblio_sets;
+}
+
+=head2 ModOAISetsBiblios
+
+    my $oai_sets_biblios = {
+        '1' => [1, 3, 4],   # key is the set_id, and value is an array ref of biblionumbers
+        '2' => [],
+        ...
+    };
+    ModOAISetsBiblios($oai_sets_biblios);
+
+ModOAISetsBiblios truncate oai_sets_biblios table and call AddOAISetsBiblios.
+This table is then used in opac/oai.pl.
+
+=cut
+
+sub ModOAISetsBiblios {
+    my $oai_sets_biblios = shift;
+
+    return unless ref($oai_sets_biblios) eq "HASH";
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        TRUNCATE TABLE oai_sets_biblios
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    AddOAISetsBiblios($oai_sets_biblios);
+}
+
+=head2 UpdateOAISetsBiblio
+
+    UpdateOAISetsBiblio($biblionumber, $record);
+
+Update OAI sets for one biblio. The two parameters are mandatory.
+$record is a MARC::Record.
+
+=cut
+
+sub UpdateOAISetsBiblio {
+    my ($biblionumber, $record) = @_;
+
+    return unless($biblionumber and $record);
+
+    my $sets_biblios;
+    my @sets = CalcOAISetsBiblio($record);
+    foreach (@sets) {
+        push @{ $sets_biblios->{$_} }, $biblionumber;
+    }
+    DelOAISetsBiblio($biblionumber);
+    AddOAISetsBiblios($sets_biblios);
+}
+
+=head2 AddOAISetsBiblios
+
+    my $oai_sets_biblios = {
+        '1' => [1, 3, 4],   # key is the set_id, and value is an array ref of biblionumbers
+        '2' => [],
+        ...
+    };
+    ModOAISetsBiblios($oai_sets_biblios);
+
+AddOAISetsBiblios insert given infos in oai_sets_biblios table.
+This table is then used in opac/oai.pl.
+
+=cut
+
+sub AddOAISetsBiblios {
+    my $oai_sets_biblios = shift;
+
+    return unless ref($oai_sets_biblios) eq "HASH";
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        INSERT INTO oai_sets_biblios (set_id, biblionumber)
+        VALUES (?,?)
+    };
+    my $sth = $dbh->prepare($query);
+    foreach my $set_id (keys %$oai_sets_biblios) {
+        foreach my $biblionumber (@{$oai_sets_biblios->{$set_id}}) {
+            $sth->execute($set_id, $biblionumber);
+        }
+    }
+}
+
+1;
diff --git a/admin/oai_set_mappings.pl b/admin/oai_set_mappings.pl
new file mode 100755
index 0000000..4d570f9
--- /dev/null
+++ b/admin/oai_set_mappings.pl
@@ -0,0 +1,86 @@
+#!/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
+
+oai_set_mappings.pl
+
+=head1 DESCRIPTION
+
+Define mappings for a given set.
+Mappings are conditions that define which biblio is included in which set.
+A condition is in the form 200$a = 'abc'.
+Multiple conditions can be defined for a given set. In this case,
+the OR operator will be applied.
+
+=cut
+
+use Modern::Perl;
+
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::OAI::Sets;
+
+use Data::Dumper;
+
+my $input = new CGI;
+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
+    template_name   => 'admin/oai_set_mappings.tt',
+    query           => $input,
+    type            => 'intranet',
+    authnotrequired => 0,
+    flagsrequired   => { 'parameters' => '*' },
+    debug           => 1,
+} );
+
+my $id = $input->param('id');
+my $op = $input->param('op');
+
+if($op && $op eq "save") {
+    my @marcfields = $input->param('marcfield');
+    my @marcsubfields = $input->param('marcsubfield');
+    my @marcvalues = $input->param('marcvalue');
+
+    my @mappings;
+    my $i = 0;
+    while($i < @marcfields and $i < @marcsubfields and $i < @marcvalues) {
+        if($marcfields[$i] and $marcsubfields[$i] and $marcvalues[$i]) {
+            push @mappings, {
+                marcfield    => $marcfields[$i],
+                marcsubfield => $marcsubfields[$i],
+                marcvalue    => $marcvalues[$i]
+            };
+        }
+        $i++;
+    }
+    ModOAISetMappings($id, \@mappings);
+    $template->param(mappings_saved => 1);
+}
+
+my $set = GetOAISet($id);
+my $mappings = GetOAISetMappings($id);
+
+$template->param(
+    id => $id,
+    setName => $set->{'name'},
+    setSpec => $set->{'spec'},
+    mappings => $mappings,
+);
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/admin/oai_sets.pl b/admin/oai_sets.pl
new file mode 100755
index 0000000..a826107
--- /dev/null
+++ b/admin/oai_sets.pl
@@ -0,0 +1,102 @@
+#!/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
+
+oai_sets.pl
+
+=head1 DESCRIPTION
+
+Admin page to describe OAI SETs
+
+=cut
+
+use Modern::Perl;
+
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::OAI::Sets;
+
+use Data::Dumper;
+
+my $input = new CGI;
+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
+    template_name   => 'admin/oai_sets.tt',
+    query           => $input,
+    type            => 'intranet',
+    authnotrequired => 0,
+    flagsrequired   => { 'parameters' => '*' },
+    debug           => 1,
+} );
+
+my $op = $input->param('op');
+
+if($op && $op eq "new") {
+    $template->param( op_new => 1 );
+} elsif($op && $op eq "savenew") {
+    my $spec = $input->param('spec');
+    my $name = $input->param('name');
+    my @descriptions = $input->param('description');
+    AddOAISet({
+        spec => $spec,
+        name => $name,
+        descriptions => \@descriptions
+    });
+} elsif($op && $op eq "mod") {
+    my $id = $input->param('id');
+    my $set = GetOAISet($id);
+    $template->param(
+        op_mod => 1,
+        id => $set->{'id'},
+        spec => $set->{'spec'},
+        name => $set->{'name'},
+        descriptions => [ map { {description => $_} } @{ $set->{'descriptions'} } ],
+    );
+} elsif($op && $op eq "savemod") {
+    my $id = $input->param('id');
+    my $spec = $input->param('spec');
+    my $name = $input->param('name');
+    my @descriptions = $input->param('description');
+    ModOAISet({
+        id => $id,
+        spec => $spec,
+        name => $name,
+        descriptions => \@descriptions
+    });
+} elsif($op && $op eq "del") {
+    my $id = $input->param('id');
+    DelOAISet($id);
+}
+
+my $OAISets = GetOAISets;
+my @sets_loop;
+foreach(@$OAISets) {
+    push @sets_loop, {
+        id => $_->{'id'},
+        spec => $_->{'spec'},
+        name => $_->{'name'},
+        descriptions => [ map { {description => $_} } @{ $_->{'descriptions'} } ]
+    };
+}
+
+$template->param(
+    sets_loop => \@sets_loop,
+);
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/installer/data/mysql/atomicupdate/oai_sets.sql b/installer/data/mysql/atomicupdate/oai_sets.sql
new file mode 100644
index 0000000..a843ab7
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/oai_sets.sql
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS `oai_sets_descriptions`;
+DROP TABLE IF EXISTS `oai_sets_mappings`;
+DROP TABLE IF EXISTS `oai_sets_biblios`;
+DROP TABLE IF EXISTS `oai_sets`;
+
+CREATE TABLE `oai_sets` (
+  `id` int(11) NOT NULL auto_increment,
+  `spec` varchar(80) NOT NULL UNIQUE,
+  `name` varchar(80) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `oai_sets_descriptions` (
+  `set_id` int(11) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  CONSTRAINT `oai_sets_descriptions_ibfk_1` FOREIGN KEY (`set_id`) REFERENCES `oai_sets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `oai_sets_mappings` (
+  `set_id` int(11) NOT NULL,
+  `marcfield` char(3) NOT NULL,
+  `marcsubfield` char(1) NOT NULL,
+  `marcvalue` varchar(80) NOT NULL,
+  CONSTRAINT `oai_sets_mappings_ibfk_1` FOREIGN KEY (`set_id`) REFERENCES `oai_sets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `oai_sets_biblios` (
+  `biblionumber` int(11) NOT NULL,
+  `set_id` int(11) NOT NULL,
+  PRIMARY KEY (`biblionumber`, `set_id`),
+  CONSTRAINT `oai_sets_biblios_ibfk_1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `oai_sets_biblios_ibfk_2` FOREIGN KEY (`set_id`) REFERENCES `oai_sets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OAI-PMH:AutoUpdateSets','0','Automatically update OAI sets when a bibliographic record is created or updated','','YesNo');
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 37113c2..daf0acb 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1353,6 +1353,55 @@ CREATE TABLE `nozebra` (
   ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
+-- Table structure for table `oai_sets`
+--
+
+DROP TABLE IF EXISTS `oai_sets`;
+CREATE TABLE `oai_sets` (
+  `id` int(11) NOT NULL auto_increment,
+  `spec` varchar(80) NOT NULL UNIQUE,
+  `name` varchar(80) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `oai_sets_descriptions`
+--
+
+DROP TABLE IF EXISTS `oai_sets_descriptions`;
+CREATE TABLE `oai_sets_descriptions` (
+  `set_id` int(11) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  CONSTRAINT `oai_sets_descriptions_ibfk_1` FOREIGN KEY (`set_id`) REFERENCES `oai_sets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `oai_sets_mappings`
+--
+
+DROP TABLE IF EXISTS `oai_sets_mappings`;
+CREATE TABLE `oai_sets_mappings` (
+  `set_id` int(11) NOT NULL,
+  `marcfield` char(3) NOT NULL,
+  `marcsubfield` char(1) NOT NULL,
+  `marcvalue` varchar(80) NOT NULL,
+  CONSTRAINT `oai_sets_mappings_ibfk_1` FOREIGN KEY (`set_id`) REFERENCES `oai_sets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `oai_sets_biblios`
+--
+
+DROP TABLE IF EXISTS `oai_sets_biblios`;
+CREATE TABLE `oai_sets_biblios` (
+  `biblionumber` int(11) NOT NULL,
+  `set_id` int(11) NOT NULL,
+  PRIMARY KEY (`biblionumber`, `set_id`),
+  CONSTRAINT `oai_sets_biblios_ibfk_1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `oai_sets_biblios_ibfk_2` FOREIGN KEY (`set_id`) REFERENCES `oai_sets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
 -- Table structure for table `old_issues`
 --
 
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 0cc79b2..1b5a60a 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -336,3 +336,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('BorrowerRenewalPeriodBase', 'now', 'Set whether the borrower renewal date should be counted from the dateexpiry or from the current date ','dateexpiry|now','Choice');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('AllowItemsOnHoldCheckout',0,'Do not generate RESERVE_WAITING and RESERVED warning when checking out items reserved to someone else. This allows self checkouts for those items.','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacExportOptions','bibtex|dc|marcxml|marc8|utf8|marcstd|mods|ris','Define export options available on OPAC detail page.','','free');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OAI-PMH:AutoUpdateSets','0','Automatically update OAI sets when a bibliographic record is created or updated','','YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 0ef0b1f..435f69a 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4684,6 +4684,16 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    my $installer = C4::Installer->new();
+    my $full_path = C4::Context->config('intranetdir') . "/installer/data/$installer->{dbms}/atomicupdate/oai_sets.sql";
+    my $error     = $installer->load_sql($full_path);
+    warn $error if $error;
+    print "Upgrade to $DBversion done (Atomic update for OAI-PMH sets management)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index e9537f4..74dd667 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -43,6 +43,7 @@
     <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li>
     <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></li>
     <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>
+    <li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI Sets configuration</a></li>
 </ul>
 
 <h5>Acquisition parameters</h5>
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 fe76ae8..cea2215 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
@@ -74,6 +74,8 @@
     <dd>Define classification sources (i.e., call number schemes) used by your collection.  Also define filing rules used for sorting call numbers.</dd>
     <dt><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></dt>
     <dd>Manage rules for automatically matching MARC records during record imports.</dd>
+    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI Sets Configuration</a></dt>
+    <dd>Manage OAI Sets</dd>
 </dl>
 
 <h3>Acquisition parameters</h3>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
new file mode 100644
index 0000000..894d7d5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
@@ -0,0 +1,103 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Admin &rsaquo; OAI Set Mappings</title>
+[% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function() {
+    // Some JS
+});
+
+function newCondition() {
+    var tr = $('#ORbutton').parents('tr');
+    var clone = $(tr).clone();
+    $("#ORbutton").parent('td').replaceWith('<td style="text-align:center">OR</td>');
+    $(tr).parent('tbody').append(clone);
+}
+
+function hideDialogBox() {
+    $('div.dialog').remove();
+}
+
+function returnToSetsPage() {
+    window.location.href = "/cgi-bin/koha/admin/oai_sets.pl";
+}
+//]]>
+</script>
+</head>
+
+<body>
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id %]">OAI Set Mappings</a></div>
+
+<div id="doc3" class="yui-t2">
+
+<div id="bd">
+  <div id="yui-main">
+    <div class="yui-b">
+      [% IF ( mappings_saved ) %]
+        <div class="dialog">
+          <p>Mappings have been saved</p>
+          <p><a href="/cgi-bin/koha/admin/oai_sets.pl">Return to sets management</a></p>
+        </div>
+      [% END %]
+      <h1>Mappings for set '[% setName %]' ([% setSpec %])</h1>
+      [% UNLESS ( mappings ) %]
+        <p class="warning">Warning: no mappings defined for this set</p>
+      [% END %]
+      <form action="/cgi-bin/koha/admin/oai_set_mappings.pl" method="post" onsubmit="hideDialogBox();">
+        <table id="mappings">
+          <thead>
+            <tr>
+              <th>Field</th>
+              <th>Subfield</th>
+              <th>&nbsp;</th>
+              <th>Value</th>
+              <th>&nbsp;</th>
+            </tr>
+          </thead>
+          <tbody>
+            [% IF ( mappings ) %]
+              [% FOREACH mapping IN mappings %]
+                <tr>
+                  <td><input type="text" name="marcfield" size="3" value="[% mapping.marcfield %]" /></td>
+                  <td style="text-align:center"><input type="text" name="marcsubfield" size="1" value="[% mapping.marcsubfield %]" /></td>
+                  <td>is equal to</td>
+                  <td><input type="text" name="marcvalue" value="[% mapping.marcvalue %]" /></td>
+                  <td style="text-align:center">
+                    [% IF ( loop.last ) %]
+                      <input type="button" id="ORbutton" value="OR" onclick="newCondition()"/>
+                    [% ELSE %]
+                      OR
+                    [% END %]
+                  </td>
+                </tr>
+              [% END %]
+            [% ELSE %]
+              <tr>
+                <td><input type="text" name="marcfield" size="3" /></td>
+                <td style="text-align:center"><input type="text" name="marcsubfield" size="1" /></td>
+                <td>is equal to</td>
+                <td><input type="text" name="marcvalue" /></td>
+                <td><input type="button" id="ORbutton" value="OR" onclick="newCondition()"/></td>
+              </tr>
+            [% END %]
+          </tbody>
+        </table>
+        <p class="hint">Hint: to delete a line, empty at least one of the text fields in this line</p>
+        <input type="hidden" name="id" value="[% id %]" />
+        <input type="hidden" name="op" value="save" />
+        <fieldset class="action">
+            <input type="submit" value="Save" />
+            <input type="button" value="Cancel" onclick="returnToSetsPage();" />
+        </fieldset>
+      </form>
+
+    </div>
+  </div>
+  <div class="yui-b">
+    [% INCLUDE 'admin-menu.inc' %]
+  </div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
new file mode 100644
index 0000000..444f972
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
@@ -0,0 +1,140 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Admin &rsaquo; OAI Sets</title>
+[% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+function newDescField() {
+    $("#descriptionlist").append(
+        '<li>' +
+        '<textarea style="vertical-align:middle" name="description"></textarea>' +
+        '<a style="cursor:pointer" onclick="delDescField(this)">&nbsp;&times;</a>' +
+        '</li>'
+    );
+}
+
+function delDescField(minusButton) {
+    var li = $(minusButton).parent('li');
+    $(li).remove();
+}
+
+$(document).ready(function() {
+    // Some JS
+});
+//]]>
+</script>
+</head>
+
+<body>
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; OAI Sets</div>
+
+<div id="doc3" class="yui-t2">
+
+<div id="bd">
+  <div id="yui-main">
+    <div class="yui-b">
+      <h1>OAI Sets Configuration</h1>
+
+        [% IF op_new %]
+            <h2>Add a new set</h2>
+            <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl">
+                <input type="hidden" name="op" value="savenew" />
+                <fieldset>
+                    <label for="spec">setSpec</label>
+                    <input type="text" id="spec" name="spec" />
+                    <br />
+                    <label for="name">setName</label>
+                    <input type="text" id="name" name="name" />
+                    <br />
+                    <label>setDescriptions</label>
+                    <ul id="descriptionlist">
+                    </ul>
+                    <a style="cursor:pointer" onclick='newDescField()'>Add description</a>
+                </fieldset>
+                <input type="submit" value="Save" />
+                <input type="button" value="Cancel" onclick="window.location.href = '/cgi-bin/koha/admin/oai_sets.pl'" />
+            </form>
+        [% ELSE %][% IF op_mod %]
+            <h2>Modify set '[% spec %]'</h2>
+            <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl">
+                <input type="hidden" name="op" value="savemod" />
+                <input type="hidden" name="id" value="[% id %]" />
+                <fieldset>
+                    <label for="spec">setSpec</label>
+                    <input type="text" id="spec" name="spec" value="[% spec %]" />
+                    <br />
+                    <label for="name">setName</label>
+                    <input type="text" id="name" name="name" value="[% name %]" />
+                    <br />
+                    <label>setDescriptions</label>
+                    <ul id="descriptionlist">
+                        [% FOREACH desc IN descriptions %]
+                            <li>
+                                <textarea style="vertical-align:middle" name="description">[% desc.description %]</textarea>
+                                <a style="cursor:pointer" onclick="delDescField(this)">&nbsp;&times;</a>
+                            </li>
+                        [% END %]
+                    </ul>
+                    <a style="cursor:pointer" onclick='newDescField()'>Add description</a>
+                </fieldset>
+                <input type="submit" value="Save" />
+                <input type="button" value="Cancel" onclick="window.location.href = '/cgi-bin/koha/admin/oai_sets.pl'" />
+            </form>
+        [% END %]
+        [% END %]
+
+        <h2>List of sets</h2>
+        [% UNLESS ( op_new ) %]
+            <a href="/cgi-bin/koha/admin/oai_sets.pl?op=new">Add a new set</a>
+        [% END %]
+        [% IF sets_loop %]
+            <table>
+                <thead>
+                    <tr>
+                        <th>setSpec</th>
+                        <th>setName</th>
+                        <th>setDescriptions</th>
+                        <th>Action</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    [% FOREACH set IN sets_loop %]
+                        <tr>
+                            <td>[% set.spec %]</td>
+                            <td>[% set.name %]</td>
+                            <td>
+                                [% IF set.descriptions %]
+                                    <ul>
+                                        [% FOREACH desc IN set.descriptions %]
+                                            <li>[% desc.description %]</li>
+                                        [% END %]
+                                    </ul>
+                                [% ELSE %]
+                                    <em>No descriptions</em>
+                                [% END %]
+                            </td>
+                            <td>
+                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id %]">Modify</a>
+                                |
+                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id %]">Delete</a>
+                                |
+                                <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id %]">Define mappings</a>
+                            </td>
+                        </tr>
+                    [% END %]
+                </tbody>
+            </table>
+        [% ELSE %]
+            <p>There is no set defined.</p>
+        [% END %]
+
+
+    </div>
+  </div>
+  <div class="yui-b">
+    [% INCLUDE 'admin-menu.inc' %]
+  </div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
index f4f5d6f..fae1fa9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
@@ -21,6 +21,12 @@ Web Services:
             - pref: "OAI-PMH:ConfFile"
               class: file
             - . If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode. In extended mode, it's possible to parameter other formats than marcxml or Dublin Core. OAI-PMH:ConfFile specify a YAML configuration file which list available metadata formats and XSL file used to create them from marcxml records.
+        -
+            - pref: "OAI-PMH:AutoUpdateSets"
+              choices:
+                  yes: Enable
+                  no: Disable
+            - automatic update of OAI-PMH sets when a bibliographic record is created or updated
     ILS-DI:
         -
             - pref: ILS-DI
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
new file mode 100644
index 0000000..39fd21b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
@@ -0,0 +1,40 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>OAI-PMH Sets Mappings Configuration</h1>
+
+<p>
+    Here you can define how a set will be build (what records will belong to
+    this set) by defining mappings. Mappings are a list of conditions on record
+    content. A record only need to match one condition to belong to the set.
+<p>
+
+<h2>Defining a mapping</h2>
+<ol>
+    <li>
+        Fill the fields 'Field', 'Subfield' and 'Value'. For example if you
+        want to include in this set all records that have a 999$9 equal to
+        'XXX'. Fill 'Field' with 999, 'Subfield' with 9 and 'Value' with XXX.
+    </li>
+    <li>
+        If you want to add another condition, click on 'OR' button and repeat
+        step 1.
+    </li>
+    <li>Click on 'Save'</li>
+</ol>
+
+<p>
+    To delete a condition, just leave at least one of 'Field', 'Subfield' or
+    'Value' empty and click on 'Save'.
+</p>
+
+<p>
+    Note: Actually, a condition is true if value in the corresponding subfield
+    is strictly equal to what is defined if 'Value'. A record having
+    999$9 = 'XXX YYY' will not belong to a set where condition is
+    999$9 = 'XXX'.
+    <br />
+    And it is case sensitive : a record having 999$9 = 'xxx' will not belong
+    to a set where condition is 999$9 = 'XXX'.
+</p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
new file mode 100644
index 0000000..7fc46cc
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
@@ -0,0 +1,49 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>OAI-PMH Sets Configuration</h1>
+
+<p>On this page you can create, modify and delete OAI-PMH sets<p>
+
+<h2>Create a set</h2>
+
+<ol>
+    <li>Click on the link 'Add a new set'</li>
+    <li>Fill the mandatory fields 'setSpec' and 'setName'</li>
+    <li>
+        Then you can add descriptions for this set. To do this click on
+        'Add description' and fill the newly created text box. You can add as
+        many descriptions as you want.
+    </li>
+    <li>Click on 'Save' button'</li>
+</ol>
+
+<h2>Modify a set</h2>
+
+<p>
+    To modify a set, just click on the link 'Modify' on the same line of the
+    set you want to modify. A form similar to set creation form will appear and
+    allow you to modify the setSpec, setName and descriptions.
+<p>
+
+<h2>Delete a set</h2>
+
+<p>
+    To delete a set, just click on the link 'Delete' on the same line of the
+    set you want to delete.
+</p>
+
+<h2>Define mappings</h2>
+
+<p>
+    The 'Define mappings' link allow you to tell how the set will be build
+    (what records will belong to this set)
+</p>
+
+<h2>Build sets</h2>
+
+<p>
+    Once you have configured all your sets, you have to build the sets. This is
+    done by calling the script misc/migration_tools/build_oai_sets.pl.
+</p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
index 6352384..a75b800 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
@@ -163,9 +163,10 @@
       </dc:identifier>
     </xsl:for-each>
     <xsl:for-each select="marc:datafield[@tag=090]">
-       <dc:identifier>
-      <xsl:text>http://opac.mylibrary.org/bib/</xsl:text>
-      <xsl:value-of select="marc:subfield[@code='a']"/>
+      <dc:identifier>
+        <xsl:value-of select="$OPACBaseURL" />
+        <xsl:text>/bib/</xsl:text>
+        <xsl:value-of select="marc:subfield[@code='a']"/>
       </dc:identifier>
     </xsl:for-each>
     <xsl:for-each select="marc:datafield[@tag=995]">
@@ -175,10 +176,10 @@
         <xsl:when test="marc:subfield[@code='c']='MAIN'">Main Branch</xsl:when>
         <xsl:when test="marc:subfield[@code='c']='BIB2'">Library 2</xsl:when>
       </xsl:choose>
-      <xsl:foreach select="marc:subfield[@code='k']">
+      <xsl:for-each select="marc:subfield[@code='k']">
         <xsl:text>:</xsl:text>
         <xsl:value-of select="."/>
-      </xsl:foreach>
+      </xsl:for-each>
       </dc:identifier>
     </xsl:for-each>
   </xsl:template>
diff --git a/misc/migration_tools/build_oai_sets.pl b/misc/migration_tools/build_oai_sets.pl
new file mode 100755
index 0000000..577c06e
--- /dev/null
+++ b/misc/migration_tools/build_oai_sets.pl
@@ -0,0 +1,165 @@
+#!/usr/bin/perl
+
+# Copyright 2011 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.
+
+=head1 DESCRIPTION
+
+This script build OAI-PMH sets (to be used by opac/oai.pl) according to sets
+and mappings defined in Koha. It reads informations from oai_sets and
+oai_sets_mappings, and then fill table oai_sets_biblios with builded infos.
+
+=head1 USAGE
+
+    build_oai_sets.pl [-h] [-v] [-r] [-i] [-l LENGTH [-o OFFSET]]
+        -h          Print help message;
+        -v          Be verbose
+        -r          Truncate table oai_sets_biblios before inserting new rows
+        -i          Embed items informations, mandatory if you defined mappings
+                    on item fields
+        -l LENGTH   Process LENGTH biblios
+        -o OFFSET   If LENGTH is defined, start processing from OFFSET
+
+=cut
+
+use Modern::Perl;
+use MARC::Record;
+use MARC::File::XML;
+use List::MoreUtils qw/uniq/;
+use Getopt::Std;
+
+use C4::Context;
+use C4::Charset qw/StripNonXmlChars/;
+use C4::Biblio;
+use C4::OAI::Sets;
+
+my %opts;
+$Getopt::Std::STANDARD_HELP_VERSION = 1;
+my $go = getopts('vo:l:ihr', \%opts);
+
+if(!$go or $opts{h}){
+    &print_usage;
+    exit;
+}
+
+my $verbose = $opts{v};
+my $offset = $opts{o};
+my $length = $opts{l};
+my $embed_items = $opts{i};
+my $reset = $opts{r};
+
+my $dbh = C4::Context->dbh;
+
+# Get OAI sets mappings
+my $mappings = GetOAISetsMappings;
+
+# Get all biblionumbers and marcxml
+print "Retrieving biblios... " if $verbose;
+my $query = qq{
+    SELECT biblionumber, marcxml
+    FROM biblioitems
+};
+if($length) {
+    $query .= "LIMIT $length";
+    if($offset) {
+        $query .= " OFFSET $offset";
+    }
+}
+my $sth = $dbh->prepare($query);
+$sth->execute;
+my $results = $sth->fetchall_arrayref({});
+print "done.\n" if $verbose;
+
+# Build lists of parents sets
+my $sets = GetOAISets;
+my $parentsets;
+foreach my $set (@$sets) {
+    my $setSpec = $set->{'spec'};
+    while($setSpec =~ /^(.+):(.+)$/) {
+        my $parent = $1;
+        my $parent_set = GetOAISetBySpec($parent);
+        if($parent_set) {
+            push @{ $parentsets->{$set->{'id'}} }, $parent_set->{'id'};
+            $setSpec = $parent;
+        } else {
+            last;
+        }
+    }
+}
+
+my $num_biblios = scalar @$results;
+my $i = 1;
+my $sets_biblios = {};
+foreach my $res (@$results) {
+    my $biblionumber = $res->{'biblionumber'};
+    my $marcxml = $res->{'marcxml'};
+    if($verbose and $i % 1000 == 0) {
+        my $percent = ($i * 100) / $num_biblios;
+        $percent = sprintf("%.2f", $percent);
+        say "Progression: $i/$num_biblios ($percent %)";
+    }
+    # The following lines are copied from GetMarcBiblio
+    # We don't call GetMarcBiblio to avoid a sql query to be executed each time
+    $marcxml = StripNonXmlChars($marcxml);
+    MARC::File::XML->default_record_format(C4::Context->preference('marcflavour'));
+    my $record;
+    eval {
+        $record = MARC::Record::new_from_xml($marcxml, "utf8", C4::Context->preference('marcflavour'));
+    };
+    if($@) {
+        warn "(biblio $biblionumber) Error while creating record from marcxml: $@";
+        next;
+    }
+    if($embed_items) {
+        C4::Biblio::EmbedItemsInMarcBiblio($record, $biblionumber);
+    }
+
+    my @biblio_sets = CalcOAISetsBiblio($record, $mappings);
+    foreach my $set_id (@biblio_sets) {
+        push @{ $sets_biblios->{$set_id} }, $biblionumber;
+        foreach my $parent_set_id ( @{ $parentsets->{$set_id} } ) {
+            push @{ $sets_biblios->{$parent_set_id} }, $biblionumber;
+        }
+    }
+    $i++;
+}
+say "Progression: done." if $verbose;
+
+say "Summary:";
+foreach my $set_id (keys %$sets_biblios) {
+    $sets_biblios->{$set_id} = [ uniq @{ $sets_biblios->{$set_id} } ];
+    my $set = GetOAISet($set_id);
+    my $setSpec = $set->{'spec'};
+    say "Set '$setSpec': ". scalar(@{$sets_biblios->{$set_id}}) ." biblios";
+}
+
+print "Updating database... ";
+if($reset) {
+    ModOAISetsBiblios( {} );
+}
+AddOAISetsBiblios($sets_biblios);
+print "done.\n";
+
+sub print_usage {
+    print "build_oai_sets.pl: Build OAI-PMH sets, according to mappings defined in Koha\n";
+    print "Usage: build_oai_sets.pl [-h] [-v] [-i] [-l LENGTH [-o OFFSET]]\n\n";
+    print "\t-h\t\tPrint this help and exit\n";
+    print "\t-v\t\tBe verbose\n";
+    print "\t-i\t\tEmbed items informations, mandatory if you defined mappings on item fields\n";
+    print "\t-l LENGTH\tProcess LENGTH biblios\n";
+    print "\t-o OFFSET\tIf LENGTH is defined, start processing from OFFSET\n\n";
+}
diff --git a/opac/oai.pl b/opac/oai.pl
index 2ef3f28..bad250a 100755
--- a/opac/oai.pl
+++ b/opac/oai.pl
@@ -2,7 +2,6 @@
 
 use strict;
 use warnings;
-use diagnostics;
 
 use CGI qw/:standard -oldstyle_urls/;
 use vars qw( $GZIP );
@@ -59,7 +58,6 @@ package C4::OAI::ResumptionToken;
 
 use strict;
 use warnings;
-use diagnostics;
 use HTTP::OAI;
 
 use base ("HTTP::OAI::ResumptionToken");
@@ -70,9 +68,9 @@ sub new {
 
     my $self = $class->SUPER::new(%args);
 
-    my ($metadata_prefix, $offset, $from, $until);
+    my ($metadata_prefix, $offset, $from, $until, $set);
     if ( $args{ resumptionToken } ) {
-        ($metadata_prefix, $offset, $from, $until)
+        ($metadata_prefix, $offset, $from, $until, $set)
             = split( ':', $args{resumptionToken} );
     }
     else {
@@ -84,15 +82,17 @@ sub new {
             $until = sprintf( "%.4d-%.2d-%.2d", $year+1900, $mon+1,$mday );
         }
         $offset = $args{ offset } || 0;
+        $set = $args{set};
     }
 
     $self->{ metadata_prefix } = $metadata_prefix;
     $self->{ offset          } = $offset;
     $self->{ from            } = $from;
     $self->{ until           } = $until;
+    $self->{ set             } = $set;
 
     $self->resumptionToken(
-        join( ':', $metadata_prefix, $offset, $from, $until ) );
+        join( ':', $metadata_prefix, $offset, $from, $until, $set ) );
     $self->cursor( $offset );
 
     return $self;
@@ -106,7 +106,6 @@ package C4::OAI::Identify;
 
 use strict;
 use warnings;
-use diagnostics;
 use HTTP::OAI;
 use C4::Context;
 
@@ -145,7 +144,6 @@ package C4::OAI::ListMetadataFormats;
 
 use strict;
 use warnings;
-use diagnostics;
 use HTTP::OAI;
 
 use base ("HTTP::OAI::ListMetadataFormats");
@@ -188,14 +186,13 @@ package C4::OAI::Record;
 
 use strict;
 use warnings;
-use diagnostics;
 use HTTP::OAI;
 use HTTP::OAI::Metadata::OAI_DC;
 
 use base ("HTTP::OAI::Record");
 
 sub new {
-    my ($class, $repository, $marcxml, $timestamp, %args) = @_;
+    my ($class, $repository, $marcxml, $timestamp, $setSpecs, %args) = @_;
 
     my $self = $class->SUPER::new(%args);
 
@@ -205,11 +202,18 @@ sub new {
         datestamp   => $timestamp,
     ) );
 
+    foreach my $setSpec (@$setSpecs) {
+        $self->header->setSpec($setSpec);
+    }
+
     my $parser = XML::LibXML->new();
     my $record_dom = $parser->parse_string( $marcxml );
     my $format =  $args{metadataPrefix};
     if ( $format ne 'marcxml' ) {
-        $record_dom = $repository->stylesheet($format)->transform( $record_dom );
+        my %args = (
+            OPACBaseURL => "'" . C4::Context->preference('OPACBaseURL') . "'"
+        );
+        $record_dom = $repository->stylesheet($format)->transform($record_dom, %args);
     }
     $self->metadata( HTTP::OAI::Metadata->new( dom => $record_dom ) );
 
@@ -224,8 +228,8 @@ package C4::OAI::GetRecord;
 
 use strict;
 use warnings;
-use diagnostics;
 use HTTP::OAI;
+use C4::OAI::Sets;
 
 use base ("HTTP::OAI::GetRecord");
 
@@ -254,9 +258,15 @@ sub new {
         );
     }
 
+    my $oai_sets = GetOAISetsBiblio($biblionumber);
+    my @setSpecs;
+    foreach (@$oai_sets) {
+        push @setSpecs, $_->{spec};
+    }
+
     #$self->header( HTTP::OAI::Header->new( identifier  => $args{identifier} ) );
     $self->record( C4::OAI::Record->new(
-        $repository, $marcxml, $timestamp, %args ) );
+        $repository, $marcxml, $timestamp, \@setSpecs, %args ) );
 
     return $self;
 }
@@ -269,8 +279,8 @@ package C4::OAI::ListIdentifiers;
 
 use strict;
 use warnings;
-use diagnostics;
 use HTTP::OAI;
+use C4::OAI::Sets;
 
 use base ("HTTP::OAI::ListIdentifiers");
 
@@ -282,42 +292,148 @@ sub new {
 
     my $token = new C4::OAI::ResumptionToken( %args );
     my $dbh = C4::Context->dbh;
-    my $sql = "SELECT biblionumber, timestamp
-               FROM   biblioitems
-               WHERE  timestamp >= ? AND timestamp <= ?
-               LIMIT  " . $repository->{koha_max_count} . "
-               OFFSET " . $token->{offset};
+    my $set;
+    if(defined $token->{'set'}) {
+        $set = GetOAISetBySpec($token->{'set'});
+    }
+    my $sql = "
+        SELECT biblioitems.biblionumber, biblioitems.timestamp
+        FROM biblioitems
+    ";
+    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
+    $sql .= " WHERE DATE(timestamp) >= ? AND DATE(timestamp) <= ? ";
+    $sql .= " AND oai_sets_biblios.set_id = ? " if defined $set;
+    $sql .= "
+        LIMIT $repository->{'koha_max_count'}
+        OFFSET $token->{'offset'}
+    ";
     my $sth = $dbh->prepare( $sql );
-   	$sth->execute( $token->{from}, $token->{until} );
+    my @bind_params = ($token->{'from'}, $token->{'until'});
+    push @bind_params, $set->{'id'} if defined $set;
+    $sth->execute( @bind_params );
 
     my $pos = $token->{offset};
- 	while ( my ($biblionumber, $timestamp) = $sth->fetchrow ) {
- 	    $timestamp =~ s/ /T/, $timestamp .= 'Z';
+    while ( my ($biblionumber, $timestamp) = $sth->fetchrow ) {
+        $timestamp =~ s/ /T/, $timestamp .= 'Z';
         $self->identifier( new HTTP::OAI::Header(
             identifier => $repository->{ koha_identifier} . ':' . $biblionumber,
             datestamp  => $timestamp,
         ) );
         $pos++;
- 	}
- 	$self->resumptionToken( new C4::OAI::ResumptionToken(
-        metadataPrefix  => $token->{metadata_prefix},
-        from            => $token->{from},
-        until           => $token->{until},
-        offset          => $pos ) ) if ($pos > $token->{offset});
+    }
+    $self->resumptionToken(
+        new C4::OAI::ResumptionToken(
+            metadataPrefix  => $token->{metadata_prefix},
+            from            => $token->{from},
+            until           => $token->{until},
+            offset          => $pos,
+            set             => $token->{set}
+        )
+    ) if ($pos > $token->{offset});
 
     return $self;
 }
 
 # __END__ C4::OAI::ListIdentifiers
 
+package C4::OAI::Description;
+
+use strict;
+use warnings;
+use HTTP::OAI;
+use HTTP::OAI::SAXHandler qw/ :SAX /;
+
+sub new {
+    my ( $class, %args ) = @_;
+
+    my $self = {};
+
+    if(my $setDescription = $args{setDescription}) {
+        $self->{setDescription} = $setDescription;
+    }
+    if(my $handler = $args{handler}) {
+        $self->{handler} = $handler;
+    }
+
+    bless $self, $class;
+    return $self;
+}
+
+sub set_handler {
+    my ( $self, $handler ) = @_;
+
+    $self->{handler} = $handler if $handler;
+
+    return $self;
+}
+
+sub generate {
+    my ( $self ) = @_;
+
+    g_data_element($self->{handler}, 'http://www.openarchives.org/OAI/2.0/', 'setDescription', {}, $self->{setDescription});
+
+    return $self;
+}
+
+# __END__ C4::OAI::Description
+
+package C4::OAI::ListSets;
+
+use strict;
+use warnings;
+use HTTP::OAI;
+use C4::OAI::Sets;
+
+use base ("HTTP::OAI::ListSets");
+
+sub new {
+    my ( $class, $repository, %args ) = @_;
+
+    my $self = HTTP::OAI::ListSets->new(%args);
+
+    my $token = C4::OAI::ResumptionToken->new(%args);
+    my $sets = GetOAISets;
+    my $pos = 0;
+    foreach my $set (@$sets) {
+        if ($pos < $token->{offset}) {
+            $pos++;
+            next;
+        }
+        my @descriptions;
+        foreach my $desc (@{$set->{'descriptions'}}) {
+            push @descriptions, C4::OAI::Description->new(
+                setDescription => $desc,
+            );
+        }
+        $self->set(
+            HTTP::OAI::Set->new(
+                setSpec => $set->{'spec'},
+                setName => $set->{'name'},
+                setDescription => \@descriptions,
+            )
+        );
+        $pos++;
+        last if ($pos + 1 - $token->{offset}) > $repository->{koha_max_count};
+    }
 
+    $self->resumptionToken(
+        new C4::OAI::ResumptionToken(
+            metadataPrefix => $token->{metadata_prefix},
+            offset         => $pos
+        )
+    ) if ( $pos > $token->{offset} );
+
+    return $self;
+}
+
+# __END__ C4::OAI::ListSets;
 
 package C4::OAI::ListRecords;
 
 use strict;
 use warnings;
-use diagnostics;
 use HTTP::OAI;
+use C4::OAI::Sets;
 
 use base ("HTTP::OAI::ListRecords");
 
@@ -329,28 +445,50 @@ sub new {
 
     my $token = new C4::OAI::ResumptionToken( %args );
     my $dbh = C4::Context->dbh;
-    my $sql = "SELECT biblionumber, marcxml, timestamp
-               FROM   biblioitems
-               WHERE  timestamp >= ? AND timestamp <= ?
-               LIMIT  " . $repository->{koha_max_count} . "
-               OFFSET " . $token->{offset};
+    my $set;
+    if(defined $token->{'set'}) {
+        $set = GetOAISetBySpec($token->{'set'});
+    }
+    my $sql = "
+        SELECT biblioitems.biblionumber, biblioitems.marcxml, biblioitems.timestamp
+        FROM biblioitems
+    ";
+    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
+    $sql .= " WHERE DATE(timestamp) >= ? AND DATE(timestamp) <= ? ";
+    $sql .= " AND oai_sets_biblios.set_id = ? " if defined $set;
+    $sql .= "
+        LIMIT $repository->{'koha_max_count'}
+        OFFSET $token->{'offset'}
+    ";
+
     my $sth = $dbh->prepare( $sql );
-   	$sth->execute( $token->{from}, $token->{until} );
+    my @bind_params = ($token->{'from'}, $token->{'until'});
+    push @bind_params, $set->{'id'} if defined $set;
+    $sth->execute( @bind_params );
 
     my $pos = $token->{offset};
- 	while ( my ($biblionumber, $marcxml, $timestamp) = $sth->fetchrow ) {
+    while ( my ($biblionumber, $marcxml, $timestamp) = $sth->fetchrow ) {
+        my $oai_sets = GetOAISetsBiblio($biblionumber);
+        my @setSpecs;
+        foreach (@$oai_sets) {
+            push @setSpecs, $_->{spec};
+        }
         $self->record( C4::OAI::Record->new(
-            $repository, $marcxml, $timestamp,
+            $repository, $marcxml, $timestamp, \@setSpecs,
             identifier      => $repository->{ koha_identifier } . ':' . $biblionumber,
             metadataPrefix  => $token->{metadata_prefix}
         ) );
         $pos++;
- 	}
- 	$self->resumptionToken( new C4::OAI::ResumptionToken(
-        metadataPrefix  => $token->{metadata_prefix},
-        from            => $token->{from},
-        until           => $token->{until},
-        offset          => $pos ) ) if ($pos > $token->{offset});
+    }
+    $self->resumptionToken(
+        new C4::OAI::ResumptionToken(
+            metadataPrefix  => $token->{metadata_prefix},
+            from            => $token->{from},
+            until           => $token->{until},
+            offset          => $pos,
+            set             => $token->{set}
+        )
+    ) if ($pos > $token->{offset});
 
     return $self;
 }
@@ -365,7 +503,6 @@ use base ("HTTP::OAI::Repository");
 
 use strict;
 use warnings;
-use diagnostics;
 
 use HTTP::OAI;
 use HTTP::OAI::Repository qw/:validate/;
@@ -418,14 +555,8 @@ sub new {
     else {
         my %attr = CGI::Vars();
         my $verb = delete( $attr{verb} );
-        if ( grep { $_ eq $verb } qw( ListSets ) ) {
-            $response = HTTP::OAI::Response->new(
-                requestURL  => $self->self_url(),
-                errors      => [ new HTTP::OAI::Error(
-                    code    => 'noSetHierarchy',
-                    message => "Koha repository doesn't have sets",
-                    ) ] ,
-            );
+        if ( $verb eq 'ListSets' ) {
+            $response = C4::OAI::ListSets->new($self, %attr);
         }
         elsif ( $verb eq 'Identify' ) {
             $response = C4::OAI::Identify->new( $self );
-- 
1.7.9


From julian.maurice at biblibre.com  Thu Feb 16 16:04:15 2012
From: julian.maurice at biblibre.com (julian.maurice at biblibre.com)
Date: Thu, 16 Feb 2012 16:04:15 +0100
Subject: [Koha-patches] [PATCH 1/2] Bug 5339: Invoices management improvement
Message-ID: <1329404656-23648-1-git-send-email-julian.maurice@biblibre.com>

From: Julian Maurice <julian.maurice at biblibre.com>

Database update files
---
 installer/data/mysql/kohastructure.sql |   26 +++++++++++++-
 installer/data/mysql/updatedatabase.pl |   59 ++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 37113c2..c4f2ee7 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2607,7 +2607,7 @@ CREATE TABLE `aqorders` (
   `listprice` decimal(28,6) default NULL,
   `totalamount` decimal(28,6) default NULL,
   `datereceived` date default NULL,
-  `booksellerinvoicenumber` mediumtext,
+  invoiceid int(11) default NULL,
   `freight` decimal(28,6) default NULL,
   `unitprice` decimal(28,6) default NULL,
   `quantityreceived` smallint(6) NOT NULL default 0,
@@ -2639,7 +2639,8 @@ CREATE TABLE `aqorders` (
   KEY `biblionumber` (`biblionumber`),
   KEY `budget_id` (`budget_id`),
   CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE
+  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT aqorders_ibfk_3 FOREIGN KEY (invoiceid) REFERENCES aqinvoices (invoiceid) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -2656,6 +2657,27 @@ CREATE TABLE `aqorders_items` (
   KEY `ordernumber` (`ordernumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+
+--
+-- Table structure for table aqinvoices
+--
+
+DROP TABLE IF EXISTS aqinvoices;
+CREATE TABLE aqinvoices (
+  invoiceid int(11) NOT NULL AUTO_INCREMENT,    -- ID of the invoice, primary key
+  invoicenumber mediumtext NOT NULL,    -- Name of invoice
+  booksellerid int(11) NOT NULL,    -- foreign key to aqbooksellers
+  shipmentdate date default NULL,   -- date of shipment
+  billingdate date default NULL,    -- date of billing
+  closedate date default NULL,  -- invoice close date, NULL means the invoice is open
+  shipmentcost decimal(28,6) default NULL,  -- shipment cost
+  shipmentcost_budgetid int(11) default NULL,   -- foreign key to aqbudgets, link the shipment cost to a budget
+  PRIMARY KEY (invoiceid),
+  CONSTRAINT aqinvoices_fk_aqbooksellerid FOREIGN KEY (booksellerid) REFERENCES aqbooksellers (id) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT aqinvoices_fk_shipmentcost_budgetid FOREIGN KEY (shipmentcost_budgetid) REFERENCES aqbudgets (budget_id) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
 --
 -- Table structure for table `fieldmapping`
 --
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 0ef0b1f..4d9cede 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4684,6 +4684,65 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("
+        CREATE TABLE aqinvoices (
+          invoiceid int(11) NOT NULL AUTO_INCREMENT,
+          invoicenumber mediumtext NOT NULL,
+          booksellerid int(11) NOT NULL,
+          shipmentdate date default NULL,
+          billingdate date default NULL,
+          closedate date default NULL,
+          shipmentcost decimal(28,6) default NULL,
+          shipmentcost_budgetid int(11) default NULL,
+          PRIMARY KEY (invoiceid),
+          CONSTRAINT aqinvoices_fk_aqbooksellerid FOREIGN KEY (booksellerid) REFERENCES aqbooksellers (id) ON DELETE CASCADE ON UPDATE CASCADE,
+          CONSTRAINT aqinvoices_fk_shipmentcost_budgetid FOREIGN KEY (shipmentcost_budgetid) REFERENCES aqbudgets (budget_id) ON DELETE SET NULL ON UPDATE CASCADE
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+    ");
+
+    # Fill this new table with existing invoices
+    my $sth = $dbh->prepare("
+        SELECT aqorders.booksellerinvoicenumber AS invoicenumber, aqbasket.booksellerid
+        FROM aqorders
+          LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
+        WHERE aqorders.booksellerinvoicenumber IS NOT NULL
+          AND aqorders.booksellerinvoicenumber != ''
+        GROUP BY aqorders.booksellerinvoicenumber
+    ");
+    $sth->execute;
+    my $results = $sth->fetchall_arrayref({});
+    $sth = $dbh->prepare("
+        INSERT INTO aqinvoices (invoicenumber, booksellerid) VALUES (?,?)
+    ");
+    foreach(@$results) {
+        $sth->execute($_->{'invoicenumber'}, $_->{'booksellerid'});
+    }
+
+    # Add the column in aqorders, fill it with correct value
+    # and then drop booksellerinvoicenumber column
+    $dbh->do("
+        ALTER TABLE aqorders
+        ADD COLUMN invoiceid int(11) default NULL AFTER booksellerinvoicenumber,
+        ADD CONSTRAINT aqorders_ibfk_3 FOREIGN KEY (invoiceid) REFERENCES aqinvoices (invoiceid) ON DELETE SET NULL ON UPDATE CASCADE
+    ");
+
+    $dbh->do("
+        UPDATE aqorders, aqinvoices
+        SET aqorders.invoiceid = aqinvoices.invoiceid
+        WHERE aqorders.booksellerinvoicenumber = aqinvoices.invoicenumber
+    ");
+
+    $dbh->do("
+        ALTER TABLE aqorders
+        DROP COLUMN booksellerinvoicenumber
+    ");
+
+    print "Upgrade to $DBversion done (Add aqinvoices table) \n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
-- 
1.7.9


From julian.maurice at biblibre.com  Thu Feb 16 16:04:16 2012
From: julian.maurice at biblibre.com (julian.maurice at biblibre.com)
Date: Thu, 16 Feb 2012 16:04:16 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 5339: Invoices management improvement
In-Reply-To: <1329404656-23648-1-git-send-email-julian.maurice@biblibre.com>
References: <1329404656-23648-1-git-send-email-julian.maurice@biblibre.com>
Message-ID: <1329404656-23648-2-git-send-email-julian.maurice@biblibre.com>

From: Julian Maurice <julian.maurice at biblibre.com>

- New pages:
  - invoices.pl: allow to search in invoices on several criteria
  - invoice.pl: permit to view and modify invoice details
    - shipment date
    - billing date
    - shipment cost and budget used for shipment cost

Invoice informations are now stored in their own sql table and aqorders
have a link to it
---
 C4/Acquisition.pm                                  |  354 +++++++++++++++++++-
 C4/Budgets.pm                                      |   24 ++-
 acqui/finishreceive.pl                             |   12 +-
 acqui/invoice.pl                                   |  211 ++++++++++++
 acqui/invoices.pl                                  |  150 +++++++++
 acqui/orderreceive.pl                              |   32 +-
 acqui/parcel.pl                                    |  251 +++++++--------
 acqui/parcels.pl                                   |   48 ++-
 .../prog/en/includes/acquisitions-menu.inc         |    1 +
 .../intranet-tmpl/prog/en/modules/acqui/invoice.tt |  182 ++++++++++
 .../prog/en/modules/acqui/invoices.tt              |  223 ++++++++++++
 .../prog/en/modules/acqui/orderreceive.tt          |    7 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |  208 ++++++------
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |   48 ++--
 14 files changed, 1453 insertions(+), 298 deletions(-)
 create mode 100755 acqui/invoice.pl
 create mode 100755 acqui/invoices.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 0a96a02..df212c6 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -61,6 +61,14 @@ BEGIN {
         &GetParcels &GetParcel
         &GetContracts &GetContract
 
+        &GetInvoices
+        &GetInvoice
+        &GetInvoiceDetails
+        &AddInvoice
+        &ModInvoice
+        &CloseInvoice
+        &ReopenInvoice
+
         &GetItemnumbersFromOrder
 
         &AddClaim
@@ -1103,7 +1111,7 @@ C<$ordernumber>.
 sub ModReceiveOrder {
     my (
         $biblionumber,    $ordernumber,  $quantrec, $user, $cost,
-        $invoiceno, $freight, $rrp, $budget_id, $datereceived
+        $invoiceid, $rrp, $budget_id, $datereceived
     )
     = @_;
     my $dbh = C4::Context->dbh;
@@ -1129,14 +1137,13 @@ sub ModReceiveOrder {
             UPDATE aqorders
             SET quantityreceived=?
                 , datereceived=?
-                , booksellerinvoicenumber=?
+                , invoiceid=?
                 , unitprice=?
-                , freight=?
                 , rrp=?
                 , quantity=?
             WHERE biblionumber=? AND ordernumber=?");
 
-        $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$quantrec,$biblionumber,$ordernumber);
+        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$quantrec,$biblionumber,$ordernumber);
         $sth->finish;
 
         # create a new order for the remaining items, and set its bookfund.
@@ -1148,10 +1155,10 @@ sub ModReceiveOrder {
         my $newOrder = NewOrder($order);
 } else {
         $sth=$dbh->prepare("update aqorders
-                            set quantityreceived=?,datereceived=?,booksellerinvoicenumber=?,
-                                unitprice=?,freight=?,rrp=?
+                            set quantityreceived=?,datereceived=?,invoiceid=?,
+                                unitprice=?,rrp=?
                             where biblionumber=? and ordernumber=?");
-        $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$biblionumber,$ordernumber);
+        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$biblionumber,$ordernumber);
         $sth->finish;
     }
     return $datereceived;
@@ -1801,7 +1808,340 @@ sub AddClaim {
         ";
     my $sth = $dbh->prepare($query);
     $sth->execute($ordernumber);
+}
+
+=head3 GetInvoices
+
+    my @invoices = GetInvoices(
+        invoicenumber => $invoicenumber,
+        suppliername => $suppliername,
+        shipmentdatefrom => $shipmentdatefrom, # ISO format
+        shipmentdateto => $shipmentdateto, # ISO format
+        billingdatefrom => $billingdatefrom, # ISO format
+        billingdateto => $billingdateto, # ISO format
+        isbneanissn => $isbn_or_ean_or_issn,
+        title => $title,
+        author => $author,
+        publisher => $publisher,
+        publicationyear => $publicationyear,
+        branchcode => $branchcode,
+        order_by => $order_by
+    );
+
+Return a list of invoices that match all given criteria.
+
+$order_by is "column_name (asc|desc)", where column_name is any of
+'invoicenumber', 'booksellerid', 'shipmentdate', 'billingdate', 'closedate',
+'shipmentcost', 'shipmentcost_budgetid'.
+
+asc is the default if omitted
+
+=cut
+
+sub GetInvoices {
+    my %args = @_;
+
+    my @columns = qw(invoicenumber booksellerid shipmentdate billingdate
+        closedate shipmentcost shipmentcost_budgetid);
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT aqinvoices.*, aqbooksellers.name AS suppliername,
+          COUNT(
+            DISTINCT IF(
+              aqorders.datereceived IS NOT NULL,
+              aqorders.biblionumber,
+              NULL
+            )
+          ) AS receivedbiblios,
+          SUM(aqorders.quantityreceived) AS receiveditems
+        FROM aqinvoices
+          LEFT JOIN aqbooksellers ON aqbooksellers.id = aqinvoices.booksellerid
+          LEFT JOIN aqorders ON aqorders.invoiceid = aqinvoices.invoiceid
+          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
+          LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber
+          LEFT JOIN subscription ON biblio.biblionumber = subscription.biblionumber
+    };
+
+    my @bind_args;
+    my @bind_strs;
+    if($args{invoicenumber}) {
+        push @bind_strs, " aqinvoices.invoicenumber LIKE ? ";
+        push @bind_args, "%$args{invoicenumber}%";
+    }
+    if($args{suppliername}) {
+        push @bind_strs, " aqbooksellers.name LIKE ? ";
+        push @bind_args, "%$args{suppliername}%";
+    }
+    if($args{shipmentdatefrom}) {
+        push @bind_strs, " aqinvoices.shipementdate >= ? ";
+        push @bind_args, $args{shipementdatefrom};
+    }
+    if($args{shipmentdateto}) {
+        push @bind_strs, " aqinvoices.shipementdate <= ? ";
+        push @bind_args, $args{shipementdateto};
+    }
+    if($args{billingdatefrom}) {
+        push @bind_strs, " aqinvoices.billingdate >= ? ";
+        push @bind_args, $args{billingdatefrom};
+    }
+    if($args{billingdateto}) {
+        push @bind_strs, " aqinvoices.billingdate <= ? ";
+        push @bind_args, $args{billingdateto};
+    }
+    if($args{isbneanissn}) {
+        push @bind_strs, " (biblioitems.isbn LIKE ? OR biblioitems.ean LIKE ? OR biblioitems.issn LIKE ? ) ";
+        push @bind_args, $args{isbneanissn}, $args{isbneanissn}, $args{isbneanissn};
+    }
+    if($args{title}) {
+        push @bind_strs, " biblio.title LIKE ? ";
+        push @bind_args, $args{title};
+    }
+    if($args{author}) {
+        push @bind_strs, " biblio.author LIKE ? ";
+        push @bind_args, $args{author};
+    }
+    if($args{publisher}) {
+        push @bind_strs, " biblioitems.publishercode LIKE ? ";
+        push @bind_args, $args{publisher};
+    }
+    if($args{publicationyear}) {
+        push @bind_strs, " biblioitems.publicationyear = ? ";
+        push @bind_args, $args{publicationyear};
+    }
+    if($args{branchcode}) {
+        push @bind_strs, " aqorders.branchcode = ? ";
+        push @bind_args, $args{branchcode};
+    }
+
+    $query .= " WHERE " . join(" AND ", @bind_strs) if @bind_strs;
+    $query .= " GROUP BY aqinvoices.invoiceid ";
+
+    if($args{order_by}) {
+        my ($column, $direction) = split / /, $args{order_by};
+        if(grep /^$column$/, @columns) {
+            $direction ||= 'ASC';
+            $query .= " ORDER BY $column $direction";
+        }
+    }
+
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@bind_args);
+
+    my $results = $sth->fetchall_arrayref({});
+    return @$results;
+}
+
+=head3 GetInvoice
+
+    my $invoice = GetInvoice($invoiceid);
+
+Get informations about invoice with given $invoiceid
+
+Return a hash filled with aqinvoices.* fields
+
+=cut
+
+sub GetInvoice {
+    my ($invoiceid) = @_;
+    my $invoice;
+
+    return unless $invoiceid;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT *
+        FROM aqinvoices
+        WHERE invoiceid = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($invoiceid);
+
+    $invoice = $sth->fetchrow_hashref;
+    return $invoice;
+}
+
+=head3 GetInvoiceDetails
+
+    my $invoice = GetInvoiceDetails($invoiceid)
+
+Return informations about an invoice + the list of related order lines
+
+Orders informations are in $invoice->{orders} (array ref)
+
+=cut
+
+sub GetInvoiceDetails {
+    my ($invoiceid) = @_;
+    my $invoice;
+
+    return unless $invoiceid;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        SELECT aqinvoices.*, aqbooksellers.name AS suppliername
+        FROM aqinvoices
+          LEFT JOIN aqbooksellers ON aqinvoices.booksellerid = aqbooksellers.id
+        WHERE invoiceid = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($invoiceid);
+
+    $invoice = $sth->fetchrow_hashref;
 
+    $query = qq{
+        SELECT aqorders.*, biblio.*
+        FROM aqorders
+          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
+        WHERE invoiceid = ?
+    };
+    $sth = $dbh->prepare($query);
+    $sth->execute($invoiceid);
+    $invoice->{orders} = $sth->fetchall_arrayref({});
+
+    return $invoice;
+}
+
+=head3 AddInvoice
+
+    my $invoiceid = AddInvoice(
+        invoicenumber => $invoicenumber,
+        booksellerid => $booksellerid,
+        shipmentdate => $shipmentdate,
+        billingdate => $billingdate,
+        closedate => $closedate,
+        shipmentcost => $shipmentcost,
+        shipmentcost_budgetid => $shipmentcost_budgetid
+    );
+
+Create a new invoice and return its id or undef if it fails.
+
+=cut
+
+sub AddInvoice {
+    my %invoice = @_;
+
+    return unless(%invoice and $invoice{invoicenumber});
+
+    my @columns = qw(invoicenumber booksellerid shipmentdate billingdate
+        closedate shipmentcost shipmentcost_budgetid);
+
+    my @set_strs;
+    my @set_args;
+    foreach my $key (keys %invoice) {
+        if(0 < grep(/^$key$/, @columns)) {
+            push @set_strs, "$key = ?";
+            push @set_args, ($invoice{$key} || undef);
+        }
+    }
+
+    my $rv;
+    if(@set_args > 0) {
+        my $dbh = C4::Context->dbh;
+        my $query = "INSERT INTO aqinvoices SET ";
+        $query .= join (",", @set_strs);
+        my $sth = $dbh->prepare($query);
+        $rv = $sth->execute(@set_args);
+        if($rv) {
+            $rv = $dbh->last_insert_id(undef, undef, 'aqinvoices', undef);
+        }
+    }
+    return $rv;
+}
+
+=head3 ModInvoice
+
+    ModInvoice(
+        invoiceid => $invoiceid,    # Mandatory
+        invoicenumber => $invoicenumber,
+        booksellerid => $booksellerid,
+        shipmentdate => $shipmentdate,
+        billingdate => $billingdate,
+        closedate => $closedate,
+        shipmentcost => $shipmentcost,
+        shipmentcost_budgetid => $shipmentcost_budgetid
+    );
+
+Modify an invoice, invoiceid is mandatory.
+
+Return undef if it fails.
+
+=cut
+
+sub ModInvoice {
+    my %invoice = @_;
+
+    return unless(%invoice and $invoice{invoiceid});
+
+    my @columns = qw(invoicenumber booksellerid shipmentdate billingdate
+        closedate shipmentcost shipmentcost_budgetid);
+
+    my @set_strs;
+    my @set_args;
+    foreach my $key (keys %invoice) {
+        if(0 < grep(/^$key$/, @columns)) {
+            push @set_strs, "$key = ?";
+            push @set_args, ($invoice{$key} || undef);
+        }
+    }
+
+    my $dbh = C4::Context->dbh;
+    my $query = "UPDATE aqinvoices SET ";
+    $query .= join(",", @set_strs);
+    $query .= " WHERE invoiceid = ?";
+
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@set_args, $invoice{invoiceid});
+}
+
+=head3 CloseInvoice
+
+    CloseInvoice($invoiceid);
+
+Close an invoice.
+
+Equivalent to ModInvoice(invoiceid => $invoiceid, closedate => undef);
+
+=cut
+
+sub CloseInvoice {
+    my ($invoiceid) = @_;
+
+    return unless $invoiceid;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        UPDATE aqinvoices
+        SET closedate = CAST(NOW() AS DATE)
+        WHERE invoiceid = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($invoiceid);
+}
+
+=head3 ReopenInvoice
+
+    ReopenInvoice($invoiceid);
+
+Reopen an invoice
+
+Equivalent to ModInvoice(invoiceid => $invoiceid, closedate => C4::Dates->new()->output('iso'))
+
+=cut
+
+sub ReopenInvoice {
+    my ($invoiceid) = @_;
+
+    return unless $invoiceid;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        UPDATE aqinvoices
+        SET closedate = NULL
+        WHERE invoiceid = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($invoiceid);
 }
 
 1;
diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 7c867e0..e4aa889 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -309,9 +309,19 @@ sub GetBudgetSpent {
             quantityreceived > 0 AND
             datecancellationprinted IS NULL
     |);
-
 	$sth->execute($budget_id);
 	my $sum =  $sth->fetchrow_array;
+
+    $sth = $dbh->prepare(qq|
+        SELECT SUM(shipmentcost) AS sum
+        FROM aqinvoices
+        WHERE shipmentcost_budgetid = ?
+          AND closedate IS NOT NULL
+    |);
+    $sth->execute($budget_id);
+    my ($shipmentcost_sum) = $sth->fetchrow_array;
+    $sum += $shipmentcost_sum;
+
 	return $sum;
 }
 
@@ -325,9 +335,19 @@ sub GetBudgetOrdered {
             quantityreceived = 0 AND
             datecancellationprinted IS NULL
     |);
-
 	$sth->execute($budget_id);
 	my $sum =  $sth->fetchrow_array;
+
+    $sth = $dbh->prepare(qq|
+        SELECT SUM(shipmentcost) AS sum
+        FROM aqinvoices
+        WHERE shipmentcost_budgetid = ?
+          AND closedate IS NULL
+    |);
+    $sth->execute($budget_id);
+    my ($shipmentcost_sum) = $sth->fetchrow_array;
+    $sum += $shipmentcost_sum;
+
 	return $sum;
 }
 
diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 0f2f070..f83b7d0 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -43,14 +43,14 @@ my $origquantityrec=$input->param('origquantityrec');
 my $quantityrec=$input->param('quantityrec');
 my $quantity=$input->param('quantity');
 my $unitprice=$input->param('cost');
-my $invoiceno=$input->param('invoice');
-my $datereceived=$input->param('datereceived');
+my $invoiceid = $input->param('invoiceid');
+my $invoice = GetInvoice($invoiceid);
+my $invoiceno = $invoice->{invoicenumber};
+my $datereceived= $invoice->{shipmentdate};
 my $replacement=$input->param('rrp');
 my $gst=$input->param('gst');
-my $freight=$input->param('freight');
 my $supplierid = $input->param('supplierid');
 my $cnt=0;
-my $error_url_str;
 my $ecost = $input->param('ecost');
 my $note = $input->param("note");
 
@@ -94,12 +94,12 @@ if ($quantityrec > $origquantityrec ) {
     }
     
     # save the quantity received.
-    $datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
+    $datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoice->{invoiceid},$replacement,undef,$datereceived);
 }
 
 update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber );
 
-print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
+print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid");
 
 ################################ End of script ################################
 
diff --git a/acqui/invoice.pl b/acqui/invoice.pl
new file mode 100755
index 0000000..19579d3
--- /dev/null
+++ b/acqui/invoice.pl
@@ -0,0 +1,211 @@
+#!/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
+
+invoice.pl
+
+=head1 DESCRIPTION
+
+Invoice details
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Acquisition;
+use C4::Bookseller qw/GetBookSellerFromId/;
+use C4::Budgets;
+
+my $input = new CGI;
+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
+    template_name   => 'acqui/invoice.tmpl',
+    query           => $input,
+    type            => 'intranet',
+    authnotrequired => 0,
+    flagsrequired   => { 'acquisition' => '*' },
+    debug           => 1,
+} );
+
+my $invoiceid = $input->param('invoiceid');
+my $op = $input->param('op');
+
+if($op && $op eq 'close') {
+    CloseInvoice($invoiceid);
+    my $referer = $input->param('referer');
+    if($referer) {
+        print $input->redirect($referer);
+        exit 0;
+    }
+}elsif($op && $op eq 'reopen') {
+    ReopenInvoice($invoiceid);
+    my $referer = $input->param('referer');
+    if($referer) {
+        print $input->redirect($referer);
+        exit 0;
+    }
+}elsif($op && $op eq 'mod') {
+    my $shipmentdate = $input->param('shipmentdate');
+    my $billingdate = $input->param('billingdate');
+    my $shipmentcost = $input->param('shipmentcost');
+    my $shipment_budget_id = $input->param('shipment_budget_id');
+    ModInvoice(
+        invoiceid => $invoiceid,
+        shipmentdate   => C4::Dates->new($shipmentdate)->output("iso"),
+        billingdate   => C4::Dates->new($billingdate)->output("iso"),
+        shipmentcost  => $shipmentcost,
+        shipmentcost_budgetid => $shipment_budget_id
+    );
+    $template->param(modified => 1);
+}
+
+my $details = GetInvoiceDetails($invoiceid);
+my $bookseller = GetBookSellerFromId($details->{booksellerid});
+my @orders_loop = ();
+my $orders = $details->{'orders'};
+my $qty_total;
+my @books_loop;
+my @book_foot_loop;
+my %foot;
+my $total_quantity = 0;
+my $total_rrp = 0;
+my $total_est = 0;
+foreach my $order (@$orders) {
+    my $line = get_infos( $order, $bookseller);
+
+    $total_quantity += $$line{quantity};
+    $total_rrp += $order->{quantity} * $order->{rrp};
+    $total_est += $order->{quantity} * $order->{'ecost'};
+
+    my %row = (%$order, %$line);
+    push @orders_loop, \%row;
+}
+
+my $gist = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
+my $discount = $bookseller->{'discount'} ? ($bookseller->{discount} / 100) : 0;
+my $total_est_gste;
+my $total_est_gsti;
+my $total_rrp_gsti; # RRP Total, GST included
+my $total_rrp_gste; # RRP Total, GST excluded
+my $gist_est;
+my $gist_rrp;
+if ($gist){
+    # if we have GST
+    if ( $bookseller->{'listincgst'} ) {
+        # if prices already includes GST
+
+        # we know $total_rrp_gsti
+        $total_rrp_gsti = $total_rrp;
+        # and can reverse compute other values
+        $total_rrp_gste = $total_rrp_gsti / ( $gist + 1 );
+
+        $gist_rrp       = $total_rrp_gsti - $total_rrp_gste;
+        $total_est_gste = $total_rrp_gste - ( $total_rrp_gste * $discount );
+        $total_est_gsti = $total_est;
+    } else {
+        # if prices does not include GST
+
+        # then we use the common way to compute other values
+        $total_rrp_gste = $total_rrp;
+        $gist_rrp       = $total_rrp_gste * $gist;
+        $total_rrp_gsti = $total_rrp_gste + $gist_rrp;
+        $total_est_gste = $total_est;
+        $total_est_gsti = $total_rrp_gsti - ( $total_rrp_gsti * $discount );
+   }
+   $gist_est = $gist_rrp - ( $gist_rrp * $discount );
+} else {
+    $total_rrp_gsti = $total_rrp;
+    $total_est_gsti = $total_est;
+}
+my $total_gsti_shipment = $total_est_gsti + $details->{shipmentcost};
+
+my $format = "%.2f";
+$template->param(
+    total_rrp_gste => sprintf($format, $total_rrp_gste),
+    total_rrp_gsti => sprintf($format, $total_rrp_gsti),
+    total_est_gste => sprintf($format, $total_est_gste),
+    total_est_gsti => sprintf($format, $total_est_gsti),
+    gist_rrp => sprintf($format, $gist_rrp),
+    gist_est => sprintf($format, $gist_est),
+    total_gsti_shipment => sprintf($format, $total_gsti_shipment),
+    gist => sprintf($format, $gist * 100),
+);
+
+my $budgets = GetBudgets();
+my @budgets_loop;
+my $shipmentcost_budgetid = $details->{shipmentcost_budgetid};
+foreach (@$budgets) {
+    my %line = %{ $_ };
+    if($shipmentcost_budgetid and $_->{'budget_id'} == $shipmentcost_budgetid) {
+        $line{'selected'} = 1;
+    }
+    push @budgets_loop, \%line;
+}
+
+$template->param(
+    invoiceid        => $details->{'invoiceid'},
+    invoicenumber    => $details->{'invoicenumber'},
+    suppliername     => $details->{'suppliername'},
+    supplierid       => $details->{'booksellerid'},
+    datereceived     => $details->{'datereceived'},
+    shipmentdate     => $details->{'shipmentdate'},
+    billingdate      => $details->{'billingdate'},
+    invoiceclosedate => $details->{'closedate'},
+    shipmentcost     => sprintf($format, $details->{'shipmentcost'} || 0),
+    orders_loop      => \@orders_loop,
+    total_quantity   => $total_quantity,
+    invoiceincgst    => $bookseller->{invoiceincgst},
+    currency         => $bookseller->{listprice},
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+    budgets_loop     => \@budgets_loop,
+);
+
+sub get_infos {
+    my $order = shift;
+    my $bookseller = shift;
+    my $qty = $order->{'quantity'} || 0;
+    if ( !defined $order->{quantityreceived} ) {
+        $order->{quantityreceived} = 0;
+    }
+    my $budget = GetBudget( $order->{'budget_id'} );
+
+    my %line = %{ $order };
+    $line{order_received} = ( $qty == $order->{'quantityreceived'} );
+    $line{budget_name}    = $budget->{budget_name};
+    $line{total} = $qty * $order->{ecost};
+
+    if ( $line{uncertainprice} ) {
+        $line{rrp} .= ' (Uncertain)';
+    }
+    if ( $line{'title'} ) {
+        my $volume      = $order->{'volume'};
+        my $seriestitle = $order->{'seriestitle'};
+        $line{'title'} .= " / $seriestitle" if $seriestitle;
+        $line{'title'} .= " / $volume"      if $volume;
+    } else {
+        $line{'title'} = "Deleted bibliographic notice, can't find title.";
+    }
+
+    return \%line;
+}
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/invoices.pl b/acqui/invoices.pl
new file mode 100755
index 0000000..3ca0f01
--- /dev/null
+++ b/acqui/invoices.pl
@@ -0,0 +1,150 @@
+#!/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
+
+invoices.pl
+
+=head1 DESCRIPTION
+
+Search for invoices
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use C4::Auth;
+use C4::Output;
+
+use C4::Acquisition;
+use C4::Bookseller qw/GetBookSeller/;
+use C4::Branch;
+
+my $input = new CGI;
+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
+    template_name   => 'acqui/invoices.tmpl',
+    query           => $input,
+    type            => 'intranet',
+    authnotrequired => 0,
+    flagsrequired   => { 'acquisition' => '*' },
+    debug           => 1,
+} );
+
+my $invoicenumber   = $input->param('invoicenumber');
+my $supplier        = $input->param('supplier');
+my $billingdatefrom = $input->param('billingdatefrom');
+my $billingdateto   = $input->param('billingdateto');
+my $isbneanissn     = $input->param('isbneanissn');
+my $title           = $input->param('title');
+my $author          = $input->param('author');
+my $publisher       = $input->param('publisher');
+my $publicationyear = $input->param('publicationyear');
+my $branch          = $input->param('branch');
+my $op              = $input->param('op');
+
+my @results_loop = ();
+if($op and $op eq "do_search") {
+    my $billingdatefrom_iso = C4::Dates->new($billingdatefrom)->output("iso");
+    my $billingdateto_iso = C4::Dates->new($billingdateto)->output("iso");
+    my @invoices = GetInvoices(
+        invoicenumber => $invoicenumber,
+        suppliername => $supplier,
+        billingdatefrom => $billingdatefrom_iso,
+        billingdateto => $billingdateto_iso,
+        isbneanissn => $isbneanissn,
+        title => $title,
+        author => $author,
+        publisher => $publisher,
+        publicationyear => $publicationyear,
+        branchcode => $branch
+    );
+    foreach (@invoices) {
+        my %row = (
+            invoiceid       => $_->{invoiceid},
+            billingdate     => $_->{billingdate},
+            invoicenumber   => $_->{invoicenumber},
+            suppliername    => $_->{suppliername},
+            receivedbiblios => $_->{receivedbiblios},
+            receiveditems   => $_->{receiveditems},
+            subscriptionid  => $_->{subscriptionid},
+            closedate => $_->{closedate},
+        );
+        push @results_loop, \%row;
+    }
+}
+
+
+# Build suppliers list
+my @suppliers = GetBookSeller(undef);
+my @suppliers_loop = ();
+my $suppliername;
+foreach (@suppliers) {
+    my $selected = 0;
+    if ($supplier && $supplier == $_->{'id'}) {
+        $selected = 1;
+        $suppliername = $_->{'name'};
+    }
+    my %row = (
+        suppliername => $_->{'name'},
+        supplierid   => $_->{'id'},
+        selected     => $selected,
+    );
+    push @suppliers_loop, \%row;
+}
+
+# Build branches list
+my $branches = GetBranches();
+my @branches_loop = ();
+my $branchname;
+foreach (sort keys %$branches) {
+    my $selected = 0;
+    if ($branch && $branch eq $_) {
+        $selected = 1;
+        $branchname = $branches->{$_}->{'branchname'};
+    }
+    my %row = (
+        branchcode => $_,
+        branchname => $branches->{$_}->{'branchname'},
+        selected   => $selected,
+    );
+    push @branches_loop, \%row;
+}
+
+$template->param(
+    do_search       => ($op and $op eq "do_search") ? 1 : 0,
+    results_loop    => \@results_loop,
+    invoicenumber   => $invoicenumber,
+    supplier        => $supplier,
+    suppliername    => $suppliername,
+    billingdatefrom => $billingdatefrom,
+    billingdateto   => $billingdateto,
+    isbneanissn     => $isbneanissn,
+    title           => $title,
+    author          => $author,
+    publisher       => $publisher,
+    publicationyear => $publicationyear,
+    branch          => $branch,
+    branchname      => $branchname,
+    suppliers_loop  => \@suppliers_loop,
+    branches_loop   => \@branches_loop,
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+);
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 753071d..77e2149 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -40,9 +40,9 @@ to know on what supplier this script has to display receive order.
 
 =item receive
 
-=item invoice
+=item invoiceid
 
-the number of this invoice.
+the id of this invoice.
 
 =item freight
 
@@ -61,7 +61,8 @@ The biblionumber of this order.
 =cut
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
+
 use CGI;
 use C4::Context;
 use C4::Koha;   # GetKohaAuthorisedValues GetItemTypes
@@ -80,26 +81,23 @@ use C4::Biblio;
 my $input      = new CGI;
 
 my $dbh          = C4::Context->dbh;
-my $supplierid   = $input->param('supplierid');
-my $ordernumber       = $input->param('ordernumber');
+my $invoiceid    = $input->param('invoiceid');
+my $invoice      = GetInvoice($invoiceid);
+my $supplierid   = $invoice->{booksellerid};
+my $freight      = $invoice->{shipmentcost};
+my $datereceived = $invoice->{shipmentdate};
+my $ordernumber  = $input->param('ordernumber');
 my $search       = $input->param('receive');
-my $invoice      = $input->param('invoice');
-my $freight      = $input->param('freight');
-my $datereceived = $input->param('datereceived');
-
 
 $datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
 
 my $bookseller = GetBookSellerFromId($supplierid);
-my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
-my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
+my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
 my $results = SearchOrder($ordernumber,$search);
 
-
 my $count   = scalar @$results;
 my $order 	= GetOrder($ordernumber);
 
-
 my $date = @$results[0]->{'entrydate'};
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -164,7 +162,8 @@ if ( $count == 1 ) {
         unitprice             => @$results[0]->{'unitprice'},
         memberfirstname       => $member->{firstname} || "",
         membersurname         => $member->{surname} || "",
-        invoice               => $invoice,
+        invoiceid             => $invoice->{invoiceid},
+        invoice               => $invoice->{invoicenumber},
         datereceived          => $datereceived->output(),
         datereceived_iso      => $datereceived->output('iso'),
         notes                 => $order->{notes}
@@ -175,7 +174,7 @@ else {
     for ( my $i = 0 ; $i < $count ; $i++ ) {
         my %line = %{ @$results[$i] };
 
-        $line{invoice}      = $invoice;
+        $line{invoice}      = $invoice->{invoicenumber};
         $line{datereceived} = $datereceived->output();
         $line{freight}      = $freight;
         $line{gst}          = $gst;
@@ -188,10 +187,11 @@ else {
     $template->param(
         loop         => \@loop,
         supplierid   => $supplierid,
+        invoiceid    => $invoice->{invoiceid},
     );
 }
 my $op = $input->param('op');
-if ($op eq 'edit'){
+if ($op and $op eq 'edit'){
     $template->param(edit   =>   1);
 }
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index c256c60..a7c792b 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -42,8 +42,6 @@ To know the supplier this script has to show orders.
 
 is the bookseller invoice number.
 
-=item freight
-
 
 =item gst
 
@@ -57,7 +55,8 @@ To filter the results list on this given date.
 =cut
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
+
 use C4::Auth;
 use C4::Acquisition;
 use C4::Budgets;
@@ -70,16 +69,13 @@ use C4::Dates qw/format_date format_date_in_iso/;
 use JSON;
 
 my $input=new CGI;
-my $supplierid=$input->param('supplierid');
-my $bookseller=GetBookSellerFromId($supplierid);
-
-my $invoice=$input->param('invoice') || '';
-my $freight=$input->param('freight');
-my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
-my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
-my $datereceived =  ($input->param('op') eq 'new') ? C4::Dates->new($input->param('datereceived')) 
-					:  C4::Dates->new($input->param('datereceived'), 'iso')   ;
-$datereceived = C4::Dates->new() unless $datereceived;
+
+my $invoiceid = $input->param('invoiceid');
+my $invoice = GetInvoiceDetails($invoiceid);
+my $supplierid = $invoice->{booksellerid};
+my $bookseller = GetBookSellerFromId($supplierid);
+my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
+my $datereceived = C4::Dates->new();
 my $code            = $input->param('code');
 my @rcv_err         = $input->param('error');
 my @rcv_err_barcode = $input->param('error_bc');
@@ -89,16 +85,17 @@ my $resultsperpage = $input->param('resultsperpage');
 $resultsperpage = 20 unless ($resultsperpage);
 $startfrom=0 unless ($startfrom);
 
-if($input->param('format') eq "json"){
+my $format = $input->param('format') || '';
+if($format eq "json"){
     my ($template, $loggedinuser, $cookie)
         = get_template_and_user({template_name => "acqui/ajax.tmpl",
                  query => $input,
-				 type => "intranet",
+                 type => "intranet",
                  authnotrequired => 0,
                  flagsrequired => {acquisition => 'order_receive'},
                  debug => 1,
     });
-       
+
     my @datas;
     my $search   = $input->param('search') || '';
     my $supplier = $input->param('supplierid') || '';
@@ -109,7 +106,7 @@ if($input->param('format') eq "json"){
     foreach my $order (@$orders){
         if($order->{quantityreceived} < $order->{quantity}){
             my $data = {};
-            
+
             $data->{basketno} = $order->{basketno};
             $data->{ordernumber} = $order->{ordernumber};
             $data->{title} = $order->{title};
@@ -117,14 +114,13 @@ if($input->param('format') eq "json"){
             $data->{isbn} = $order->{isbn};
             $data->{booksellerid} = $order->{booksellerid};
             $data->{biblionumber} = $order->{biblionumber};
-            $data->{freight} = $order->{freight};
             $data->{quantity} = $order->{quantity};
             $data->{ecost} = $order->{ecost};
             $data->{ordertotal} = sprintf("%.2f",$order->{ecost}*$order->{quantity});
             push @datas, $data;
         }
     }
-    
+
     my $json_text = to_json(\@datas);
     $template->param(return => $json_text);
     output_html_with_http_headers $input, $cookie, $template->output;
@@ -134,7 +130,7 @@ if($input->param('format') eq "json"){
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/parcel.tmpl",
                  query => $input,
-				 type => "intranet",
+                 type => "intranet",
                  authnotrequired => 0,
                  flagsrequired => {acquisition => 'order_receive'},
                  debug => 1,
@@ -154,10 +150,9 @@ if( scalar(@rcv_err) ) {
 }
 
 my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
-my @parcelitems   = GetParcel($supplierid, $invoice, $datereceived->output('iso'));
+my @parcelitems   = @{ $invoice->{orders} };
 my $countlines    = scalar @parcelitems;
 my $totalprice    = 0;
-my $totalfreight  = 0;
 my $totalquantity = 0;
 my $total;
 my $tototal;
@@ -165,152 +160,144 @@ my @loop_received = ();
 
 for (my $i = 0 ; $i < $countlines ; $i++) {
 
-    #$total=($parcelitems[$i]->{'unitprice'} + $parcelitems[$i]->{'freight'}) * $parcelitems[$i]->{'quantityreceived'};   #weird, are the freight fees counted by book? (pierre)
-    $total = ($parcelitems[$i]->{'unitprice'}) * $parcelitems[$i]->{'quantityreceived'};    #weird, are the freight fees counted by book? (pierre)
+    $total = ($parcelitems[$i]->{'unitprice'}) * $parcelitems[$i]->{'quantityreceived'};
     $parcelitems[$i]->{'unitprice'} += 0;
     my %line;
     %line          = %{ $parcelitems[$i] };
-    $line{invoice} = $invoice;
+    $line{invoice} = $invoice->{invoicenumber};
     $line{gst}     = $gst;
     $line{total} = sprintf($cfstr, $total);
-    $line{supplierid} = $supplierid;
+    $line{supplierid} = $invoice->{booksellerid};
     push @loop_received, \%line;
     $totalprice += $parcelitems[$i]->{'unitprice'};
     $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
 
-    #double FIXME - totalfreight is redefined later.
-
-# FIXME - each order in a  parcel holds the freight for the whole parcel. This means if you receive a parcel with items from multiple budgets, you'll see the freight charge in each budget..
-    if ($i > 0 && $totalfreight != $parcelitems[$i]->{'freight'}) {
-        warn "FREIGHT CHARGE MISMATCH!!";
-    }
-    $totalfreight = $parcelitems[$i]->{'freight'};
     $totalquantity += $parcelitems[$i]->{'quantityreceived'};
     $tototal       += $total;
 }
 
-my $pendingorders = GetPendingOrders($supplierid);
-my $countpendings = scalar @$pendingorders;
-
-# pending orders totals
-my ($totalPunitprice, $totalPquantity, $totalPecost, $totalPqtyrcvd);
-my $ordergrandtotal;
-my @loop_orders = ();
-for (my $i = 0 ; $i < $countpendings ; $i++) {
-    my %line;
-    %line = %{$pendingorders->[$i]};
-   
-    $line{quantity}+=0;
-    $line{quantityreceived}+=0;
-    $line{unitprice}+=0;
-    $totalPunitprice += $line{unitprice};
-    $totalPquantity +=$line{quantity};
-    $totalPqtyrcvd +=$line{quantityreceived};
-    $totalPecost += $line{ecost};
-    $line{ecost} = sprintf("%.2f",$line{ecost});
-    $line{ordertotal} = sprintf("%.2f",$line{ecost}*$line{quantity});
-    $line{unitprice} = sprintf("%.2f",$line{unitprice});
-    $line{invoice} = $invoice;
-    $line{gst} = $gst;
-    $line{total} = $total;
-    $line{supplierid} = $supplierid;
-    $ordergrandtotal += $line{ecost} * $line{quantity};
-    
-    my $biblionumber = $line{'biblionumber'};
-    my $countbiblio = CountBiblioInOrders($biblionumber);
-    my $ordernumber = $line{'ordernumber'};
-    my @subscriptions = GetSubscriptionsId ($biblionumber);
-    my $itemcount = GetItemsCount($biblionumber);
-    my $holds  = GetHolds ($biblionumber);
-    my @items = GetItemnumbersFromOrder( $ordernumber );
-    my $itemholds;
-    foreach my $item (@items){
-        my $nb = GetItemHolds($biblionumber, $item);
-        if ($nb){
-            $itemholds += $nb;
+if(!defined $invoice->{closedate}) {
+    my $pendingorders = GetPendingOrders($supplierid);
+    my $countpendings = scalar @$pendingorders;
+
+    # pending orders totals
+    my ($totalPunitprice, $totalPquantity, $totalPecost, $totalPqtyrcvd);
+    my $ordergrandtotal;
+    my @loop_orders = ();
+    for (my $i = 0 ; $i < $countpendings ; $i++) {
+        my %line;
+        %line = %{$pendingorders->[$i]};
+       
+        $line{quantity}+=0;
+        $line{quantityreceived}+=0;
+        $line{unitprice}+=0;
+        $totalPunitprice += $line{unitprice};
+        $totalPquantity +=$line{quantity};
+        $totalPqtyrcvd +=$line{quantityreceived};
+        $totalPecost += $line{ecost};
+        $line{ecost} = sprintf("%.2f",$line{ecost});
+        $line{ordertotal} = sprintf("%.2f",$line{ecost}*$line{quantity});
+        $line{unitprice} = sprintf("%.2f",$line{unitprice});
+        $line{invoice} = $invoice;
+        $line{gst} = $gst;
+        $line{total} = $total;
+        $line{supplierid} = $supplierid;
+        $ordergrandtotal += $line{ecost} * $line{quantity};
+        
+        my $biblionumber = $line{'biblionumber'};
+        my $countbiblio = CountBiblioInOrders($biblionumber);
+        my $ordernumber = $line{'ordernumber'};
+        my @subscriptions = GetSubscriptionsId ($biblionumber);
+        my $itemcount = GetItemsCount($biblionumber);
+        my $holds  = GetHolds ($biblionumber);
+        my @items = GetItemnumbersFromOrder( $ordernumber );
+        my $itemholds;
+        foreach my $item (@items){
+            my $nb = GetItemHolds($biblionumber, $item);
+            if ($nb){
+                $itemholds += $nb;
+            }
         }
+        
+        # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
+        $line{can_del_bib}          = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds);
+        $line{items}                = ($itemcount) - (scalar @items);
+        $line{left_item}            = 1 if $line{items} >= 1;
+        $line{left_biblio}          = 1 if $countbiblio > 1;
+        $line{biblios}              = $countbiblio - 1;
+        $line{left_subscription}    = 1 if scalar @subscriptions >= 1;
+        $line{subscriptions}        = scalar @subscriptions;
+        $line{left_holds}           = ($holds >= 1) ? 1 : 0;
+        $line{left_holds_on_order}  = 1 if $line{left_holds}==1 && ($line{items} == 0 || $itemholds );
+        $line{holds}                = $holds;
+        $line{holds_on_order}       = $itemholds?$itemholds:$holds if $line{left_holds_on_order};
+        
+        
+        push @loop_orders, \%line if ($i >= $startfrom and $i < $startfrom + $resultsperpage);
     }
-    
-    # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
-    $line{can_del_bib}          = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds);
-    $line{items}                = ($itemcount) - (scalar @items);
-    $line{left_item}            = 1 if $line{items} >= 1;
-    $line{left_biblio}          = 1 if $countbiblio > 1;
-    $line{biblios}              = $countbiblio - 1;
-    $line{left_subscription}    = 1 if scalar @subscriptions >= 1;
-    $line{subscriptions}        = scalar @subscriptions;
-    $line{left_holds}           = 1 if $holds >= 1;
-    $line{left_holds_on_order}  = 1 if $line{left_holds}==1 && ($line{items} == 0 || $itemholds );
-    $line{holds}                = $holds;
-    $line{holds_on_order}       = $itemholds?$itemholds:$holds if $line{left_holds_on_order};
-    
-    
-    push @loop_orders, \%line if ($i >= $startfrom and $i < $startfrom + $resultsperpage);
-}
-$freight = $totalfreight unless $freight;
 
-my $count = $countpendings;
+    my $count = $countpendings;
 
-if ($count>$resultsperpage){
-    my $displaynext=0;
-    my $displayprev=$startfrom;
-    if(($count - ($startfrom+$resultsperpage)) > 0 ) {
-        $displaynext = 1;
-    }
+    if ($count>$resultsperpage){
+        my $displaynext=0;
+        my $displayprev=$startfrom;
+        if(($count - ($startfrom+$resultsperpage)) > 0 ) {
+            $displaynext = 1;
+        }
 
-    my @numbers = ();
-    for (my $i=1; $i<$count/$resultsperpage+1; $i++) {
-            my $highlight=0;
-            ($startfrom/$resultsperpage==($i-1)) && ($highlight=1);
-            push @numbers, { number => $i,
-                highlight => $highlight ,
-                startfrom => ($i-1)*$resultsperpage};
-    }
+        my @numbers = ();
+        for (my $i=1; $i<$count/$resultsperpage+1; $i++) {
+                my $highlight=0;
+                ($startfrom/$resultsperpage==($i-1)) && ($highlight=1);
+                push @numbers, { number => $i,
+                    highlight => $highlight ,
+                    startfrom => ($i-1)*$resultsperpage};
+        }
 
-    my $from = $startfrom*$resultsperpage+1;
-    my $to;
-    if($count < (($startfrom+1)*$resultsperpage)){
-        $to = $count;
-    } else {
-        $to = (($startfrom+1)*$resultsperpage);
+        my $from = $startfrom*$resultsperpage+1;
+        my $to;
+        if($count < (($startfrom+1)*$resultsperpage)){
+            $to = $count;
+        } else {
+            $to = (($startfrom+1)*$resultsperpage);
+        }
+        $template->param(numbers=>\@numbers,
+                         displaynext=>$displaynext,
+                         displayprev=>$displayprev,
+                         nextstartfrom=>(($startfrom+$resultsperpage<$count)?$startfrom+$resultsperpage:$count),
+                         prevstartfrom=>(($startfrom-$resultsperpage>0)?$startfrom-$resultsperpage:0)
+                        );
     }
-    $template->param(numbers=>\@numbers,
-                     displaynext=>$displaynext,
-                     displayprev=>$displayprev,
-                     nextstartfrom=>(($startfrom+$resultsperpage<$count)?$startfrom+$resultsperpage:$count),
-                     prevstartfrom=>(($startfrom-$resultsperpage>0)?$startfrom-$resultsperpage:0)
-                    );
+
+    $template->param(
+        countpending => $countpendings,
+        loop_orders  => \@loop_orders,
+        ordergrandtotal => sprintf($cfstr, $ordergrandtotal),
+        totalPunitprice => sprintf("%.2f", $totalPunitprice),
+        totalPquantity  => $totalPquantity,
+        totalPqtyrcvd   => $totalPqtyrcvd,
+        totalPecost     => sprintf("%.2f", $totalPecost),
+    );
 }
 
-#$totalfreight=$freight;
-$tototal = $tototal + $freight;
 
 $template->param(
-    invoice               => $invoice,
+    invoiceid             => $invoice->{invoiceid},
+    invoice               => $invoice->{invoicenumber},
+    invoiceclosedate      => $invoice->{closedate},
     datereceived          => $datereceived->output('iso'),
     invoicedatereceived   => $datereceived->output('iso'),
     formatteddatereceived => $datereceived->output(),
     name                  => $bookseller->{'name'},
-    supplierid            => $supplierid,
+    supplierid            => $bookseller->{id},
     gst                   => $gst,
-    freight               => $freight,
-    invoice               => $invoice,
     countreceived         => $countlines,
     loop_received         => \@loop_received,
-    countpending          => $countpendings,
-    loop_orders           => \@loop_orders,
     totalprice            => sprintf($cfstr, $totalprice),
-    totalfreight          => $totalfreight,
     totalquantity         => $totalquantity,
     tototal               => sprintf($cfstr, $tototal),
-    ordergrandtotal       => sprintf($cfstr, $ordergrandtotal),
     gst                   => $gst,
     grandtot              => sprintf($cfstr, $tototal + $gst),
-    totalPunitprice       => sprintf("%.2f", $totalPunitprice),
-    totalPquantity        => $totalPquantity,
-    totalPqtyrcvd         => $totalPqtyrcvd,
-    totalPecost           => sprintf("%.2f", $totalPecost),
     resultsperpage        => $resultsperpage,
 );
 output_html_with_http_headers $input, $cookie, $template->output;
- 
diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 915b1e8..b8aa69d 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -84,6 +84,7 @@ my $code           = $input->param('filter');
 my $datefrom       = $input->param('datefrom');
 my $dateto         = $input->param('dateto');
 my $resultsperpage = $input->param('resultsperpage');
+my $op             = $input->param('op');
 $resultsperpage ||= 20;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -96,8 +97,34 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
+if($op and $op eq 'new') {
+    my $invoicenumber = $input->param('invoice');
+    my $shipmentdate = $input->param('shipmentdate');
+    if($shipmentdate) {
+        $shipmentdate = C4::Dates->new($shipmentdate)->output('iso');
+    }
+    my $invoiceid = AddInvoice(
+        invoicenumber => $invoicenumber,
+        booksellerid => $supplierid,
+        shipmentdate => $shipmentdate,
+    );
+    if(defined $invoiceid) {
+        # Successful 'Add'
+        print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid");
+        exit 0;
+    } else {
+        $template->param(error_failed_to_create_invoice => 1);
+    }
+}
+
 my $bookseller = GetBookSellerFromId($supplierid);
-my @parcels = GetParcels( $supplierid, $order, $code, $datefrom, $dateto );
+my @parcels = GetInvoices(
+    supplierid => $supplierid,
+    invoicenumber => $code,
+    shipmentdatefrom => $datefrom,
+    shipmentdateto => $dateto,
+    order_by => $order
+);
 my $count_parcels = @parcels;
 
 # multi page display gestion
@@ -114,14 +141,15 @@ for my $i ( $startfrom .. $last_row) {
 
     push @{$loopres},
       { number           => $i + 1,
-        code             => $p->{booksellerinvoicenumber},
-        nullcode         => $p->{booksellerinvoicenumber} eq 'NULL',
-        emptycode        => $p->{booksellerinvoicenumber} eq q{},
-        raw_datereceived => $p->{datereceived},
-        datereceived     => format_date( $p->{datereceived} ),
-        bibcount         => $p->{biblio},
-        reccount         => $p->{itemsreceived},
-        itemcount        => $p->{itemsexpected},
+        invoiceid        => $p->{invoiceid},
+        code             => $p->{invoicenumber},
+        nullcode         => $p->{invoicenumber} eq 'NULL',
+        emptycode        => $p->{invoicenumber} eq q{},
+        raw_datereceived => $p->{shipmentdate},
+        datereceived     => format_date( $p->{shipmentdate} ),
+        bibcount         => $p->{receivedbiblios} || 0,
+        reccount         => $p->{receiveditems} || 0,
+        itemcount        => $p->{itemsexpected} || 0,
       };
 }
 if ($count_parcels) {
@@ -135,7 +163,7 @@ $template->param(
     resultsperpage           => $resultsperpage,
     name                     => $bookseller->{'name'},
     DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-    datereceived_today       => C4::Dates->new()->output(),
+    shipmentdate_today       => C4::Dates->new()->output(),
     supplierid               => $supplierid,
     GST                      => C4::Context->preference('gist'),
 );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index a0f094c..b67cec2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -1,6 +1,7 @@
 <ul>
 	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
 	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
+    <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
     [% IF ( CAN_user_acquisition_budget_manage ) %]
 	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets &amp; Funds</a></li>
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
new file mode 100644
index 0000000..fe0dd36
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -0,0 +1,182 @@
+[% USE KohaDates %]
+
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Acquisitions &rsaquo; Invoice</title>
+[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'calendar.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+    $(document).ready(function() {
+        $("#orderst").tablesorter({widgets : ['zebra']});
+        Calendar.setup({
+            inputField: "shipmentdate",
+            ifFormat: "[% DHTMLcalendar_dateformat %]",
+            button: "shipmentdateCalendar"
+        });
+        Calendar.setup({
+            inputField: "billingdate",
+            ifFormat: "[% DHTMLcalendar_dateformat %]",
+            button: "billingdateCalendar"
+        });
+    });
+//]]>
+</script>
+</head>
+
+<body>
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'acquisitions-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a> &rsaquo; <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">[% invoicenumber %]</a></div>
+
+<div id="doc3" class="yui-t2">
+
+<div id="bd">
+  <div id="yui-main">
+    <div class="yui-b">
+      [% IF ( modified ) %]
+        <div class="dialog">
+          <p>Invoice has been modified</p>
+        </div>
+      [% END %]
+      <h1>Invoice: [% invoicenumber %]</h1>
+
+      <p>Supplier: [% suppliername %]</p>
+      <form action="" method="post">
+        <label for="shipmentdate">Shipment date:</label>
+        [% IF (shipmentdate) %]
+            <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" readonly="readonly" />
+        [% ELSE %]
+            <input type="text" size="10" id="shipmentdate" name="shipmentdate" readonly="readonly" />
+        [% END %]
+        <img id="shipmentdateCalendar" alt="Show Calendar" style="cursor:pointer" src="[% themelang %]/lib/calendar/cal.gif" />
+        <p></p>
+        <label for="billingdate">Billing date:</label>
+        [% IF (billingdate) %]
+            <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" />
+        [% ELSE %]
+            <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" />
+        [% END %]
+        <img id="billingdateCalendar" alt="Show Calendar" style="cursor:pointer" src="[% themelang %]/lib/calendar/cal.gif" />
+        <p></p>
+        <label for="shipmentcost">Shipment cost:</label>
+        <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" />
+        <label for="shipment_budget_id">Budget:</label>
+        <select id="shipment_budget_id" name="shipment_budget_id">
+            <option value="">No budget</option>
+          [% FOREACH budget IN budgets_loop %]
+            [% IF ( budget.selected ) %]
+              <option selected="selected" value="[% budget.budget_id %]">
+            [% ELSE %]
+              <option value="[% budget.budget_id %]">
+            [% END %]
+              [% budget.budget_name %]
+            </option>
+          [% END %]
+        </select>
+        <input type="hidden" name="op" value="mod" />
+        <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
+        <fieldset class="action">
+            <input type="submit" value="Save">
+        </fieldset>
+      </form>
+      <p>Status:
+        [% IF ( invoiceclosedate ) %]
+          Closed on [% invoiceclosedate | $KohaDates %].
+          <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid %]">
+            Reopen
+          </a>
+        [% ELSE %]
+          Open.
+          <a href="/cgi-bin/koha/acqui/invoice.pl?op=close&invoiceid=[% invoiceid %]">
+            Close
+          </a>
+        [% END %]
+      </p>
+      <p>
+          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Go to receipt page</a>
+      </p>
+      <h2>Invoice details</h2>
+      <table id="orderst">
+        <thead>
+          <tr>
+            <th>Summary</th>
+            <th>Publisher</th>
+            <th>Branch</th>
+            <th>RRP</th>
+            <th>Est.</th>
+            <th>Qty.</th>
+            <th>Total</th>
+            <th>Fund</th>
+          </tr>
+        </thead>
+        <tbody>
+          [% FOREACH order IN orders_loop %]
+            <tr>
+              <td><p>[% order.title %]
+                [% IF ( order.author ) %]
+                  <br /><em>by</em> [% order.author %]
+                [% END %]
+              </p></td>
+              <td>
+                [% IF ( order.publishercode ) %]
+                  <p>[% order.publishercode %]
+                    [% IF ( order.publicationyear ) %]
+                      - [% order.publicationyear %]
+                    [% END %]
+                  </p>
+                [% END %]
+              </td>
+              <td><p>[% order.branchcode %]</p></td>
+              <td>[% order.rrp %]</td>
+              <td>[% order.ecost %]</td>
+              <td class="number">[% order.quantity %]</td>
+              <td>[% order.total %]</td>
+              <td>[% order.budget_name %]</td>
+            </tr>
+          [% END %]
+        </tbody>
+        <tfoot>
+            <tr>
+                <th colspan="3">Total Tax Exc.</th>
+                <th>[% total_rrp_gste %]</th>
+                <th>&nbsp;</th>
+                <th>[% total_quantity %]</th>
+                <th>[% total_est_gste %]</th>
+                <th>&nbsp;</th>
+            </tr>
+            <tr>
+                <th colspan='3'>Tax ([% gist %]%)</th>
+                <th>[% gist_rrp %]</th>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+                <th>[% gist_est %]</th>
+                <th>&nbsp;</th>
+            </tr>
+            <tr>
+                <th colspan='3'>Total Tax Inc. ([% currency %])</th>
+                <th>[% total_rrp_gsti %]</th>
+                <th>&nbsp;</th>
+                <th>[% total_quantity %]</th>
+                <th>[% total_est_gsti %]</th>
+                <th>&nbsp;</th>
+            </tr>
+            <tr>
+                <th colspan="3">Total + Shipment cost ([% currency %])</th>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+                <th>[% total_quantity %]</th>
+                <th>[% total_gsti_shipment %]</th>
+                <th>&nbsp;</th>
+            </tr>
+        </tfoot>
+      </table>
+
+    </div>
+  </div>
+  <div class="yui-b">
+    [% INCLUDE 'acquisitions-menu.inc' %]
+  </div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
new file mode 100644
index 0000000..c734745
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -0,0 +1,223 @@
+[% USE KohaDates %]
+
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Acquisitions &rsaquo; Invoices</title>
+[% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+[% INCLUDE 'calendar.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function() {
+    Calendar.setup({
+        inputField: "billingdatefrom",
+        ifFormat: "[% DHTMLcalendar_dateformat %]",
+        button: "billingdatefromCalendar"
+    });
+    Calendar.setup({
+        inputField: "billingdateto",
+        ifFormat: "[% DHTMLcalendar_dateformat %]",
+        button: "billingdatetoCalendar"
+    });
+    $("#resultst").tablesorter({
+        widgets : ['zebra'],
+        headers: {
+            6: { sorter: false },
+        }
+    });
+});
+//]]>
+</script>
+</head>
+
+<body>
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'acquisitions-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Invoices</div>
+
+<div id="doc3" class="yui-t2">
+
+<div id="bd">
+  <div id="yui-main">
+    <div class="yui-b">
+      <h1>Invoices</h1>
+      [% IF ( do_search ) %]
+        [% IF ( results_loop ) %]
+          <table id="resultst">
+            <thead>
+              <tr>
+                <th>Invoice no.</th>
+                <th>Vendor</th>
+                <th>Billing date</th>
+                <th>Received biblios</th>
+                <th>Received items</th>
+                <th>Status</th>
+                <th>&nbsp;</th>
+              </tr>
+            </thead>
+            <tbody>
+              [% FOREACH result IN results_loop %]
+                <tr>
+                  <td>[% result.invoicenumber %]</td>
+                  <td>[% result.suppliername %]</td>
+                  <td>
+                    [% IF (result.billingdate) %]
+                      [% result.billingdate | $KohaDates %]
+                    [% END %]
+                  </td>
+                  <td>[% result.receivedbiblios %]</td>
+                  <td>[% result.receiveditems %]</td>
+                  <td>
+                    [% IF ( result.closedate ) %]
+                      Closed on [% result.closedate | $KohaDates %]
+                    [% ELSE %]
+                      Open
+                    [% END %]
+                  </td>
+                  <td>
+                    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% result.invoiceid %]">Details</a> /
+                    [% IF ( result.closedate ) %]
+                      <a href="invoice.pl?op=reopen&invoiceid=[% result.invoiceid %]">Reopen</a>
+                    [% ELSE %]
+                      <a href="invoice.pl?op=close&invoiceid=[% result.invoiceid %]">Close</a>
+                    [% END %]
+                  </td>
+                </tr>
+              [% END %]
+            </tbody>
+          </table>
+        [% ELSE %]
+          <p>Sorry, but there is no results for your search.</p>
+          <p>Search was:
+            <ul>
+              [% IF ( invoicenumber ) %]
+                <li>Invoice no.: [% invoicenumber %]</li>
+              [% END %]
+              [% IF ( supplier ) %]
+                <li>Vendor: [% suppliername %]</li>
+              [% END %]
+              [% IF ( billingdatefrom ) %]
+                <li>Billing date:
+                [% IF ( billingdateto ) %]
+                  From [% billingdatefrom %]
+                  To [% billingdateto %]
+                [% ELSE %]
+                  All since [% billingdatefrom %]
+                [% END %]
+                </li>
+              [% ELSE %]
+                [% IF ( billingdateto ) %]
+                  <li>Billing date:
+                    All until [% billingdateto %]
+                  </li>
+                [% END %]
+              [% END %]
+              [% IF ( isbneanissn ) %]
+                <li>ISBN/EAN/ISSN: [% isbneanissn %]</li>
+              [% END %]
+              [% IF ( title ) %]
+                <li>Title: [% title %]</li>
+              [% END %]
+              [% IF ( author ) %]
+                <li>Author: [% author %]</li>
+              [% END %]
+              [% IF ( publisher ) %]
+                <li>Publisher: [% publisher %]</li>
+              [% END %]
+              [% IF ( publicationyear ) %]
+                <li>Publication year: [% publicationyear %]</li>
+              [% END %]
+              [% IF ( branch ) %]
+                <li>Branch: [% branchname %]</li>
+              [% END %]
+            </ul>
+          </p>
+        [% END %]<!-- results_loop -->
+      [% ELSE %]
+        <p>Please fill in the form to the left to make a search.</p>
+      [% END %]<!-- do_search -->
+    </div>
+  </div>
+  <div class="yui-b">
+    <form action="" method="get">
+      <fieldset class="brief">
+        <h3>Search filters</h3>
+        <ol>
+          <li>
+            <label for="invoicenumber">Invoice no:</label>
+            <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber %]" />
+          </li>
+          <li>
+            <label for="supplier">Supplier:</label>
+            <select id="supplier" name="supplier">
+              <option value="">All</option>
+              [% FOREACH supplier IN suppliers_loop %]
+                [% IF ( supplier.selected ) %]
+                  <option selected="selected" value="[% supplier.supplierid %]">[% supplier.suppliername %]</option>
+                [% ELSE %]
+                  <option value="[% supplier.supplierid %]">[% supplier.suppliername %]</option>
+                [% END %]
+              [% END %]
+            </select>
+          </li>
+          <li>
+            <fieldset class="brief">
+              <legend>Billing date</legend>
+              <ol>
+                <li>
+                  <label for="billingdatefrom">From:</label>
+                  <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom %]" />
+                  <img id="billingdatefromCalendar" alt="Show Calendar" style="cursor:pointer;" src="[% themelang %]/lib/calendar/cal.gif" />
+                </li>
+                <li>
+                  <label for="billingdateto">To:</label>
+                  <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto %]" />
+                  <img id="billingdatetoCalendar" alt="Show Calendar" style="cursor:pointer;" src="[% themelang %]/lib/calendar/cal.gif" />
+                </li>
+              </ol>
+            </fieldset>
+          </li>
+          <li>
+            <label for="isbneanissn">ISBN / EAN / ISSN:</label>
+            <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn %]" />
+          </li>
+          <li>
+            <label for="title">Title:</label>
+            <input type="text" id="title" name="title" value="[% title %]" />
+          </li>
+          <li>
+            <label for="author">Author:</label>
+            <input type="text" id="author" name="author" value="[% author %]" />
+          </li>
+          <li>
+            <label for="publisher">Publisher:</label>
+            <input type="text" id="publisher" name="publisher" value="[% publisher %]" />
+          </li>
+          <li>
+            <label for="publicationyear">Publication year:</label>
+            <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear %]" />
+          </li>
+          <li>
+            <label for="branch">Branch:</label>
+            <select id="branch" name="branch">
+              <option value="">All</option>
+              [% FOREACH branch IN branches_loop %]
+                [% IF ( branch.selected ) %]
+                  <option selected="selected" value="[% branch.branchcode %]">[% branch.branchname %]</option>
+                [% ELSE %]
+                  <option value="[% branch.branchcode %]">[% branch.branchname %]</option>
+                [% END %]
+              [% END %]
+            </select>
+          </li>
+        </ol>
+        <fieldset class="action">
+          <input type="submit" value="Search" />
+        </fieldset>
+      </fieldset>
+      <input type="hidden" name="op" id="op" value="do_search" />
+    </form>
+    [% INCLUDE 'acquisitions-menu.inc' %]
+  </div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index ea422c8..c9b2693 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -78,11 +78,11 @@
     </fieldset>
     [% END %] <!-- items -->
     <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
+    <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
     <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
     <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
     <input type="hidden" name="supplierid" value="[% supplierid %]" />
     <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
-    <input type="hidden" name="freight" value="[% freight %]" />
     <input type="hidden" name="gst" value="[% gst %]" />
 	</div>
 	<div class="yui-u">
@@ -130,12 +130,11 @@
             <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
         [% END %]</li></ol>
         <label for="note">Notes: </label><textarea name="note" width="40" rows="8" >[% notes %]</textarea>
-        <input type="hidden" name="invoice" value="[% invoice %]" />
     </fieldset>
 
 </div>
 </div><div class="yui-g"><fieldset class="action">
-        <input type="button"  value="Save" onclick="javascript:if(check_additem()) { this.form.submit(); } else { alert( _('Duplicate barcodes detected.  Please correct the errors and resubmit.') ); return false };" /> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?supplierid=[% supplierid %]&amp;invoice=[% invoice %]&amp;gst=[% gst %]&amp;freight=[% freight %]">Cancel</a>
+        <input type="button"  value="Save" onclick="javascript:if(check_additem()) { this.form.submit(); } else { alert( _('Duplicate barcodes detected.  Please correct the errors and resubmit.') ); return false };" /> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Cancel</a>
 </fieldset></div>    </form>
 [% ELSE %]
 <div id="acqui_acquire_orderlist">
@@ -152,7 +151,7 @@
         <tr>
             <td>[% loo.basketno %]</td>
             <td>[% loo.isbn %]</td>
-         <td><a href="orderreceive.pl?datereceived=[% loo.datereceived %]&amp;receive=[% loo.ordernumber %]&amp;biblio=[% loo.biblionumber %]&amp;invoice=[% loo.invoice %]&amp;freight=[% loo.freight %]&amp;gst=[% loo.gst %]&amp;id=[% loo.id %]">[% loo.title |html %]</a></td>
+         <td><a href="orderreceive.pl?ordernumber=[% loo.ordernumber %]&amp;invoiceid=[% invoiceid %]">[% loo.title |html %]</a></td>
             <td>[% loo.author %]</td>
             <td>[% loo.quantity %]</td>
             <td>[% loo.quantityreceived %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index eb5492e..893c657 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -157,11 +157,17 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  [% IF ( datereceived ) %]
-            Receipt Summary for <i>[% name %]</i> [% IF ( invoice ) %]<i>[ [% invoice %] ]</i>[% END %] on <i>[% formatteddatereceived %]</i>
-        [% ELSE %]
-            Receive orders from [% name %]
-        [% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
+    [% IF ( datereceived ) %]
+        Receipt Summary for <i>[% name %]</i>
+        [% IF ( invoice ) %]
+            <i>[ [% invoice %] ]</i>
+        [% END %]
+        on <i>[% formatteddatereceived %]</i>
+    [% ELSE %]
+        Receive orders from [% name %]
+    [% END %]
+</div>
 
 <div id="doc3" class="yui-t2">
 
@@ -199,102 +205,110 @@
 
 <div id="acqui_receive_summary">
 <p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
-	<!-- TODO: Add date picker, change rcv date. -->
+<p><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">Go to invoice details</a></p>
 </div>
-<div id="acqui_receive_search">
-    <h3>Pending Orders</h3>
-
- [% IF ( loop_orders ) %]<table id="pendingt">
-    <thead>
-        <tr>
-            <th>Basket</th>
-            <th>Order Line</th>
-            <th>Summary</th>
-    	    <th>View Record</th>
-            <th>Quantity</th>
-            <th>Unit cost</th>
-            <th>Order cost</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
-		<tfoot>
-            <tr><td colspan="4" class="total">TOTAL</td>
-                <td> [% totalPquantity %] </td>
-				<td>&nbsp;</td>
-                <td>[% ordergrandtotal %]</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-            </tr>
-		</tfoot>
-    <tbody class="filterclass">
-        [% FOREACH loop_order IN loop_orders %]
-	[% UNLESS ( loop.odd ) %]
-            <tr class="highlight">
-        [% ELSE %]
+[% UNLESS (invoiceclosedate) %]
+    <div id="acqui_receive_search">
+        <h3>Pending Orders</h3>
+
+     [% IF ( loop_orders ) %]<table id="pendingt">
+        <thead>
             <tr>
-        [% END %]
-                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
-                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.supplierid %]">[% loop_order.ordernumber %]</a></td>
-                <td class="summaryfilterclass">
-                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
-                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
-                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
-                [% IF ( loop_order.publishercode ) %]<br />Publisher :[% loop_order.publishercode %][% END %]
-                </td>
-                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
-                <td>[% loop_order.quantity %]</td>
-                <td>[% loop_order.ecost %]</td>
-                <td>[% loop_order.ordertotal %]</td>
-				<td>
-				    <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&amp;datereceived=[% loop_order.invoicedatereceived %]&amp;invoice=[% loop_order.invoice %]&amp;gst=[% loop_order.gst %]&amp;freight=[% loop_order.freight %]&amp;supplierid=[% loop_order.supplierid %]">Receive</a>
-				    
-				</td>
-				<td>
-				    [% IF ( loop_order.left_holds_on_order ) %]
-                    <span class="button" title="Can't delete order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
-                    [% ELSE %]
-                    <a href="javascript:confirm_delete_item([% loop_order.ordernumber %],[% loop_order.basketno %],[% loop_order.biblionumber %])" class="button">Delete order</a><br>
-                    [% END %]
-                    [% IF ( loop_order.can_del_bib ) %]
-                    <a href="javascript:confirm_delete_biblio([% loop_order.ordernumber %],[% loop_order.basketno %],[% loop_order.biblionumber %])" class="button">Delete order and catalog record</a><br>
-                    [% ELSE %]
-                    <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
-                    [% END %]
-                    [% IF ( loop_order.left_item ) %]
-                    <b title="Can't delete catalog record, because of [% loop_order.items %] existing item(s)" >[% loop_order.items %] item(s) left</b><br>
-                    [% END %]
-                    [% IF ( loop_order.left_biblio ) %]
-                    <b title="Can't delete catalog record, delete other orders linked to it first">[% loop_order.biblios %] order(s) left</b><br>
-                    [% END %]
-                    [% IF ( loop_order.left_subscription ) %]
-                    <b title="Can't delete catalog record, delete subscriptions first">[% loop_order.subscriptions %] subscription(s) left</b><br>
-                    [% END %]
-                    [% IF ( loop_order.left_holds ) %]
-                    <b title="Can't delete catalog record or order, cancel holds first">[% loop_order.holds %] hold(s) left</b>
-                    [% END %]
-				</td>
+                <th>Basket</th>
+                <th>Order Line</th>
+                <th>Summary</th>
+                <th>View Record</th>
+                <th>Quantity</th>
+                <th>Unit cost</th>
+                <th>Order cost</th>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
             </tr>
+        </thead>
+            <tfoot>
+                <tr><td colspan="4" class="total">TOTAL</td>
+                    <td> [% totalPquantity %] </td>
+                    <td>&nbsp;</td>
+                    <td>[% ordergrandtotal %]</td>
+                    <td>&nbsp;</td>
+                    <td>&nbsp;</td>
+                </tr>
+            </tfoot>
+        <tbody class="filterclass">
+            [% FOREACH loop_order IN loop_orders %]
+        [% UNLESS ( loop.odd ) %]
+                <tr class="highlight">
+            [% ELSE %]
+                <tr>
+            [% END %]
+                    <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
+                    <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.supplierid %]">[% loop_order.ordernumber %]</a></td>
+                    <td class="summaryfilterclass">
+                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
+                    [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
+                    [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
+                    [% IF ( loop_order.publishercode ) %]<br />Publisher :[% loop_order.publishercode %][% END %]
+                    </td>
+                    <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
+                    <td>[% loop_order.quantity %]</td>
+                    <td>[% loop_order.ecost %]</td>
+                    <td>[% loop_order.ordertotal %]</td>
+                    <td>
+                        <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&amp;invoiceid=[% invoiceid %]">Receive</a>
+                        
+                    </td>
+                    <td>
+                        [% IF ( loop_order.left_holds_on_order ) %]
+                        <span class="button" title="Can't delete order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
+                        [% ELSE %]
+                        <a href="javascript:confirm_delete_item([% loop_order.ordernumber %],[% loop_order.biblionumber %])" class="button">Delete order</a><br>
+                        [% END %]
+                        [% IF ( loop_order.can_del_bib ) %]
+                        <a href="javascript:confirm_delete_biblio([% loop_order.ordernumber %],[% loop_order.biblionumber %])" class="button">Delete order and catalog record</a><br>
+                        [% ELSE %]
+                        <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
+                        [% END %]
+                        [% IF ( loop_order.left_item ) %]
+                        <b title="Can't delete catalog record, because of [% loop_order.items %] existing item(s)" >[% loop_order.items %] item(s) left</b><br>
+                        [% END %]
+                        [% IF ( loop_order.left_biblio ) %]
+                        <b title="Can't delete catalog record, delete other orders linked to it first">[% loop_order.biblios %] order(s) left</b><br>
+                        [% END %]
+                        [% IF ( loop_order.left_subscription ) %]
+                        <b title="Can't delete catalog record, delete subscriptions first">[% loop_order.subscriptions %] subscription(s) left</b><br>
+                        [% END %]
+                        [% IF ( loop_order.left_holds ) %]
+                        <b title="Can't delete catalog record or order, cancel holds first">[% loop_order.holds %] hold(s) left</b>
+                        [% END %]
+                    </td>
+                </tr>
+            [% END %]
+        </tbody>
+         </table>[% ELSE %]There are no pending orders.[% END %]
+       <div id="resultnumber">
+        <!-- Row of numbers corresponding to search result pages -->
+        [% IF ( displayprev ) %]
+            <a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% prevstartfrom %][% IF ( datereceived ) %]&amp;datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&amp;invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]#resultnumber">&lt;&lt; Previous</a>
         [% END %]
-    </tbody>
-     </table>[% ELSE %]There are no pending orders.[% END %]
-   <div id="resultnumber">
-	<!-- Row of numbers corresponding to search result pages -->
-	[% IF ( displayprev ) %]
-		<a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% prevstartfrom %][% IF ( datereceived ) %]&amp;datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&amp;invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]#resultnumber">&lt;&lt; Previous</a>
-	[% END %]
-	[% FOREACH number IN numbers %]
-		[% IF ( number.highlight ) %]
-		<span class="current">[% number.number %]</span>
-		[% ELSE %]
-		<a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% number.startfrom %][% IF ( number.datereceived ) %]&amp;datereceived=[% number.datereceived %][% END %][% IF ( number.invoice ) %]&amp;invoice=[% number.invoice %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage %][% END %]#resultnumber">[% number.number %]</a>
-		[% END %]
-	[% END %]
-	[% IF ( displaynext ) %]
-		<a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% nextstartfrom %][% IF ( datereceived ) %]&amp;datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&amp;invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next &gt;&gt;</a>
-	[% END %]
-	</div>
-</div>
+        [% FOREACH number IN numbers %]
+            [% IF ( number.highlight ) %]
+            <span class="current">[% number.number %]</span>
+            [% ELSE %]
+            <a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% number.startfrom %][% IF ( number.datereceived ) %]&amp;datereceived=[% number.datereceived %][% END %][% IF ( number.invoice ) %]&amp;invoice=[% number.invoice %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage %][% END %]#resultnumber">[% number.number %]</a>
+            [% END %]
+        [% END %]
+        [% IF ( displaynext ) %]
+            <a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% nextstartfrom %][% IF ( datereceived ) %]&amp;datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&amp;invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next &gt;&gt;</a>
+        [% END %]
+        </div>
+    </div>
+[% ELSE %]
+    <p>
+        Invoice is close, so you can't receive orders.
+        <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid %]&referer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]">Reopen it</a>.
+    </p>
+[% END %]
+
 <div id="acqui_receive_receivelist">
     <h3>Already Received</h3>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index a7d704d..d6b12a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -14,7 +14,12 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-	
+
+[% IF ( error_failed_to_create_invoice ) %]
+    <div id="error" class="dialog error">
+        <p>An error has occured. Invoice cannot be created.</p>
+    </div>
+[% END %]
 <h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a></h1>
 
 [% IF ( count ) %]
@@ -42,11 +47,16 @@
             [% searchresult.number %]
         </td>
         <td>
-            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=[% supplierid |url %]&amp;datereceived=[% searchresult.raw_datereceived |url %][% IF ( searchresult.code ) %]&amp;invoice=[% searchresult.code |url %][% END %]">
-                [% searchresult.datereceived %]</a>
+            [% searchresult.datereceived %]
         </td>
         <td>
-            [% IF ( searchresult.code ) %][% searchresult.code %][% ELSE %]<acronym title="not available">n/a</acronym>[% END %]
+            [% IF ( searchresult.code ) %]
+                <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid %]">
+                    [% searchresult.code %]
+            </a>
+            [% ELSE %]
+                <acronym title="not available">n/a</acronym>
+            [% END %]
         </td>
         <td>
             [% searchresult.reccount %] 
@@ -81,7 +91,7 @@
 [% END %]
 
     <div id="parcels_new_parcel">
-        <form method="get" action="parcel.pl">
+        <form method="get" action="parcels.pl">
     <fieldset class="rows">
     <legend>Receive a new shipment</legend>
        <ol> <li>
@@ -90,26 +100,16 @@
             <input type="hidden" name="op" value="new" />
 			<input type="text" size="20" id="invoice" name="invoice" />
         </li>
-		[% IF ( gst ) %]
-        <li>
-            <label for="gst">GST:</label>
-            <input type="text" size="20" id="gst" name="gst" />
-        </li>
-		[% END %]
-      <!--  // Removing freight input until shipping can be proplerly handled .
-	  <li>
-            <label for="freight">Shipping:</label>
-            <input type="text" size="20" id="freight" name="freight" />
-        </li> -->
-         <li><label for="datereceived">Shipment date: </label>
-            <input type="text" id="datereceived" name="datereceived"  maxlength="10" size="10"  value="[% datereceived_today %]" />
-            <img src="[% themelang %]/lib/calendar/cal.gif" id="datereceived_button" alt="Show Calendar" />
+         <li><label for="shipmentdate">Shipment date: </label>
+            <input type="text" id="shipmentdate" name="shipmentdate" maxlength="10" size="10" value="[% shipmentdate_today %]" />
+            <img src="[% themelang %]/lib/calendar/cal.gif" id="shipmentdate_button" alt="Show Calendar" />
       <script language="JavaScript" type="text/javascript">
         Calendar.setup(
           {
-            inputField : "datereceived",
+            inputField : "shipmentdate",
             ifFormat : "[% DHTMLcalendar_dateformat %]",
-            button : "datereceived_button"          }
+            button : "shipmentdate_button"
+          }
         );
       </script>
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	</li>
@@ -131,9 +131,9 @@
                 <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
             <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
                 <option value="aqorders.booksellerinvoicenumber">Invoice number</option>
-                <option value="datereceived"> Date Received</option>
-                <option value="datereceived desc"> Date Received reverse</option>
-                <option value="aqorders.booksellerinvoicenumber desc"> Invoice number reverse</option>
+                <option value="shipmentdate">Shipment date</option>
+                <option value="datereceived desc">Shipment date reverse</option>
+                <option value="aqorders.booksellerinvoicenumber desc">Invoice number reverse</option>
                 </select><br />
                 <label for="resultsperpage">Results per page :</label><select name="resultsperpage" id="resultsperpage">
                 <option value="20">20</option>
-- 
1.7.9


From wizzyrea at gmail.com  Fri Feb 17 22:35:38 2012
From: wizzyrea at gmail.com (Liz Rea)
Date: Fri, 17 Feb 2012 15:35:38 -0600
Subject: [Koha-patches] [PATCH] Bug 6488 - followup - fixes issue with bibs
	with no items and serials being suppressed
Message-ID: <1329514538-17788-1-git-send-email-wizzyrea@gmail.com>

To test:

* create a bib with no items
* update your index
	serial records and your new bib with no items should be displayed.
* add something to the OPACHiddenItems syspref (I like itype: [BK] from the test data)
*** test both ways, with something in there and with the syspref empty.
* add an item to your new bib that would be suppressed
* update your index
* search for the bib
	The item should not show
* change the item into a state where it would no longer be suppressed
* update your index
* search for the bib
	The item should show in the opac
* just for fun, delete your item
* update your index
* Search for the bib - it should still display.

I tested on MARC21 - please test UNIMARC as well.

http://bugs.koha-community.org/show_bug.cgi?id=7386
---
 C4/Search.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index c4276a3..e326986 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1758,10 +1758,10 @@ sub searchResults {
                 }
             }
         }    # notforloan, item level and biblioitem level
-
+	if ($items_count > 0) {
         next if $is_opac       && $hideatopac_count >= $items_count;
         next if $hidelostitems && $itemlost_count   >= $items_count;
-
+	}
         my ( $availableitemscount, $onloanitemscount, $otheritemscount );
         for my $key ( sort keys %$onloan_items ) {
             (++$onloanitemscount > $maxitems) and last;
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Tue Feb 21 05:12:45 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Tue, 21 Feb 2012 17:12:45 +1300
Subject: [Koha-patches] [PATCH] bug_7420: code reindent and comment
In-Reply-To: <bug 7420>
References: <bug 7420>
Message-ID: <1329797565-17945-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Overdues.pm |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/C4/Overdues.pm b/C4/Overdues.pm
index 03192c0..0f7914c 100644
--- a/C4/Overdues.pm
+++ b/C4/Overdues.pm
@@ -515,25 +515,29 @@ sub UpdateFine {
     my $data;
     my $total_amount_other = 0.00;
     my $due_qr = qr/$due/;
+    # Cycle through the fines and
+    # - find line that relates to the requested $itemnum
+    # - accumulate fines for other items
+    # so we can update $itemnum fine taking in account fine caps
     while (my $rec = $sth->fetchrow_hashref) {
-      if ($rec->{itemnumber} == $itemnum && $rec->{description} =~ /$due_qr/) {
-        if ($data) {
-          warn "Not a unique accountlines record for item $itemnum borrower $borrowernumber";
-        } else {
-          $data = $rec;
-          next;
+        if ($rec->{itemnumber} == $itemnum && $rec->{description} =~ /$due_qr/) {
+            if ($data) {
+                warn "Not a unique accountlines record for item $itemnum borrower $borrowernumber";
+            } else {
+                $data = $rec;
+                next;
+            }
         }
-      }
-      $total_amount_other += $rec->{'amount'};
+        $total_amount_other += $rec->{'amount'};
     }
     if (my $maxfine = C4::Context->preference('MaxFine')) {
-      if ($total_amount_other + $amount > $maxfine) {
-        my $new_amount = $maxfine - $total_amount_other;
-        warn "Reducing fine for item $itemnum borrower $borrowernumber from $amount to $new_amount - MaxFine reached";
-        return if $new_amount <= 0.00;
-        
-        $amount = $new_amount;
-      }
+        if ($total_amount_other + $amount > $maxfine) {
+            my $new_amount = $maxfine - $total_amount_other;
+            warn "Reducing fine for item $itemnum borrower $borrowernumber from $amount to $new_amount - MaxFine reached";
+            return if $new_amount <= 0.00;
+
+            $amount = $new_amount;
+        }
     }
 
     if ( $data ) {
-- 
1.6.5


From srdjan at catalyst.net.nz  Tue Feb 21 05:52:49 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Tue, 21 Feb 2012 17:52:49 +1300
Subject: [Koha-patches] [PATCH] bug_7001: Issue and Reserve slips are
	notices.
In-Reply-To: <bug 7001>
References: <bug 7001>
Message-ID: <1329799969-19979-1-git-send-email-srdjan@catalyst.net.nz>

Branches can have their own version of notices - added branchcode to
letter table.
Support html notices - added is_html to letter table.
Support for borrower attributes in templates.
GetPreparedletter() is the interface for compiling letters (notices).
Sysprefs for notice and slips stylesheets.
---
 C4/Circulation.pm                                  |   20 +-
 C4/Letters.pm                                      |  549 +++++++++++++-------
 C4/Members.pm                                      |   81 +++-
 C4/Members/Attributes.pm                           |   18 +
 C4/Message.pm                                      |   12 +-
 C4/Print.pm                                        |  146 ++----
 C4/Reserves.pm                                     |  103 +++--
 C4/Suggestions.pm                                  |   22 +-
 acqui/booksellers.pl                               |    7 +-
 circ/circulation.pl                                |    3 +-
 circ/hold-transfer-slip.pl                         |   32 +-
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/en/mandatory/sample_notices.sql     |   84 +++-
 .../data/mysql/es-ES/mandatory/sample_notices.sql  |    2 +-
 .../mysql/fr-FR/1-Obligatoire/sample_notices.sql   |    2 +-
 installer/data/mysql/it-IT/necessari/notices.sql   |    2 +-
 installer/data/mysql/kohastructure.sql             |    7 +-
 .../mysql/nb-NO/1-Obligatorisk/sample_notices.sql  |    2 +-
 .../data/mysql/pl-PL/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/ru-RU/mandatory/sample_notices.sql  |    2 +-
 installer/data/mysql/sysprefs.sql                  |    2 +
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    2 +-
 installer/data/mysql/updatedatabase.pl             |  100 ++++-
 .../prog/en/includes/circ-toolbar.inc              |    4 +-
 .../en/modules/admin/preferences/circulation.pref  |    5 +
 .../en/modules/admin/preferences/staff_client.pref |    5 +
 .../prog/en/modules/batch/print-notices.tt         |    6 +-
 .../prog/en/modules/circ/hold-transfer-slip.tt     |   54 --
 .../prog/en/modules/circ/printslip.tt              |   28 +
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |  162 +++++--
 .../prog/en/modules/tools/tools-home.tt            |    2 +-
 members/memberentry.pl                             |    5 +-
 members/moremember.pl                              |   10 -
 members/printslip.pl                               |   92 ++++
 misc/cronjobs/advance_notices.pl                   |   78 ++--
 misc/cronjobs/gather_print_notices.pl              |   14 +-
 misc/cronjobs/overdue_notices.pl                   |   86 ++--
 t/db_dependent/lib/KohaTest/Letters.pm             |    5 +-
 t/db_dependent/lib/KohaTest/Letters/GetLetter.pm   |    3 +-
 t/db_dependent/lib/KohaTest/Members.pm             |    1 +
 t/db_dependent/lib/KohaTest/Print.pm               |    5 +-
 t/db_dependent/lib/KohaTest/Reserves.pm            |    1 +
 tools/letter.pl                                    |  230 ++++++---
 43 files changed, 1308 insertions(+), 690 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
 create mode 100755 members/printslip.pl

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 93c6fac..a62f26e 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2667,11 +2667,18 @@ sub SendCirculationAlert {
         borrowernumber => $borrower->{borrowernumber},
         message_name   => $message_name{$type},
     });
-    my $letter = C4::Letters::getletter('circulation', $type);
-    C4::Letters::parseletter($letter, 'biblio',      $item->{biblionumber});
-    C4::Letters::parseletter($letter, 'biblioitems', $item->{biblionumber});
-    C4::Letters::parseletter($letter, 'borrowers',   $borrower->{borrowernumber});
-    C4::Letters::parseletter($letter, 'branches',    $branch);
+    my $letter =  C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => $type,
+        branchcode => $branch,
+        tables => {
+            'biblio'      => $item->{biblionumber},
+            'biblioitems' => $item->{biblionumber},
+            'borrowers'   => $borrower,
+            'branches'    => $branch,
+        }
+    ) or return;
+
     my @transports = @{ $borrower_preferences->{transports} };
     # warn "no transports" unless @transports;
     for (@transports) {
@@ -2686,7 +2693,8 @@ sub SendCirculationAlert {
             $message->update;
         }
     }
-    $letter;
+
+    return $letter;
 }
 
 =head2 updateWrongTransfer
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 28c6984..adc7b12 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -24,6 +24,7 @@ use MIME::Lite;
 use Mail::Sendmail;
 
 use C4::Members;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Branch;
 use C4::Log;
 use C4::SMS;
@@ -40,7 +41,7 @@ BEGIN {
 	$VERSION = 3.01;
 	@ISA = qw(Exporter);
 	@EXPORT = qw(
-	&GetLetters &getletter &addalert &getalert &delalert &findrelatedto &SendAlerts GetPrintMessages
+	&GetLetters &GetPreparedLetter &GetWrappedLetter &addalert &getalert &delalert &findrelatedto &SendAlerts &GetPrintMessages
 	);
 }
 
@@ -115,13 +116,26 @@ sub GetLetters (;$) {
     return \%letters;
 }
 
-sub getletter ($$) {
-    my ( $module, $code ) = @_;
+my %letter;
+sub getletter ($$$) {
+    my ( $module, $code, $branchcode ) = @_;
+
+    if (C4::Context->preference('IndependantBranches') && $branchcode){
+        $$branchcode = C4::Context->userenv->{'branch'};
+    }
+
+    if ( my $l = $letter{$module}{$code}{$branchcode} ) {
+        return { %$l }; # deep copy
+    }
+
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("select * from letter where module=? and code=?");
-    $sth->execute( $module, $code );
-    my $line = $sth->fetchrow_hashref;
-    return $line;
+    my $sth = $dbh->prepare("select * from letter where module=? and code=? and (branchcode = ? or branchcode = '') order by branchcode desc limit 1");
+    $sth->execute( $module, $code, $branchcode );
+    my $line = $sth->fetchrow_hashref
+      or return;
+    $line->{'content-type'} = 'text/html; charset="UTF-8"' if $line->{is_html};
+    $letter{$module}{$code}{$branchcode} = $line;
+    return { %$line };
 }
 
 =head2 addalert ($borrowernumber, $type, $externalid)
@@ -176,7 +190,7 @@ sub delalert ($) {
 sub getalert (;$$$) {
     my ( $borrowernumber, $type, $externalid ) = @_;
     my $dbh   = C4::Context->dbh;
-    my $query = "SELECT * FROM alert WHERE";
+    my $query = "SELECT a.*, b.branchcode FROM alert a JOIN borrowers b USING(borrowernumber) WHERE";
     my @bind;
     if ($borrowernumber and $borrowernumber =~ /^\d+$/) {
         $query .= " borrowernumber=? AND ";
@@ -232,73 +246,68 @@ sub findrelatedto ($$) {
     parameters :
     - $type : the type of alert
     - $externalid : the id of the "object" to query
-    - $letter : the letter to send.
+    - $letter_code : the letter to send.
 
     send an alert to all borrowers having put an alert on a given subject.
 
 =cut
 
 sub SendAlerts {
-    my ( $type, $externalid, $letter ) = @_;
+    my ( $type, $externalid, $letter_code ) = @_;
     my $dbh = C4::Context->dbh;
     my $strsth;
     if ( $type eq 'issue' ) {
 
-        # 		warn "sending issues...";
-        my $letter = getletter( 'serial', $letter );
-
         # prepare the letter...
         # search the biblionumber
         my $sth =
           $dbh->prepare(
             "SELECT biblionumber FROM subscription WHERE subscriptionid=?");
         $sth->execute($externalid);
-        my ($biblionumber) = $sth->fetchrow;
-
-        # parsing branch info
-        my $userenv = C4::Context->userenv;
-        parseletter( $letter, 'branches', $userenv->{branch} );
-
-        # parsing librarian name
-        $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
-        $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
-        $letter->{content} =~
-          s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-
-        # parsing biblio information
-        parseletter( $letter, 'biblio',      $biblionumber );
-        parseletter( $letter, 'biblioitems', $biblionumber );
+        my ($biblionumber) = $sth->fetchrow
+          or warn( "No subscription for '$externalid'" ),
+             return;
 
+        my %letter;
         # find the list of borrowers to alert
         my $alerts = getalert( '', 'issue', $externalid );
         foreach (@$alerts) {
 
-            # and parse borrower ...
-            my $innerletter = $letter;
             my $borinfo = C4::Members::GetMember('borrowernumber' => $_->{'borrowernumber'});
-            parseletter( $innerletter, 'borrowers', $_->{'borrowernumber'} );
+            my $email = $borinfo->{email} or next;
+
+            # 		warn "sending issues...";
+            my $userenv = C4::Context->userenv;
+            my $letter = GetPreparedLetter (
+                module => 'serial',
+                letter_code => $letter_code,
+                branchcode => $userenv->{branch},
+                tables => {
+                    'branches'    => $_->{branchcode},
+                    'biblio'      => $biblionumber,
+                    'biblioitems' => $biblionumber,
+                    'borrowers'   => $borinfo,
+                },
+                want_librarian => 1,
+            ) or return;
 
             # ... then send mail
-            if ( $borinfo->{email} ) {
-                my %mail = (
-                    To      => $borinfo->{email},
-                    From    => $borinfo->{email},
-                    Subject => "" . $innerletter->{title},
-                    Message => "" . $innerletter->{content},
-                    'Content-Type' => 'text/plain; charset="utf8"',
-                    );
-                sendmail(%mail) or carp $Mail::Sendmail::error;
-
-            }
+            my %mail = (
+                To      => $email,
+                From    => $email,
+                Subject => "" . $letter->{title},
+                Message => "" . $letter->{content},
+                'Content-Type' => 'text/plain; charset="utf8"',
+                );
+            sendmail(%mail) or carp $Mail::Sendmail::error;
         }
     }
-    elsif ( $type eq 'claimacquisition' ) {
-
-        $letter = getletter( 'claimacquisition', $letter );
+    elsif ( $type eq 'claimacquisition' or $type eq 'claimissues' ) {
 
         # prepare the letter...
         # search the biblionumber
-        $strsth = qq{
+        $strsth =  $type eq 'claimacquisition'
+            ? qq{
             SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*,aqbooksellers.*
             FROM aqorders
             LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
@@ -306,114 +315,83 @@ sub SendAlerts {
             LEFT JOIN biblioitems ON aqorders.biblioitemnumber=biblioitems.biblioitemnumber
             LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
             WHERE aqorders.ordernumber IN (
-        }
-          . join( ",", @$externalid ) . ")";
-    }
-    elsif ( $type eq 'claimissues' ) {
-
-        $letter = getletter( 'claimissues', $letter );
-
-        # prepare the letter...
-        # search the biblionumber
-        $strsth = qq{
+            }
+            : qq{
             SELECT serial.*,subscription.*, biblio.*, aqbooksellers.*
             FROM serial
             LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid
             LEFT JOIN biblio ON serial.biblionumber=biblio.biblionumber
             LEFT JOIN aqbooksellers ON subscription.aqbooksellerid=aqbooksellers.id
             WHERE serial.serialid IN (
-        }
+            }
           . join( ",", @$externalid ) . ")";
-    }
-
-    if ( $type eq 'claimacquisition' or $type eq 'claimissues' ) {
         my $sthorders = $dbh->prepare($strsth);
         $sthorders->execute;
-        my @fields = map {
-            $sthorders->{mysql_table}[$_] . "." . $sthorders->{NAME}[$_] }
-            (0 .. $#{$sthorders->{NAME}} ) ;
-
-        my @orders_infos;
-        while ( my $row = $sthorders->fetchrow_arrayref() ) {
-            my %rec = ();
-            @rec{@fields} = @$row;
-            push @orders_infos, \%rec;
+        my $dataorders = $sthorders->fetchall_arrayref( {} );
+
+        my $sthbookseller =
+          $dbh->prepare("select * from aqbooksellers where id=?");
+        $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
+        my $databookseller = $sthbookseller->fetchrow_hashref;
+
+        my @email;
+        push @email, $databookseller->{bookselleremail} if $databookseller->{bookselleremail};
+        push @email, $databookseller->{contemail}       if $databookseller->{contemail};
+        unless (@email) {
+            warn "Bookseller $dataorders->[0]->{booksellerid} without emails";
+            return;
         }
 
-        # parsing branch info
         my $userenv = C4::Context->userenv;
-        parseletter( $letter, 'branches', $userenv->{branch} );
-
-        # parsing librarian name
-        $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
-        $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
-        $letter->{content} =~ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-
-        # Get Fields remplacement
-        my $order_format = $1 if ( $letter->{content} =~ m/(<order>.*<\/order>)/xms );
-
-        # Foreach field to remplace
-        while ( $letter->{content} =~ m/<<([^>]*)>>/g ) {
-            my $field = $1;
-            my $value = $orders_infos[0]->{$field} || "";
-            $value = sprintf("%.2f", $value) if $field =~ /price/;
-            $letter->{content} =~ s/<<$field>>/$value/g;
-        }
-
-        if ( $order_format ) {
-            # For each order
-            foreach my $infos ( @orders_infos ) {
-                my $order_content = $order_format;
-                # We replace by value
-                while ( $order_content =~ m/<<([^>]*)>>/g ) {
-                    my $field = $1;
-                    my $value = $infos->{$field} || "";
-                    $value = sprintf("%.2f", $value) if $field =~ /price/;
-                    $order_content =~ s/(<<$field>>)/$value/g;
-                }
-                $order_content =~ s/<\/{0,1}?order>//g;
-                $letter->{content} =~ s/<order>.*<\/order>/$order_content\n$order_format/xms;
-            }
-            $letter->{content} =~ s/<order>.*<\/order>//xms;
-        }
-
-        my $innerletter = $letter;
+        my $letter = GetPreparedLetter (
+            module => $type,
+            letter_code => $letter_code,
+            branchcode => $userenv->{branch},
+            tables => {
+                'branches'    => $userenv->{branch},
+                'aqbooksellers' => $databookseller,
+            },
+            repeat => $dataorders,
+            want_librarian => 1,
+        ) or return;
 
         # ... then send mail
-        if (   $orders_infos[0]->{'aqbooksellers.bookselleremail'}
-            || $orders_infos[0]->{'aqbooksellers.contemail'} ) {
-            my $to = $orders_infos[0]->{'aqbooksellers.bookselleremail'};
-            $to .= ", " if $to;
-            $to .= $orders_infos[0]->{'aqbooksellers.contemail'} || "";
-            my %mail = (
-                To             => $to,
-                From           => $userenv->{emailaddress},
-                Subject        => Encode::encode( "utf8", "" . $innerletter->{title} ),
-                Message        => Encode::encode( "utf8", "" . $innerletter->{content} ),
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-            warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}" if $debug;
-            if ( C4::Context->preference("LetterLog") ) {
-                logaction( "ACQUISITION", "Send Acquisition claim letter", "", "order list : " . join( ",", @$externalid ) . "\n$innerletter->{title}\n$innerletter->{content}" ) if $type eq 'claimacquisition';
-                logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues';
-            }
-        } else {
-            return {error => "no_email" };
-        }
-
-        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug;
-    }
+        my %mail = (
+            To => join( ','. @email),
+            From           => $userenv->{emailaddress},
+            Subject        => "" . $letter->{title},
+            Message        => "" . $letter->{content},
+            'Content-Type' => 'text/plain; charset="utf8"',
+        );
+        sendmail(%mail) or carp $Mail::Sendmail::error;
 
-    # send an "account details" notice to a newly created user
+        logaction(
+            "ACQUISITION",
+            $type eq 'claimissues' ? "CLAIM ISSUE" : "ACQUISITION CLAIM",
+            undef,
+            "To="
+                . $databookseller->{contemail}
+                . " Title="
+                . $letter->{title}
+                . " Content="
+                . $letter->{content}
+        ) if C4::Context->preference("LetterLog");
+    }    
+   # send an "account details" notice to a newly created user 
     elsif ( $type eq 'members' ) {
-        # must parse the password special, before it's hashed.
-        $letter->{content} =~ s/<<borrowers.password>>/$externalid->{'password'}/g;
-
-        parseletter( $letter, 'borrowers', $externalid->{'borrowernumber'});
-        parseletter( $letter, 'branches', $externalid->{'branchcode'} );
-
         my $branchdetails = GetBranchDetail($externalid->{'branchcode'});
+        my $letter = GetPreparedLetter (
+            module => 'members',
+            letter_code => $letter_code,
+            branchcode => $externalid->{'branchcode'},
+            tables => {
+                'branches'    => $branchdetails,
+                'borrowers' => $externalid->{'borrowernumber'},
+            },
+            substitute => { 'borrowers.password' => $externalid->{'password'} },
+            want_librarian => 1,
+        ) or return;
+
         my %mail = (
                 To      =>     $externalid->{'emailaddr'},
                 From    =>  $branchdetails->{'branchemail'} || C4::Context->preference("KohaAdminEmailAddress"),
@@ -425,24 +403,148 @@ sub SendAlerts {
     }
 }
 
-=head2 parseletter($letter, $table, $pk)
-
-    parameters :
-    - $letter : a hash to letter fields (title & content useful)
-    - $table : the Koha table to parse.
-    - $pk : the primary key to query on the $table table
-    parse all fields from a table, and replace values in title & content with the appropriate value
-    (not exported sub, used only internally)
+=head2 GetPreparedLetter( %params )
+
+    %params hash:
+      module => letter module, mandatory
+      letter_code => letter code, mandatory
+      branchcode => for letter selection, if missing default system letter taken
+      tables => a hashref with table names as keys. Values are either:
+        - a scalar - primary key value
+        - an arrayref - primary key values
+        - a hashref - full record
+      substitute => custom substitution key/value pairs
+      repeat => records to be substituted on consecutive lines:
+        - an arrayref - tries to guess what needs substituting by
+          taking remaining << >> tokensr; not recommended
+        - a hashref token => @tables - replaces <token> << >> << >> </token>
+          subtemplate for each @tables row; table is a hashref as above
+      want_librarian => boolean,  if set to true triggers librarian details
+        substitution from the userenv
+    Return value:
+      letter fields hashref (title & content useful)
 
 =cut
 
-our %handles = ();
-our %columns = ();
+sub GetPreparedLetter {
+    my %params = @_;
+
+    my $module      = $params{module} or croak "No module";
+    my $letter_code = $params{letter_code} or croak "No letter_code";
+    my $branchcode  = $params{branchcode} || '';
+
+    my $letter = getletter( $module, $letter_code, $branchcode )
+        or warn( "No $module $letter_code letter"),
+            return;
 
-sub parseletter_sth {
+    my $tables = $params{tables};
+    my $substitute = $params{substitute};
+    my $repeat = $params{repeat};
+    $tables || $substitute || $repeat
+      or carp( "ERROR: nothing to substitute - both 'tables' and 'substitute' are empty" ),
+         return;
+    my $want_librarian = $params{want_librarian};
+
+    if ($substitute) {
+        while ( my ($token, $val) = each %$substitute ) {
+            $letter->{title} =~ s/<<$token>>/$val/g;
+            $letter->{content} =~ s/<<$token>>/$val/g;
+       }
+    }
+
+    if ($want_librarian) {
+        # parsing librarian name
+        my $userenv = C4::Context->userenv;
+        $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/go;
+        $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/go;
+        $letter->{content} =~ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/go;
+    }
+
+    my ($repeat_no_enclosing_tags, $repeat_enclosing_tags);
+
+    if ($repeat) {
+        if (ref ($repeat) eq 'ARRAY' ) {
+            $repeat_no_enclosing_tags = $repeat;
+        } else {
+            $repeat_enclosing_tags = $repeat;
+        }
+    }
+
+    if ($repeat_enclosing_tags) {
+        while ( my ($tag, $tag_tables) = each %$repeat_enclosing_tags ) {
+            if ( $letter->{content} =~ m!<$tag>(.*)</$tag>!s ) {
+                my $subcontent = $1;
+                my @lines = map {
+                    my %subletter = ( title => '', content => $subcontent );
+                    _substitute_tables( \%subletter, $_ );
+                    $subletter{content};
+                } @$tag_tables;
+                $letter->{content} =~ s!<$tag>.*</$tag>!join( "\n", @lines )!se;
+            }
+        }
+    }
+
+    if ($tables) {
+        _substitute_tables( $letter, $tables );
+    }
+
+    if ($repeat_no_enclosing_tags) {
+        if ( $letter->{content} =~ m/[^\n]*<<.*>>[^\n]*/so ) {
+            my $line = $&;
+            my $i = 1;
+            my @lines = map {
+                my $c = $line;
+                $c =~ s/<<count>>/$i/go;
+                foreach my $field ( keys %{$_} ) {
+                    $c =~ s/(<<[^\.]+.$field>>)/$_->{$field}/;
+                }
+                $i++;
+                $c;
+            } @$repeat_no_enclosing_tags;
+
+            my $replaceby = join( "\n", @lines );
+            $letter->{content} =~ s/\Q$line\E/$replaceby/s;
+        }
+    }
+
+    $letter->{content} =~ s/<<\S*>>//go; #remove any stragglers
+#   $letter->{content} =~ s/<<[^>]*>>//go;
+
+    return $letter;
+}
+
+sub _substitute_tables {
+    my ( $letter, $tables ) = @_;
+    while ( my ($table, $param) = each %$tables ) {
+        next unless $param;
+
+        my $ref = ref $param;
+
+        my $values;
+        if ($ref && $ref eq 'HASH') {
+            $values = $param;
+        }
+        else {
+            my @pk;
+            my $sth = _parseletter_sth($table);
+            unless ($sth) {
+                warn "_parseletter_sth('$table') failed to return a valid sth.  No substitution will be done for that table.";
+                return;
+            }
+            $sth->execute( $ref ? @$param : $param );
+
+            $values = $sth->fetchrow_hashref;
+        }
+
+        _parseletter ( $letter, $table, $values );
+    }
+}
+
+my %handles = ();
+sub _parseletter_sth {
     my $table = shift;
     unless ($table) {
-        carp "ERROR: parseletter_sth() called without argument (table)";
+        carp "ERROR: _parseletter_sth() called without argument (table)";
         return;
     }
     # check cache first
@@ -456,9 +558,12 @@ sub parseletter_sth {
     ($table eq 'borrowers'    ) ? "SELECT * FROM $table WHERE borrowernumber = ?"                      :
     ($table eq 'branches'     ) ? "SELECT * FROM $table WHERE     branchcode = ?"                      :
     ($table eq 'suggestions'  ) ? "SELECT * FROM $table WHERE   suggestionid = ?"                      :
-    ($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE             id = ?"                      : undef ;
+    ($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE             id = ?"                      :
+    ($table eq 'aqorders'     ) ? "SELECT * FROM $table WHERE    ordernumber = ?"                      :
+    ($table eq 'opac_news'    ) ? "SELECT * FROM $table WHERE          idnew = ?"                      :
+    undef ;
     unless ($query) {
-        warn "ERROR: No parseletter_sth query for table '$table'";
+        warn "ERROR: No _parseletter_sth query for table '$table'";
         return;     # nothing to get
     }
     unless ($handles{$table} = C4::Context->dbh->prepare($query)) {
@@ -468,25 +573,21 @@ sub parseletter_sth {
     return $handles{$table};    # now cache is populated for that $table
 }
 
-sub parseletter {
-    my ( $letter, $table, $pk, $pk2 ) = @_;
-    unless ($letter) {
-        carp "ERROR: parseletter() 1st argument 'letter' empty";
-        return;
-    }
-    my $sth = parseletter_sth($table);
-    unless ($sth) {
-        warn "parseletter_sth('$table') failed to return a valid sth.  No substitution will be done for that table.";
-        return;
-    }
-    if ( $pk2 ) {
-        $sth->execute($pk, $pk2);
-    } else {
-        $sth->execute($pk);
-    }
+=head2 _parseletter($letter, $table, $values)
 
-    my $values = $sth->fetchrow_hashref;
-    
+    parameters :
+    - $letter : a hash to letter fields (title & content useful)
+    - $table : the Koha table to parse.
+    - $values : table record hashref
+    parse all fields from a table, and replace values in title & content with the appropriate value
+    (not exported sub, used only internally)
+
+=cut
+
+my %columns = ();
+sub _parseletter {
+    my ( $letter, $table, $values ) = @_;
+   
     # TEMPORARY hack until the expirationdate column is added to reserves
     if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
         my @waitingdate = split /-/, $values->{'waitingdate'};
@@ -500,16 +601,51 @@ sub parseletter {
         )->output();
     }
 
+    if ($letter->{content} && $letter->{content} =~ /<<today>>/) {
+        my @da = localtime();
+        my $todaysdate = "$da[2]:$da[1]  " . C4::Dates->today();
+        $letter->{content} =~ s/<<today>>/$todaysdate/go;
+    }
 
     # and get all fields from the table
-    my $columns = C4::Context->dbh->prepare("SHOW COLUMNS FROM $table");
-    $columns->execute;
-    while ( ( my $field ) = $columns->fetchrow_array ) {
-        my $replacefield = "<<$table.$field>>";
-        $values->{$field} =~ s/\p{P}(?=$)//g if $values->{$field};
-        my $replacedby   = $values->{$field} || '';
-        ($letter->{title}  ) and $letter->{title}   =~ s/$replacefield/$replacedby/g;
-        ($letter->{content}) and $letter->{content} =~ s/$replacefield/$replacedby/g;
+#   my $columns = $columns{$table};
+#   unless ($columns) {
+#       $columns = $columns{$table} =  C4::Context->dbh->selectcol_arrayref("SHOW COLUMNS FROM $table");
+#   }
+#   foreach my $field (@$columns) {
+
+    while ( my ($field, $val) = each %$values ) {
+        my $replacetablefield = "<<$table.$field>>";
+        my $replacefield = "<<$field>>";
+        $val =~ s/\p{P}(?=$)//g if $val;
+        my $replacedby   = defined ($val) ? $val : '';
+        ($letter->{title}  ) and do {
+            $letter->{title}   =~ s/$replacetablefield/$replacedby/g;
+            $letter->{title}   =~ s/$replacefield/$replacedby/g;
+        };
+        ($letter->{content}) and do {
+            $letter->{content} =~ s/$replacetablefield/$replacedby/g;
+            $letter->{content} =~ s/$replacefield/$replacedby/g;
+        };
+    }
+
+    if ($table eq 'borrowers' && $letter->{content}) {
+        if ( my $attributes = GetBorrowerAttributes($values->{borrowernumber}) ) {
+            my %attr;
+            foreach (@$attributes) {
+                my $code = $_->{code};
+                my $val  = $_->{value_description} || $_->{value};
+                $val =~ s/\p{P}(?=$)//g if $val;
+                next unless $val gt '';
+                $attr{$code} ||= [];
+                push @{ $attr{$code} }, $val;
+            }
+            while ( my ($code, $val_ar) = each %attr ) {
+                my $replacefield = "<<borrower-attribute:$code>>";
+                my $replacedby   = join ',', @$val_ar;
+                $letter->{content} =~ s/$replacefield/$replacedby/g;
+            }
+        }
     }
     return $letter;
 }
@@ -694,31 +830,32 @@ returns your letter object, with the content updated.
 sub _add_attachments {
     my $params = shift;
 
-    return unless 'HASH' eq ref $params;
-    foreach my $required_parameter (qw( letter attachments message )) {
-        return unless exists $params->{$required_parameter};
-    }
-    return $params->{'letter'} unless @{ $params->{'attachments'} };
+    my $letter = $params->{'letter'};
+    my $attachments = $params->{'attachments'};
+    return $letter unless @$attachments;
+    my $message = $params->{'message'};
 
     # First, we have to put the body in as the first attachment
-    $params->{'message'}->attach(
-        Type => 'TEXT',
-        Data => $params->{'letter'}->{'content'},
+    $message->attach(
+        Type => $letter->{'content-type'} || 'TEXT',
+        Data => $letter->{'is_html'}
+            ? _wrap_html($letter->{'content'}, $letter->{'title'})
+            : $letter->{'content'},
     );
 
-    foreach my $attachment ( @{ $params->{'attachments'} } ) {
-        $params->{'message'}->attach(
+    foreach my $attachment ( @$attachments ) {
+        $message->attach(
             Type     => $attachment->{'type'},
             Data     => $attachment->{'content'},
             Filename => $attachment->{'filename'},
         );
     }
     # we're forcing list context here to get the header, not the count back from grep.
-    ( $params->{'letter'}->{'content-type'} ) = grep( /^Content-Type:/, split( /\n/, $params->{'message'}->header_as_string ) );
-    $params->{'letter'}->{'content-type'} =~ s/^Content-Type:\s+//;
-    $params->{'letter'}->{'content'} = $params->{'message'}->body_as_string;
+    ( $letter->{'content-type'} ) = grep( /^Content-Type:/, split( /\n/, $params->{'message'}->header_as_string ) );
+    $letter->{'content-type'} =~ s/^Content-Type:\s+//;
+    $letter->{'content'} = $message->body_as_string;
 
-    return $params->{'letter'};
+    return $letter;
 
 }
 
@@ -785,14 +922,17 @@ sub _send_message_by_email ($;$$$) {
 
     my $utf8   = decode('MIME-Header', $message->{'subject'} );
     $message->{subject}= encode('MIME-Header', $utf8);
+    my $subject = encode('utf8', $message->{'subject'});
     my $content = encode('utf8', $message->{'content'});
+    my $content_type = $message->{'content_type'} || 'text/plain; charset="UTF-8"';
+    my $is_html = $content_type =~ m/html/io;
     my %sendmail_params = (
         To   => $to_address,
         From => $message->{'from_address'} || C4::Context->preference('KohaAdminEmailAddress'),
-        Subject => encode('utf8', $message->{'subject'}),
+        Subject => $subject,
         charset => 'utf8',
-        Message => $content,
-        'content-type' => $message->{'content_type'} || 'text/plain; charset="UTF-8"',
+        Message => $is_html ? _wrap_html($content, $subject) : $content,
+        'content-type' => $content_type,
     );
     $sendmail_params{'Auth'} = {user => $username, pass => $password, method => $method} if $username;
     if ( my $bcc = C4::Context->preference('OverdueNoticeBcc') ) {
@@ -812,6 +952,27 @@ sub _send_message_by_email ($;$$$) {
     }
 }
 
+sub _wrap_html {
+    my ($content, $title) = @_;
+
+    my $css = C4::Context->preference("NoticeCSS") || '';
+    $css = qq{<link rel="stylesheet" type="text/css" href="$css">} if $css;
+    return <<EOS;
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>$title</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+$css
+</head>
+<body>
+$content
+</body>
+</html>
+EOS
+}
+
 sub _send_message_by_sms ($) {
     my $message = shift or return undef;
     my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} );
diff --git a/C4/Members.pm b/C4/Members.pm
index b81872c..7def77e 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -23,7 +23,7 @@ package C4::Members;
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
-use C4::Dates qw(format_date_in_iso);
+use C4::Dates qw(format_date_in_iso format_date);
 use Digest::MD5 qw(md5_base64);
 use Date::Calc qw/Today Add_Delta_YM check_date Date_to_Days/;
 use C4::Log; # logaction
@@ -31,8 +31,10 @@ use C4::Overdues;
 use C4::Reserves;
 use C4::Accounts;
 use C4::Biblio;
+use C4::Letters;
 use C4::SQLHelper qw(InsertInTable UpdateInTable SearchInTable);
 use C4::Members::Attributes qw(SearchIdMatchingAttribute);
+use C4::NewsChannels; #get slip news
 
 our ($VERSION, at ISA, at EXPORT, at EXPORT_OK,$debug);
 
@@ -91,6 +93,8 @@ BEGIN {
 		&DeleteMessage
 		&GetMessages
 		&GetMessagesCount
+
+        &IssueSlip
 	);
 
 	#Modify data
@@ -2229,7 +2233,80 @@ sub DeleteMessage {
     logaction("MEMBERS", "DELCIRCMESSAGE", $message->{'borrowernumber'}, $message->{'message'}) if C4::Context->preference("BorrowersLog");
 }
 
-END { }    # module clean-up code here (global destructor)
+=head2 IssueSlip
+
+  IssueSlip($branchcode, $borrowernumber, $quickslip)
+
+  Returns letter hash ( see C4::Letters::GetPreparedLetter )
+
+  $quickslip is boolean, to indicate whether we want a quick slip
+
+=cut
+
+sub IssueSlip {
+    my ($branch, $borrowernumber, $quickslip) = @_;
+
+#   return unless ( C4::Context->boolean_preference('printcirculationslips') );
+
+    my $today       = POSIX::strftime("%Y-%m-%d", localtime);
+
+    my $issueslist = GetPendingIssues($borrowernumber);
+    foreach my $it (@$issueslist){
+        if ($it->{'issuedate'} eq $today) {
+            $it->{'today'} = 1;
+        }
+        elsif ($it->{'date_due'} le $today) {
+            $it->{'overdue'} = 1;
+        }
+
+        $it->{'date_due'}=format_date($it->{'date_due'});
+    }
+    my @issues = sort { $b->{'timestamp'} <=> $a->{'timestamp'} } @$issueslist;
+
+    my ($letter_code, %repeat);
+    if ( $quickslip ) {
+        $letter_code = 'ISSUEQSLIP';
+        %repeat =  (
+            'checkedout' => [ map {
+                'biblio' => $_,
+                'items'  => $_,
+                'issues' => $_,
+            }, grep { $_->{'today'} } @issues ],
+        );
+    }
+    else {
+        $letter_code = 'ISSUESLIP';
+        %repeat =  (
+            'checkedout' => [ map {
+                'biblio' => $_,
+                'items'  => $_,
+                'issues' => $_,
+            }, grep { !$_->{'overdue'} } @issues ],
+
+            'overdue' => [ map {
+                'biblio' => $_,
+                'items'  => $_,
+                'issues' => $_,
+            }, grep { $_->{'overdue'} } @issues ],
+
+            'news' => [ map {
+                $_->{'timestamp'} = $_->{'newdate'};
+                { opac_news => $_ }
+            } @{ GetNewsToDisplay("slip") } ],
+        );
+    }
+
+    return  C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => $letter_code,
+        branchcode => $branch,
+        tables => {
+            'branches'    => $branch,
+            'borrowers'   => $borrowernumber,
+        },
+        repeat => \%repeat,
+    );
+}
 
 1;
 
diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm
index 4ae5600..33affa8 100644
--- a/C4/Members/Attributes.pm
+++ b/C4/Members/Attributes.pm
@@ -95,6 +95,24 @@ sub GetBorrowerAttributes {
     return \@results;
 }
 
+=head2 GetAttributes
+
+  my $attributes = C4::Members::Attributes::GetAttributes([$opac_only]);
+
+Retrieve an arrayref of extended attribute codes
+
+=cut
+
+sub GetAttributes {
+    my ($opac_only) = @_;
+
+    my $dbh = C4::Context->dbh();
+    my $query = "SELECT code FROM borrower_attribute_types";
+    $query .= "\nWHERE opac_display = 1" if $opac_only;
+    $query .= "\nORDER BY code";
+    return $dbh->selectcol_arrayref($query);
+}
+
 =head2 GetBorrowerAttributeValue
 
   my $value = C4::Members::Attributes::GetBorrowerAttributeValue($borrowernumber, $attribute_code);
diff --git a/C4/Message.pm b/C4/Message.pm
index 16272ff..4b88970 100644
--- a/C4/Message.pm
+++ b/C4/Message.pm
@@ -18,9 +18,15 @@ How to add a new message to the queue:
   use C4::Items;
   my $borrower = { borrowernumber => 1 };
   my $item     = C4::Items::GetItem(1);
-  my $letter   = C4::Letters::getletter('circulation', 'CHECKOUT');
-  C4::Letters::parseletter($letter, 'biblio', $item->{biblionumber});
-  C4::Letters::parseletter($letter, 'biblioitems', $item->{biblionumber});
+  my $letter =  C4::Letters::GetPreparedLetter (
+      module => 'circulation',
+      letter_code => 'CHECKOUT',
+      branchcode => $branch,
+      tables => {
+          'biblio', $item->{biblionumber},
+          'biblioitems', $item->{biblionumber},
+      },
+  );
   C4::Message->enqueue($letter, $borrower->{borrowernumber}, 'email');
 
 How to update a borrower's last checkout message:
diff --git a/C4/Print.pm b/C4/Print.pm
index f810816..7fb55cf 100644
--- a/C4/Print.pm
+++ b/C4/Print.pm
@@ -20,8 +20,6 @@ package C4::Print;
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
-use C4::Members;
-use C4::Dates qw(format_date);
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -30,7 +28,7 @@ BEGIN {
 	$VERSION = 3.01;
 	require Exporter;
 	@ISA    = qw(Exporter);
-	@EXPORT = qw(&remoteprint &printreserve &printslip);
+	@EXPORT = qw(&printslip);
 }
 
 =head1 NAME
@@ -47,28 +45,48 @@ The functions in this module handle sending text to a printer.
 
 =head1 FUNCTIONS
 
-=head2 remoteprint
+=cut
 
-  &remoteprint($items, $borrower);
+=comment
+    my $slip = <<"EOF";
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Date: $todaysdate;
 
-Prints the list of items in C<$items> to a printer.
+ITEM RESERVED: 
+$itemdata->{'title'} ($itemdata->{'author'})
+barcode: $itemdata->{'barcode'}
 
-C<$borrower> is a reference-to-hash giving information about a patron.
-This may be gotten from C<&GetMemberDetails>. The patron's name
-will be printed in the output.
+COLLECT AT: $branchname
+
+BORROWER:
+$bordata->{'surname'}, $bordata->{'firstname'}
+card number: $bordata->{'cardnumber'}
+Phone: $bordata->{'phone'}
+$bordata->{'streetaddress'}
+$bordata->{'suburb'}
+$bordata->{'town'}
+$bordata->{'emailaddress'}
 
-C<$items> is a reference-to-list, where each element is a
-reference-to-hash describing a borrowed item. C<$items> may be gotten
-from C<&GetBorrowerIssues>.
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+EOF
 =cut
 
+=head2 printslip
+
+  &printslip($slip)
+
+print a slip for the given $borrowernumber and $branchcode
+
+=cut
+
+sub printslip ($) {
+    my ($slip) = @_;
+
+    return unless ( C4::Context->boolean_preference('printcirculationslips') );
+
 # FIXME - It'd be nifty if this could generate pretty PostScript.
-sub remoteprint ($$) {
-    my ($items, $borrower) = @_;
 
-    (return)
-      unless ( C4::Context->boolean_preference('printcirculationslips') );
     my $queue = '';
 
     # FIXME - If 'queue' is undefined or empty, then presumably it should
@@ -94,107 +112,13 @@ sub remoteprint ($$) {
 
     #  print $queue;
     #open (FILE,">/tmp/$file");
-    my $i      = 0;
-    # FIXME - This is HLT-specific. Put this stuff in a customizable
-    # site-specific file somewhere.
-    print PRINTER "Horowhenua Library Trust\r\n";
-    print PRINTER "Phone: 368-1953\r\n";
-    print PRINTER "Fax:    367-9218\r\n";
-    print PRINTER "Email:  renewals\@library.org.nz\r\n\r\n\r\n";
-    print PRINTER "$borrower->{'cardnumber'}\r\n";
-    print PRINTER
-      "$borrower->{'title'} $borrower->{'initials'} $borrower->{'surname'}\r\n";
-
-    # FIXME - Use   for ($i = 0; $items->[$i]; $i++)
-    # Or better yet,   foreach $item (@{$items})
-    while ( $items->[$i] ) {
-
-        #    print $i;
-        my $itemdata = $items->[$i];
-
-        # FIXME - This is just begging for a Perl format.
-        print PRINTER "$i $itemdata->{'title'}\r\n";
-        print PRINTER "$itemdata->{'barcode'}";
-        print PRINTER " " x 15;
-        print PRINTER "$itemdata->{'date_due'}\r\n";
-        $i++;
-    }
+    print PRINTER $slip;
     print PRINTER "\r\n" x 7 ;
     close PRINTER;
 
     #system("lpr /tmp/$file");
 }
 
-sub printreserve {
-
-    # FIXME - make useful
-    return;
-
-    my ( $branchname, $bordata, $itemdata ) = @_;
-    my $printer = '';
-    (return) unless ( C4::Context->boolean_preference('printreserveslips') );
-    if ( $printer eq "" || $printer eq 'nulllp' ) {
-        open( PRINTER, ">>/tmp/kohares" )
-		  or die "Could not write to /tmp/kohares";
-    }
-    else {
-        open( PRINTER, "| lpr -P $printer >/dev/null" )
-          or die "Couldn't write to queue:$!\n";
-    }
-    my @da = localtime();
-    my $todaysdate = "$da[2]:$da[1]  " . C4::Dates->today();
-    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'}
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-EOF
-    print PRINTER $slip;
-    close PRINTER;
-    return $slip;
-}
-
-=head2 printslip
-
-  &printslip($borrowernumber)
-
-print a slip for the given $borrowernumber
-
-=cut
-
-#'
-sub printslip ($) {
-
-    #FIXME - make useful
-
-    my $borrowernumber = shift;
-    my $borrower   = GetMemberDetails($borrowernumber);
-	my $issueslist = GetPendingIssues($borrowernumber); 
-	foreach my $it (@$issueslist){
-		$it->{'date_due'}=format_date($it->{'date_due'});
-    }		
-    my @issues = sort { $b->{'timestamp'} <=> $a->{'timestamp'} } @$issueslist;
-    remoteprint(\@issues, $borrower );
-}
-
-END { }    # module clean-up code here (global destructor)
-
 1;
 __END__
 
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 359bbad..d2af1c5 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -121,6 +121,8 @@ BEGIN {
         
         &AlterPriority
         &ToggleLowestPriority
+
+        &ReserveSlip
     );
     @EXPORT_OK = qw( MergeHolds );
 }    
@@ -194,32 +196,31 @@ sub AddReserve {
     # Send e-mail to librarian if syspref is active
     if(C4::Context->preference("emailLibrarianWhenHoldIsPlaced")){
         my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
-        my $biblio   = GetBiblioData($biblionumber);
-        my $letter = C4::Letters::getletter( 'reserves', 'HOLDPLACED');
-	my $branchcode = $borrower->{branchcode};
-        my $branch_details = C4::Branch::GetBranchDetail($branchcode);
-        my $admin_email_address =$branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
-
-        my %keys = (%$borrower, %$biblio);
-        foreach my $key (keys %keys) {
-            my $replacefield = "<<$key>>";
-            $letter->{content} =~ s/$replacefield/$keys{$key}/g;
-            $letter->{title} =~ s/$replacefield/$keys{$key}/g;
+        my $branch_details = C4::Branch::GetBranchDetail($borrower->{branchcode});
+        if ( my $letter =  C4::Letters::GetPreparedLetter (
+            module => 'reserves',
+            letter_code => 'HOLDPLACED',
+            branchcode => $branch,
+            tables => {
+                'branches'  => $branch_details,
+                'borrowers' => $borrower,
+                'biblio'    => $biblionumber,
+            },
+        ) ) {
+
+            my $admin_email_address =$branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
+
+            C4::Letters::EnqueueLetter(
+                {   letter                 => $letter,
+                    borrowernumber         => $borrowernumber,
+                    message_transport_type => 'email',
+                    from_address           => $admin_email_address,
+                    to_address           => $admin_email_address,
+                }
+            );
         }
-        
-        C4::Letters::EnqueueLetter(
-                            {   letter                 => $letter,
-                                borrowernumber         => $borrowernumber,
-                                message_transport_type => 'email',
-                                from_address           => $admin_email_address,
-                                to_address           => $admin_email_address,
-                            }
-                        );
-        
-
     }
 
-
     #}
     ($const eq "o" || $const eq "e") or return;   # FIXME: why not have a useful return value?
     $query = qq/
@@ -1720,21 +1721,21 @@ sub _koha_notify_reserve {
 
     my $admin_email_address = $branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
 
-    my $letter = getletter( 'reserves', $letter_code );
-    die "Could not find a letter called '$letter_code' in the 'reserves' module" unless( $letter );
+    my $letter =  C4::Letters::GetPreparedLetter (
+        module => 'reserves',
+        letter_code => $letter_code,
+        branchcode => $reserve->{branchcode},
+        tables => {
+            'branches'  => $branch_details,
+            'borrowers' => $borrower,
+            'biblio'    => $biblionumber,
+            'reserves'  => $reserve,
+            'items', $reserve->{'itemnumber'},
+        },
+        substitute => { today => C4::Dates->new()->output() },
+    ) or die "Could not find a letter called '$letter_code' in the 'reserves' module";
 
-    C4::Letters::parseletter( $letter, 'branches', $reserve->{'branchcode'} );
-    C4::Letters::parseletter( $letter, 'borrowers', $borrowernumber );
-    C4::Letters::parseletter( $letter, 'biblio', $biblionumber );
-    C4::Letters::parseletter( $letter, 'reserves', $borrowernumber, $biblionumber );
 
-    if ( $reserve->{'itemnumber'} ) {
-        C4::Letters::parseletter( $letter, 'items', $reserve->{'itemnumber'} );
-    }
-    my $today = C4::Dates->new()->output();
-    $letter->{'title'} =~ s/<<today>>/$today/g;
-    $letter->{'content'} =~ s/<<today>>/$today/g;
-    $letter->{'content'} =~ s/<<[a-z0-9_]+\.[a-z0-9]+>>//g; #remove any stragglers
 
     if ( $print_mode ) {
         C4::Letters::EnqueueLetter( {
@@ -1908,6 +1909,36 @@ sub MergeHolds {
 }
 
 
+=head2 ReserveSlip
+
+  ReserveSlip($branchcode, $borrowernumber, $biblionumber)
+
+  Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef
+
+=cut
+
+sub ReserveSlip {
+    my ($branch, $borrowernumber, $biblionumber) = @_;
+
+#   return unless ( C4::Context->boolean_preference('printreserveslips') );
+
+    my $reserve = GetReserveInfo($borrowernumber,$biblionumber )
+      or return;
+
+    return  C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => 'RESERVESLIP',
+        branchcode => $branch,
+        tables => {
+            'reserves'    => $reserve,
+            'branches'    => $reserve->{branchcode},
+            'borrowers'   => $reserve,
+            'biblio'      => $reserve,
+            'items'       => $reserve,
+        },
+    );
+}
+
 =head1 AUTHOR
 
 Koha Development Team <http://koha-community.org/>
diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index c9461f5..60d0e99 100644
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -425,20 +425,24 @@ sub ModSuggestion {
     if ($suggestion->{STATUS}) {
         # fetch the entire updated suggestion so that we can populate the letter
         my $full_suggestion = GetSuggestion($suggestion->{suggestionid});
-        my $letter = C4::Letters::getletter('suggestions', $full_suggestion->{STATUS});
-        if ($letter) {
-            C4::Letters::parseletter($letter, 'branches',    $full_suggestion->{branchcode});
-            C4::Letters::parseletter($letter, 'borrowers',   $full_suggestion->{suggestedby});
-            C4::Letters::parseletter($letter, 'suggestions', $full_suggestion->{suggestionid});
-            C4::Letters::parseletter($letter, 'biblio',      $full_suggestion->{biblionumber});
-            my $enqueued = C4::Letters::EnqueueLetter({
+        if ( my $letter =  C4::Letters::GetPreparedLetter (
+            module => 'suggestions',
+            letter_code => $full_suggestion->{STATUS},
+            branchcode => $full_suggestion->{branchcode},
+            tables => {
+                'branches'    => $full_suggestion->{branchcode},
+                'borrowers'   => $full_suggestion->{suggestedby},
+                'suggestions' => $full_suggestion,
+                'biblio'      => $full_suggestion->{biblionumber},
+            },
+        ) ) {
+            C4::Letters::EnqueueLetter({
                 letter                  => $letter,
                 borrowernumber          => $full_suggestion->{suggestedby},
                 suggestionid            => $full_suggestion->{suggestionid},
                 LibraryName             => C4::Context->preference("LibraryName"),
                 message_transport_type  => 'email',
-            });
-            if (!$enqueued){warn "can't enqueue letter $letter";}
+            }) or warn "can't enqueue letter $letter";
         }
     }
     return $status_update_table;
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index d7c64db..ac3c557 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -111,16 +111,11 @@ for my $vendor (@suppliers) {
     
     for my $basket ( @{$baskets} ) {
         my $authorisedby = $basket->{authorisedby};
-        my $basketbranch = ''; # set a blank branch to start with
-        if ( GetMember( borrowernumber => $authorisedby ) ) {
-           # authorisedby may not be a valid borrowernumber; it's not foreign-key constrained!
-           $basketbranch = GetMember( borrowernumber => $authorisedby )->{branchcode};
-        }
         
         if ($userenv->{'flags'} & 1 || #user is superlibrarian
                (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
                    ($viewbaskets eq 'all' || #user is allowed to see all baskets
-                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
+                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq GetMember( borrowernumber => $authorisedby )->{branchcode}) || #basket belongs to user's branch
                    ($basket->{authorisedby} &&  $viewbaskets == 'user' && $authorisedby == $loggedinuser) #user created this basket
                    ) 
                 ) 
diff --git a/circ/circulation.pl b/circ/circulation.pl
index e8d22cb..6928966 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -24,7 +24,6 @@ use strict;
 #use warnings; FIXME - Bug 2505
 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
@@ -176,7 +175,7 @@ if ( $barcode eq '' && $query->param('charges') eq 'yes' ) {
 }
 
 if ( $print eq 'yes' && $borrowernumber ne '' ) {
-    printslip( $borrowernumber );
+    PrintIssueSlip($session->param('branch') || $branch, $borrowernumber);
     $query->param( 'borrowernumber', '' );
     $borrowernumber = '';
 }
diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl
index f581464..8ae5d2a 100755
--- a/circ/hold-transfer-slip.pl
+++ b/circ/hold-transfer-slip.pl
@@ -23,10 +23,8 @@ use strict;
 use C4::Context;
 use C4::Output;
 use CGI;
-use C4::Auth;
+use C4::Auth qw/:DEFAULT get_session/;
 use C4::Reserves;
-use C4::Branch;
-use C4::Dates qw/format_date format_date_in_iso/;
 
 use vars qw($debug);
 
@@ -35,13 +33,16 @@ BEGIN {
 }
 
 my $input = new CGI;
+my $sessionID = $input->cookie("CGISESSID");
+my $session = get_session($sessionID);
+
 my $biblionumber = $input->param('biblionumber');
 my $borrowernumber = $input->param('borrowernumber');
 my $transfer = $input->param('transfer');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   
-        template_name   => "circ/hold-transfer-slip.tmpl",
+        template_name   => "circ/printslip.tmpl",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -50,14 +51,21 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $reserveinfo = GetReserveInfo($borrowernumber,$biblionumber );
-my $pulldate = C4::Dates->new();
-$reserveinfo->{'pulldate'} = $pulldate->output();
-$reserveinfo->{'branchname'} = GetBranchName($reserveinfo->{'branchcode'});
-$reserveinfo->{'transferrequired'} = $transfer;
-
-$template->param( reservedata => [ $reserveinfo ] ,
-				);
+my $userenv = C4::Context->userenv;
+my ($slip, $is_html);
+if ( my $letter = ReserveSlip ($session->param('branch') || $userenv->{branch}, $borrowernumber, $biblionumber) ) {
+    $slip = $letter->{content};
+    $is_html = $letter->{is_html};
+}
+else {
+    $slip = "Reserve not found";
+}
+$template->param(
+    slip => $slip,
+    plain => !$is_html,
+    title => "Koha -- Circulation: Transfers",
+    stylesheet => C4::Context->preference("SlipCSS"),
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;
 
diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
index 0d172db..f668d99 100644
--- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql
+++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
@@ -11,7 +11,7 @@ VALUES ('circulation','ODUE','Mahnung','Mahnung','Liebe/r <<borrowers.firstname>
 ('reserves', 'HOLD_PRINT', 'Vormerkbenachrichtigung (Print)', 'Vormerkbenachrichtigung (Print)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchzip>> <<branches.branchcity>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.address2>>\r\n<<borrowers.zipcode>> <<borrowers.city>>\r\n<<borrowers.country>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\nLiebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nF??r Sie liegt seit dem <<reserves.waitingdate>> eine Vormerkung zur Abholung bereit:\r\n\r\nTitel: <<biblio.title>>\r\nVerfasser: <<biblio.author>>\r\nSignatur: <<items.itemcallnumber>>\r\n'),
 ('circulation','CHECKIN','R??ckgabequittung (Zusammenfassung)','R??ckgabequittung','Die folgenden Medien wurden zur??ckgegeben:\r\n----\r\n<<biblio.title>>\r\n----\r\nVielen Dank.'),
 ('circulation','CHECKOUT','Ausleihquittung (Zusammenfassung)','Ausleihquittung','Die folgenden Medien wurden entliehen:\r\n----\r\n<<biblio.title>>\r\n----\r\nVielen Dank f??r Ihren Besuch in <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Neue Vormerkung', 'Neue Vormerkung','Folgender Titel wurde vorgemerkt: <<title>> (<<biblionumber>>) durch den Benutzer <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Neue Vormerkung', 'Neue Vormerkung','Folgender Titel wurde vorgemerkt: <<biblio.title>> (<<biblio.biblionumber>>) durch den Benutzer <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Anschaffungsvorschlag wurde angenommen', 'Ihr Anschaffungsvorschlag wurde angenommen','Liebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\n\nSie haben der Bibliothek folgendes Medium zur Anschaffung vorgeschlagen: <<suggestions.title>> by <<suggestions.author>>.\n\nDie Bibliothek hat diesen Titel heute recherchiert und wird Ihn sobald wie m??glich im Buchhandel bestellen. Sie erhalten Nachricht, sobald die Bestellung abgeschlossen ist und sobald der Titel in der Bibliotek verf??gbar ist.\n\nWenn Sie Fragen haben, richten Sie Ihre Mail bitte an: <<branches.branchemail>>.\n\nVielen Dank,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Vorgeschlagenes Medium verf??gbar', 'Das vorgeschlagene Medium ist jetzt verf??gbar','Liebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\n\nSie haben der Bibliothek folgendes Medium zur Anschaffung vorgeschlagen: <<suggestions.title>> von <<suggestions.author>>.\n\nWir freuen uns Ihnen mitteilen zu k??nnen, dass dieser Titel jetzt im Bestand der Bibliothek verf??gbar ist.\n\nWenn Sie Fragen haben, richten Sie Ihre Mail bitte an: <<branches.branchemail>>.\n\nVielen Dank,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Vorgeschlagenes Medium bestellt', 'Das vorgeschlagene Medium wurde im Buchhandel bestellt','Liebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\n\nSie haben der Bibliothek folgendes Medium zur Anschaffung vorgeschlaten: <<suggestions.title>> von <<suggestions.author>>.\n\nWir freuen uns Ihnen mitteilen zu k??nnen, dass dieser Titel jetzt im Buchhandel bestellt wurde. Nach Eintreffen wird er in unseren Bestand eingearbeitet.\n\nSie erhalten Nachricht, sobald das Medium verf??gbar ist.\n\nBei Nachfragen erreichen Sie uns unter der Emailadresse <<branches.branchemail>>.\n\nVielen Dank,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
index 5ca7eaf..a600373 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -11,8 +11,90 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','REJECTED','Suggestion rejected', 'Purchase suggestion declined','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your request today, and has decided not to accept the suggestion at this time.\n\nThe reason given is: <<suggestions.reason>>\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>');
+INSERT INTO `letter` (module, code, name, title, content, is_html)
+VALUES ('circulation','ISSUESLIP','Issue Slip','Issue Slip', '<h3><<branches.branchname>></h3>
+Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />
+(<<borrowers.cardnumber>>) <br />
+
+<<today>><br />
+
+<h4>Checked Out</h4>
+<checkedout>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</checkedout>
+
+<h4>Overdues</h4>
+<overdue>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</overdue>
+
+<hr>
+
+<h4 style="text-align: center; font-style:italic;">News</h4>
+<news>
+<div class="newsitem">
+<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<opac_news.title>></b></h5>
+<p style="margin-bottom: 1px; margin-top: 1px"><<opac_news.new>></p>
+<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<opac_news.timestamp>></p>
+<hr />
+</div>
+</news>', 1),
+('circulation','ISSUEQSLIP','Issue Quick Slip','Issue Quick Slip', '<h3><<branches.branchname>></h3>
+Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />
+(<<borrowers.cardnumber>>) <br />
+
+<<today>><br />
+
+<h4>Checked Out Today</h4>
+<checkedout>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</checkedout>', 1),
+('circulation','RESERVESLIP','Reserve Slip','Reserve Slip', '<h5>Date: <<today>></h5>
+
+<h3> Transfer to/Hold in <<branches.branchname>></h3>
+
+<reserves>
+<div>
+<h3><<borrowers.surname>>, <<borrowers.firstname>></h3>
+
+<ul>
+    <li><<borrowers.cardnumber>></li>
+    <li><<borrowers.phone>></li>
+    <li> <<borrowers.address>><br />
+         <<borrowers.address2>><br />
+         <<borrowers.city >>  <<borrowers.zipcode>>
+    </li>
+    <li><<borrowers.email>></li>
+</ul>
+<br />
+<h3>ITEM ON HOLD</h3>
+ <h4><<biblio.title>></h4>
+ <h5><<biblio.author>></h5>
+ <ul>
+    <li><<items.barcode>></li>
+    <li><<items.itemcallnumber>></li>
+    <li><<reserves.waitingdate>></li>
+ </ul>
+ <p>Notes:
+ <pre><<reserves.reservenotes>></pre>
+ </p>
+</div>
+</reserves>', 1);
+
diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
index 78b80fa..0450bd0 100644
--- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql
+++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
@@ -11,7 +11,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
index 9e9f66d..4eb1210 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
@@ -13,7 +13,7 @@ VALUES
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup at <<branches.branchname>>', '<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>>\n\n\nChange Service Requested\n\n\n\n\n\n\n\n<<borrowers.firstname>> <<borrowers.surname>>\n<<borrowers.address>>\n<<borrowers.city>> <<borrowers.zipcode>>\n\n\n\n\n\n\n\n\n\n\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\n\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql
index 78b80fa..0450bd0 100644
--- a/installer/data/mysql/it-IT/necessari/notices.sql
+++ b/installer/data/mysql/it-IT/necessari/notices.sql
@@ -11,7 +11,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 67149c9..0cff8c5 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1169,10 +1169,12 @@ DROP TABLE IF EXISTS `letter`;
 CREATE TABLE `letter` ( -- table for all notice templates in Koha
   `module` varchar(20) NOT NULL default '', -- Koha module that triggers this notice
   `code` varchar(20) NOT NULL default '', -- unique identifier for this notice
+  `branchcode` varchar(10) default NULL, -- foreign key, linking to the branches table for the location the item was checked out
   `name` varchar(100) NOT NULL default '', -- plain text name for this notice
+  `is_html` tinyint(1) default 0,
   `title` varchar(200) NOT NULL default '', -- subject line of the notice
   `content` text, -- body text for the notice
-  PRIMARY KEY  (`module`,`code`)
+  PRIMARY KEY  (`module`,`code`, `branchcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -2253,12 +2255,13 @@ CREATE TABLE `message_transports` (
   `is_digest` tinyint(1) NOT NULL default '0',
   `letter_module` varchar(20) NOT NULL default '',
   `letter_code` varchar(20) NOT NULL default '',
+  `branchcode` varchar(10) NOT NULL default '',
   PRIMARY KEY  (`message_attribute_id`,`message_transport_type`,`is_digest`),
   KEY `message_transport_type` (`message_transport_type`),
   KEY `letter_module` (`letter_module`,`letter_code`),
   CONSTRAINT `message_transports_ibfk_1` FOREIGN KEY (`message_attribute_id`) REFERENCES `message_attributes` (`message_attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `message_transports_ibfk_2` FOREIGN KEY (`message_transport_type`) REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `message_transports_ibfk_3` FOREIGN KEY (`letter_module`, `letter_code`) REFERENCES `letter` (`module`, `code`) ON DELETE CASCADE ON UPDATE CASCADE
+  CONSTRAINT `message_transports_ibfk_3` FOREIGN KEY (`letter_module`, `letter_code`, `branchcode`) REFERENCES `letter` (`module`, `code`, `branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
index 762da91..f40da36 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
@@ -32,7 +32,7 @@ VALUES ('circulation','ODUE','Purring','Purring p?? dokument','<<borrowers.first
 ('reserves', 'HOLD_PRINT', 'Hentemelding (p?? papir)', 'Hentemelding', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nDu har et reservert dokument som kan hentes fra  <<reserves.waitingdate>>:\r\n\r\nTittel: <<biblio.title>>\r\nForfatter: <<biblio.author>>\r\nEksemplar: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Innlevering','Melding om innlevering','F??lgende dokument har blitt innlevert:\r\n----\r\n<<biblio.title>>\r\n----\r\nVennlig hilsen\r\nBiblioteket'),
 ('circulation','CHECKOUT','Utl??n','Melding om utl??n','F??lgende dokument har blitt l??nt ut:\r\n----\r\n<<biblio.title>>\r\n----\r\nVennlig hilsen\r\nBiblioteket'),
-('reserves', 'HOLDPLACED', 'Melding om reservasjon', 'Melding om reservasjon','F??lgende dokument har blitt reservert : <<title>> (<<biblionumber>>) av <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Melding om reservasjon', 'Melding om reservasjon','F??lgende dokument har blitt reservert : <<biblio.title>> (<<biblio.biblionumber>>) av <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Forslag godtatt', 'Innkj??psforslag godtatt','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foresl??tt at biblioteket kj??per inn <<suggestions.title>> av <<suggestions.author>>.\n\nBiblioteket har vurdert forslaget i dag. Dokumentet vil bli bestilt s?? fort det lar seg gj??re. Du vil f?? en ny melding n??r bestillingen er gjort, og n??r dokumentet ankommer biblioteket.\n\nEr det noe du lurer p??, vennligst kontakt oss p?? <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Foresl??tt dokument tilgjengelig', 'Foresl??tt dokument tilgjengelig','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foresl??tt at biblioteket kj??per inn <<suggestions.title>> av <<suggestions.author>>.\n\nVi har gleden av ?? informere deg om at dokumentet n?? er innlemmet i samlingen.\n\nEr det noe du lurer p??, vennligst kontakt oss p?? <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Innkj??psforslag i bestilling', 'Innkj??psforslag i bestilling','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foresl??tt at biblioteket kj??per inn <<suggestions.title>> av <<suggestions.author>>.\n\nVi har gleden av ?? informere deg om at dokumentet du foreslo n?? er i bestilling.\n\nDu vil f?? en ny melding n??r dokumentet er tilgjengelig.\n\nEr det noe du lurer p??, vennligst kontakt oss p?? <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
index c101b0b..73102af 100644
--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
@@ -13,7 +13,7 @@ VALUES
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
index 5ca7eaf..e13782a 100644
--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
@@ -11,7 +11,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 0cc79b2..1d0513b 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -330,6 +330,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('EasyAnalyticalRecords','0','If on, display in the catalogue screens tools to easily setup analytical record relationships','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CircAutoPrintQuickSlip', '1', 'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window or Clear the screen.',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoticeCSS','','Notices CSS url.',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACLocalCoverImages','0','Display local cover images on OPAC search and details pages.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('LocalCoverImages','0','Display local cover images on intranet details pages.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllowMultipleCovers','0','Allow multiple cover images to be attached to each bibliographic record.','1','YesNo');
diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
index 6ab0e18..a908f6c 100644
--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
@@ -10,7 +10,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <<branches.branchname>>', 'Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\nLocation: <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index d2d9d97..cc6c06a 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4497,7 +4497,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
         print "Upgrade to $DBversion done (Add 461 subfield 9 to default framework)\n";
         SetVersion ($DBversion);
     }
-		
 }
 
 $DBversion = "3.05.00.018";
@@ -4712,6 +4711,105 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.07.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE `message_transports` DROP FOREIGN KEY `message_transports_ibfk_3`");
+    $dbh->do("ALTER TABLE `letter` DROP PRIMARY KEY");
+    $dbh->do("ALTER TABLE `letter` ADD `branchcode` varchar(10) default NULL AFTER `code`");
+    $dbh->do("ALTER TABLE `letter` ADD PRIMARY KEY  (`module`,`code`, `branchcode`)");
+    $dbh->do("ALTER TABLE `message_transports` ADD `branchcode` varchar(10) NOT NULL default ''");
+    $dbh->do("ALTER TABLE `message_transports` ADD CONSTRAINT `message_transports_ibfk_3` FOREIGN KEY (`letter_module`, `letter_code`, `branchcode`) REFERENCES `letter` (`module`, `code`, `branchcode`) ON DELETE CASCADE ON UPDATE CASCADE");
+    $dbh->do("ALTER TABLE `letter` ADD `is_html` tinyint(1) default 0 AFTER `name`");
+
+    $dbh->do("INSERT INTO `letter` (module, code, name, title, content, is_html)
+              VALUES ('circulation','ISSUESLIP','Issue Slip','Issue Slip', '<h3><<branches.branchname>></h3>
+Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />
+(<<borrowers.cardnumber>>) <br />
+
+<<today>><br />
+
+<h4>Checked Out</h4>
+<checkedout>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</checkedout>
+
+<h4>Overdues</h4>
+<overdue>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</overdue>
+
+<hr>
+
+<h4 style=\"text-align: center; font-style:italic;\">News</h4>
+<news>
+<div class=\"newsitem\">
+<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<opac_news.title>></b></h5>
+<p style=\"margin-bottom: 1px; margin-top: 1px\"><<opac_news.new>></p>
+<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">Posted on <<opac_news.timestamp>></p>
+<hr />
+</div>
+</news>', 1)");
+    $dbh->do("INSERT INTO `letter` (module, code, name, title, content, is_html)
+              VALUES ('circulation','ISSUEQSLIP','Issue Quick Slip','Issue Quick Slip', '<h3><<branches.branchname>></h3>
+Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />
+(<<borrowers.cardnumber>>) <br />
+
+<<today>><br />
+
+<h4>Checked Out Today</h4>
+<checkedout>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</checkedout>', 1)");
+    $dbh->do("INSERT INTO `letter` (module, code, name, title, content, is_html)
+              VALUES ('circulation','RESERVESLIP','Reserve Slip','Reserve Slip', '<h5>Date: <<today>></h5>
+
+<h3> Transfer to/Hold in <<branches.branchname>></h3>
+
+<h3><<borrowers.surname>>, <<borrowers.firstname>></h3>
+
+<ul>
+    <li><<borrowers.cardnumber>></li>
+    <li><<borrowers.phone>></li>
+    <li> <<borrowers.address>><br />
+         <<borrowers.address2>><br />
+         <<borrowers.city >>  <<borrowers.zipcode>>
+    </li>
+    <li><<borrowers.email>></li>
+</ul>
+<br />
+<h3>ITEM ON HOLD</h3>
+<h4><<biblio.title>></h4>
+<h5><<biblio.author>></h5>
+<ul>
+   <li><<items.barcode>></li>
+   <li><<items.itemcallnumber>></li>
+   <li><<reserves.waitingdate>></li>
+</ul>
+<p>Notes:
+<pre><<reserves.reservenotes>></pre>
+</p>', 1)");
+
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoticeCSS','','Notices CSS url.',NULL,'free')");
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free')");
+
+    $dbh->do("UPDATE `letter` SET content = replace(content, '<<title>>', '<<biblio.title>>') WHERE code = 'HOLDPLACED'");
+
+    print "Upgrade to $DBversion done (Add branchcode and is_html to letter table; Default ISSUESLIP and RESERVESLIP letters; Add NoticeCSS and SlipCSS sysprefs)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index a4acfdf..4e583f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -42,8 +42,10 @@ function update_child() {
 	 });
 
 	// YUI Toolbar Functions
+    var slip_re = /slip/;
 	function printx_window(print_type) {
-		window.open("/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=" + print_type, "printwindow");
+        var handler = print_type.match(slip_re) ? "printslip" : "moremember";
+		window.open("/cgi-bin/koha/members/" + handler + ".pl?borrowernumber=[% borrowernumber %]&amp;print=" + print_type, "printwindow");
 		return false;
 	}
 	function searchToHold(){
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 b3716c0..1556385 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
@@ -98,6 +98,11 @@ Circulation:
                   yes: "open a print quick slip window"
                   no: "clear the screen"
             - .
+        -
+            - Include the stylesheet at
+            - pref: NoticeCSS
+              class: url
+            - on Notices. (This should be a complete URL, starting with <code>http://</code>)
     Checkout Policy:
         -
             - pref: AllowNotForLoanOverride
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
index df0a434..efa33a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
@@ -83,6 +83,11 @@ Staff Client:
                   Results: "Results page (for future use, Results XSLT not functional at this time)."
                   Both: "Both Results and Details pages (for future use, Results XSLT not functional at this time)."
             - 'Note: The corresponding XSLT option must be turned on.'
+        -
+            - Include the stylesheet at
+            - pref: SlipCSS
+              class: url
+            - on Issue and Reserve Slips. (This should be a complete URL, starting with <code>http://</code>.)
     Options:
         -
             - pref: viewMARC
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
index 1904381..73f9e61 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
@@ -8,11 +8,7 @@
         -->
     </style>
     [% IF ( stylesheet ) %]
-    <style type="text/css">
-        <!--
-        [% stylesheet %]
-        -->
-    </style>
+    <link rel="stylesheet" type="text/css" href="[% stylesheet %]">
     [% END %]
 </head>
 <body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
deleted file mode 100644
index 18d45aa..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
+++ /dev/null
@@ -1,54 +0,0 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha -- Circulation: Transfers</title>
-[% INCLUDE 'doc-head-close-receipt.inc' %]
-<script language="javascript">
-function printandclose()
-{
-window.print();
-window.close();
-}
-</script>
-</head>
-<body onload="printandclose();"><div id="main">
-
-[% FOREACH reservedat IN reservedata %]
-
-<h5>Date: [% reservedat.pulldate %]</h5>
-<h3> [% IF ( reservedat.transferrequired ) %]Transfer to [% reservedat.branchname %] [% ELSE %]Hold in [% reservedat.branchname %][% END %]</h3>
-
-<div id="reserve_display">
-
-<h3>[% reservedat.surname %], [% reservedat.firstname %]</h3>
-
-<ul>
-	<li>[% reservedat.cardnumber %]</li>
-    [% IF ( reservedat.phone ) %]
-        <li>[% reservedat.phone %]</li>
-    [% END %]
-    <li>
-        [% reservedat.address %]<br />
-	    [% IF ( reservedat.address2 ) %][% reservedat.address2 %]<br />[% END %]
-        [% reservedat.city %]  [% reservedat.zip %]
-    </li>
-    [% IF ( reservedat.email ) %]
-        <li>[% reservedat.email %]</li>
-    [% END %]
-</ul>
-<br />
-<h3>ITEM ON HOLD</h3>
- <h4>[% reservedat.title |html %]</h4>
- <h5>[% reservedat.author %] </h5>
- <ul>
-    [% IF ( reservedat.barcode ) %]<li>[% reservedat.barcode %]</li>[% END %]
-    [% IF ( reservedat.itemcallnumber ) %]<li>[% reservedat.itemcallnumber %]</li>[% END %]
-    [% IF ( reservedat.waitingdate ) %]<li>[% reservedat.waitingdate %]</li>[% END %]
- </ul>
- [% IF ( reservedat.reservenotes ) %]
-    <p>Notes: [% reservedat.reservenotes %]</p>
- [% END %]
-
-
-
-[% END %]
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
new file mode 100644
index 0000000..a790069
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
@@ -0,0 +1,28 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>[% title %]</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
+[% IF stylesheet %]
+<link rel="stylesheet" type="text/css" href="[% stylesheet %]" />
+[% END %]
+
+<script language="javascript">
+    function printThenClose() {
+        window.print();
+        window.close();
+    }
+</script>
+</head>
+<body onload="printThenClose();">
+<div id="receipt">
+
+[% IF plain %]
+<pre>
+[% slip %]
+</pre>
+[% ELSE %]
+[% slip %]
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index 063236e..eec2384 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -5,14 +5,29 @@
 	<script type="text/javascript">
 	//<![CDATA[
 $(document).ready(function() {
-	$("#lettert").tablesorter({
+	$("#lettert:has(tbody tr)").tablesorter({
 		widgets : ['zebra'],
 		sortList: [[0,0]],
 		headers: { 3: {sorter:false},4: { sorter: false }}
 	}); 
+
+    $('#branch').change(function() {
+            $('#op').val("");
+            $('#selectlibrary').submit();
+    });
+    $('#newnotice').click(function() {
+            $('#op').val("add_form");
+            return true;
+    });
 }); 
 [% IF ( add_form ) %]
 	
+    function cancel(f) {
+        $('#op').val("");
+        f.method = "get";
+        f.submit();
+    }
+
 		function isNotNull(f,noalert) {
 			if (f.value.length ==0) {
 	return false;
@@ -106,7 +121,7 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'letters-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( add_form ) %][% IF ( modify ) %]<a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Modify notice[% ELSE %] <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Add notice[% END %][% ELSE %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Notice added[% ELSE %][% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Confirm Deletion[% ELSE %]Notices[% END %][% END %][% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( add_form ) %][% IF ( modify ) %]<a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Modify notice[% ELSE %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Add notice[% END %][% ELSE %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Notice added[% ELSE %][% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Confirm Deletion[% ELSE %]Notices &amp; Slips[% END %][% END %][% END %]</div>
 
 [% IF ( add_form ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
    
@@ -114,65 +129,97 @@ $(document).ready(function() {
 	<div id="yui-main">
 	<div class="yui-b">
 
-	[% IF ( no_op_set ) %]
-<div id="toolbar">
-	<script type="text/javascript">
-	//<![CDATA[
-	// prepare DOM for YUI Toolbar
-	 $(document).ready(function() {
-	    yuiToolbar();
-	 });
-	// YUI Toolbar Functions
-	function yuiToolbar() {
-	    new YAHOO.widget.Button("newnotice");
-	}
-	//]]>
-	</script>
-	<ul class="toolbar">
-	<li><a id="newnotice" href="/cgi-bin/koha/tools/letter.pl?op=add_form">New Notice</a></li>
-</ul></div>
-		
+[% IF ( no_op_set ) %]
+    <form method="get" action="?" id="selectlibrary">
+      <input type="hidden" name="searchfield" value="[% searchfield %]" />
+    [% UNLESS independant_branch %]        
+      <p>
+        Select a library :
+            <select name="branchcode" id="branch" style="width:20em;">
+                <option value="">All libraries</option>
+            [% FOREACH branchloo IN branchloop %]
+                [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
+            [% END %]
+            </select>
+      </p>
+    [% END %]        
+      <p>
+	      <input type="submit" id="newnotice" value="New Notice" />
+        <input type="hidden" id="op" name="op" />
+      </p>
+    </form>
+
 		[% IF ( search ) %]
 		<p>You Searched for <b>[% searchfield %]</b></p>
 		[% END %]
-		[% IF ( letter ) %]<table id="lettert">
+		[% IF ( letter && !independant_branch) %]
+            [% select_for_copy = BLOCK %]
+            <select name="branchcode">
+                [% FOREACH branchloo IN branchloop %]
+                <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
+                [% END %]
+            </select>
+            [% END %]
+        [% END %]
+        <table id="lettert">
 		<thead><tr>
+			<th>Branch</th>
 			<th>Module</th>
 			<th>Code</th>
 			<th>Name</th>
 			<th>&nbsp;</th>
 			<th>&nbsp;</th>
+			<th>&nbsp;</th>
 		</tr></thead>
-		<tbody>[% FOREACH lette IN letter %]
-		[% UNLESS ( loop.odd ) %]
+		<tbody>
+    [% FOREACH lette IN letter %]
+        [% can_edit = lette.branchcode || !independant_branch %]
+        [% UNLESS ( loop.odd ) %]
 			<tr class="highlight">
-		[% ELSE %]
+        [% ELSE %]
 			<tr>
-		[% END %]
+        [% END %]
+				<td>[% lette.branchname || "(All libraries)" %]</td>
 				<td>[% lette.module %]</td>
 				<td>[% lette.code %]</td>
 				<td>[% lette.name %]</td>
 				<td>
-					<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Edit</a>
+        [% IF can_edit %]
+					<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]">Edit</a>
+        [% END %]        
+				</td>
+				<td>
+        [% IF !independant_branch || !lette.branchcode %]
+                    <form method="post" action="?">
+                        <input type="hidden" name="op" value="copy" />
+				        <input type="hidden" name="oldbranchcode" value="[% lette.branchcode %]" />
+                        <input type="hidden" name="module" value="[% lette.module %]" />
+                        <input type="hidden" name="code" value="[% lette.code %]" />
+            [% IF independant_branch %]
+                        <input type="hidden" name="branchcode" value="[% independant_branch %]" />
+            [% ELSE %]
+                        [% select_for_copy %]
+            [% END %]
+                        <input type="submit" value="Copy" />
+                    </form>
+        [% END %]        
 				</td>
 				<td>
-					[% IF ( lette.protected ) %]
-					-
-					[% ELSE %]
-					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Delete</a>
-					[% END %]
+        [% IF !lette.protected && can_edit %]
+					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[%lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]">Delete</a>
+        [% END %]
 				</td>
 			</tr>
-		[% END %]</tbody>
+    [% END %]
+        </tbody>
 		</table>
-		[% END %]
+[% END %]
 
-	[% END %]
 	
-	[% IF ( add_form ) %]
+[% IF ( add_form ) %]
 	
-		<form action="/cgi-bin/koha/tools/letter.pl" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
+		<form action="?" name="Aform" method="post">
+		<input type="hidden" name="op" id="op" value="add_validate" />
 		<input type="hidden" name="checked" value="0" />
 		[% IF ( modify ) %]
 		<input type="hidden" name="add" value="0" />
@@ -182,6 +229,20 @@ $(document).ready(function() {
 		<fieldset class="rows">
 		<legend>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</legend>
 		<ol>
+				<input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
+            [% IF independant_branch %]
+                <input type="hidden" name="branchcode" value="[% independant_branch %]" />
+            [% ELSE %]
+			<li>
+				<label for="branchcode">Library:</label>
+                <select name="branchcode" id="branch" style="width:20em;">
+                    <option value="">All libraries</option>
+                [% FOREACH branchloo IN branchloop %]
+                    [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
+                [% END %]
+                </select>
+			</li>
+            [% END %]
 			<li>
 				<label for="module">Koha module:</label>
 				<input type="hidden" name="oldmodule" value="[% module %]" />
@@ -235,6 +296,14 @@ $(document).ready(function() {
 			<label for="name">Name:</label><input type="text" id="name" name="name" size="60" value="[% name %]" />
 		</li>
 		<li>
+			<label for="is_html">HTML Message:</label>
+      [% IF is_html %]
+      <input type="checkbox" id="is_html" name="is_html" value="1" checked />
+      [% ELSE %]
+      <input type="checkbox" id="is_html" name="is_html" value="1" />
+      [% END %]
+		</li>
+		<li>
 			<label for="title">Message Subject:</label><input type="text" id="title" name="title" size="60" value="[% title %]" />
 		</li>
 		<li>
@@ -252,27 +321,31 @@ $(document).ready(function() {
 		</ol>
 		</fieldset>
 		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></fieldset>
+		<fieldset class="action"><input type="button" value="Cancel" onclick="cancel(this.form)" class="button" /></fieldset>
+      <input type="hidden" name="searchfield" value="[% searchfield %]" />
 		</form>
-	[% END %]
+[% END %]
 	
-	[% IF ( add_validate ) %]
+[% IF ( add_validate ) %]
 	Data recorded
 	<form action="[% action %]" method="post">
 	<input type="submit" value="OK" />
 	</form>
-	[% END %]
+[% END %]
 	
-	[% IF ( delete_confirm ) %]
+[% IF ( delete_confirm ) %]
 	<div class="dialog alert"><h3>Delete Notice?</h3>
 	<table>
         <thead>
 		<tr>
+			<th>Branch</th>
 			<th>Module</th>
 			<th>Code</th>
 			<th>Name</th>
 		</tr>
         </thead>
 		<tr>
+			<td>[% branchname %]</td>
 			<td>[% module %]</td>
             <td>[% code %]</td>
 			<td>[% name %]</td>
@@ -280,6 +353,7 @@ $(document).ready(function() {
 	</table>
 		<form action="[% action %]" method="post">
 		<input type="hidden" name="op" value="delete_confirmed">
+		<input type="hidden" name="branchcode" value="[% branchcode %]" />
 		<input type="hidden" name="code" value="[% code %]" />
 		<input type="hidden" name="module" value="[% module %]" />
 				<input type="submit" value="Yes, Delete" class="approve" />
@@ -290,14 +364,14 @@ $(document).ready(function() {
 				</form>
 		</div>
 
-	[% END %]
+[% END %]
 	
-	[% IF ( delete_confirmed ) %]
+[% IF ( delete_confirmed ) %]
 	Data deleted
 	<form action="[% action %]" method="post">
 	<input type="submit" value="OK" />
 	</form>
-	[% END %]
+[% END %]
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index b71a1ee..5cc3bbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -26,7 +26,7 @@
     [% END %]
 
     [% IF ( CAN_user_tools_edit_notices ) %]
-    <dt><a href="/cgi-bin/koha/tools/letter.pl">Notices</a></dt>
+    <dt><a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a></dt>
     <dd>Define notices (print and email notification messages for overdues, etc.)</dd>
     [% END %]
 
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 86dd6ed..c474a66 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -347,10 +347,7 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
             # if we manage to find a valid email address, send notice 
             if ($emailaddr) {
                 $newdata{emailaddr} = $emailaddr;
-                my $letter = getletter ('members', "ACCTDETAILS:$newdata{'branchcode'}") ;
-                # if $branch notice fails, then email a default notice instead.
-                $letter = getletter ('members', "ACCTDETAILS")  if !$letter;
-                SendAlerts ( 'members' , \%newdata , $letter ) if $letter
+                SendAlerts ( 'members', \%newdata, "ACCTDETAILS" );
             }
         } 
 
diff --git a/members/moremember.pl b/members/moremember.pl
index c477100..5a988f9 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -51,7 +51,6 @@ use C4::Reserves;
 use C4::Branch; # GetBranchName
 use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Form::MessagingPreferences;
-use C4::NewsChannels; #get slip news
 use List::MoreUtils qw/uniq/;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 
@@ -484,13 +483,4 @@ $template->param(
 	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
 );
 
-#Get the slip news items
-my $all_koha_news   = &GetNewsToDisplay("slip");
-my $koha_news_count = scalar @$all_koha_news;
-
-$template->param(
-    koha_news       => $all_koha_news,
-    koha_news_count => $koha_news_count
-);
-
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/members/printslip.pl b/members/printslip.pl
new file mode 100755
index 0000000..3a499cd
--- /dev/null
+++ b/members/printslip.pl
@@ -0,0 +1,92 @@
+#!/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.
+
+
+=head1 moremember.pl
+
+ script to do a borrower enquiry/bring up borrower details etc
+ Displays all the details about a borrower
+ written 20/12/99 by chris at katipo.co.nz
+ last modified 21/1/2000 by chris at katipo.co.nz
+ modified 31/1/2001 by chris at katipo.co.nz
+   to not allow items on request to be renewed
+
+ needs html removed and to use the C4::Output more, but its tricky
+
+=cut
+
+use strict;
+#use warnings; FIXME - Bug 2505
+use CGI;
+use C4::Context;
+use C4::Auth qw/:DEFAULT get_session/;
+use C4::Output;
+use C4::Members;
+use C4::Koha;
+
+#use Smart::Comments;
+#use Data::Dumper;
+
+use vars qw($debug);
+
+BEGIN {
+	$debug = $ENV{DEBUG} || 0;
+}
+
+my $input = new CGI;
+my $sessionID = $input->cookie("CGISESSID");
+my $session = get_session($sessionID);
+
+$debug or $debug = $input->param('debug') || 0;
+my $print = $input->param('print');
+my $error = $input->param('error');
+
+# circ staff who process checkouts but can't edit
+# patrons still need to be able to print receipts
+my $flagsrequired = { circulate => "circulate_remaining_permissions" };
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "circ/printslip.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => $flagsrequired,
+        debug           => 1,
+    }
+);
+
+my $borrowernumber = $input->param('borrowernumber');
+my $branch=C4::Context->userenv->{'branch'};
+my ($slip, $is_html);
+if (my $letter = IssueSlip ($session->param('branch') || $branch, $borrowernumber, $print eq "qslip")) {
+    $slip = $letter->{content};
+    $is_html = $letter->{is_html};
+}
+
+$template->param(
+    slip => $slip,
+    plain => !$is_html,
+    title => "Print Receipt for $borrowernumber",
+    stylesheet => C4::Context->preference("SlipCSS"),
+    error           => $error,
+);
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/misc/cronjobs/advance_notices.pl b/misc/cronjobs/advance_notices.pl
index 1fa358f..09c4017 100755
--- a/misc/cronjobs/advance_notices.pl
+++ b/misc/cronjobs/advance_notices.pl
@@ -79,13 +79,10 @@ patrons. It queues them in the message queue, which is processed by
 the process_message_queue.pl cronjob.
 See the comments in the script for directions on changing the script.
 This script has the following parameters :
-	-c Confirm and remove this help & warning
-        -m maximum number of days in advance to send advance notices.
-	-n send No mail. Instead, all mail messages are printed on screen. Usefull for testing purposes.
-        -v verbose
-        -i csv list of fields that get substituted into templates in places
-           of the E<lt>E<lt>items.contentE<gt>E<gt> placeholder.  Defaults to
-           issuedate,title,barcode,author
+    -c Confirm and remove this help & warning
+    -m maximum number of days in advance to send advance notices.
+    -n send No mail. Instead, all mail messages are printed on screen. Usefull for testing purposes.
+    -v verbose
 ENDUSAGE
 
 # Since advance notice options are not visible in the web-interface
@@ -157,8 +154,6 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
         } else {
             my $biblio = C4::Biblio::GetBiblioFromItemNumber( $upcoming->{'itemnumber'} );
             my $letter_type = 'DUE';
-            $letter = C4::Letters::getletter( 'circulation', $letter_type );
-            die "no letter of type '$letter_type' found. Please see sample_notices.sql" unless $letter;
             $sth->execute($upcoming->{'borrowernumber'},$upcoming->{'itemnumber'},'0');
             my $titles = "";
             while ( my $item_info = $sth->fetchrow_hashref()) {
@@ -166,13 +161,14 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
               $titles .= join("\t", at item_info) . "\n";
             }
         
-            $letter = parse_letter( { letter         => $letter,
+            $letter = parse_letter( { letter_code    => $letter_type,
                                       borrowernumber => $upcoming->{'borrowernumber'},
                                       branchcode     => $upcoming->{'branchcode'},
                                       biblionumber   => $biblio->{'biblionumber'},
                                       itemnumber     => $upcoming->{'itemnumber'},
                                       substitute     => { 'items.content' => $titles }
-                                    } );
+                                    } )
+              or die "no letter of type '$letter_type' found. Please see sample_notices.sql";
         }
     } else {
         $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $upcoming->{'borrowernumber'},
@@ -189,8 +185,6 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
         } else {
             my $biblio = C4::Biblio::GetBiblioFromItemNumber( $upcoming->{'itemnumber'} );
             my $letter_type = 'PREDUE';
-            $letter = C4::Letters::getletter( 'circulation', $letter_type );
-            die "no letter of type '$letter_type' found. Please see sample_notices.sql" unless $letter;
             $sth->execute($upcoming->{'borrowernumber'},$upcoming->{'itemnumber'},$borrower_preferences->{'days_in_advance'});
             my $titles = "";
             while ( my $item_info = $sth->fetchrow_hashref()) {
@@ -198,13 +192,14 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
               $titles .= join("\t", at item_info) . "\n";
             }
         
-            $letter = parse_letter( { letter         => $letter,
+            $letter = parse_letter( { letter_code    => $letter_type,
                                       borrowernumber => $upcoming->{'borrowernumber'},
                                       branchcode     => $upcoming->{'branchcode'},
                                       biblionumber   => $biblio->{'biblionumber'},
                                       itemnumber     => $upcoming->{'itemnumber'},
                                       substitute     => { 'items.content' => $titles }
-                                    } );
+                                    } )
+              or die "no letter of type '$letter_type' found. Please see sample_notices.sql";
         }
     }
 
@@ -250,8 +245,6 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$upcoming_digest ) {
 
 
     my $letter_type = 'PREDUEDGST';
-    my $letter = C4::Letters::getletter( 'circulation', $letter_type );
-    die "no letter of type '$letter_type' found. Please see sample_notices.sql" unless $letter;
 
     $sth->execute($borrowernumber,$borrower_preferences->{'days_in_advance'});
     my $titles = "";
@@ -259,12 +252,13 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$upcoming_digest ) {
       my @item_info = map { $_ =~ /^date|date$/ ? format_date($item_info->{$_}) : $item_info->{$_} || '' } @item_content_fields;
       $titles .= join("\t", at item_info) . "\n";
     }
-    $letter = parse_letter( { letter         => $letter,
+    my $letter = parse_letter( { letter_code    => $letter_type,
                               borrowernumber => $borrowernumber,
                               substitute     => { count => $count,
                                                   'items.content' => $titles
                                                 }
-                         } );
+                         } )
+      or die "no letter of type '$letter_type' found. Please see sample_notices.sql";
     if ($nomail) {
       local $, = "\f";
       print $letter->{'content'};
@@ -290,20 +284,19 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$due_digest ) {
     next PATRON unless $borrower_preferences; # how could this happen?
 
     my $letter_type = 'DUEDGST';
-    my $letter = C4::Letters::getletter( 'circulation', $letter_type );
-    die "no letter of type '$letter_type' found. Please see sample_notices.sql" unless $letter;
     $sth->execute($borrowernumber,'0');
     my $titles = "";
     while ( my $item_info = $sth->fetchrow_hashref()) {
       my @item_info = map { $_ =~ /^date|date$/ ? format_date($item_info->{$_}) : $item_info->{$_} || '' } @item_content_fields;
       $titles .= join("\t", at item_info) . "\n";
     }
-    $letter = parse_letter( { letter         => $letter,
+    my $letter = parse_letter( { letter_code    => $letter_type,
                               borrowernumber => $borrowernumber,
                               substitute     => { count => $count,
                                                   'items.content' => $titles
                                                 }
-                         } );
+                         } )
+      or die "no letter of type '$letter_type' found. Please see sample_notices.sql";
 
     if ($nomail) {
       local $, = "\f";
@@ -323,40 +316,35 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$due_digest ) {
 
 =head2 parse_letter
 
-
-
 =cut
 
 sub parse_letter {
     my $params = shift;
-    foreach my $required ( qw( letter borrowernumber ) ) {
+    foreach my $required ( qw( letter_code borrowernumber ) ) {
         return unless exists $params->{$required};
     }
 
-    if ( $params->{'substitute'} ) {
-        while ( my ($key, $replacedby) = each %{$params->{'substitute'}} ) {
-            my $replacefield = "<<$key>>";
-            
-            $params->{'letter'}->{title}   =~ s/$replacefield/$replacedby/g;
-            $params->{'letter'}->{content} =~ s/$replacefield/$replacedby/g;
-        }
-    }
-
-    C4::Letters::parseletter( $params->{'letter'}, 'borrowers',   $params->{'borrowernumber'} );
+    my %table_params = ( 'borrowers' => $params->{'borrowernumber'} );
 
-    if ( $params->{'branchcode'} ) {
-        C4::Letters::parseletter( $params->{'letter'}, 'branches',    $params->{'branchcode'} );
+    if ( my $p = $params->{'branchcode'} ) {
+        $table_params{'branches'} = $p;
     }
-    if ( $params->{'itemnumber'} ) {
-        C4::Letters::parseletter( $params->{'letter'}, 'issues', $params->{'itemnumber'} );
-        C4::Letters::parseletter( $params->{'letter'}, 'items', $params->{'itemnumber'} );
+    if ( my $p = $params->{'itemnumber'} ) {
+        $table_params{'issues'} = $p;
+        $table_params{'items'} = $p;
     }
-    if ( $params->{'biblionumber'} ) {
-        C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $params->{'biblionumber'} );
-        C4::Letters::parseletter( $params->{'letter'}, 'biblioitems', $params->{'biblionumber'} );
+    if ( my $p = $params->{'biblionumber'} ) {
+        $table_params{'biblio'} = $p;
+        $table_params{'biblioitems'} = $p;
     }
 
-    return $params->{'letter'};
+    return C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => $params->{'letter_code'},
+        branchcode => $table_params{'branches'},
+        substitute => $params->{'substitute'},
+        tables     => \%table_params,
+    );
 }
 
 1;
diff --git a/misc/cronjobs/gather_print_notices.pl b/misc/cronjobs/gather_print_notices.pl
index a72d6a6..165b16e 100755
--- a/misc/cronjobs/gather_print_notices.pl
+++ b/misc/cronjobs/gather_print_notices.pl
@@ -39,11 +39,9 @@ use Getopt::Long;
 
 sub usage {
     print STDERR <<USAGE;
-Usage: $0 [ -s STYLESHEET ] OUTPUT_DIRECTORY
+Usage: $0 OUTPUT_DIRECTORY
   Will print all waiting print notices to
   OUTPUT_DIRECTORY/notices-CURRENT_DATE.html .
-  If the filename of a CSS stylesheet is specified with -s, the contents of that
-  file will be included in the HTML.
 USAGE
     exit $_[0];
 }
@@ -51,7 +49,6 @@ USAGE
 my ( $stylesheet, $help );
 
 GetOptions(
-    's:s' => \$stylesheet,
     'h|help' => \$help,
 ) || usage( 1 );
 
@@ -71,16 +68,9 @@ exit unless( @messages );
 open OUTPUT, '>', File::Spec->catdir( $output_directory, "holdnotices-" . $today->output( 'iso' ) . ".html" );
 
 my $template = C4::Templates::gettemplate( 'batch/print-notices.tmpl', 'intranet', new CGI );
-my $stylesheet_contents = '';
-
-if ($stylesheet) {
-  open STYLESHEET, '<', $stylesheet;
-  while ( <STYLESHEET> ) { $stylesheet_contents .= $_ }
-  close STYLESHEET;
-}
 
 $template->param(
-    stylesheet => $stylesheet_contents,
+    stylesheet => C4::Context->preference("NoticeCSS"),
     today => $today->output(),
     messages => \@messages,
 );
diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 5896abd..d303f4f 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -460,16 +460,6 @@ END_SQL
             {
                 $verbose and warn "borrower $firstname, $lastname ($borrowernumber) has items triggering level $i.";
     
-                my $letter = C4::Letters::getletter( 'circulation', $overdue_rules->{"letter$i"} );
-
-                unless ($letter) {
-                    $verbose and warn "Message '$overdue_rules->{letter$i}' content not found";
-    
-                    # might as well skip while PERIOD, no other borrowers are going to work.
-                    # FIXME : Does this mean a letter must be defined in order to trigger a debar ?
-                    next PERIOD;
-                }
-    
                 if ( $overdue_rules->{"debarred$i"} ) {
     
                     #action taken is debarring
@@ -494,11 +484,12 @@ END_SQL
                     my @item_info = map { $_ =~ /^date|date$/ ? format_date( $item_info->{$_} ) : $item_info->{$_} || '' } @item_content_fields;
                     $titles .= join("\t", @item_info) . "\n";
                     $itemcount++;
-                    push @items, { itemnumber => $item_info->{'itemnumber'}, biblionumber => $item_info->{'biblionumber'} };
+                    push @items, $item_info;
                 }
                 $sth2->finish;
-                $letter = parse_letter(
-                    {   letter          => $letter,
+
+                my $letter = parse_letter(
+                    {   letter_code     => $overdue_rules->{"letter$i"},
                         borrowernumber  => $borrowernumber,
                         branchcode      => $branchcode,
                         items           => \@items,
@@ -509,6 +500,13 @@ END_SQL
                                            }
                     }
                 );
+                unless ($letter) {
+                    $verbose and warn "Message '$overdue_rules->{letter$i}' content not found";
+    
+                    # might as well skip while PERIOD, no other borrowers are going to work.
+                    # FIXME : Does this mean a letter must be defined in order to trigger a debar ?
+                    next PERIOD;
+                }
                 
                 if ( $exceededPrintNoticesMaxLines ) {
                   $letter->{'content'} .= "List too long for form; please check your account online for a complete list of your overdue items.";
@@ -643,54 +641,56 @@ substituted keys and values.
 
 =cut
 
-sub parse_letter { # FIXME: this code should probably be moved to C4::Letters:parseletter
+sub parse_letter {
     my $params = shift;
-    foreach my $required (qw( letter borrowernumber )) {
+    foreach my $required (qw( letter_code borrowernumber )) {
         return unless exists $params->{$required};
     }
 
-   my $todaysdate = C4::Dates->new()->output("syspref");
-   $params->{'letter'}->{title}   =~ s/<<today>>/$todaysdate/g;
-   $params->{'letter'}->{content} =~ s/<<today>>/$todaysdate/g;
+    my $substitute = $params->{'substitute'} || {};
+    $substitute->{today} ||= C4::Dates->new()->output("syspref");
 
-    if ( $params->{'substitute'} ) {
-        while ( my ( $key, $replacedby ) = each %{ $params->{'substitute'} } ) {
-            my $replacefield = "<<$key>>";
-            $params->{'letter'}->{title}   =~ s/$replacefield/$replacedby/g;
-            $params->{'letter'}->{content} =~ s/$replacefield/$replacedby/g;
-        }
+    my %tables = ( 'borrowers' => $params->{'borrowernumber'} );
+    if ( my $p = $params->{'branchcode'} ) {
+        $tables{'branches'} = $p;
     }
 
-    $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'borrowers', $params->{'borrowernumber'} );
-
-    if ( $params->{'branchcode'} ) {
-        $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'branches', $params->{'branchcode'} );
+    my $currency_format;
+    if ($params->{'letter'}->{'content'} =~ m/<fine>(.*)<\/fine>/o) { # process any fine tags...
+        $currency_format = $1;
+        $params->{'letter'}->{'content'} =~ s/<fine>.*<\/fine>/<<item.fine>>/o;
     }
 
-    if ( $params->{'items'} ) {
+    my @item_tables;
+    if ( my $i = $params->{'items'} ) {
         my $item_format = '';
-        PROCESS_ITEMS:
-        while (scalar(@{$params->{'items'}}) > 0) {
-            my $item = shift @{$params->{'items'}};
+        foreach my $item (@$i) {
             my $fine = GetFine($item->{'itemnumber'}, $params->{'borrowernumber'});
             if (!$item_format) {
                 $params->{'letter'}->{'content'} =~ m/(<item>.*<\/item>)/;
                 $item_format = $1;
             }
-            if ($params->{'letter'}->{'content'} =~ m/<fine>(.*)<\/fine>/) { # process any fine tags...
-                my $formatted_fine = currency_format("$1", "$fine", FMT_SYMBOL);
-                $params->{'letter'}->{'content'} =~ s/<fine>.*<\/fine>/$formatted_fine/;
-            }
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $item->{'biblionumber'} );
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblioitems', $item->{'biblionumber'} );
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'items', $item->{'itemnumber'} );
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'issues', $item->{'itemnumber'} );
-            $params->{'letter'}->{'content'} =~ s/(<item>.*<\/item>)/$1\n$item_format/ if scalar(@{$params->{'items'}} > 0);
 
+            $item->{'fine'} = currency_format($currency_format, "$fine", FMT_SYMBOL)
+              if $currency_format;
+
+            push @item_tables, {
+                'biblio' => $item->{'biblionumber'},
+                'biblioitems' => $item->{'biblionumber'},
+                'items' => $item,
+                'issues' => $item->{'itemnumber'},
+            };
         }
     }
-    $params->{'letter'}->{'content'} =~ s/<\/{0,1}?item>//g; # strip all remaining item tags...
-    return $params->{'letter'};
+
+    return C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => $params->{'letter_code'},
+        branchcode => $params->{'branchcode'},
+        tables => \%tables,
+        substitute => $substitute,
+        repeat => { item => \@item_tables },
+    );
 }
 
 =head2 prepare_letter_for_printing
diff --git a/t/db_dependent/lib/KohaTest/Letters.pm b/t/db_dependent/lib/KohaTest/Letters.pm
index 97d58fb..f2d7b0d 100644
--- a/t/db_dependent/lib/KohaTest/Letters.pm
+++ b/t/db_dependent/lib/KohaTest/Letters.pm
@@ -12,13 +12,12 @@ sub testing_class { 'C4::Letters' };
 
 sub methods : Test( 1 ) {
     my $self = shift;
-    my @methods = qw( getletter
-                      addalert
+    my @methods = qw( addalert
                       delalert
                       getalert
                       findrelatedto
                       SendAlerts
-                      parseletter
+                      GetPreparedLetter
                 );
     
     can_ok( $self->testing_class, @methods );    
diff --git a/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm b/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm
index 76b6ab4..53e5439 100644
--- a/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm
+++ b/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm
@@ -10,7 +10,7 @@ use Test::More;
 sub GetLetter : Test( 6 ) {
     my $self = shift;
 
-    my $letter = getletter( 'circulation', 'ODUE' );
+    my $letter = getletter( 'circulation', 'ODUE', '' );
 
     isa_ok( $letter, 'HASH' )
       or diag( Data::Dumper->Dump( [ $letter ], [ 'letter' ] ) );
@@ -21,7 +21,6 @@ sub GetLetter : Test( 6 ) {
     ok( exists $letter->{'name'}, 'name' );
     ok( exists $letter->{'title'}, 'title' );
 
-
 }
 
 1;
diff --git a/t/db_dependent/lib/KohaTest/Members.pm b/t/db_dependent/lib/KohaTest/Members.pm
index 5646be1..dfde7da 100644
--- a/t/db_dependent/lib/KohaTest/Members.pm
+++ b/t/db_dependent/lib/KohaTest/Members.pm
@@ -52,6 +52,7 @@ sub methods : Test( 1 ) {
                       GetBorrowersWhoHaveNeverBorrowed 
                       GetBorrowersWithIssuesHistoryOlderThan 
                       GetBorrowersNamesAndLatestIssue 
+                      IssueSlip
                 );
     
     can_ok( $self->testing_class, @methods );    
diff --git a/t/db_dependent/lib/KohaTest/Print.pm b/t/db_dependent/lib/KohaTest/Print.pm
index 02fd5fb..d35ab34 100644
--- a/t/db_dependent/lib/KohaTest/Print.pm
+++ b/t/db_dependent/lib/KohaTest/Print.pm
@@ -12,10 +12,7 @@ sub testing_class { 'C4::Print' };
 
 sub methods : Test( 1 ) {
     my $self = shift;
-    my @methods = qw( remoteprint
-                      printreserve 
-                      printslip
-                );
+    my @methods = qw( printslip );
     
     can_ok( $self->testing_class, @methods );    
 }
diff --git a/t/db_dependent/lib/KohaTest/Reserves.pm b/t/db_dependent/lib/KohaTest/Reserves.pm
index 8b05dd0..6416ac3 100644
--- a/t/db_dependent/lib/KohaTest/Reserves.pm
+++ b/t/db_dependent/lib/KohaTest/Reserves.pm
@@ -33,6 +33,7 @@ sub methods : Test( 1 ) {
                        GetReserveInfo 
                        _FixPriority 
                        _Findgroupreserve 
+                       ReserveSlip
                 );
     
     can_ok( $self->testing_class, @methods );    
diff --git a/tools/letter.pl b/tools/letter.pl
index 04cd7d2..ae47810 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -46,14 +46,35 @@ use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
+use C4::Branch; # GetBranches
+use C4::Members::Attributes;
 
-# letter_exists($module, $code)
-# - return true if a letter with the given $module and $code exists
+# _letter_from_where($branchcode,$module, $code)
+# - return FROM WHERE clause and bind args for a letter
+sub _letter_from_where {
+    my ($branchcode, $module, $code) = @_;
+    my $sql = q{FROM letter WHERE branchcode = ? AND module = ? AND code = ?};
+    my @args = ($branchcode || '', $module, $code);
+# Mysql is retarded. cause branchcode is part of the primary key it cannot be null. How does that
+# work with foreign key constraint I wonder...
+
+#   if ($branchcode) {
+#       $sql .= " AND branchcode = ?";
+#       push @args, $branchcode;
+#   } else {
+#       $sql .= " AND branchcode IS NULL";
+#   }
+
+    return ($sql, \@args);
+}
+
+# letter_exists($branchcode,$module, $code)
+# - return true if a letter with the given $branchcode, $module and $code exists
 sub letter_exists {
-    my ($module, $code) = @_;
+    my ($sql, $args) = _letter_from_where(@_);
     my $dbh = C4::Context->dbh;
-    my $letters = $dbh->selectall_arrayref(q{SELECT name FROM letter WHERE module = ? AND code = ?}, undef, $module, $code);
-    return @{$letters};
+    my $letter = $dbh->selectrow_hashref("SELECT * $sql", undef, @$args);
+    return $letter;
 }
 
 # $protected_letters = protected_letters()
@@ -67,16 +88,14 @@ sub protected_letters {
 my $input       = new CGI;
 my $searchfield = $input->param('searchfield');
 my $script_name = '/cgi-bin/koha/tools/letter.pl';
+my $branchcode  = $input->param('branchcode');
 my $code        = $input->param('code');
 my $module      = $input->param('module');
 my $content     = $input->param('content');
-my $op          = $input->param('op');
+my $op          = $input->param('op') || '';
 my $dbh = C4::Context->dbh;
-if (!defined $module ) {
-    $module = q{};
-}
 
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+my ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
     {
         template_name   => 'tools/letter.tmpl',
         query           => $input,
@@ -87,32 +106,39 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-if (!defined $op) {
-    $op = q{}; # silence errors from eq
-}
+my $my_branch = C4::Context->preference("IndependantBranches") && !$staffflags->{'superlibrarian'}
+  ?  C4::Context->userenv()->{'branch'}
+  : undef;
 # we show only the TMPL_VAR names $op
 
 $template->param(
+    independant_branch => $my_branch,
 	script_name => $script_name,
+  searchfield => $searchfield,
 	action => $script_name
 );
 
+if ($op eq 'copy') {
+    add_copy();
+    $op = 'add_form';
+}
+
 if ($op eq 'add_form') {
-    add_form($module, $code);
+    add_form($branchcode, $module, $code);
 }
 elsif ( $op eq 'add_validate' ) {
     add_validate();
     $op = q{}; # next operation is to return to default screen
 }
 elsif ( $op eq 'delete_confirm' ) {
-    delete_confirm($module, $code);
+    delete_confirm($branchcode, $module, $code);
 }
 elsif ( $op eq 'delete_confirmed' ) {
-    delete_confirmed($module, $code);
+    delete_confirmed($branchcode, $module, $code);
     $op = q{}; # next operation is to return to default screen
 }
 else {
-    default_display($searchfield);
+    default_display($branchcode,$searchfield);
 }
 
 # Do this last as delete_confirmed resets
@@ -125,23 +151,21 @@ if ($op) {
 output_html_with_http_headers $input, $cookie, $template->output;
 
 sub add_form {
-    my ($module, $code ) = @_;
+    my ($branchcode,$module, $code ) = @_;
 
     my $letter;
     # if code has been passed we can identify letter and its an update action
     if ($code) {
-        $letter = $dbh->selectrow_hashref(q{SELECT module, code, name, title, content FROM letter WHERE module=? AND code=?},
-            undef, $module, $code);
+        $letter = letter_exists($branchcode,$module, $code);
+    }
+    if ($letter) {
         $template->param( modify => 1 );
         $template->param( code   => $letter->{code} );
     }
     else { # initialize the new fields
         $letter = {
-            module  => $module,
-            code    => q{},
-            name    => q{},
-            title   => q{},
-            content => q{},
+            branchcode => $branchcode,
+            module     => $module,
         };
         $template->param( adding => 1 );
     }
@@ -173,14 +197,20 @@ sub add_form {
             {value => q{},             text => '---ITEMS---'  },
             {value => 'items.content', text => 'items.content'},
             add_fields('issues','borrowers');
+        if ($module eq 'circulation') {
+            push @{$field_selection}, add_fields('opac_news');
+        }
     }
 
     $template->param(
-        name    => $letter->{name},
-        title   => $letter->{title},
-        content => $letter->{content},
-        module  => $module,
-        $module => 1,
+        branchcode => $letter->{branchcode},
+        name       => $letter->{name},
+        is_html    => $letter->{is_html},
+        title      => $letter->{title},
+        content    => $letter->{content},
+        module     => $module,
+        $module    => 1,
+        branchloop => _branchloop($branchcode),
         SQLfieldname => $field_selection,
     );
     return;
@@ -188,37 +218,56 @@ sub add_form {
 
 sub add_validate {
     my $dbh        = C4::Context->dbh;
-    my $module     = $input->param('module');
-    my $oldmodule  = $input->param('oldmodule');
-    my $code       = $input->param('code');
-    my $name       = $input->param('name');
-    my $title      = $input->param('title');
-    my $content    = $input->param('content');
-    if (letter_exists($oldmodule, $code)) {
+    my $oldbranchcode = $input->param('oldbranchcode');
+    my $branchcode    = $input->param('branchcode') || '';
+    my $module        = $input->param('module');
+    my $oldmodule     = $input->param('oldmodule');
+    my $code          = $input->param('code');
+    my $name          = $input->param('name');
+    my $is_html       = $input->param('is_html');
+    my $title         = $input->param('title');
+    my $content       = $input->param('content');
+    if (letter_exists($oldbranchcode,$oldmodule, $code)) {
         $dbh->do(
-            q{UPDATE letter SET module = ?, code = ?, name = ?, title = ?, content = ? WHERE module = ? AND code = ?},
+            q{UPDATE letter SET branchcode = ?, module = ?, name = ?, is_html = ?, title = ?, content = ? WHERE branchcode = ? AND module = ? AND code = ?},
             undef,
-            $module, $code, $name, $title, $content,
-            $oldmodule, $code
+            $branchcode, $module, $name, $is_html || 0, $title, $content,
+            $oldbranchcode, $oldmodule, $code
         );
     } else {
         $dbh->do(
-            q{INSERT INTO letter (module,code,name,title,content) VALUES (?,?,?,?,?)},
+            q{INSERT INTO letter (branchcode,module,code,name,is_html,title,content) VALUES (?,?,?,?,?,?,?)},
             undef,
-            $module, $code, $name, $title, $content
+            $branchcode, $module, $code, $name, $is_html || 0, $title, $content
         );
     }
     # set up default display
-    default_display();
-    return;
+    default_display($branchcode);
+}
+
+sub add_copy {
+    my $dbh        = C4::Context->dbh;
+    my $oldbranchcode = $input->param('oldbranchcode');
+    my $branchcode    = $input->param('branchcode');
+    my $module        = $input->param('module');
+    my $code          = $input->param('code');
+
+    return if letter_exists($branchcode,$module, $code);
+
+    my $old_letter = letter_exists($oldbranchcode,$module, $code);
+
+    $dbh->do(
+        q{INSERT INTO letter (branchcode,module,code,name,is_html,title,content) VALUES (?,?,?,?,?,?,?)},
+        undef,
+        $branchcode, $module, $code, $old_letter->{name}, $old_letter->{is_html}, $old_letter->{title}, $old_letter->{content}
+    );
 }
 
 sub delete_confirm {
-    my ($module, $code) = @_;
+    my ($branchcode, $module, $code) = @_;
     my $dbh = C4::Context->dbh;
-    my $letter = $dbh->selectrow_hashref(q|SELECT  name FROM letter WHERE module = ? AND code = ?|,
-        { Slice => {} },
-        $module, $code);
+    my $letter = letter_exists($branchcode, $module, $code);
+    $template->param( branchcode => $branchcode, branchname => GetBranchName($branchcode) );
     $template->param( code => $code );
     $template->param( module => $module);
     $template->param( name => $letter->{name});
@@ -226,40 +275,53 @@ sub delete_confirm {
 }
 
 sub delete_confirmed {
-    my ($module, $code) = @_;
+    my ($branchcode, $module, $code) = @_;
+    my ($sql, $args) = _letter_from_where($branchcode, $module, $code);
     my $dbh    = C4::Context->dbh;
-    $dbh->do('DELETE FROM letter WHERE module=? AND code=?',{},$module,$code);
+    $dbh->do("DELETE $sql", undef, @$args);
     # setup default display for screen
-    default_display();
+    default_display($branchcode);
     return;
 }
 
 sub retrieve_letters {
-    my $searchstring = shift;
+    my ($branchcode, $searchstring) = @_;
+
+    $branchcode = $my_branch if $branchcode && $my_branch;
+
     my $dbh = C4::Context->dbh;
-    if ($searchstring) {
-        if ($searchstring=~m/(\S+)/) {
-            $searchstring = $1 . q{%};
-            return $dbh->selectall_arrayref('SELECT module, code, name FROM letter WHERE code LIKE ? ORDER BY module, code',
-                { Slice => {} }, $searchstring);
-        }
+    my ($sql, @where, @args);
+    $sql = "SELECT branchcode, module, code, name, branchname
+            FROM letter
+            LEFT OUTER JOIN branches USING (branchcode)";
+    if ($searchstring && $searchstring=~m/(\S+)/) {
+        $searchstring = $1 . q{%};
+        push @where, 'code LIKE ?';
+        push @args, $searchstring;
     }
-    else {
-        return $dbh->selectall_arrayref('SELECT module, code, name FROM letter ORDER BY module, code', { Slice => {} });
+    elsif ($branchcode) {
+        push @where, 'branchcode = ?';
+        push @args, $branchcode || '';
     }
-    return;
+    elsif ($my_branch) {
+        push @where, "(branchcode = ? OR branchcode = '')";
+        push @args, $my_branch;
+    }
+
+    $sql .= " WHERE ".join(" AND ", @where) if @where;
+    $sql .= " ORDER BY module, code, branchcode";
+#   use Data::Dumper; die Dumper($sql, \@args);
+    return $dbh->selectall_arrayref($sql, { Slice => {} }, @args);
 }
 
 sub default_display {
-    my $searchfield = shift;
-    my $results;
+    my ($branchcode, $searchfield) = @_;
+
     if ( $searchfield  ) {
         $template->param( search      => 1 );
-        $template->param( searchfield => $searchfield );
-        $results = retrieve_letters($searchfield);
-    } else {
-        $results = retrieve_letters();
     }
+    my $results = retrieve_letters($branchcode,$searchfield);
+
     my $loop_data = [];
     my $protected_letters = protected_letters();
     foreach my $row (@{$results}) {
@@ -267,8 +329,27 @@ sub default_display {
         push @{$loop_data}, $row;
 
     }
-    $template->param( letter => $loop_data );
-    return;
+
+    $template->param(
+        letter => $loop_data,
+        branchloop => _branchloop($branchcode),
+    );
+}
+
+sub _branchloop {
+    my ($branchcode) = @_;
+
+    my $branches = GetBranches();
+    my @branchloop;
+    for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
+        push @branchloop, {
+            value      => $thisbranch,
+            selected   => $branchcode && $thisbranch eq $branchcode,
+            branchname => $branches->{$thisbranch}->{'branchname'},
+        };
+    }
+
+    return \@branchloop;
 }
 
 sub add_fields {
@@ -307,6 +388,7 @@ sub get_columns_for {
             text  => $tlabel,
         };
     }
+
     my $sql = "SHOW COLUMNS FROM $table";# TODO not db agnostic
     my $table_prefix = $table . q|.|;
     my $rows = C4::Context->dbh->selectall_arrayref($sql, { Slice => {} });
@@ -317,5 +399,15 @@ sub get_columns_for {
             text  => $table_prefix . $row->{Field},
         }
     }
+    if ($table eq 'borrowers') {
+        if ( my $attributes = C4::Members::Attributes::GetAttributes() ) {
+            foreach (@$attributes) {
+                push @fields, {
+                    value => "borrower-attribute:$_",
+                    text  => "attribute:$_",
+                }
+            }
+        }
+    }
     return @fields;
 }
-- 
1.6.5


From srdjan at catalyst.net.nz  Wed Feb 22 06:49:30 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed, 22 Feb 2012 18:49:30 +1300
Subject: [Koha-patches] [PATCH] bug_7001: Issue and Reserve slips are
	notices.
In-Reply-To: <bug 7001>
References: <bug 7001>
Message-ID: <1329889770-12936-1-git-send-email-srdjan@catalyst.net.nz>

Branches can have their own version of notices - added branchcode to
letter table.
Support html notices - added is_html to letter table.
Support for borrower attributes in templates.
GetPreparedletter() is the interface for compiling letters (notices).
Sysprefs for notice and slips stylesheets.
---
 C4/Circulation.pm                                  |   20 +-
 C4/Letters.pm                                      |  549 +++++++++++++-------
 C4/Members.pm                                      |   81 +++-
 C4/Members/Attributes.pm                           |   18 +
 C4/Message.pm                                      |   12 +-
 C4/Print.pm                                        |  146 ++----
 C4/Reserves.pm                                     |  103 +++--
 C4/Suggestions.pm                                  |   22 +-
 acqui/booksellers.pl                               |    7 +-
 circ/circulation.pl                                |    3 +-
 circ/hold-transfer-slip.pl                         |   32 +-
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/en/mandatory/sample_notices.sql     |   84 +++-
 .../data/mysql/es-ES/mandatory/sample_notices.sql  |    2 +-
 .../mysql/fr-FR/1-Obligatoire/sample_notices.sql   |    2 +-
 installer/data/mysql/it-IT/necessari/notices.sql   |    2 +-
 installer/data/mysql/kohastructure.sql             |    7 +-
 .../mysql/nb-NO/1-Obligatorisk/sample_notices.sql  |    2 +-
 .../data/mysql/pl-PL/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/ru-RU/mandatory/sample_notices.sql  |    2 +-
 installer/data/mysql/sysprefs.sql                  |    2 +
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    2 +-
 installer/data/mysql/updatedatabase.pl             |  100 ++++-
 .../prog/en/includes/circ-toolbar.inc              |    4 +-
 .../en/modules/admin/preferences/circulation.pref  |    5 +
 .../en/modules/admin/preferences/staff_client.pref |    5 +
 .../prog/en/modules/batch/print-notices.tt         |    6 +-
 .../prog/en/modules/circ/hold-transfer-slip.tt     |   54 --
 .../prog/en/modules/circ/printslip.tt              |   28 +
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |  162 +++++--
 .../prog/en/modules/tools/tools-home.tt            |    2 +-
 members/memberentry.pl                             |    5 +-
 members/moremember.pl                              |   10 -
 members/printslip.pl                               |   92 ++++
 misc/cronjobs/advance_notices.pl                   |   78 ++--
 misc/cronjobs/gather_print_notices.pl              |   14 +-
 misc/cronjobs/overdue_notices.pl                   |   86 ++--
 t/db_dependent/lib/KohaTest/Letters.pm             |    5 +-
 t/db_dependent/lib/KohaTest/Letters/GetLetter.pm   |    3 +-
 t/db_dependent/lib/KohaTest/Members.pm             |    1 +
 t/db_dependent/lib/KohaTest/Print.pm               |    5 +-
 t/db_dependent/lib/KohaTest/Reserves.pm            |    1 +
 tools/letter.pl                                    |  230 ++++++---
 43 files changed, 1308 insertions(+), 690 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
 create mode 100755 members/printslip.pl

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 93c6fac..a62f26e 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2667,11 +2667,18 @@ sub SendCirculationAlert {
         borrowernumber => $borrower->{borrowernumber},
         message_name   => $message_name{$type},
     });
-    my $letter = C4::Letters::getletter('circulation', $type);
-    C4::Letters::parseletter($letter, 'biblio',      $item->{biblionumber});
-    C4::Letters::parseletter($letter, 'biblioitems', $item->{biblionumber});
-    C4::Letters::parseletter($letter, 'borrowers',   $borrower->{borrowernumber});
-    C4::Letters::parseletter($letter, 'branches',    $branch);
+    my $letter =  C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => $type,
+        branchcode => $branch,
+        tables => {
+            'biblio'      => $item->{biblionumber},
+            'biblioitems' => $item->{biblionumber},
+            'borrowers'   => $borrower,
+            'branches'    => $branch,
+        }
+    ) or return;
+
     my @transports = @{ $borrower_preferences->{transports} };
     # warn "no transports" unless @transports;
     for (@transports) {
@@ -2686,7 +2693,8 @@ sub SendCirculationAlert {
             $message->update;
         }
     }
-    $letter;
+
+    return $letter;
 }
 
 =head2 updateWrongTransfer
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 28c6984..5080a0c 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -24,6 +24,7 @@ use MIME::Lite;
 use Mail::Sendmail;
 
 use C4::Members;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Branch;
 use C4::Log;
 use C4::SMS;
@@ -40,7 +41,7 @@ BEGIN {
 	$VERSION = 3.01;
 	@ISA = qw(Exporter);
 	@EXPORT = qw(
-	&GetLetters &getletter &addalert &getalert &delalert &findrelatedto &SendAlerts GetPrintMessages
+	&GetLetters &GetPreparedLetter &GetWrappedLetter &addalert &getalert &delalert &findrelatedto &SendAlerts &GetPrintMessages
 	);
 }
 
@@ -115,13 +116,26 @@ sub GetLetters (;$) {
     return \%letters;
 }
 
-sub getletter ($$) {
-    my ( $module, $code ) = @_;
+my %letter;
+sub getletter ($$$) {
+    my ( $module, $code, $branchcode ) = @_;
+
+    if (C4::Context->preference('IndependantBranches') && $branchcode){
+        $branchcode = C4::Context->userenv->{'branch'};
+    }
+
+    if ( my $l = $letter{$module}{$code}{$branchcode} ) {
+        return { %$l }; # deep copy
+    }
+
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("select * from letter where module=? and code=?");
-    $sth->execute( $module, $code );
-    my $line = $sth->fetchrow_hashref;
-    return $line;
+    my $sth = $dbh->prepare("select * from letter where module=? and code=? and (branchcode = ? or branchcode = '') order by branchcode desc limit 1");
+    $sth->execute( $module, $code, $branchcode );
+    my $line = $sth->fetchrow_hashref
+      or return;
+    $line->{'content-type'} = 'text/html; charset="UTF-8"' if $line->{is_html};
+    $letter{$module}{$code}{$branchcode} = $line;
+    return { %$line };
 }
 
 =head2 addalert ($borrowernumber, $type, $externalid)
@@ -176,7 +190,7 @@ sub delalert ($) {
 sub getalert (;$$$) {
     my ( $borrowernumber, $type, $externalid ) = @_;
     my $dbh   = C4::Context->dbh;
-    my $query = "SELECT * FROM alert WHERE";
+    my $query = "SELECT a.*, b.branchcode FROM alert a JOIN borrowers b USING(borrowernumber) WHERE";
     my @bind;
     if ($borrowernumber and $borrowernumber =~ /^\d+$/) {
         $query .= " borrowernumber=? AND ";
@@ -232,73 +246,68 @@ sub findrelatedto ($$) {
     parameters :
     - $type : the type of alert
     - $externalid : the id of the "object" to query
-    - $letter : the letter to send.
+    - $letter_code : the letter to send.
 
     send an alert to all borrowers having put an alert on a given subject.
 
 =cut
 
 sub SendAlerts {
-    my ( $type, $externalid, $letter ) = @_;
+    my ( $type, $externalid, $letter_code ) = @_;
     my $dbh = C4::Context->dbh;
     my $strsth;
     if ( $type eq 'issue' ) {
 
-        # 		warn "sending issues...";
-        my $letter = getletter( 'serial', $letter );
-
         # prepare the letter...
         # search the biblionumber
         my $sth =
           $dbh->prepare(
             "SELECT biblionumber FROM subscription WHERE subscriptionid=?");
         $sth->execute($externalid);
-        my ($biblionumber) = $sth->fetchrow;
-
-        # parsing branch info
-        my $userenv = C4::Context->userenv;
-        parseletter( $letter, 'branches', $userenv->{branch} );
-
-        # parsing librarian name
-        $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
-        $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
-        $letter->{content} =~
-          s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-
-        # parsing biblio information
-        parseletter( $letter, 'biblio',      $biblionumber );
-        parseletter( $letter, 'biblioitems', $biblionumber );
+        my ($biblionumber) = $sth->fetchrow
+          or warn( "No subscription for '$externalid'" ),
+             return;
 
+        my %letter;
         # find the list of borrowers to alert
         my $alerts = getalert( '', 'issue', $externalid );
         foreach (@$alerts) {
 
-            # and parse borrower ...
-            my $innerletter = $letter;
             my $borinfo = C4::Members::GetMember('borrowernumber' => $_->{'borrowernumber'});
-            parseletter( $innerletter, 'borrowers', $_->{'borrowernumber'} );
+            my $email = $borinfo->{email} or next;
+
+            # 		warn "sending issues...";
+            my $userenv = C4::Context->userenv;
+            my $letter = GetPreparedLetter (
+                module => 'serial',
+                letter_code => $letter_code,
+                branchcode => $userenv->{branch},
+                tables => {
+                    'branches'    => $_->{branchcode},
+                    'biblio'      => $biblionumber,
+                    'biblioitems' => $biblionumber,
+                    'borrowers'   => $borinfo,
+                },
+                want_librarian => 1,
+            ) or return;
 
             # ... then send mail
-            if ( $borinfo->{email} ) {
-                my %mail = (
-                    To      => $borinfo->{email},
-                    From    => $borinfo->{email},
-                    Subject => "" . $innerletter->{title},
-                    Message => "" . $innerletter->{content},
-                    'Content-Type' => 'text/plain; charset="utf8"',
-                    );
-                sendmail(%mail) or carp $Mail::Sendmail::error;
-
-            }
+            my %mail = (
+                To      => $email,
+                From    => $email,
+                Subject => "" . $letter->{title},
+                Message => "" . $letter->{content},
+                'Content-Type' => 'text/plain; charset="utf8"',
+                );
+            sendmail(%mail) or carp $Mail::Sendmail::error;
         }
     }
-    elsif ( $type eq 'claimacquisition' ) {
-
-        $letter = getletter( 'claimacquisition', $letter );
+    elsif ( $type eq 'claimacquisition' or $type eq 'claimissues' ) {
 
         # prepare the letter...
         # search the biblionumber
-        $strsth = qq{
+        $strsth =  $type eq 'claimacquisition'
+            ? qq{
             SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*,aqbooksellers.*
             FROM aqorders
             LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
@@ -306,114 +315,83 @@ sub SendAlerts {
             LEFT JOIN biblioitems ON aqorders.biblioitemnumber=biblioitems.biblioitemnumber
             LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
             WHERE aqorders.ordernumber IN (
-        }
-          . join( ",", @$externalid ) . ")";
-    }
-    elsif ( $type eq 'claimissues' ) {
-
-        $letter = getletter( 'claimissues', $letter );
-
-        # prepare the letter...
-        # search the biblionumber
-        $strsth = qq{
+            }
+            : qq{
             SELECT serial.*,subscription.*, biblio.*, aqbooksellers.*
             FROM serial
             LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid
             LEFT JOIN biblio ON serial.biblionumber=biblio.biblionumber
             LEFT JOIN aqbooksellers ON subscription.aqbooksellerid=aqbooksellers.id
             WHERE serial.serialid IN (
-        }
+            }
           . join( ",", @$externalid ) . ")";
-    }
-
-    if ( $type eq 'claimacquisition' or $type eq 'claimissues' ) {
         my $sthorders = $dbh->prepare($strsth);
         $sthorders->execute;
-        my @fields = map {
-            $sthorders->{mysql_table}[$_] . "." . $sthorders->{NAME}[$_] }
-            (0 .. $#{$sthorders->{NAME}} ) ;
-
-        my @orders_infos;
-        while ( my $row = $sthorders->fetchrow_arrayref() ) {
-            my %rec = ();
-            @rec{@fields} = @$row;
-            push @orders_infos, \%rec;
+        my $dataorders = $sthorders->fetchall_arrayref( {} );
+
+        my $sthbookseller =
+          $dbh->prepare("select * from aqbooksellers where id=?");
+        $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
+        my $databookseller = $sthbookseller->fetchrow_hashref;
+
+        my @email;
+        push @email, $databookseller->{bookselleremail} if $databookseller->{bookselleremail};
+        push @email, $databookseller->{contemail}       if $databookseller->{contemail};
+        unless (@email) {
+            warn "Bookseller $dataorders->[0]->{booksellerid} without emails";
+            return;
         }
 
-        # parsing branch info
         my $userenv = C4::Context->userenv;
-        parseletter( $letter, 'branches', $userenv->{branch} );
-
-        # parsing librarian name
-        $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
-        $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
-        $letter->{content} =~ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-
-        # Get Fields remplacement
-        my $order_format = $1 if ( $letter->{content} =~ m/(<order>.*<\/order>)/xms );
-
-        # Foreach field to remplace
-        while ( $letter->{content} =~ m/<<([^>]*)>>/g ) {
-            my $field = $1;
-            my $value = $orders_infos[0]->{$field} || "";
-            $value = sprintf("%.2f", $value) if $field =~ /price/;
-            $letter->{content} =~ s/<<$field>>/$value/g;
-        }
-
-        if ( $order_format ) {
-            # For each order
-            foreach my $infos ( @orders_infos ) {
-                my $order_content = $order_format;
-                # We replace by value
-                while ( $order_content =~ m/<<([^>]*)>>/g ) {
-                    my $field = $1;
-                    my $value = $infos->{$field} || "";
-                    $value = sprintf("%.2f", $value) if $field =~ /price/;
-                    $order_content =~ s/(<<$field>>)/$value/g;
-                }
-                $order_content =~ s/<\/{0,1}?order>//g;
-                $letter->{content} =~ s/<order>.*<\/order>/$order_content\n$order_format/xms;
-            }
-            $letter->{content} =~ s/<order>.*<\/order>//xms;
-        }
-
-        my $innerletter = $letter;
+        my $letter = GetPreparedLetter (
+            module => $type,
+            letter_code => $letter_code,
+            branchcode => $userenv->{branch},
+            tables => {
+                'branches'    => $userenv->{branch},
+                'aqbooksellers' => $databookseller,
+            },
+            repeat => $dataorders,
+            want_librarian => 1,
+        ) or return;
 
         # ... then send mail
-        if (   $orders_infos[0]->{'aqbooksellers.bookselleremail'}
-            || $orders_infos[0]->{'aqbooksellers.contemail'} ) {
-            my $to = $orders_infos[0]->{'aqbooksellers.bookselleremail'};
-            $to .= ", " if $to;
-            $to .= $orders_infos[0]->{'aqbooksellers.contemail'} || "";
-            my %mail = (
-                To             => $to,
-                From           => $userenv->{emailaddress},
-                Subject        => Encode::encode( "utf8", "" . $innerletter->{title} ),
-                Message        => Encode::encode( "utf8", "" . $innerletter->{content} ),
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-            warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}" if $debug;
-            if ( C4::Context->preference("LetterLog") ) {
-                logaction( "ACQUISITION", "Send Acquisition claim letter", "", "order list : " . join( ",", @$externalid ) . "\n$innerletter->{title}\n$innerletter->{content}" ) if $type eq 'claimacquisition';
-                logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues';
-            }
-        } else {
-            return {error => "no_email" };
-        }
-
-        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug;
-    }
+        my %mail = (
+            To => join( ','. @email),
+            From           => $userenv->{emailaddress},
+            Subject        => "" . $letter->{title},
+            Message        => "" . $letter->{content},
+            'Content-Type' => 'text/plain; charset="utf8"',
+        );
+        sendmail(%mail) or carp $Mail::Sendmail::error;
 
-    # send an "account details" notice to a newly created user
+        logaction(
+            "ACQUISITION",
+            $type eq 'claimissues' ? "CLAIM ISSUE" : "ACQUISITION CLAIM",
+            undef,
+            "To="
+                . $databookseller->{contemail}
+                . " Title="
+                . $letter->{title}
+                . " Content="
+                . $letter->{content}
+        ) if C4::Context->preference("LetterLog");
+    }    
+   # send an "account details" notice to a newly created user 
     elsif ( $type eq 'members' ) {
-        # must parse the password special, before it's hashed.
-        $letter->{content} =~ s/<<borrowers.password>>/$externalid->{'password'}/g;
-
-        parseletter( $letter, 'borrowers', $externalid->{'borrowernumber'});
-        parseletter( $letter, 'branches', $externalid->{'branchcode'} );
-
         my $branchdetails = GetBranchDetail($externalid->{'branchcode'});
+        my $letter = GetPreparedLetter (
+            module => 'members',
+            letter_code => $letter_code,
+            branchcode => $externalid->{'branchcode'},
+            tables => {
+                'branches'    => $branchdetails,
+                'borrowers' => $externalid->{'borrowernumber'},
+            },
+            substitute => { 'borrowers.password' => $externalid->{'password'} },
+            want_librarian => 1,
+        ) or return;
+
         my %mail = (
                 To      =>     $externalid->{'emailaddr'},
                 From    =>  $branchdetails->{'branchemail'} || C4::Context->preference("KohaAdminEmailAddress"),
@@ -425,24 +403,148 @@ sub SendAlerts {
     }
 }
 
-=head2 parseletter($letter, $table, $pk)
-
-    parameters :
-    - $letter : a hash to letter fields (title & content useful)
-    - $table : the Koha table to parse.
-    - $pk : the primary key to query on the $table table
-    parse all fields from a table, and replace values in title & content with the appropriate value
-    (not exported sub, used only internally)
+=head2 GetPreparedLetter( %params )
+
+    %params hash:
+      module => letter module, mandatory
+      letter_code => letter code, mandatory
+      branchcode => for letter selection, if missing default system letter taken
+      tables => a hashref with table names as keys. Values are either:
+        - a scalar - primary key value
+        - an arrayref - primary key values
+        - a hashref - full record
+      substitute => custom substitution key/value pairs
+      repeat => records to be substituted on consecutive lines:
+        - an arrayref - tries to guess what needs substituting by
+          taking remaining << >> tokensr; not recommended
+        - a hashref token => @tables - replaces <token> << >> << >> </token>
+          subtemplate for each @tables row; table is a hashref as above
+      want_librarian => boolean,  if set to true triggers librarian details
+        substitution from the userenv
+    Return value:
+      letter fields hashref (title & content useful)
 
 =cut
 
-our %handles = ();
-our %columns = ();
+sub GetPreparedLetter {
+    my %params = @_;
+
+    my $module      = $params{module} or croak "No module";
+    my $letter_code = $params{letter_code} or croak "No letter_code";
+    my $branchcode  = $params{branchcode} || '';
+
+    my $letter = getletter( $module, $letter_code, $branchcode )
+        or warn( "No $module $letter_code letter"),
+            return;
 
-sub parseletter_sth {
+    my $tables = $params{tables};
+    my $substitute = $params{substitute};
+    my $repeat = $params{repeat};
+    $tables || $substitute || $repeat
+      or carp( "ERROR: nothing to substitute - both 'tables' and 'substitute' are empty" ),
+         return;
+    my $want_librarian = $params{want_librarian};
+
+    if ($substitute) {
+        while ( my ($token, $val) = each %$substitute ) {
+            $letter->{title} =~ s/<<$token>>/$val/g;
+            $letter->{content} =~ s/<<$token>>/$val/g;
+       }
+    }
+
+    if ($want_librarian) {
+        # parsing librarian name
+        my $userenv = C4::Context->userenv;
+        $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/go;
+        $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/go;
+        $letter->{content} =~ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/go;
+    }
+
+    my ($repeat_no_enclosing_tags, $repeat_enclosing_tags);
+
+    if ($repeat) {
+        if (ref ($repeat) eq 'ARRAY' ) {
+            $repeat_no_enclosing_tags = $repeat;
+        } else {
+            $repeat_enclosing_tags = $repeat;
+        }
+    }
+
+    if ($repeat_enclosing_tags) {
+        while ( my ($tag, $tag_tables) = each %$repeat_enclosing_tags ) {
+            if ( $letter->{content} =~ m!<$tag>(.*)</$tag>!s ) {
+                my $subcontent = $1;
+                my @lines = map {
+                    my %subletter = ( title => '', content => $subcontent );
+                    _substitute_tables( \%subletter, $_ );
+                    $subletter{content};
+                } @$tag_tables;
+                $letter->{content} =~ s!<$tag>.*</$tag>!join( "\n", @lines )!se;
+            }
+        }
+    }
+
+    if ($tables) {
+        _substitute_tables( $letter, $tables );
+    }
+
+    if ($repeat_no_enclosing_tags) {
+        if ( $letter->{content} =~ m/[^\n]*<<.*>>[^\n]*/so ) {
+            my $line = $&;
+            my $i = 1;
+            my @lines = map {
+                my $c = $line;
+                $c =~ s/<<count>>/$i/go;
+                foreach my $field ( keys %{$_} ) {
+                    $c =~ s/(<<[^\.]+.$field>>)/$_->{$field}/;
+                }
+                $i++;
+                $c;
+            } @$repeat_no_enclosing_tags;
+
+            my $replaceby = join( "\n", @lines );
+            $letter->{content} =~ s/\Q$line\E/$replaceby/s;
+        }
+    }
+
+    $letter->{content} =~ s/<<\S*>>//go; #remove any stragglers
+#   $letter->{content} =~ s/<<[^>]*>>//go;
+
+    return $letter;
+}
+
+sub _substitute_tables {
+    my ( $letter, $tables ) = @_;
+    while ( my ($table, $param) = each %$tables ) {
+        next unless $param;
+
+        my $ref = ref $param;
+
+        my $values;
+        if ($ref && $ref eq 'HASH') {
+            $values = $param;
+        }
+        else {
+            my @pk;
+            my $sth = _parseletter_sth($table);
+            unless ($sth) {
+                warn "_parseletter_sth('$table') failed to return a valid sth.  No substitution will be done for that table.";
+                return;
+            }
+            $sth->execute( $ref ? @$param : $param );
+
+            $values = $sth->fetchrow_hashref;
+        }
+
+        _parseletter ( $letter, $table, $values );
+    }
+}
+
+my %handles = ();
+sub _parseletter_sth {
     my $table = shift;
     unless ($table) {
-        carp "ERROR: parseletter_sth() called without argument (table)";
+        carp "ERROR: _parseletter_sth() called without argument (table)";
         return;
     }
     # check cache first
@@ -456,9 +558,12 @@ sub parseletter_sth {
     ($table eq 'borrowers'    ) ? "SELECT * FROM $table WHERE borrowernumber = ?"                      :
     ($table eq 'branches'     ) ? "SELECT * FROM $table WHERE     branchcode = ?"                      :
     ($table eq 'suggestions'  ) ? "SELECT * FROM $table WHERE   suggestionid = ?"                      :
-    ($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE             id = ?"                      : undef ;
+    ($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE             id = ?"                      :
+    ($table eq 'aqorders'     ) ? "SELECT * FROM $table WHERE    ordernumber = ?"                      :
+    ($table eq 'opac_news'    ) ? "SELECT * FROM $table WHERE          idnew = ?"                      :
+    undef ;
     unless ($query) {
-        warn "ERROR: No parseletter_sth query for table '$table'";
+        warn "ERROR: No _parseletter_sth query for table '$table'";
         return;     # nothing to get
     }
     unless ($handles{$table} = C4::Context->dbh->prepare($query)) {
@@ -468,25 +573,21 @@ sub parseletter_sth {
     return $handles{$table};    # now cache is populated for that $table
 }
 
-sub parseletter {
-    my ( $letter, $table, $pk, $pk2 ) = @_;
-    unless ($letter) {
-        carp "ERROR: parseletter() 1st argument 'letter' empty";
-        return;
-    }
-    my $sth = parseletter_sth($table);
-    unless ($sth) {
-        warn "parseletter_sth('$table') failed to return a valid sth.  No substitution will be done for that table.";
-        return;
-    }
-    if ( $pk2 ) {
-        $sth->execute($pk, $pk2);
-    } else {
-        $sth->execute($pk);
-    }
+=head2 _parseletter($letter, $table, $values)
 
-    my $values = $sth->fetchrow_hashref;
-    
+    parameters :
+    - $letter : a hash to letter fields (title & content useful)
+    - $table : the Koha table to parse.
+    - $values : table record hashref
+    parse all fields from a table, and replace values in title & content with the appropriate value
+    (not exported sub, used only internally)
+
+=cut
+
+my %columns = ();
+sub _parseletter {
+    my ( $letter, $table, $values ) = @_;
+   
     # TEMPORARY hack until the expirationdate column is added to reserves
     if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
         my @waitingdate = split /-/, $values->{'waitingdate'};
@@ -500,16 +601,51 @@ sub parseletter {
         )->output();
     }
 
+    if ($letter->{content} && $letter->{content} =~ /<<today>>/) {
+        my @da = localtime();
+        my $todaysdate = "$da[2]:$da[1]  " . C4::Dates->today();
+        $letter->{content} =~ s/<<today>>/$todaysdate/go;
+    }
 
     # and get all fields from the table
-    my $columns = C4::Context->dbh->prepare("SHOW COLUMNS FROM $table");
-    $columns->execute;
-    while ( ( my $field ) = $columns->fetchrow_array ) {
-        my $replacefield = "<<$table.$field>>";
-        $values->{$field} =~ s/\p{P}(?=$)//g if $values->{$field};
-        my $replacedby   = $values->{$field} || '';
-        ($letter->{title}  ) and $letter->{title}   =~ s/$replacefield/$replacedby/g;
-        ($letter->{content}) and $letter->{content} =~ s/$replacefield/$replacedby/g;
+#   my $columns = $columns{$table};
+#   unless ($columns) {
+#       $columns = $columns{$table} =  C4::Context->dbh->selectcol_arrayref("SHOW COLUMNS FROM $table");
+#   }
+#   foreach my $field (@$columns) {
+
+    while ( my ($field, $val) = each %$values ) {
+        my $replacetablefield = "<<$table.$field>>";
+        my $replacefield = "<<$field>>";
+        $val =~ s/\p{P}(?=$)//g if $val;
+        my $replacedby   = defined ($val) ? $val : '';
+        ($letter->{title}  ) and do {
+            $letter->{title}   =~ s/$replacetablefield/$replacedby/g;
+            $letter->{title}   =~ s/$replacefield/$replacedby/g;
+        };
+        ($letter->{content}) and do {
+            $letter->{content} =~ s/$replacetablefield/$replacedby/g;
+            $letter->{content} =~ s/$replacefield/$replacedby/g;
+        };
+    }
+
+    if ($table eq 'borrowers' && $letter->{content}) {
+        if ( my $attributes = GetBorrowerAttributes($values->{borrowernumber}) ) {
+            my %attr;
+            foreach (@$attributes) {
+                my $code = $_->{code};
+                my $val  = $_->{value_description} || $_->{value};
+                $val =~ s/\p{P}(?=$)//g if $val;
+                next unless $val gt '';
+                $attr{$code} ||= [];
+                push @{ $attr{$code} }, $val;
+            }
+            while ( my ($code, $val_ar) = each %attr ) {
+                my $replacefield = "<<borrower-attribute:$code>>";
+                my $replacedby   = join ',', @$val_ar;
+                $letter->{content} =~ s/$replacefield/$replacedby/g;
+            }
+        }
     }
     return $letter;
 }
@@ -694,31 +830,32 @@ returns your letter object, with the content updated.
 sub _add_attachments {
     my $params = shift;
 
-    return unless 'HASH' eq ref $params;
-    foreach my $required_parameter (qw( letter attachments message )) {
-        return unless exists $params->{$required_parameter};
-    }
-    return $params->{'letter'} unless @{ $params->{'attachments'} };
+    my $letter = $params->{'letter'};
+    my $attachments = $params->{'attachments'};
+    return $letter unless @$attachments;
+    my $message = $params->{'message'};
 
     # First, we have to put the body in as the first attachment
-    $params->{'message'}->attach(
-        Type => 'TEXT',
-        Data => $params->{'letter'}->{'content'},
+    $message->attach(
+        Type => $letter->{'content-type'} || 'TEXT',
+        Data => $letter->{'is_html'}
+            ? _wrap_html($letter->{'content'}, $letter->{'title'})
+            : $letter->{'content'},
     );
 
-    foreach my $attachment ( @{ $params->{'attachments'} } ) {
-        $params->{'message'}->attach(
+    foreach my $attachment ( @$attachments ) {
+        $message->attach(
             Type     => $attachment->{'type'},
             Data     => $attachment->{'content'},
             Filename => $attachment->{'filename'},
         );
     }
     # we're forcing list context here to get the header, not the count back from grep.
-    ( $params->{'letter'}->{'content-type'} ) = grep( /^Content-Type:/, split( /\n/, $params->{'message'}->header_as_string ) );
-    $params->{'letter'}->{'content-type'} =~ s/^Content-Type:\s+//;
-    $params->{'letter'}->{'content'} = $params->{'message'}->body_as_string;
+    ( $letter->{'content-type'} ) = grep( /^Content-Type:/, split( /\n/, $params->{'message'}->header_as_string ) );
+    $letter->{'content-type'} =~ s/^Content-Type:\s+//;
+    $letter->{'content'} = $message->body_as_string;
 
-    return $params->{'letter'};
+    return $letter;
 
 }
 
@@ -785,14 +922,17 @@ sub _send_message_by_email ($;$$$) {
 
     my $utf8   = decode('MIME-Header', $message->{'subject'} );
     $message->{subject}= encode('MIME-Header', $utf8);
+    my $subject = encode('utf8', $message->{'subject'});
     my $content = encode('utf8', $message->{'content'});
+    my $content_type = $message->{'content_type'} || 'text/plain; charset="UTF-8"';
+    my $is_html = $content_type =~ m/html/io;
     my %sendmail_params = (
         To   => $to_address,
         From => $message->{'from_address'} || C4::Context->preference('KohaAdminEmailAddress'),
-        Subject => encode('utf8', $message->{'subject'}),
+        Subject => $subject,
         charset => 'utf8',
-        Message => $content,
-        'content-type' => $message->{'content_type'} || 'text/plain; charset="UTF-8"',
+        Message => $is_html ? _wrap_html($content, $subject) : $content,
+        'content-type' => $content_type,
     );
     $sendmail_params{'Auth'} = {user => $username, pass => $password, method => $method} if $username;
     if ( my $bcc = C4::Context->preference('OverdueNoticeBcc') ) {
@@ -812,6 +952,27 @@ sub _send_message_by_email ($;$$$) {
     }
 }
 
+sub _wrap_html {
+    my ($content, $title) = @_;
+
+    my $css = C4::Context->preference("NoticeCSS") || '';
+    $css = qq{<link rel="stylesheet" type="text/css" href="$css">} if $css;
+    return <<EOS;
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>$title</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+$css
+</head>
+<body>
+$content
+</body>
+</html>
+EOS
+}
+
 sub _send_message_by_sms ($) {
     my $message = shift or return undef;
     my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} );
diff --git a/C4/Members.pm b/C4/Members.pm
index b81872c..7def77e 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -23,7 +23,7 @@ package C4::Members;
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
-use C4::Dates qw(format_date_in_iso);
+use C4::Dates qw(format_date_in_iso format_date);
 use Digest::MD5 qw(md5_base64);
 use Date::Calc qw/Today Add_Delta_YM check_date Date_to_Days/;
 use C4::Log; # logaction
@@ -31,8 +31,10 @@ use C4::Overdues;
 use C4::Reserves;
 use C4::Accounts;
 use C4::Biblio;
+use C4::Letters;
 use C4::SQLHelper qw(InsertInTable UpdateInTable SearchInTable);
 use C4::Members::Attributes qw(SearchIdMatchingAttribute);
+use C4::NewsChannels; #get slip news
 
 our ($VERSION, at ISA, at EXPORT, at EXPORT_OK,$debug);
 
@@ -91,6 +93,8 @@ BEGIN {
 		&DeleteMessage
 		&GetMessages
 		&GetMessagesCount
+
+        &IssueSlip
 	);
 
 	#Modify data
@@ -2229,7 +2233,80 @@ sub DeleteMessage {
     logaction("MEMBERS", "DELCIRCMESSAGE", $message->{'borrowernumber'}, $message->{'message'}) if C4::Context->preference("BorrowersLog");
 }
 
-END { }    # module clean-up code here (global destructor)
+=head2 IssueSlip
+
+  IssueSlip($branchcode, $borrowernumber, $quickslip)
+
+  Returns letter hash ( see C4::Letters::GetPreparedLetter )
+
+  $quickslip is boolean, to indicate whether we want a quick slip
+
+=cut
+
+sub IssueSlip {
+    my ($branch, $borrowernumber, $quickslip) = @_;
+
+#   return unless ( C4::Context->boolean_preference('printcirculationslips') );
+
+    my $today       = POSIX::strftime("%Y-%m-%d", localtime);
+
+    my $issueslist = GetPendingIssues($borrowernumber);
+    foreach my $it (@$issueslist){
+        if ($it->{'issuedate'} eq $today) {
+            $it->{'today'} = 1;
+        }
+        elsif ($it->{'date_due'} le $today) {
+            $it->{'overdue'} = 1;
+        }
+
+        $it->{'date_due'}=format_date($it->{'date_due'});
+    }
+    my @issues = sort { $b->{'timestamp'} <=> $a->{'timestamp'} } @$issueslist;
+
+    my ($letter_code, %repeat);
+    if ( $quickslip ) {
+        $letter_code = 'ISSUEQSLIP';
+        %repeat =  (
+            'checkedout' => [ map {
+                'biblio' => $_,
+                'items'  => $_,
+                'issues' => $_,
+            }, grep { $_->{'today'} } @issues ],
+        );
+    }
+    else {
+        $letter_code = 'ISSUESLIP';
+        %repeat =  (
+            'checkedout' => [ map {
+                'biblio' => $_,
+                'items'  => $_,
+                'issues' => $_,
+            }, grep { !$_->{'overdue'} } @issues ],
+
+            'overdue' => [ map {
+                'biblio' => $_,
+                'items'  => $_,
+                'issues' => $_,
+            }, grep { $_->{'overdue'} } @issues ],
+
+            'news' => [ map {
+                $_->{'timestamp'} = $_->{'newdate'};
+                { opac_news => $_ }
+            } @{ GetNewsToDisplay("slip") } ],
+        );
+    }
+
+    return  C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => $letter_code,
+        branchcode => $branch,
+        tables => {
+            'branches'    => $branch,
+            'borrowers'   => $borrowernumber,
+        },
+        repeat => \%repeat,
+    );
+}
 
 1;
 
diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm
index 4ae5600..33affa8 100644
--- a/C4/Members/Attributes.pm
+++ b/C4/Members/Attributes.pm
@@ -95,6 +95,24 @@ sub GetBorrowerAttributes {
     return \@results;
 }
 
+=head2 GetAttributes
+
+  my $attributes = C4::Members::Attributes::GetAttributes([$opac_only]);
+
+Retrieve an arrayref of extended attribute codes
+
+=cut
+
+sub GetAttributes {
+    my ($opac_only) = @_;
+
+    my $dbh = C4::Context->dbh();
+    my $query = "SELECT code FROM borrower_attribute_types";
+    $query .= "\nWHERE opac_display = 1" if $opac_only;
+    $query .= "\nORDER BY code";
+    return $dbh->selectcol_arrayref($query);
+}
+
 =head2 GetBorrowerAttributeValue
 
   my $value = C4::Members::Attributes::GetBorrowerAttributeValue($borrowernumber, $attribute_code);
diff --git a/C4/Message.pm b/C4/Message.pm
index 16272ff..4b88970 100644
--- a/C4/Message.pm
+++ b/C4/Message.pm
@@ -18,9 +18,15 @@ How to add a new message to the queue:
   use C4::Items;
   my $borrower = { borrowernumber => 1 };
   my $item     = C4::Items::GetItem(1);
-  my $letter   = C4::Letters::getletter('circulation', 'CHECKOUT');
-  C4::Letters::parseletter($letter, 'biblio', $item->{biblionumber});
-  C4::Letters::parseletter($letter, 'biblioitems', $item->{biblionumber});
+  my $letter =  C4::Letters::GetPreparedLetter (
+      module => 'circulation',
+      letter_code => 'CHECKOUT',
+      branchcode => $branch,
+      tables => {
+          'biblio', $item->{biblionumber},
+          'biblioitems', $item->{biblionumber},
+      },
+  );
   C4::Message->enqueue($letter, $borrower->{borrowernumber}, 'email');
 
 How to update a borrower's last checkout message:
diff --git a/C4/Print.pm b/C4/Print.pm
index f810816..7fb55cf 100644
--- a/C4/Print.pm
+++ b/C4/Print.pm
@@ -20,8 +20,6 @@ package C4::Print;
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
-use C4::Members;
-use C4::Dates qw(format_date);
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -30,7 +28,7 @@ BEGIN {
 	$VERSION = 3.01;
 	require Exporter;
 	@ISA    = qw(Exporter);
-	@EXPORT = qw(&remoteprint &printreserve &printslip);
+	@EXPORT = qw(&printslip);
 }
 
 =head1 NAME
@@ -47,28 +45,48 @@ The functions in this module handle sending text to a printer.
 
 =head1 FUNCTIONS
 
-=head2 remoteprint
+=cut
 
-  &remoteprint($items, $borrower);
+=comment
+    my $slip = <<"EOF";
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Date: $todaysdate;
 
-Prints the list of items in C<$items> to a printer.
+ITEM RESERVED: 
+$itemdata->{'title'} ($itemdata->{'author'})
+barcode: $itemdata->{'barcode'}
 
-C<$borrower> is a reference-to-hash giving information about a patron.
-This may be gotten from C<&GetMemberDetails>. The patron's name
-will be printed in the output.
+COLLECT AT: $branchname
+
+BORROWER:
+$bordata->{'surname'}, $bordata->{'firstname'}
+card number: $bordata->{'cardnumber'}
+Phone: $bordata->{'phone'}
+$bordata->{'streetaddress'}
+$bordata->{'suburb'}
+$bordata->{'town'}
+$bordata->{'emailaddress'}
 
-C<$items> is a reference-to-list, where each element is a
-reference-to-hash describing a borrowed item. C<$items> may be gotten
-from C<&GetBorrowerIssues>.
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+EOF
 =cut
 
+=head2 printslip
+
+  &printslip($slip)
+
+print a slip for the given $borrowernumber and $branchcode
+
+=cut
+
+sub printslip ($) {
+    my ($slip) = @_;
+
+    return unless ( C4::Context->boolean_preference('printcirculationslips') );
+
 # FIXME - It'd be nifty if this could generate pretty PostScript.
-sub remoteprint ($$) {
-    my ($items, $borrower) = @_;
 
-    (return)
-      unless ( C4::Context->boolean_preference('printcirculationslips') );
     my $queue = '';
 
     # FIXME - If 'queue' is undefined or empty, then presumably it should
@@ -94,107 +112,13 @@ sub remoteprint ($$) {
 
     #  print $queue;
     #open (FILE,">/tmp/$file");
-    my $i      = 0;
-    # FIXME - This is HLT-specific. Put this stuff in a customizable
-    # site-specific file somewhere.
-    print PRINTER "Horowhenua Library Trust\r\n";
-    print PRINTER "Phone: 368-1953\r\n";
-    print PRINTER "Fax:    367-9218\r\n";
-    print PRINTER "Email:  renewals\@library.org.nz\r\n\r\n\r\n";
-    print PRINTER "$borrower->{'cardnumber'}\r\n";
-    print PRINTER
-      "$borrower->{'title'} $borrower->{'initials'} $borrower->{'surname'}\r\n";
-
-    # FIXME - Use   for ($i = 0; $items->[$i]; $i++)
-    # Or better yet,   foreach $item (@{$items})
-    while ( $items->[$i] ) {
-
-        #    print $i;
-        my $itemdata = $items->[$i];
-
-        # FIXME - This is just begging for a Perl format.
-        print PRINTER "$i $itemdata->{'title'}\r\n";
-        print PRINTER "$itemdata->{'barcode'}";
-        print PRINTER " " x 15;
-        print PRINTER "$itemdata->{'date_due'}\r\n";
-        $i++;
-    }
+    print PRINTER $slip;
     print PRINTER "\r\n" x 7 ;
     close PRINTER;
 
     #system("lpr /tmp/$file");
 }
 
-sub printreserve {
-
-    # FIXME - make useful
-    return;
-
-    my ( $branchname, $bordata, $itemdata ) = @_;
-    my $printer = '';
-    (return) unless ( C4::Context->boolean_preference('printreserveslips') );
-    if ( $printer eq "" || $printer eq 'nulllp' ) {
-        open( PRINTER, ">>/tmp/kohares" )
-		  or die "Could not write to /tmp/kohares";
-    }
-    else {
-        open( PRINTER, "| lpr -P $printer >/dev/null" )
-          or die "Couldn't write to queue:$!\n";
-    }
-    my @da = localtime();
-    my $todaysdate = "$da[2]:$da[1]  " . C4::Dates->today();
-    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'}
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-EOF
-    print PRINTER $slip;
-    close PRINTER;
-    return $slip;
-}
-
-=head2 printslip
-
-  &printslip($borrowernumber)
-
-print a slip for the given $borrowernumber
-
-=cut
-
-#'
-sub printslip ($) {
-
-    #FIXME - make useful
-
-    my $borrowernumber = shift;
-    my $borrower   = GetMemberDetails($borrowernumber);
-	my $issueslist = GetPendingIssues($borrowernumber); 
-	foreach my $it (@$issueslist){
-		$it->{'date_due'}=format_date($it->{'date_due'});
-    }		
-    my @issues = sort { $b->{'timestamp'} <=> $a->{'timestamp'} } @$issueslist;
-    remoteprint(\@issues, $borrower );
-}
-
-END { }    # module clean-up code here (global destructor)
-
 1;
 __END__
 
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 359bbad..d2af1c5 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -121,6 +121,8 @@ BEGIN {
         
         &AlterPriority
         &ToggleLowestPriority
+
+        &ReserveSlip
     );
     @EXPORT_OK = qw( MergeHolds );
 }    
@@ -194,32 +196,31 @@ sub AddReserve {
     # Send e-mail to librarian if syspref is active
     if(C4::Context->preference("emailLibrarianWhenHoldIsPlaced")){
         my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
-        my $biblio   = GetBiblioData($biblionumber);
-        my $letter = C4::Letters::getletter( 'reserves', 'HOLDPLACED');
-	my $branchcode = $borrower->{branchcode};
-        my $branch_details = C4::Branch::GetBranchDetail($branchcode);
-        my $admin_email_address =$branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
-
-        my %keys = (%$borrower, %$biblio);
-        foreach my $key (keys %keys) {
-            my $replacefield = "<<$key>>";
-            $letter->{content} =~ s/$replacefield/$keys{$key}/g;
-            $letter->{title} =~ s/$replacefield/$keys{$key}/g;
+        my $branch_details = C4::Branch::GetBranchDetail($borrower->{branchcode});
+        if ( my $letter =  C4::Letters::GetPreparedLetter (
+            module => 'reserves',
+            letter_code => 'HOLDPLACED',
+            branchcode => $branch,
+            tables => {
+                'branches'  => $branch_details,
+                'borrowers' => $borrower,
+                'biblio'    => $biblionumber,
+            },
+        ) ) {
+
+            my $admin_email_address =$branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
+
+            C4::Letters::EnqueueLetter(
+                {   letter                 => $letter,
+                    borrowernumber         => $borrowernumber,
+                    message_transport_type => 'email',
+                    from_address           => $admin_email_address,
+                    to_address           => $admin_email_address,
+                }
+            );
         }
-        
-        C4::Letters::EnqueueLetter(
-                            {   letter                 => $letter,
-                                borrowernumber         => $borrowernumber,
-                                message_transport_type => 'email',
-                                from_address           => $admin_email_address,
-                                to_address           => $admin_email_address,
-                            }
-                        );
-        
-
     }
 
-
     #}
     ($const eq "o" || $const eq "e") or return;   # FIXME: why not have a useful return value?
     $query = qq/
@@ -1720,21 +1721,21 @@ sub _koha_notify_reserve {
 
     my $admin_email_address = $branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
 
-    my $letter = getletter( 'reserves', $letter_code );
-    die "Could not find a letter called '$letter_code' in the 'reserves' module" unless( $letter );
+    my $letter =  C4::Letters::GetPreparedLetter (
+        module => 'reserves',
+        letter_code => $letter_code,
+        branchcode => $reserve->{branchcode},
+        tables => {
+            'branches'  => $branch_details,
+            'borrowers' => $borrower,
+            'biblio'    => $biblionumber,
+            'reserves'  => $reserve,
+            'items', $reserve->{'itemnumber'},
+        },
+        substitute => { today => C4::Dates->new()->output() },
+    ) or die "Could not find a letter called '$letter_code' in the 'reserves' module";
 
-    C4::Letters::parseletter( $letter, 'branches', $reserve->{'branchcode'} );
-    C4::Letters::parseletter( $letter, 'borrowers', $borrowernumber );
-    C4::Letters::parseletter( $letter, 'biblio', $biblionumber );
-    C4::Letters::parseletter( $letter, 'reserves', $borrowernumber, $biblionumber );
 
-    if ( $reserve->{'itemnumber'} ) {
-        C4::Letters::parseletter( $letter, 'items', $reserve->{'itemnumber'} );
-    }
-    my $today = C4::Dates->new()->output();
-    $letter->{'title'} =~ s/<<today>>/$today/g;
-    $letter->{'content'} =~ s/<<today>>/$today/g;
-    $letter->{'content'} =~ s/<<[a-z0-9_]+\.[a-z0-9]+>>//g; #remove any stragglers
 
     if ( $print_mode ) {
         C4::Letters::EnqueueLetter( {
@@ -1908,6 +1909,36 @@ sub MergeHolds {
 }
 
 
+=head2 ReserveSlip
+
+  ReserveSlip($branchcode, $borrowernumber, $biblionumber)
+
+  Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef
+
+=cut
+
+sub ReserveSlip {
+    my ($branch, $borrowernumber, $biblionumber) = @_;
+
+#   return unless ( C4::Context->boolean_preference('printreserveslips') );
+
+    my $reserve = GetReserveInfo($borrowernumber,$biblionumber )
+      or return;
+
+    return  C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => 'RESERVESLIP',
+        branchcode => $branch,
+        tables => {
+            'reserves'    => $reserve,
+            'branches'    => $reserve->{branchcode},
+            'borrowers'   => $reserve,
+            'biblio'      => $reserve,
+            'items'       => $reserve,
+        },
+    );
+}
+
 =head1 AUTHOR
 
 Koha Development Team <http://koha-community.org/>
diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index c9461f5..60d0e99 100644
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -425,20 +425,24 @@ sub ModSuggestion {
     if ($suggestion->{STATUS}) {
         # fetch the entire updated suggestion so that we can populate the letter
         my $full_suggestion = GetSuggestion($suggestion->{suggestionid});
-        my $letter = C4::Letters::getletter('suggestions', $full_suggestion->{STATUS});
-        if ($letter) {
-            C4::Letters::parseletter($letter, 'branches',    $full_suggestion->{branchcode});
-            C4::Letters::parseletter($letter, 'borrowers',   $full_suggestion->{suggestedby});
-            C4::Letters::parseletter($letter, 'suggestions', $full_suggestion->{suggestionid});
-            C4::Letters::parseletter($letter, 'biblio',      $full_suggestion->{biblionumber});
-            my $enqueued = C4::Letters::EnqueueLetter({
+        if ( my $letter =  C4::Letters::GetPreparedLetter (
+            module => 'suggestions',
+            letter_code => $full_suggestion->{STATUS},
+            branchcode => $full_suggestion->{branchcode},
+            tables => {
+                'branches'    => $full_suggestion->{branchcode},
+                'borrowers'   => $full_suggestion->{suggestedby},
+                'suggestions' => $full_suggestion,
+                'biblio'      => $full_suggestion->{biblionumber},
+            },
+        ) ) {
+            C4::Letters::EnqueueLetter({
                 letter                  => $letter,
                 borrowernumber          => $full_suggestion->{suggestedby},
                 suggestionid            => $full_suggestion->{suggestionid},
                 LibraryName             => C4::Context->preference("LibraryName"),
                 message_transport_type  => 'email',
-            });
-            if (!$enqueued){warn "can't enqueue letter $letter";}
+            }) or warn "can't enqueue letter $letter";
         }
     }
     return $status_update_table;
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index d7c64db..ac3c557 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -111,16 +111,11 @@ for my $vendor (@suppliers) {
     
     for my $basket ( @{$baskets} ) {
         my $authorisedby = $basket->{authorisedby};
-        my $basketbranch = ''; # set a blank branch to start with
-        if ( GetMember( borrowernumber => $authorisedby ) ) {
-           # authorisedby may not be a valid borrowernumber; it's not foreign-key constrained!
-           $basketbranch = GetMember( borrowernumber => $authorisedby )->{branchcode};
-        }
         
         if ($userenv->{'flags'} & 1 || #user is superlibrarian
                (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
                    ($viewbaskets eq 'all' || #user is allowed to see all baskets
-                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
+                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq GetMember( borrowernumber => $authorisedby )->{branchcode}) || #basket belongs to user's branch
                    ($basket->{authorisedby} &&  $viewbaskets == 'user' && $authorisedby == $loggedinuser) #user created this basket
                    ) 
                 ) 
diff --git a/circ/circulation.pl b/circ/circulation.pl
index e8d22cb..6928966 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -24,7 +24,6 @@ use strict;
 #use warnings; FIXME - Bug 2505
 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
@@ -176,7 +175,7 @@ if ( $barcode eq '' && $query->param('charges') eq 'yes' ) {
 }
 
 if ( $print eq 'yes' && $borrowernumber ne '' ) {
-    printslip( $borrowernumber );
+    PrintIssueSlip($session->param('branch') || $branch, $borrowernumber);
     $query->param( 'borrowernumber', '' );
     $borrowernumber = '';
 }
diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl
index f581464..8ae5d2a 100755
--- a/circ/hold-transfer-slip.pl
+++ b/circ/hold-transfer-slip.pl
@@ -23,10 +23,8 @@ use strict;
 use C4::Context;
 use C4::Output;
 use CGI;
-use C4::Auth;
+use C4::Auth qw/:DEFAULT get_session/;
 use C4::Reserves;
-use C4::Branch;
-use C4::Dates qw/format_date format_date_in_iso/;
 
 use vars qw($debug);
 
@@ -35,13 +33,16 @@ BEGIN {
 }
 
 my $input = new CGI;
+my $sessionID = $input->cookie("CGISESSID");
+my $session = get_session($sessionID);
+
 my $biblionumber = $input->param('biblionumber');
 my $borrowernumber = $input->param('borrowernumber');
 my $transfer = $input->param('transfer');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   
-        template_name   => "circ/hold-transfer-slip.tmpl",
+        template_name   => "circ/printslip.tmpl",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -50,14 +51,21 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $reserveinfo = GetReserveInfo($borrowernumber,$biblionumber );
-my $pulldate = C4::Dates->new();
-$reserveinfo->{'pulldate'} = $pulldate->output();
-$reserveinfo->{'branchname'} = GetBranchName($reserveinfo->{'branchcode'});
-$reserveinfo->{'transferrequired'} = $transfer;
-
-$template->param( reservedata => [ $reserveinfo ] ,
-				);
+my $userenv = C4::Context->userenv;
+my ($slip, $is_html);
+if ( my $letter = ReserveSlip ($session->param('branch') || $userenv->{branch}, $borrowernumber, $biblionumber) ) {
+    $slip = $letter->{content};
+    $is_html = $letter->{is_html};
+}
+else {
+    $slip = "Reserve not found";
+}
+$template->param(
+    slip => $slip,
+    plain => !$is_html,
+    title => "Koha -- Circulation: Transfers",
+    stylesheet => C4::Context->preference("SlipCSS"),
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;
 
diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
index 0d172db..f668d99 100644
--- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql
+++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
@@ -11,7 +11,7 @@ VALUES ('circulation','ODUE','Mahnung','Mahnung','Liebe/r <<borrowers.firstname>
 ('reserves', 'HOLD_PRINT', 'Vormerkbenachrichtigung (Print)', 'Vormerkbenachrichtigung (Print)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchzip>> <<branches.branchcity>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.address2>>\r\n<<borrowers.zipcode>> <<borrowers.city>>\r\n<<borrowers.country>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\nLiebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nF??r Sie liegt seit dem <<reserves.waitingdate>> eine Vormerkung zur Abholung bereit:\r\n\r\nTitel: <<biblio.title>>\r\nVerfasser: <<biblio.author>>\r\nSignatur: <<items.itemcallnumber>>\r\n'),
 ('circulation','CHECKIN','R??ckgabequittung (Zusammenfassung)','R??ckgabequittung','Die folgenden Medien wurden zur??ckgegeben:\r\n----\r\n<<biblio.title>>\r\n----\r\nVielen Dank.'),
 ('circulation','CHECKOUT','Ausleihquittung (Zusammenfassung)','Ausleihquittung','Die folgenden Medien wurden entliehen:\r\n----\r\n<<biblio.title>>\r\n----\r\nVielen Dank f??r Ihren Besuch in <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Neue Vormerkung', 'Neue Vormerkung','Folgender Titel wurde vorgemerkt: <<title>> (<<biblionumber>>) durch den Benutzer <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Neue Vormerkung', 'Neue Vormerkung','Folgender Titel wurde vorgemerkt: <<biblio.title>> (<<biblio.biblionumber>>) durch den Benutzer <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Anschaffungsvorschlag wurde angenommen', 'Ihr Anschaffungsvorschlag wurde angenommen','Liebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\n\nSie haben der Bibliothek folgendes Medium zur Anschaffung vorgeschlagen: <<suggestions.title>> by <<suggestions.author>>.\n\nDie Bibliothek hat diesen Titel heute recherchiert und wird Ihn sobald wie m??glich im Buchhandel bestellen. Sie erhalten Nachricht, sobald die Bestellung abgeschlossen ist und sobald der Titel in der Bibliotek verf??gbar ist.\n\nWenn Sie Fragen haben, richten Sie Ihre Mail bitte an: <<branches.branchemail>>.\n\nVielen Dank,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Vorgeschlagenes Medium verf??gbar', 'Das vorgeschlagene Medium ist jetzt verf??gbar','Liebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\n\nSie haben der Bibliothek folgendes Medium zur Anschaffung vorgeschlagen: <<suggestions.title>> von <<suggestions.author>>.\n\nWir freuen uns Ihnen mitteilen zu k??nnen, dass dieser Titel jetzt im Bestand der Bibliothek verf??gbar ist.\n\nWenn Sie Fragen haben, richten Sie Ihre Mail bitte an: <<branches.branchemail>>.\n\nVielen Dank,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Vorgeschlagenes Medium bestellt', 'Das vorgeschlagene Medium wurde im Buchhandel bestellt','Liebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\n\nSie haben der Bibliothek folgendes Medium zur Anschaffung vorgeschlaten: <<suggestions.title>> von <<suggestions.author>>.\n\nWir freuen uns Ihnen mitteilen zu k??nnen, dass dieser Titel jetzt im Buchhandel bestellt wurde. Nach Eintreffen wird er in unseren Bestand eingearbeitet.\n\nSie erhalten Nachricht, sobald das Medium verf??gbar ist.\n\nBei Nachfragen erreichen Sie uns unter der Emailadresse <<branches.branchemail>>.\n\nVielen Dank,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
index 5ca7eaf..a600373 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -11,8 +11,90 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','REJECTED','Suggestion rejected', 'Purchase suggestion declined','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your request today, and has decided not to accept the suggestion at this time.\n\nThe reason given is: <<suggestions.reason>>\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>');
+INSERT INTO `letter` (module, code, name, title, content, is_html)
+VALUES ('circulation','ISSUESLIP','Issue Slip','Issue Slip', '<h3><<branches.branchname>></h3>
+Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />
+(<<borrowers.cardnumber>>) <br />
+
+<<today>><br />
+
+<h4>Checked Out</h4>
+<checkedout>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</checkedout>
+
+<h4>Overdues</h4>
+<overdue>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</overdue>
+
+<hr>
+
+<h4 style="text-align: center; font-style:italic;">News</h4>
+<news>
+<div class="newsitem">
+<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<opac_news.title>></b></h5>
+<p style="margin-bottom: 1px; margin-top: 1px"><<opac_news.new>></p>
+<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<opac_news.timestamp>></p>
+<hr />
+</div>
+</news>', 1),
+('circulation','ISSUEQSLIP','Issue Quick Slip','Issue Quick Slip', '<h3><<branches.branchname>></h3>
+Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />
+(<<borrowers.cardnumber>>) <br />
+
+<<today>><br />
+
+<h4>Checked Out Today</h4>
+<checkedout>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</checkedout>', 1),
+('circulation','RESERVESLIP','Reserve Slip','Reserve Slip', '<h5>Date: <<today>></h5>
+
+<h3> Transfer to/Hold in <<branches.branchname>></h3>
+
+<reserves>
+<div>
+<h3><<borrowers.surname>>, <<borrowers.firstname>></h3>
+
+<ul>
+    <li><<borrowers.cardnumber>></li>
+    <li><<borrowers.phone>></li>
+    <li> <<borrowers.address>><br />
+         <<borrowers.address2>><br />
+         <<borrowers.city >>  <<borrowers.zipcode>>
+    </li>
+    <li><<borrowers.email>></li>
+</ul>
+<br />
+<h3>ITEM ON HOLD</h3>
+ <h4><<biblio.title>></h4>
+ <h5><<biblio.author>></h5>
+ <ul>
+    <li><<items.barcode>></li>
+    <li><<items.itemcallnumber>></li>
+    <li><<reserves.waitingdate>></li>
+ </ul>
+ <p>Notes:
+ <pre><<reserves.reservenotes>></pre>
+ </p>
+</div>
+</reserves>', 1);
+
diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
index 78b80fa..0450bd0 100644
--- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql
+++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
@@ -11,7 +11,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
index 9e9f66d..4eb1210 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
@@ -13,7 +13,7 @@ VALUES
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup at <<branches.branchname>>', '<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>>\n\n\nChange Service Requested\n\n\n\n\n\n\n\n<<borrowers.firstname>> <<borrowers.surname>>\n<<borrowers.address>>\n<<borrowers.city>> <<borrowers.zipcode>>\n\n\n\n\n\n\n\n\n\n\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\n\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql
index 78b80fa..0450bd0 100644
--- a/installer/data/mysql/it-IT/necessari/notices.sql
+++ b/installer/data/mysql/it-IT/necessari/notices.sql
@@ -11,7 +11,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 67149c9..0cff8c5 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1169,10 +1169,12 @@ DROP TABLE IF EXISTS `letter`;
 CREATE TABLE `letter` ( -- table for all notice templates in Koha
   `module` varchar(20) NOT NULL default '', -- Koha module that triggers this notice
   `code` varchar(20) NOT NULL default '', -- unique identifier for this notice
+  `branchcode` varchar(10) default NULL, -- foreign key, linking to the branches table for the location the item was checked out
   `name` varchar(100) NOT NULL default '', -- plain text name for this notice
+  `is_html` tinyint(1) default 0,
   `title` varchar(200) NOT NULL default '', -- subject line of the notice
   `content` text, -- body text for the notice
-  PRIMARY KEY  (`module`,`code`)
+  PRIMARY KEY  (`module`,`code`, `branchcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -2253,12 +2255,13 @@ CREATE TABLE `message_transports` (
   `is_digest` tinyint(1) NOT NULL default '0',
   `letter_module` varchar(20) NOT NULL default '',
   `letter_code` varchar(20) NOT NULL default '',
+  `branchcode` varchar(10) NOT NULL default '',
   PRIMARY KEY  (`message_attribute_id`,`message_transport_type`,`is_digest`),
   KEY `message_transport_type` (`message_transport_type`),
   KEY `letter_module` (`letter_module`,`letter_code`),
   CONSTRAINT `message_transports_ibfk_1` FOREIGN KEY (`message_attribute_id`) REFERENCES `message_attributes` (`message_attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `message_transports_ibfk_2` FOREIGN KEY (`message_transport_type`) REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `message_transports_ibfk_3` FOREIGN KEY (`letter_module`, `letter_code`) REFERENCES `letter` (`module`, `code`) ON DELETE CASCADE ON UPDATE CASCADE
+  CONSTRAINT `message_transports_ibfk_3` FOREIGN KEY (`letter_module`, `letter_code`, `branchcode`) REFERENCES `letter` (`module`, `code`, `branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
index 762da91..f40da36 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
@@ -32,7 +32,7 @@ VALUES ('circulation','ODUE','Purring','Purring p?? dokument','<<borrowers.first
 ('reserves', 'HOLD_PRINT', 'Hentemelding (p?? papir)', 'Hentemelding', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nDu har et reservert dokument som kan hentes fra  <<reserves.waitingdate>>:\r\n\r\nTittel: <<biblio.title>>\r\nForfatter: <<biblio.author>>\r\nEksemplar: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Innlevering','Melding om innlevering','F??lgende dokument har blitt innlevert:\r\n----\r\n<<biblio.title>>\r\n----\r\nVennlig hilsen\r\nBiblioteket'),
 ('circulation','CHECKOUT','Utl??n','Melding om utl??n','F??lgende dokument har blitt l??nt ut:\r\n----\r\n<<biblio.title>>\r\n----\r\nVennlig hilsen\r\nBiblioteket'),
-('reserves', 'HOLDPLACED', 'Melding om reservasjon', 'Melding om reservasjon','F??lgende dokument har blitt reservert : <<title>> (<<biblionumber>>) av <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Melding om reservasjon', 'Melding om reservasjon','F??lgende dokument har blitt reservert : <<biblio.title>> (<<biblio.biblionumber>>) av <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Forslag godtatt', 'Innkj??psforslag godtatt','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foresl??tt at biblioteket kj??per inn <<suggestions.title>> av <<suggestions.author>>.\n\nBiblioteket har vurdert forslaget i dag. Dokumentet vil bli bestilt s?? fort det lar seg gj??re. Du vil f?? en ny melding n??r bestillingen er gjort, og n??r dokumentet ankommer biblioteket.\n\nEr det noe du lurer p??, vennligst kontakt oss p?? <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Foresl??tt dokument tilgjengelig', 'Foresl??tt dokument tilgjengelig','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foresl??tt at biblioteket kj??per inn <<suggestions.title>> av <<suggestions.author>>.\n\nVi har gleden av ?? informere deg om at dokumentet n?? er innlemmet i samlingen.\n\nEr det noe du lurer p??, vennligst kontakt oss p?? <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Innkj??psforslag i bestilling', 'Innkj??psforslag i bestilling','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foresl??tt at biblioteket kj??per inn <<suggestions.title>> av <<suggestions.author>>.\n\nVi har gleden av ?? informere deg om at dokumentet du foreslo n?? er i bestilling.\n\nDu vil f?? en ny melding n??r dokumentet er tilgjengelig.\n\nEr det noe du lurer p??, vennligst kontakt oss p?? <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
index c101b0b..73102af 100644
--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
@@ -13,7 +13,7 @@ VALUES
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
index 5ca7eaf..e13782a 100644
--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
@@ -11,7 +11,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 0cc79b2..1d0513b 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -330,6 +330,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('EasyAnalyticalRecords','0','If on, display in the catalogue screens tools to easily setup analytical record relationships','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CircAutoPrintQuickSlip', '1', 'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window or Clear the screen.',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoticeCSS','','Notices CSS url.',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACLocalCoverImages','0','Display local cover images on OPAC search and details pages.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('LocalCoverImages','0','Display local cover images on intranet details pages.','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllowMultipleCovers','0','Allow multiple cover images to be attached to each bibliographic record.','1','YesNo');
diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
index 6ab0e18..a908f6c 100644
--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
@@ -10,7 +10,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <<branches.branchname>>', 'Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\nLocation: <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<title>> (<<biblionumber>>) by the user <<firstname>> <<surname>> (<<cardnumber>>).'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
 ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>'),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index d2d9d97..cc6c06a 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4497,7 +4497,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
         print "Upgrade to $DBversion done (Add 461 subfield 9 to default framework)\n";
         SetVersion ($DBversion);
     }
-		
 }
 
 $DBversion = "3.05.00.018";
@@ -4712,6 +4711,105 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.07.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE `message_transports` DROP FOREIGN KEY `message_transports_ibfk_3`");
+    $dbh->do("ALTER TABLE `letter` DROP PRIMARY KEY");
+    $dbh->do("ALTER TABLE `letter` ADD `branchcode` varchar(10) default NULL AFTER `code`");
+    $dbh->do("ALTER TABLE `letter` ADD PRIMARY KEY  (`module`,`code`, `branchcode`)");
+    $dbh->do("ALTER TABLE `message_transports` ADD `branchcode` varchar(10) NOT NULL default ''");
+    $dbh->do("ALTER TABLE `message_transports` ADD CONSTRAINT `message_transports_ibfk_3` FOREIGN KEY (`letter_module`, `letter_code`, `branchcode`) REFERENCES `letter` (`module`, `code`, `branchcode`) ON DELETE CASCADE ON UPDATE CASCADE");
+    $dbh->do("ALTER TABLE `letter` ADD `is_html` tinyint(1) default 0 AFTER `name`");
+
+    $dbh->do("INSERT INTO `letter` (module, code, name, title, content, is_html)
+              VALUES ('circulation','ISSUESLIP','Issue Slip','Issue Slip', '<h3><<branches.branchname>></h3>
+Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />
+(<<borrowers.cardnumber>>) <br />
+
+<<today>><br />
+
+<h4>Checked Out</h4>
+<checkedout>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</checkedout>
+
+<h4>Overdues</h4>
+<overdue>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</overdue>
+
+<hr>
+
+<h4 style=\"text-align: center; font-style:italic;\">News</h4>
+<news>
+<div class=\"newsitem\">
+<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<opac_news.title>></b></h5>
+<p style=\"margin-bottom: 1px; margin-top: 1px\"><<opac_news.new>></p>
+<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">Posted on <<opac_news.timestamp>></p>
+<hr />
+</div>
+</news>', 1)");
+    $dbh->do("INSERT INTO `letter` (module, code, name, title, content, is_html)
+              VALUES ('circulation','ISSUEQSLIP','Issue Quick Slip','Issue Quick Slip', '<h3><<branches.branchname>></h3>
+Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />
+(<<borrowers.cardnumber>>) <br />
+
+<<today>><br />
+
+<h4>Checked Out Today</h4>
+<checkedout>
+<p>
+<<biblio.title>> <br />
+Barcode: <<items.barcode>><br />
+Date due: <<issues.date_due>><br />
+</p>
+</checkedout>', 1)");
+    $dbh->do("INSERT INTO `letter` (module, code, name, title, content, is_html)
+              VALUES ('circulation','RESERVESLIP','Reserve Slip','Reserve Slip', '<h5>Date: <<today>></h5>
+
+<h3> Transfer to/Hold in <<branches.branchname>></h3>
+
+<h3><<borrowers.surname>>, <<borrowers.firstname>></h3>
+
+<ul>
+    <li><<borrowers.cardnumber>></li>
+    <li><<borrowers.phone>></li>
+    <li> <<borrowers.address>><br />
+         <<borrowers.address2>><br />
+         <<borrowers.city >>  <<borrowers.zipcode>>
+    </li>
+    <li><<borrowers.email>></li>
+</ul>
+<br />
+<h3>ITEM ON HOLD</h3>
+<h4><<biblio.title>></h4>
+<h5><<biblio.author>></h5>
+<ul>
+   <li><<items.barcode>></li>
+   <li><<items.itemcallnumber>></li>
+   <li><<reserves.waitingdate>></li>
+</ul>
+<p>Notes:
+<pre><<reserves.reservenotes>></pre>
+</p>', 1)");
+
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoticeCSS','','Notices CSS url.',NULL,'free')");
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free')");
+
+    $dbh->do("UPDATE `letter` SET content = replace(content, '<<title>>', '<<biblio.title>>') WHERE code = 'HOLDPLACED'");
+
+    print "Upgrade to $DBversion done (Add branchcode and is_html to letter table; Default ISSUESLIP and RESERVESLIP letters; Add NoticeCSS and SlipCSS sysprefs)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index a4acfdf..4e583f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -42,8 +42,10 @@ function update_child() {
 	 });
 
 	// YUI Toolbar Functions
+    var slip_re = /slip/;
 	function printx_window(print_type) {
-		window.open("/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=" + print_type, "printwindow");
+        var handler = print_type.match(slip_re) ? "printslip" : "moremember";
+		window.open("/cgi-bin/koha/members/" + handler + ".pl?borrowernumber=[% borrowernumber %]&amp;print=" + print_type, "printwindow");
 		return false;
 	}
 	function searchToHold(){
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 b3716c0..1556385 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
@@ -98,6 +98,11 @@ Circulation:
                   yes: "open a print quick slip window"
                   no: "clear the screen"
             - .
+        -
+            - Include the stylesheet at
+            - pref: NoticeCSS
+              class: url
+            - on Notices. (This should be a complete URL, starting with <code>http://</code>)
     Checkout Policy:
         -
             - pref: AllowNotForLoanOverride
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
index df0a434..efa33a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
@@ -83,6 +83,11 @@ Staff Client:
                   Results: "Results page (for future use, Results XSLT not functional at this time)."
                   Both: "Both Results and Details pages (for future use, Results XSLT not functional at this time)."
             - 'Note: The corresponding XSLT option must be turned on.'
+        -
+            - Include the stylesheet at
+            - pref: SlipCSS
+              class: url
+            - on Issue and Reserve Slips. (This should be a complete URL, starting with <code>http://</code>.)
     Options:
         -
             - pref: viewMARC
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
index 1904381..73f9e61 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
@@ -8,11 +8,7 @@
         -->
     </style>
     [% IF ( stylesheet ) %]
-    <style type="text/css">
-        <!--
-        [% stylesheet %]
-        -->
-    </style>
+    <link rel="stylesheet" type="text/css" href="[% stylesheet %]">
     [% END %]
 </head>
 <body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
deleted file mode 100644
index 18d45aa..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
+++ /dev/null
@@ -1,54 +0,0 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha -- Circulation: Transfers</title>
-[% INCLUDE 'doc-head-close-receipt.inc' %]
-<script language="javascript">
-function printandclose()
-{
-window.print();
-window.close();
-}
-</script>
-</head>
-<body onload="printandclose();"><div id="main">
-
-[% FOREACH reservedat IN reservedata %]
-
-<h5>Date: [% reservedat.pulldate %]</h5>
-<h3> [% IF ( reservedat.transferrequired ) %]Transfer to [% reservedat.branchname %] [% ELSE %]Hold in [% reservedat.branchname %][% END %]</h3>
-
-<div id="reserve_display">
-
-<h3>[% reservedat.surname %], [% reservedat.firstname %]</h3>
-
-<ul>
-	<li>[% reservedat.cardnumber %]</li>
-    [% IF ( reservedat.phone ) %]
-        <li>[% reservedat.phone %]</li>
-    [% END %]
-    <li>
-        [% reservedat.address %]<br />
-	    [% IF ( reservedat.address2 ) %][% reservedat.address2 %]<br />[% END %]
-        [% reservedat.city %]  [% reservedat.zip %]
-    </li>
-    [% IF ( reservedat.email ) %]
-        <li>[% reservedat.email %]</li>
-    [% END %]
-</ul>
-<br />
-<h3>ITEM ON HOLD</h3>
- <h4>[% reservedat.title |html %]</h4>
- <h5>[% reservedat.author %] </h5>
- <ul>
-    [% IF ( reservedat.barcode ) %]<li>[% reservedat.barcode %]</li>[% END %]
-    [% IF ( reservedat.itemcallnumber ) %]<li>[% reservedat.itemcallnumber %]</li>[% END %]
-    [% IF ( reservedat.waitingdate ) %]<li>[% reservedat.waitingdate %]</li>[% END %]
- </ul>
- [% IF ( reservedat.reservenotes ) %]
-    <p>Notes: [% reservedat.reservenotes %]</p>
- [% END %]
-
-
-
-[% END %]
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
new file mode 100644
index 0000000..a790069
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
@@ -0,0 +1,28 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>[% title %]</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
+[% IF stylesheet %]
+<link rel="stylesheet" type="text/css" href="[% stylesheet %]" />
+[% END %]
+
+<script language="javascript">
+    function printThenClose() {
+        window.print();
+        window.close();
+    }
+</script>
+</head>
+<body onload="printThenClose();">
+<div id="receipt">
+
+[% IF plain %]
+<pre>
+[% slip %]
+</pre>
+[% ELSE %]
+[% slip %]
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index 063236e..eec2384 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -5,14 +5,29 @@
 	<script type="text/javascript">
 	//<![CDATA[
 $(document).ready(function() {
-	$("#lettert").tablesorter({
+	$("#lettert:has(tbody tr)").tablesorter({
 		widgets : ['zebra'],
 		sortList: [[0,0]],
 		headers: { 3: {sorter:false},4: { sorter: false }}
 	}); 
+
+    $('#branch').change(function() {
+            $('#op').val("");
+            $('#selectlibrary').submit();
+    });
+    $('#newnotice').click(function() {
+            $('#op').val("add_form");
+            return true;
+    });
 }); 
 [% IF ( add_form ) %]
 	
+    function cancel(f) {
+        $('#op').val("");
+        f.method = "get";
+        f.submit();
+    }
+
 		function isNotNull(f,noalert) {
 			if (f.value.length ==0) {
 	return false;
@@ -106,7 +121,7 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'letters-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( add_form ) %][% IF ( modify ) %]<a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Modify notice[% ELSE %] <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Add notice[% END %][% ELSE %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Notice added[% ELSE %][% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices</a> &rsaquo; Confirm Deletion[% ELSE %]Notices[% END %][% END %][% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( add_form ) %][% IF ( modify ) %]<a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Modify notice[% ELSE %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Add notice[% END %][% ELSE %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Notice added[% ELSE %][% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Confirm Deletion[% ELSE %]Notices &amp; Slips[% END %][% END %][% END %]</div>
 
 [% IF ( add_form ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
    
@@ -114,65 +129,97 @@ $(document).ready(function() {
 	<div id="yui-main">
 	<div class="yui-b">
 
-	[% IF ( no_op_set ) %]
-<div id="toolbar">
-	<script type="text/javascript">
-	//<![CDATA[
-	// prepare DOM for YUI Toolbar
-	 $(document).ready(function() {
-	    yuiToolbar();
-	 });
-	// YUI Toolbar Functions
-	function yuiToolbar() {
-	    new YAHOO.widget.Button("newnotice");
-	}
-	//]]>
-	</script>
-	<ul class="toolbar">
-	<li><a id="newnotice" href="/cgi-bin/koha/tools/letter.pl?op=add_form">New Notice</a></li>
-</ul></div>
-		
+[% IF ( no_op_set ) %]
+    <form method="get" action="?" id="selectlibrary">
+      <input type="hidden" name="searchfield" value="[% searchfield %]" />
+    [% UNLESS independant_branch %]        
+      <p>
+        Select a library :
+            <select name="branchcode" id="branch" style="width:20em;">
+                <option value="">All libraries</option>
+            [% FOREACH branchloo IN branchloop %]
+                [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
+            [% END %]
+            </select>
+      </p>
+    [% END %]        
+      <p>
+	      <input type="submit" id="newnotice" value="New Notice" />
+        <input type="hidden" id="op" name="op" />
+      </p>
+    </form>
+
 		[% IF ( search ) %]
 		<p>You Searched for <b>[% searchfield %]</b></p>
 		[% END %]
-		[% IF ( letter ) %]<table id="lettert">
+		[% IF ( letter && !independant_branch) %]
+            [% select_for_copy = BLOCK %]
+            <select name="branchcode">
+                [% FOREACH branchloo IN branchloop %]
+                <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
+                [% END %]
+            </select>
+            [% END %]
+        [% END %]
+        <table id="lettert">
 		<thead><tr>
+			<th>Branch</th>
 			<th>Module</th>
 			<th>Code</th>
 			<th>Name</th>
 			<th>&nbsp;</th>
 			<th>&nbsp;</th>
+			<th>&nbsp;</th>
 		</tr></thead>
-		<tbody>[% FOREACH lette IN letter %]
-		[% UNLESS ( loop.odd ) %]
+		<tbody>
+    [% FOREACH lette IN letter %]
+        [% can_edit = lette.branchcode || !independant_branch %]
+        [% UNLESS ( loop.odd ) %]
 			<tr class="highlight">
-		[% ELSE %]
+        [% ELSE %]
 			<tr>
-		[% END %]
+        [% END %]
+				<td>[% lette.branchname || "(All libraries)" %]</td>
 				<td>[% lette.module %]</td>
 				<td>[% lette.code %]</td>
 				<td>[% lette.name %]</td>
 				<td>
-					<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Edit</a>
+        [% IF can_edit %]
+					<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]">Edit</a>
+        [% END %]        
+				</td>
+				<td>
+        [% IF !independant_branch || !lette.branchcode %]
+                    <form method="post" action="?">
+                        <input type="hidden" name="op" value="copy" />
+				        <input type="hidden" name="oldbranchcode" value="[% lette.branchcode %]" />
+                        <input type="hidden" name="module" value="[% lette.module %]" />
+                        <input type="hidden" name="code" value="[% lette.code %]" />
+            [% IF independant_branch %]
+                        <input type="hidden" name="branchcode" value="[% independant_branch %]" />
+            [% ELSE %]
+                        [% select_for_copy %]
+            [% END %]
+                        <input type="submit" value="Copy" />
+                    </form>
+        [% END %]        
 				</td>
 				<td>
-					[% IF ( lette.protected ) %]
-					-
-					[% ELSE %]
-					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Delete</a>
-					[% END %]
+        [% IF !lette.protected && can_edit %]
+					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[%lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]">Delete</a>
+        [% END %]
 				</td>
 			</tr>
-		[% END %]</tbody>
+    [% END %]
+        </tbody>
 		</table>
-		[% END %]
+[% END %]
 
-	[% END %]
 	
-	[% IF ( add_form ) %]
+[% IF ( add_form ) %]
 	
-		<form action="/cgi-bin/koha/tools/letter.pl" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
+		<form action="?" name="Aform" method="post">
+		<input type="hidden" name="op" id="op" value="add_validate" />
 		<input type="hidden" name="checked" value="0" />
 		[% IF ( modify ) %]
 		<input type="hidden" name="add" value="0" />
@@ -182,6 +229,20 @@ $(document).ready(function() {
 		<fieldset class="rows">
 		<legend>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</legend>
 		<ol>
+				<input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
+            [% IF independant_branch %]
+                <input type="hidden" name="branchcode" value="[% independant_branch %]" />
+            [% ELSE %]
+			<li>
+				<label for="branchcode">Library:</label>
+                <select name="branchcode" id="branch" style="width:20em;">
+                    <option value="">All libraries</option>
+                [% FOREACH branchloo IN branchloop %]
+                    [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
+                [% END %]
+                </select>
+			</li>
+            [% END %]
 			<li>
 				<label for="module">Koha module:</label>
 				<input type="hidden" name="oldmodule" value="[% module %]" />
@@ -235,6 +296,14 @@ $(document).ready(function() {
 			<label for="name">Name:</label><input type="text" id="name" name="name" size="60" value="[% name %]" />
 		</li>
 		<li>
+			<label for="is_html">HTML Message:</label>
+      [% IF is_html %]
+      <input type="checkbox" id="is_html" name="is_html" value="1" checked />
+      [% ELSE %]
+      <input type="checkbox" id="is_html" name="is_html" value="1" />
+      [% END %]
+		</li>
+		<li>
 			<label for="title">Message Subject:</label><input type="text" id="title" name="title" size="60" value="[% title %]" />
 		</li>
 		<li>
@@ -252,27 +321,31 @@ $(document).ready(function() {
 		</ol>
 		</fieldset>
 		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></fieldset>
+		<fieldset class="action"><input type="button" value="Cancel" onclick="cancel(this.form)" class="button" /></fieldset>
+      <input type="hidden" name="searchfield" value="[% searchfield %]" />
 		</form>
-	[% END %]
+[% END %]
 	
-	[% IF ( add_validate ) %]
+[% IF ( add_validate ) %]
 	Data recorded
 	<form action="[% action %]" method="post">
 	<input type="submit" value="OK" />
 	</form>
-	[% END %]
+[% END %]
 	
-	[% IF ( delete_confirm ) %]
+[% IF ( delete_confirm ) %]
 	<div class="dialog alert"><h3>Delete Notice?</h3>
 	<table>
         <thead>
 		<tr>
+			<th>Branch</th>
 			<th>Module</th>
 			<th>Code</th>
 			<th>Name</th>
 		</tr>
         </thead>
 		<tr>
+			<td>[% branchname %]</td>
 			<td>[% module %]</td>
             <td>[% code %]</td>
 			<td>[% name %]</td>
@@ -280,6 +353,7 @@ $(document).ready(function() {
 	</table>
 		<form action="[% action %]" method="post">
 		<input type="hidden" name="op" value="delete_confirmed">
+		<input type="hidden" name="branchcode" value="[% branchcode %]" />
 		<input type="hidden" name="code" value="[% code %]" />
 		<input type="hidden" name="module" value="[% module %]" />
 				<input type="submit" value="Yes, Delete" class="approve" />
@@ -290,14 +364,14 @@ $(document).ready(function() {
 				</form>
 		</div>
 
-	[% END %]
+[% END %]
 	
-	[% IF ( delete_confirmed ) %]
+[% IF ( delete_confirmed ) %]
 	Data deleted
 	<form action="[% action %]" method="post">
 	<input type="submit" value="OK" />
 	</form>
-	[% END %]
+[% END %]
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index b71a1ee..5cc3bbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -26,7 +26,7 @@
     [% END %]
 
     [% IF ( CAN_user_tools_edit_notices ) %]
-    <dt><a href="/cgi-bin/koha/tools/letter.pl">Notices</a></dt>
+    <dt><a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a></dt>
     <dd>Define notices (print and email notification messages for overdues, etc.)</dd>
     [% END %]
 
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 86dd6ed..c474a66 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -347,10 +347,7 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
             # if we manage to find a valid email address, send notice 
             if ($emailaddr) {
                 $newdata{emailaddr} = $emailaddr;
-                my $letter = getletter ('members', "ACCTDETAILS:$newdata{'branchcode'}") ;
-                # if $branch notice fails, then email a default notice instead.
-                $letter = getletter ('members', "ACCTDETAILS")  if !$letter;
-                SendAlerts ( 'members' , \%newdata , $letter ) if $letter
+                SendAlerts ( 'members', \%newdata, "ACCTDETAILS" );
             }
         } 
 
diff --git a/members/moremember.pl b/members/moremember.pl
index c477100..5a988f9 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -51,7 +51,6 @@ use C4::Reserves;
 use C4::Branch; # GetBranchName
 use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Form::MessagingPreferences;
-use C4::NewsChannels; #get slip news
 use List::MoreUtils qw/uniq/;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 
@@ -484,13 +483,4 @@ $template->param(
 	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
 );
 
-#Get the slip news items
-my $all_koha_news   = &GetNewsToDisplay("slip");
-my $koha_news_count = scalar @$all_koha_news;
-
-$template->param(
-    koha_news       => $all_koha_news,
-    koha_news_count => $koha_news_count
-);
-
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/members/printslip.pl b/members/printslip.pl
new file mode 100755
index 0000000..3a499cd
--- /dev/null
+++ b/members/printslip.pl
@@ -0,0 +1,92 @@
+#!/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.
+
+
+=head1 moremember.pl
+
+ script to do a borrower enquiry/bring up borrower details etc
+ Displays all the details about a borrower
+ written 20/12/99 by chris at katipo.co.nz
+ last modified 21/1/2000 by chris at katipo.co.nz
+ modified 31/1/2001 by chris at katipo.co.nz
+   to not allow items on request to be renewed
+
+ needs html removed and to use the C4::Output more, but its tricky
+
+=cut
+
+use strict;
+#use warnings; FIXME - Bug 2505
+use CGI;
+use C4::Context;
+use C4::Auth qw/:DEFAULT get_session/;
+use C4::Output;
+use C4::Members;
+use C4::Koha;
+
+#use Smart::Comments;
+#use Data::Dumper;
+
+use vars qw($debug);
+
+BEGIN {
+	$debug = $ENV{DEBUG} || 0;
+}
+
+my $input = new CGI;
+my $sessionID = $input->cookie("CGISESSID");
+my $session = get_session($sessionID);
+
+$debug or $debug = $input->param('debug') || 0;
+my $print = $input->param('print');
+my $error = $input->param('error');
+
+# circ staff who process checkouts but can't edit
+# patrons still need to be able to print receipts
+my $flagsrequired = { circulate => "circulate_remaining_permissions" };
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "circ/printslip.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => $flagsrequired,
+        debug           => 1,
+    }
+);
+
+my $borrowernumber = $input->param('borrowernumber');
+my $branch=C4::Context->userenv->{'branch'};
+my ($slip, $is_html);
+if (my $letter = IssueSlip ($session->param('branch') || $branch, $borrowernumber, $print eq "qslip")) {
+    $slip = $letter->{content};
+    $is_html = $letter->{is_html};
+}
+
+$template->param(
+    slip => $slip,
+    plain => !$is_html,
+    title => "Print Receipt for $borrowernumber",
+    stylesheet => C4::Context->preference("SlipCSS"),
+    error           => $error,
+);
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/misc/cronjobs/advance_notices.pl b/misc/cronjobs/advance_notices.pl
index 1fa358f..09c4017 100755
--- a/misc/cronjobs/advance_notices.pl
+++ b/misc/cronjobs/advance_notices.pl
@@ -79,13 +79,10 @@ patrons. It queues them in the message queue, which is processed by
 the process_message_queue.pl cronjob.
 See the comments in the script for directions on changing the script.
 This script has the following parameters :
-	-c Confirm and remove this help & warning
-        -m maximum number of days in advance to send advance notices.
-	-n send No mail. Instead, all mail messages are printed on screen. Usefull for testing purposes.
-        -v verbose
-        -i csv list of fields that get substituted into templates in places
-           of the E<lt>E<lt>items.contentE<gt>E<gt> placeholder.  Defaults to
-           issuedate,title,barcode,author
+    -c Confirm and remove this help & warning
+    -m maximum number of days in advance to send advance notices.
+    -n send No mail. Instead, all mail messages are printed on screen. Usefull for testing purposes.
+    -v verbose
 ENDUSAGE
 
 # Since advance notice options are not visible in the web-interface
@@ -157,8 +154,6 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
         } else {
             my $biblio = C4::Biblio::GetBiblioFromItemNumber( $upcoming->{'itemnumber'} );
             my $letter_type = 'DUE';
-            $letter = C4::Letters::getletter( 'circulation', $letter_type );
-            die "no letter of type '$letter_type' found. Please see sample_notices.sql" unless $letter;
             $sth->execute($upcoming->{'borrowernumber'},$upcoming->{'itemnumber'},'0');
             my $titles = "";
             while ( my $item_info = $sth->fetchrow_hashref()) {
@@ -166,13 +161,14 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
               $titles .= join("\t", at item_info) . "\n";
             }
         
-            $letter = parse_letter( { letter         => $letter,
+            $letter = parse_letter( { letter_code    => $letter_type,
                                       borrowernumber => $upcoming->{'borrowernumber'},
                                       branchcode     => $upcoming->{'branchcode'},
                                       biblionumber   => $biblio->{'biblionumber'},
                                       itemnumber     => $upcoming->{'itemnumber'},
                                       substitute     => { 'items.content' => $titles }
-                                    } );
+                                    } )
+              or die "no letter of type '$letter_type' found. Please see sample_notices.sql";
         }
     } else {
         $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $upcoming->{'borrowernumber'},
@@ -189,8 +185,6 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
         } else {
             my $biblio = C4::Biblio::GetBiblioFromItemNumber( $upcoming->{'itemnumber'} );
             my $letter_type = 'PREDUE';
-            $letter = C4::Letters::getletter( 'circulation', $letter_type );
-            die "no letter of type '$letter_type' found. Please see sample_notices.sql" unless $letter;
             $sth->execute($upcoming->{'borrowernumber'},$upcoming->{'itemnumber'},$borrower_preferences->{'days_in_advance'});
             my $titles = "";
             while ( my $item_info = $sth->fetchrow_hashref()) {
@@ -198,13 +192,14 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
               $titles .= join("\t", at item_info) . "\n";
             }
         
-            $letter = parse_letter( { letter         => $letter,
+            $letter = parse_letter( { letter_code    => $letter_type,
                                       borrowernumber => $upcoming->{'borrowernumber'},
                                       branchcode     => $upcoming->{'branchcode'},
                                       biblionumber   => $biblio->{'biblionumber'},
                                       itemnumber     => $upcoming->{'itemnumber'},
                                       substitute     => { 'items.content' => $titles }
-                                    } );
+                                    } )
+              or die "no letter of type '$letter_type' found. Please see sample_notices.sql";
         }
     }
 
@@ -250,8 +245,6 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$upcoming_digest ) {
 
 
     my $letter_type = 'PREDUEDGST';
-    my $letter = C4::Letters::getletter( 'circulation', $letter_type );
-    die "no letter of type '$letter_type' found. Please see sample_notices.sql" unless $letter;
 
     $sth->execute($borrowernumber,$borrower_preferences->{'days_in_advance'});
     my $titles = "";
@@ -259,12 +252,13 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$upcoming_digest ) {
       my @item_info = map { $_ =~ /^date|date$/ ? format_date($item_info->{$_}) : $item_info->{$_} || '' } @item_content_fields;
       $titles .= join("\t", at item_info) . "\n";
     }
-    $letter = parse_letter( { letter         => $letter,
+    my $letter = parse_letter( { letter_code    => $letter_type,
                               borrowernumber => $borrowernumber,
                               substitute     => { count => $count,
                                                   'items.content' => $titles
                                                 }
-                         } );
+                         } )
+      or die "no letter of type '$letter_type' found. Please see sample_notices.sql";
     if ($nomail) {
       local $, = "\f";
       print $letter->{'content'};
@@ -290,20 +284,19 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$due_digest ) {
     next PATRON unless $borrower_preferences; # how could this happen?
 
     my $letter_type = 'DUEDGST';
-    my $letter = C4::Letters::getletter( 'circulation', $letter_type );
-    die "no letter of type '$letter_type' found. Please see sample_notices.sql" unless $letter;
     $sth->execute($borrowernumber,'0');
     my $titles = "";
     while ( my $item_info = $sth->fetchrow_hashref()) {
       my @item_info = map { $_ =~ /^date|date$/ ? format_date($item_info->{$_}) : $item_info->{$_} || '' } @item_content_fields;
       $titles .= join("\t", at item_info) . "\n";
     }
-    $letter = parse_letter( { letter         => $letter,
+    my $letter = parse_letter( { letter_code    => $letter_type,
                               borrowernumber => $borrowernumber,
                               substitute     => { count => $count,
                                                   'items.content' => $titles
                                                 }
-                         } );
+                         } )
+      or die "no letter of type '$letter_type' found. Please see sample_notices.sql";
 
     if ($nomail) {
       local $, = "\f";
@@ -323,40 +316,35 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$due_digest ) {
 
 =head2 parse_letter
 
-
-
 =cut
 
 sub parse_letter {
     my $params = shift;
-    foreach my $required ( qw( letter borrowernumber ) ) {
+    foreach my $required ( qw( letter_code borrowernumber ) ) {
         return unless exists $params->{$required};
     }
 
-    if ( $params->{'substitute'} ) {
-        while ( my ($key, $replacedby) = each %{$params->{'substitute'}} ) {
-            my $replacefield = "<<$key>>";
-            
-            $params->{'letter'}->{title}   =~ s/$replacefield/$replacedby/g;
-            $params->{'letter'}->{content} =~ s/$replacefield/$replacedby/g;
-        }
-    }
-
-    C4::Letters::parseletter( $params->{'letter'}, 'borrowers',   $params->{'borrowernumber'} );
+    my %table_params = ( 'borrowers' => $params->{'borrowernumber'} );
 
-    if ( $params->{'branchcode'} ) {
-        C4::Letters::parseletter( $params->{'letter'}, 'branches',    $params->{'branchcode'} );
+    if ( my $p = $params->{'branchcode'} ) {
+        $table_params{'branches'} = $p;
     }
-    if ( $params->{'itemnumber'} ) {
-        C4::Letters::parseletter( $params->{'letter'}, 'issues', $params->{'itemnumber'} );
-        C4::Letters::parseletter( $params->{'letter'}, 'items', $params->{'itemnumber'} );
+    if ( my $p = $params->{'itemnumber'} ) {
+        $table_params{'issues'} = $p;
+        $table_params{'items'} = $p;
     }
-    if ( $params->{'biblionumber'} ) {
-        C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $params->{'biblionumber'} );
-        C4::Letters::parseletter( $params->{'letter'}, 'biblioitems', $params->{'biblionumber'} );
+    if ( my $p = $params->{'biblionumber'} ) {
+        $table_params{'biblio'} = $p;
+        $table_params{'biblioitems'} = $p;
     }
 
-    return $params->{'letter'};
+    return C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => $params->{'letter_code'},
+        branchcode => $table_params{'branches'},
+        substitute => $params->{'substitute'},
+        tables     => \%table_params,
+    );
 }
 
 1;
diff --git a/misc/cronjobs/gather_print_notices.pl b/misc/cronjobs/gather_print_notices.pl
index a72d6a6..165b16e 100755
--- a/misc/cronjobs/gather_print_notices.pl
+++ b/misc/cronjobs/gather_print_notices.pl
@@ -39,11 +39,9 @@ use Getopt::Long;
 
 sub usage {
     print STDERR <<USAGE;
-Usage: $0 [ -s STYLESHEET ] OUTPUT_DIRECTORY
+Usage: $0 OUTPUT_DIRECTORY
   Will print all waiting print notices to
   OUTPUT_DIRECTORY/notices-CURRENT_DATE.html .
-  If the filename of a CSS stylesheet is specified with -s, the contents of that
-  file will be included in the HTML.
 USAGE
     exit $_[0];
 }
@@ -51,7 +49,6 @@ USAGE
 my ( $stylesheet, $help );
 
 GetOptions(
-    's:s' => \$stylesheet,
     'h|help' => \$help,
 ) || usage( 1 );
 
@@ -71,16 +68,9 @@ exit unless( @messages );
 open OUTPUT, '>', File::Spec->catdir( $output_directory, "holdnotices-" . $today->output( 'iso' ) . ".html" );
 
 my $template = C4::Templates::gettemplate( 'batch/print-notices.tmpl', 'intranet', new CGI );
-my $stylesheet_contents = '';
-
-if ($stylesheet) {
-  open STYLESHEET, '<', $stylesheet;
-  while ( <STYLESHEET> ) { $stylesheet_contents .= $_ }
-  close STYLESHEET;
-}
 
 $template->param(
-    stylesheet => $stylesheet_contents,
+    stylesheet => C4::Context->preference("NoticeCSS"),
     today => $today->output(),
     messages => \@messages,
 );
diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 5896abd..d303f4f 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -460,16 +460,6 @@ END_SQL
             {
                 $verbose and warn "borrower $firstname, $lastname ($borrowernumber) has items triggering level $i.";
     
-                my $letter = C4::Letters::getletter( 'circulation', $overdue_rules->{"letter$i"} );
-
-                unless ($letter) {
-                    $verbose and warn "Message '$overdue_rules->{letter$i}' content not found";
-    
-                    # might as well skip while PERIOD, no other borrowers are going to work.
-                    # FIXME : Does this mean a letter must be defined in order to trigger a debar ?
-                    next PERIOD;
-                }
-    
                 if ( $overdue_rules->{"debarred$i"} ) {
     
                     #action taken is debarring
@@ -494,11 +484,12 @@ END_SQL
                     my @item_info = map { $_ =~ /^date|date$/ ? format_date( $item_info->{$_} ) : $item_info->{$_} || '' } @item_content_fields;
                     $titles .= join("\t", @item_info) . "\n";
                     $itemcount++;
-                    push @items, { itemnumber => $item_info->{'itemnumber'}, biblionumber => $item_info->{'biblionumber'} };
+                    push @items, $item_info;
                 }
                 $sth2->finish;
-                $letter = parse_letter(
-                    {   letter          => $letter,
+
+                my $letter = parse_letter(
+                    {   letter_code     => $overdue_rules->{"letter$i"},
                         borrowernumber  => $borrowernumber,
                         branchcode      => $branchcode,
                         items           => \@items,
@@ -509,6 +500,13 @@ END_SQL
                                            }
                     }
                 );
+                unless ($letter) {
+                    $verbose and warn "Message '$overdue_rules->{letter$i}' content not found";
+    
+                    # might as well skip while PERIOD, no other borrowers are going to work.
+                    # FIXME : Does this mean a letter must be defined in order to trigger a debar ?
+                    next PERIOD;
+                }
                 
                 if ( $exceededPrintNoticesMaxLines ) {
                   $letter->{'content'} .= "List too long for form; please check your account online for a complete list of your overdue items.";
@@ -643,54 +641,56 @@ substituted keys and values.
 
 =cut
 
-sub parse_letter { # FIXME: this code should probably be moved to C4::Letters:parseletter
+sub parse_letter {
     my $params = shift;
-    foreach my $required (qw( letter borrowernumber )) {
+    foreach my $required (qw( letter_code borrowernumber )) {
         return unless exists $params->{$required};
     }
 
-   my $todaysdate = C4::Dates->new()->output("syspref");
-   $params->{'letter'}->{title}   =~ s/<<today>>/$todaysdate/g;
-   $params->{'letter'}->{content} =~ s/<<today>>/$todaysdate/g;
+    my $substitute = $params->{'substitute'} || {};
+    $substitute->{today} ||= C4::Dates->new()->output("syspref");
 
-    if ( $params->{'substitute'} ) {
-        while ( my ( $key, $replacedby ) = each %{ $params->{'substitute'} } ) {
-            my $replacefield = "<<$key>>";
-            $params->{'letter'}->{title}   =~ s/$replacefield/$replacedby/g;
-            $params->{'letter'}->{content} =~ s/$replacefield/$replacedby/g;
-        }
+    my %tables = ( 'borrowers' => $params->{'borrowernumber'} );
+    if ( my $p = $params->{'branchcode'} ) {
+        $tables{'branches'} = $p;
     }
 
-    $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'borrowers', $params->{'borrowernumber'} );
-
-    if ( $params->{'branchcode'} ) {
-        $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'branches', $params->{'branchcode'} );
+    my $currency_format;
+    if ($params->{'letter'}->{'content'} =~ m/<fine>(.*)<\/fine>/o) { # process any fine tags...
+        $currency_format = $1;
+        $params->{'letter'}->{'content'} =~ s/<fine>.*<\/fine>/<<item.fine>>/o;
     }
 
-    if ( $params->{'items'} ) {
+    my @item_tables;
+    if ( my $i = $params->{'items'} ) {
         my $item_format = '';
-        PROCESS_ITEMS:
-        while (scalar(@{$params->{'items'}}) > 0) {
-            my $item = shift @{$params->{'items'}};
+        foreach my $item (@$i) {
             my $fine = GetFine($item->{'itemnumber'}, $params->{'borrowernumber'});
             if (!$item_format) {
                 $params->{'letter'}->{'content'} =~ m/(<item>.*<\/item>)/;
                 $item_format = $1;
             }
-            if ($params->{'letter'}->{'content'} =~ m/<fine>(.*)<\/fine>/) { # process any fine tags...
-                my $formatted_fine = currency_format("$1", "$fine", FMT_SYMBOL);
-                $params->{'letter'}->{'content'} =~ s/<fine>.*<\/fine>/$formatted_fine/;
-            }
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $item->{'biblionumber'} );
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblioitems', $item->{'biblionumber'} );
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'items', $item->{'itemnumber'} );
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'issues', $item->{'itemnumber'} );
-            $params->{'letter'}->{'content'} =~ s/(<item>.*<\/item>)/$1\n$item_format/ if scalar(@{$params->{'items'}} > 0);
 
+            $item->{'fine'} = currency_format($currency_format, "$fine", FMT_SYMBOL)
+              if $currency_format;
+
+            push @item_tables, {
+                'biblio' => $item->{'biblionumber'},
+                'biblioitems' => $item->{'biblionumber'},
+                'items' => $item,
+                'issues' => $item->{'itemnumber'},
+            };
         }
     }
-    $params->{'letter'}->{'content'} =~ s/<\/{0,1}?item>//g; # strip all remaining item tags...
-    return $params->{'letter'};
+
+    return C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => $params->{'letter_code'},
+        branchcode => $params->{'branchcode'},
+        tables => \%tables,
+        substitute => $substitute,
+        repeat => { item => \@item_tables },
+    );
 }
 
 =head2 prepare_letter_for_printing
diff --git a/t/db_dependent/lib/KohaTest/Letters.pm b/t/db_dependent/lib/KohaTest/Letters.pm
index 97d58fb..f2d7b0d 100644
--- a/t/db_dependent/lib/KohaTest/Letters.pm
+++ b/t/db_dependent/lib/KohaTest/Letters.pm
@@ -12,13 +12,12 @@ sub testing_class { 'C4::Letters' };
 
 sub methods : Test( 1 ) {
     my $self = shift;
-    my @methods = qw( getletter
-                      addalert
+    my @methods = qw( addalert
                       delalert
                       getalert
                       findrelatedto
                       SendAlerts
-                      parseletter
+                      GetPreparedLetter
                 );
     
     can_ok( $self->testing_class, @methods );    
diff --git a/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm b/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm
index 76b6ab4..53e5439 100644
--- a/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm
+++ b/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm
@@ -10,7 +10,7 @@ use Test::More;
 sub GetLetter : Test( 6 ) {
     my $self = shift;
 
-    my $letter = getletter( 'circulation', 'ODUE' );
+    my $letter = getletter( 'circulation', 'ODUE', '' );
 
     isa_ok( $letter, 'HASH' )
       or diag( Data::Dumper->Dump( [ $letter ], [ 'letter' ] ) );
@@ -21,7 +21,6 @@ sub GetLetter : Test( 6 ) {
     ok( exists $letter->{'name'}, 'name' );
     ok( exists $letter->{'title'}, 'title' );
 
-
 }
 
 1;
diff --git a/t/db_dependent/lib/KohaTest/Members.pm b/t/db_dependent/lib/KohaTest/Members.pm
index 5646be1..dfde7da 100644
--- a/t/db_dependent/lib/KohaTest/Members.pm
+++ b/t/db_dependent/lib/KohaTest/Members.pm
@@ -52,6 +52,7 @@ sub methods : Test( 1 ) {
                       GetBorrowersWhoHaveNeverBorrowed 
                       GetBorrowersWithIssuesHistoryOlderThan 
                       GetBorrowersNamesAndLatestIssue 
+                      IssueSlip
                 );
     
     can_ok( $self->testing_class, @methods );    
diff --git a/t/db_dependent/lib/KohaTest/Print.pm b/t/db_dependent/lib/KohaTest/Print.pm
index 02fd5fb..d35ab34 100644
--- a/t/db_dependent/lib/KohaTest/Print.pm
+++ b/t/db_dependent/lib/KohaTest/Print.pm
@@ -12,10 +12,7 @@ sub testing_class { 'C4::Print' };
 
 sub methods : Test( 1 ) {
     my $self = shift;
-    my @methods = qw( remoteprint
-                      printreserve 
-                      printslip
-                );
+    my @methods = qw( printslip );
     
     can_ok( $self->testing_class, @methods );    
 }
diff --git a/t/db_dependent/lib/KohaTest/Reserves.pm b/t/db_dependent/lib/KohaTest/Reserves.pm
index 8b05dd0..6416ac3 100644
--- a/t/db_dependent/lib/KohaTest/Reserves.pm
+++ b/t/db_dependent/lib/KohaTest/Reserves.pm
@@ -33,6 +33,7 @@ sub methods : Test( 1 ) {
                        GetReserveInfo 
                        _FixPriority 
                        _Findgroupreserve 
+                       ReserveSlip
                 );
     
     can_ok( $self->testing_class, @methods );    
diff --git a/tools/letter.pl b/tools/letter.pl
index 04cd7d2..ae47810 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -46,14 +46,35 @@ use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
+use C4::Branch; # GetBranches
+use C4::Members::Attributes;
 
-# letter_exists($module, $code)
-# - return true if a letter with the given $module and $code exists
+# _letter_from_where($branchcode,$module, $code)
+# - return FROM WHERE clause and bind args for a letter
+sub _letter_from_where {
+    my ($branchcode, $module, $code) = @_;
+    my $sql = q{FROM letter WHERE branchcode = ? AND module = ? AND code = ?};
+    my @args = ($branchcode || '', $module, $code);
+# Mysql is retarded. cause branchcode is part of the primary key it cannot be null. How does that
+# work with foreign key constraint I wonder...
+
+#   if ($branchcode) {
+#       $sql .= " AND branchcode = ?";
+#       push @args, $branchcode;
+#   } else {
+#       $sql .= " AND branchcode IS NULL";
+#   }
+
+    return ($sql, \@args);
+}
+
+# letter_exists($branchcode,$module, $code)
+# - return true if a letter with the given $branchcode, $module and $code exists
 sub letter_exists {
-    my ($module, $code) = @_;
+    my ($sql, $args) = _letter_from_where(@_);
     my $dbh = C4::Context->dbh;
-    my $letters = $dbh->selectall_arrayref(q{SELECT name FROM letter WHERE module = ? AND code = ?}, undef, $module, $code);
-    return @{$letters};
+    my $letter = $dbh->selectrow_hashref("SELECT * $sql", undef, @$args);
+    return $letter;
 }
 
 # $protected_letters = protected_letters()
@@ -67,16 +88,14 @@ sub protected_letters {
 my $input       = new CGI;
 my $searchfield = $input->param('searchfield');
 my $script_name = '/cgi-bin/koha/tools/letter.pl';
+my $branchcode  = $input->param('branchcode');
 my $code        = $input->param('code');
 my $module      = $input->param('module');
 my $content     = $input->param('content');
-my $op          = $input->param('op');
+my $op          = $input->param('op') || '';
 my $dbh = C4::Context->dbh;
-if (!defined $module ) {
-    $module = q{};
-}
 
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+my ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
     {
         template_name   => 'tools/letter.tmpl',
         query           => $input,
@@ -87,32 +106,39 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-if (!defined $op) {
-    $op = q{}; # silence errors from eq
-}
+my $my_branch = C4::Context->preference("IndependantBranches") && !$staffflags->{'superlibrarian'}
+  ?  C4::Context->userenv()->{'branch'}
+  : undef;
 # we show only the TMPL_VAR names $op
 
 $template->param(
+    independant_branch => $my_branch,
 	script_name => $script_name,
+  searchfield => $searchfield,
 	action => $script_name
 );
 
+if ($op eq 'copy') {
+    add_copy();
+    $op = 'add_form';
+}
+
 if ($op eq 'add_form') {
-    add_form($module, $code);
+    add_form($branchcode, $module, $code);
 }
 elsif ( $op eq 'add_validate' ) {
     add_validate();
     $op = q{}; # next operation is to return to default screen
 }
 elsif ( $op eq 'delete_confirm' ) {
-    delete_confirm($module, $code);
+    delete_confirm($branchcode, $module, $code);
 }
 elsif ( $op eq 'delete_confirmed' ) {
-    delete_confirmed($module, $code);
+    delete_confirmed($branchcode, $module, $code);
     $op = q{}; # next operation is to return to default screen
 }
 else {
-    default_display($searchfield);
+    default_display($branchcode,$searchfield);
 }
 
 # Do this last as delete_confirmed resets
@@ -125,23 +151,21 @@ if ($op) {
 output_html_with_http_headers $input, $cookie, $template->output;
 
 sub add_form {
-    my ($module, $code ) = @_;
+    my ($branchcode,$module, $code ) = @_;
 
     my $letter;
     # if code has been passed we can identify letter and its an update action
     if ($code) {
-        $letter = $dbh->selectrow_hashref(q{SELECT module, code, name, title, content FROM letter WHERE module=? AND code=?},
-            undef, $module, $code);
+        $letter = letter_exists($branchcode,$module, $code);
+    }
+    if ($letter) {
         $template->param( modify => 1 );
         $template->param( code   => $letter->{code} );
     }
     else { # initialize the new fields
         $letter = {
-            module  => $module,
-            code    => q{},
-            name    => q{},
-            title   => q{},
-            content => q{},
+            branchcode => $branchcode,
+            module     => $module,
         };
         $template->param( adding => 1 );
     }
@@ -173,14 +197,20 @@ sub add_form {
             {value => q{},             text => '---ITEMS---'  },
             {value => 'items.content', text => 'items.content'},
             add_fields('issues','borrowers');
+        if ($module eq 'circulation') {
+            push @{$field_selection}, add_fields('opac_news');
+        }
     }
 
     $template->param(
-        name    => $letter->{name},
-        title   => $letter->{title},
-        content => $letter->{content},
-        module  => $module,
-        $module => 1,
+        branchcode => $letter->{branchcode},
+        name       => $letter->{name},
+        is_html    => $letter->{is_html},
+        title      => $letter->{title},
+        content    => $letter->{content},
+        module     => $module,
+        $module    => 1,
+        branchloop => _branchloop($branchcode),
         SQLfieldname => $field_selection,
     );
     return;
@@ -188,37 +218,56 @@ sub add_form {
 
 sub add_validate {
     my $dbh        = C4::Context->dbh;
-    my $module     = $input->param('module');
-    my $oldmodule  = $input->param('oldmodule');
-    my $code       = $input->param('code');
-    my $name       = $input->param('name');
-    my $title      = $input->param('title');
-    my $content    = $input->param('content');
-    if (letter_exists($oldmodule, $code)) {
+    my $oldbranchcode = $input->param('oldbranchcode');
+    my $branchcode    = $input->param('branchcode') || '';
+    my $module        = $input->param('module');
+    my $oldmodule     = $input->param('oldmodule');
+    my $code          = $input->param('code');
+    my $name          = $input->param('name');
+    my $is_html       = $input->param('is_html');
+    my $title         = $input->param('title');
+    my $content       = $input->param('content');
+    if (letter_exists($oldbranchcode,$oldmodule, $code)) {
         $dbh->do(
-            q{UPDATE letter SET module = ?, code = ?, name = ?, title = ?, content = ? WHERE module = ? AND code = ?},
+            q{UPDATE letter SET branchcode = ?, module = ?, name = ?, is_html = ?, title = ?, content = ? WHERE branchcode = ? AND module = ? AND code = ?},
             undef,
-            $module, $code, $name, $title, $content,
-            $oldmodule, $code
+            $branchcode, $module, $name, $is_html || 0, $title, $content,
+            $oldbranchcode, $oldmodule, $code
         );
     } else {
         $dbh->do(
-            q{INSERT INTO letter (module,code,name,title,content) VALUES (?,?,?,?,?)},
+            q{INSERT INTO letter (branchcode,module,code,name,is_html,title,content) VALUES (?,?,?,?,?,?,?)},
             undef,
-            $module, $code, $name, $title, $content
+            $branchcode, $module, $code, $name, $is_html || 0, $title, $content
         );
     }
     # set up default display
-    default_display();
-    return;
+    default_display($branchcode);
+}
+
+sub add_copy {
+    my $dbh        = C4::Context->dbh;
+    my $oldbranchcode = $input->param('oldbranchcode');
+    my $branchcode    = $input->param('branchcode');
+    my $module        = $input->param('module');
+    my $code          = $input->param('code');
+
+    return if letter_exists($branchcode,$module, $code);
+
+    my $old_letter = letter_exists($oldbranchcode,$module, $code);
+
+    $dbh->do(
+        q{INSERT INTO letter (branchcode,module,code,name,is_html,title,content) VALUES (?,?,?,?,?,?,?)},
+        undef,
+        $branchcode, $module, $code, $old_letter->{name}, $old_letter->{is_html}, $old_letter->{title}, $old_letter->{content}
+    );
 }
 
 sub delete_confirm {
-    my ($module, $code) = @_;
+    my ($branchcode, $module, $code) = @_;
     my $dbh = C4::Context->dbh;
-    my $letter = $dbh->selectrow_hashref(q|SELECT  name FROM letter WHERE module = ? AND code = ?|,
-        { Slice => {} },
-        $module, $code);
+    my $letter = letter_exists($branchcode, $module, $code);
+    $template->param( branchcode => $branchcode, branchname => GetBranchName($branchcode) );
     $template->param( code => $code );
     $template->param( module => $module);
     $template->param( name => $letter->{name});
@@ -226,40 +275,53 @@ sub delete_confirm {
 }
 
 sub delete_confirmed {
-    my ($module, $code) = @_;
+    my ($branchcode, $module, $code) = @_;
+    my ($sql, $args) = _letter_from_where($branchcode, $module, $code);
     my $dbh    = C4::Context->dbh;
-    $dbh->do('DELETE FROM letter WHERE module=? AND code=?',{},$module,$code);
+    $dbh->do("DELETE $sql", undef, @$args);
     # setup default display for screen
-    default_display();
+    default_display($branchcode);
     return;
 }
 
 sub retrieve_letters {
-    my $searchstring = shift;
+    my ($branchcode, $searchstring) = @_;
+
+    $branchcode = $my_branch if $branchcode && $my_branch;
+
     my $dbh = C4::Context->dbh;
-    if ($searchstring) {
-        if ($searchstring=~m/(\S+)/) {
-            $searchstring = $1 . q{%};
-            return $dbh->selectall_arrayref('SELECT module, code, name FROM letter WHERE code LIKE ? ORDER BY module, code',
-                { Slice => {} }, $searchstring);
-        }
+    my ($sql, @where, @args);
+    $sql = "SELECT branchcode, module, code, name, branchname
+            FROM letter
+            LEFT OUTER JOIN branches USING (branchcode)";
+    if ($searchstring && $searchstring=~m/(\S+)/) {
+        $searchstring = $1 . q{%};
+        push @where, 'code LIKE ?';
+        push @args, $searchstring;
     }
-    else {
-        return $dbh->selectall_arrayref('SELECT module, code, name FROM letter ORDER BY module, code', { Slice => {} });
+    elsif ($branchcode) {
+        push @where, 'branchcode = ?';
+        push @args, $branchcode || '';
     }
-    return;
+    elsif ($my_branch) {
+        push @where, "(branchcode = ? OR branchcode = '')";
+        push @args, $my_branch;
+    }
+
+    $sql .= " WHERE ".join(" AND ", @where) if @where;
+    $sql .= " ORDER BY module, code, branchcode";
+#   use Data::Dumper; die Dumper($sql, \@args);
+    return $dbh->selectall_arrayref($sql, { Slice => {} }, @args);
 }
 
 sub default_display {
-    my $searchfield = shift;
-    my $results;
+    my ($branchcode, $searchfield) = @_;
+
     if ( $searchfield  ) {
         $template->param( search      => 1 );
-        $template->param( searchfield => $searchfield );
-        $results = retrieve_letters($searchfield);
-    } else {
-        $results = retrieve_letters();
     }
+    my $results = retrieve_letters($branchcode,$searchfield);
+
     my $loop_data = [];
     my $protected_letters = protected_letters();
     foreach my $row (@{$results}) {
@@ -267,8 +329,27 @@ sub default_display {
         push @{$loop_data}, $row;
 
     }
-    $template->param( letter => $loop_data );
-    return;
+
+    $template->param(
+        letter => $loop_data,
+        branchloop => _branchloop($branchcode),
+    );
+}
+
+sub _branchloop {
+    my ($branchcode) = @_;
+
+    my $branches = GetBranches();
+    my @branchloop;
+    for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
+        push @branchloop, {
+            value      => $thisbranch,
+            selected   => $branchcode && $thisbranch eq $branchcode,
+            branchname => $branches->{$thisbranch}->{'branchname'},
+        };
+    }
+
+    return \@branchloop;
 }
 
 sub add_fields {
@@ -307,6 +388,7 @@ sub get_columns_for {
             text  => $tlabel,
         };
     }
+
     my $sql = "SHOW COLUMNS FROM $table";# TODO not db agnostic
     my $table_prefix = $table . q|.|;
     my $rows = C4::Context->dbh->selectall_arrayref($sql, { Slice => {} });
@@ -317,5 +399,15 @@ sub get_columns_for {
             text  => $table_prefix . $row->{Field},
         }
     }
+    if ($table eq 'borrowers') {
+        if ( my $attributes = C4::Members::Attributes::GetAttributes() ) {
+            foreach (@$attributes) {
+                push @fields, {
+                    value => "borrower-attribute:$_",
+                    text  => "attribute:$_",
+                }
+            }
+        }
+    }
     return @fields;
 }
-- 
1.6.5


From srdjan at catalyst.net.nz  Wed Feb 22 07:29:58 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 22 Feb 2012 16:29:58 +1000
Subject: [Koha-patches] Patch 5668
Message-ID: <4F448B66.20508@catalyst.net.nz>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5668-star-ratings-in-the-OPAC.patch
Type: text/x-patch
Size: 38179 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20120222/afdf7494/attachment-0001.bin>

From srdjan at catalyst.net.nz  Wed Feb 22 09:36:49 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed, 22 Feb 2012 21:36:49 +1300
Subject: [Koha-patches] [PATCH] bug_5911: Transport Cost Matrix
In-Reply-To: <bug 5911>
References: <bug 5911>
Message-ID: <1329899809-20502-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             |   15 +
 installer/data/mysql/sysprefs.sql                  |    2 +
 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, 1086 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 0417c45..07a1040 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -521,6 +521,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 <to branch code> => <from branch code> => 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 => <code>, tobranch => <code>, cost => <figure>, 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 f4069ae..c0854c7 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 67149c9..e9492f5 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2672,6 +2672,21 @@ 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 `bibliocoverimage`
 --
 
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 0cc79b2..08bef91 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -308,6 +308,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('TraceCompleteSubfields','0','Force subject tracings to only match complete subfields.','0','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('UseAuthoritiesForTracings','1','Use authority record numbers for subject tracings instead of heading strings.','0','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
+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('displayFacetCount', '0', NULL, NULL, 'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo');
@@ -322,6 +323,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 d2d9d97..ff54c46 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4712,6 +4712,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 DropAllForeignKeys($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 fe76ae8..9913663 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 @@
 	<dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
 	<dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library Transfer Limits</a></dt>
 	<dd>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.</dd>
+	<dt><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport Cost Matrix</a></dt>
+	<dd>Define transport costs between branches</dd>
 	<dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item Circulation Alerts</a></dt>
 	<dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
 </dl>
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' %]
+<title>Koha &rsaquo; Administration &rsaquo; Transport Cost Matrix</title>
+[% INCLUDE 'doc-head-close.inc' %]
+
+<script type="text/javascript">
+//<![CDATA[
+function check_transport_cost(e) {
+    var val = e.value;
+    if (val && !isNaN(val) && val >= 0.0 && val <= 1.0) {
+        return;
+    }
+    alert("Cost must be expressed as a decimal number in 0 to 1 range");
+}
+function disable_transport_cost_chg(e, cost_id) {
+    disable_transport_cost(cost_id, e.checked);
+}
+function disable_transport_cost(cost_id, disable) {
+    if (disable) {
+        $('#celldiv_'+cost_id).find('input[type=text]').attr("disabled","disabled").addClass('disabled-transfer');
+    } else {
+        $('#celldiv_'+cost_id).find('input:disabled').removeAttr("disabled").removeClass('disabled-transfer');
+    }
+}
+function enable_cost_input(cost_id) {
+    var cell = $('#celldiv_'+cost_id);
+    var cost = $(cell).text();
+    var disabled = $(cell).hasClass('disabled-transfer');
+    $(cell).removeClass('disabled-transfer');
+
+    $('#celldiv_'+cost_id).html(
+        '<input name="cost_'+cost_id+'" onchange="check_transport_cost(this);" size="4" value="'+$.trim(cost)+'" />'+
+        '<br/>No xfr <input name="disable_'+cost_id+'" value="1" onchange="disable_transport_cost_chg(this, \''+cost_id+'\');" type="checkbox" '+(disabled ? 'checked' : '')+' />'
+    );
+    disable_transport_cost(cost_id, disabled);
+}
+function use_transport_cost_matrix_chg (e) {
+    show_transport_cost_matrix(e.checked);
+}
+function show_transport_cost_matrix(show) {
+    if (show) {
+        $('#transport-cost-matrix').show();
+    } else {
+        $('#transport-cost-matrix').hide();
+    }
+}
+function form_submit (f) {
+    $(f).find('input:disabled').removeAttr("disabled");
+    // XXX check 0 - 1
+    return true;
+}
+
+$(document).ready(function() {
+    show_transport_cost_matrix([% IF UseTransportCostMatrix %]true[% ELSE %]false[% END %]);
+});
+//]]>
+</script>
+<style type="text/css">
+.disabled-transfer {
+    background-color: red;
+}
+</style>
+
+</head>
+<body>
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Transport Cost Matrix</div>
+
+<div id="doc3" class="yui-t1">
+
+<div id="bd">
+    <div id="yui-main">
+    <div class="yui-b">
+    <h1 class="parameters">
+            Defining transport costs between libraries
+    </h1>
+    <div class="container">
+        <form method="post" action="?" onSubmit="return form_submit(this);">
+            <input type="hidden" name="op" value="set-cost-matrix" />
+            <p> Use Transport Cost Matrix <input type="checkbox" name="UseTransportCostMatrix" value="1" [% IF UseTransportCostMatrix %]checked[% END %] onChange="use_transport_cost_matrix_chg(this);" />
+            <div id="transport-cost-matrix">
+                <div class="help">
+                    <p>Costs are normalised decimal values 0 to 1, 0 being minimum (no) cost, 1 maximum.</p>
+                    <p>Red cells signify no transfer allowed</p>
+                    <p>Click on the cell to edit</p>
+                </div>
+                <table>
+                    <tr>
+                        <th>From \ To</th>
+                [% FOR b IN branchloop %]
+                        <th>[% b.name %]</th>
+                [% END %]
+                    <tr>
+                [% FOR bf IN branchfromloop %]
+                    <tr>
+                        <th>[% bf.name %]</th>
+                    [% FOR bt IN bf.branchtoloop %]
+                        <td>
+                        [% IF bt.skip %]
+                            &nbsp;
+                        [% ELSE %]
+                            <div id="celldiv_[% bt.id %]"[% IF bt.disabled %] class="disabled-transfer"[% END %]>
+                            <div onclick="enable_cost_input('[% bt.id %]');">[% bt.value %]</div>
+                            <input type="hidden" name="cost_[% bt.id %]" value="[% bt.value %]" />
+                            [% IF bt.disabled %]
+                            <input type="hidden" name="disable_[% bt.id %]" value="1" />
+                            [% END %]
+                            </div>
+                        [% END %]
+                        </td>
+                    [% END %]
+                    </tr>
+                [% END %]
+                </table>
+            </div>
+            <input type="submit" value="Save" class="submit" />
+        </form>
+    </div>
+    </div>
+    </div>
+<div class="yui-b">
+[% INCLUDE 'admin-menu.inc' %]
+</div>
+</div>
+[% 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 = <<EOQ;
+select *
+from borrowers
+where borrowernumber = (select max(borrowernumber) from issues)
+EOQ
+my $dbh = C4::Context->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.6.5


From jonathan.druart at biblibre.com  Wed Feb 22 10:32:57 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Wed, 22 Feb 2012 10:32:57 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7291: Adds new field
	aqbooksellers.deliverytime
Message-ID: <1329903178-7878-1-git-send-email-jonathan.druart@biblibre.com>

New field deliverytime in aqbooksellers table. It is an estimated
delivery time for orders (in days).
You can set this delay on the supplier modification page.
It is used in the late orders search.

The order estimated date is the aqbasket.closedate +
aqbooksellers.deliverytime

If you set a delay, the query check if closedate <= today - delay

If you set a "delivery time from" and a "delivery time to", the query check if
$delivery_time_from <= aqbooksellers.deliverytime is not NULL and if
closedate + deliverytime >= $delivery_time_to
if there is not a time_to then $delivery_time_to = the current date.
---
 C4/Acquisition.pm                                  |   28 ++++++++-
 C4/Bookseller.pm                                   |   61 +++++++++++++++-----
 acqui/basket.pl                                    |   11 ++++
 acqui/lateorders.pl                                |   21 +++++--
 acqui/supplier.pl                                  |    2 +
 acqui/updatesupplier.pl                            |    1 +
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 ++
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    2 +
 .../prog/en/modules/acqui/lateorders.tt            |   41 +++++++++++++-
 .../prog/en/modules/acqui/supplier.tt              |    8 +++
 11 files changed, 157 insertions(+), 26 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 0a96a02..c6220c1 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -1438,13 +1438,15 @@ sub GetLateOrders {
     my $delay      = shift;
     my $supplierid = shift;
     my $branch     = shift;
+    my $estimateddeliverydatefrom = shift;
+    my $estimateddeliverydateto = shift;
 
     my $dbh = C4::Context->dbh;
 
     #BEWARE, order of parenthesis and LEFT JOIN is important for speed
     my $dbdriver = C4::Context->config("db_scheme") || "mysql";
 
-    my @query_params = ($delay);	# delay is the first argument regardless
+    my @query_params = ();
     my $select = "
     SELECT aqbasket.basketno,
         aqorders.ordernumber,
@@ -1460,6 +1462,7 @@ sub GetLateOrders {
         biblio.author, biblio.title,
         biblioitems.publishercode AS publisher,
         biblioitems.publicationyear,
+        ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate,
     ";
     my $from = "
     FROM
@@ -1473,6 +1476,7 @@ sub GetLateOrders {
             OR datereceived IS NULL
             OR aqorders.quantityreceived < aqorders.quantity
         )
+        AND aqbasket.closedate IS NOT NULL
         AND (aqorders.datecancellationprinted IS NULL OR aqorders.datecancellationprinted='0000-00-00')
     ";
     my $having = "";
@@ -1482,7 +1486,10 @@ sub GetLateOrders {
         (aqorders.quantity - IFNULL(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
         DATEDIFF(CURDATE( ),closedate) AS latesince
         ";
-        $from .= " AND (closedate <= DATE_SUB(CURDATE( ),INTERVAL ? DAY)) ";
+        if ( defined $delay ) {
+            $from .= " AND (closedate <= DATE_SUB(CURDATE( ),INTERVAL ? DAY)) " ;
+            push @query_params, $delay;
+        }
         $having = "
         HAVING quantity          <> 0
             AND unitpricesupplier <> 0
@@ -1495,7 +1502,10 @@ sub GetLateOrders {
                 aqorders.quantity * aqorders.rrp AS subtotal,
                 (CURDATE - closedate)            AS latesince
         ";
-        $from .= " AND (closedate <= (CURDATE -(INTERVAL ? DAY)) ";
+        if ( defined $delay ) {
+            $from .= " AND (closedate <= (CURDATE -(INTERVAL ? DAY)) ";
+            push @query_params, $delay;
+        }
     }
     if (defined $supplierid) {
         $from .= ' AND aqbasket.booksellerid = ? ';
@@ -1505,6 +1515,18 @@ sub GetLateOrders {
         $from .= ' AND borrowers.branchcode LIKE ? ';
         push @query_params, $branch;
     }
+    if ( defined $estimateddeliverydatefrom ) {
+        $from .= '
+            AND aqbooksellers.deliverytime IS NOT NULL
+            AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) >= ?';
+        push @query_params, $estimateddeliverydatefrom;
+    }
+    if ( defined $estimateddeliverydatefrom and defined $estimateddeliverydateto ) {
+        $from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= ?';
+        push @query_params, $estimateddeliverydateto;
+    } elsif ( defined $estimateddeliverydatefrom ) {
+        $from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CURDATE()';
+    }
     if (C4::Context->preference("IndependantBranches")
             && C4::Context->userenv
             && C4::Context->userenv->{flags} != 1 ) {
diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index 6a91f99..f4db133 100644
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -99,19 +99,48 @@ Searches for suppliers with late orders.
 =cut
 
 sub GetBooksellersWithLateOrders {
-    my $delay = shift;
-    my $dbh   = C4::Context->dbh;
-
-    # TODO delay should be verified
-    my $query_string =
-      "SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
-    FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
-    LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
-    WHERE (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY)
-    AND (datereceived = '' OR datereceived IS NULL))";
-
-    my $sth = $dbh->prepare($query_string);
-    $sth->execute;
+    my ( $delay, $branch, $estimateddeliverydatefrom, $estimateddeliverydateto ) = @_;    # FIXME: Branch argument unused.
+    my $dbh = C4::Context->dbh;
+
+    # FIXME NOT quite sure that this operation is valid for DBMs different from Mysql, HOPING so
+    # should be tested with other DBMs
+
+    my $strsth;
+    my @query_params = ();
+    my $dbdriver = C4::Context->config("db_scheme") || "mysql";
+    $strsth = "
+        SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
+        FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
+        LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
+        WHERE 
+            ( datereceived = ''
+            OR datereceived IS NULL
+            OR aqorders.quantityreceived < aqorders.quantity
+            )
+            AND aqorders.rrp <> 0
+            AND aqorders.ecost <> 0
+            AND aqorders.quantity - IFNULL(aqorders.quantityreceived,0) <> 0
+            AND aqbasket.closedate IS NOT NULL
+    ";
+    if ( defined $delay ) {
+        $strsth .= " AND (closedate <= DATE_SUB(CURDATE( ),INTERVAL ? DAY)) ";
+        push @query_params, $delay;
+    }
+    if ( defined $estimateddeliverydatefrom ) {
+        $strsth .= '
+            AND aqbooksellers.deliverytime IS NOT NULL
+            AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) >= ?';
+        push @query_params, $estimateddeliverydatefrom;
+    }
+    if ( defined $estimateddeliverydatefrom and defined $estimateddeliverydateto ) {
+        $strsth .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= ?';
+        push @query_params, $estimateddeliverydateto;
+    } elsif ( defined $estimateddeliverydatefrom ) {
+        $strsth .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CURDATE()';
+    }
+
+    my $sth = $dbh->prepare($strsth);
+    $sth->execute( @query_params );
     my %supplierlist;
     while ( my ( $id, $name ) = $sth->fetchrow ) {
         $supplierlist{$id} = $name;
@@ -198,7 +227,7 @@ sub ModBookseller {
             contphone=?,contfax=?,contaltphone=?,contemail=?,
             contnotes=?,active=?,listprice=?, invoiceprice=?,
             gstreg=?,listincgst=?,invoiceincgst=?,
-            discount=?,notes=?,gstrate=?
+            discount=?,notes=?,gstrate=?,deliverytime=?
         WHERE id=?';
     my $sth = $dbh->prepare($query);
     $sth->execute(
@@ -215,7 +244,9 @@ sub ModBookseller {
         $data->{'invoiceprice'}, $data->{'gstreg'},
         $data->{'listincgst'},   $data->{'invoiceincgst'},
         $data->{'discount'},     $data->{'notes'},
-        $data->{'gstrate'},      $data->{'id'}
+        $data->{'gstrate'},
+        $data->{deliverytime},
+        $data->{'id'}
     );
     return;
 }
diff --git a/acqui/basket.pl b/acqui/basket.pl
index 7864fee..163c65d 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -35,6 +35,7 @@ use C4::Biblio;
 use C4::Members qw/GetMember/;  #needed for permissions checking for changing basketgroup of a basket
 use C4::Items;
 use C4::Suggestions;
+use Date::Calc qw/Add_Delta_Days/;
 
 =head1 NAME
 
@@ -214,6 +215,15 @@ if ( $op eq 'delete_confirm' ) {
         }
         unshift( @$basketgroups, \%emptygroup );
     }
+
+    # if the basket is closed, calculate estimated delivery date
+    my $estimateddeliverydate;
+    if( $basket->{closedate} ) {
+        my ($year, $month, $day) = ($basket->{closedate} =~ /(\d+)-(\d+)-(\d+)/);
+        ($year, $month, $day) = Add_Delta_Days($year, $month, $day, $bookseller->{deliverytime});
+        $estimateddeliverydate = "$year-$month-$day";
+    }
+
     # if new basket, pre-fill infos
     $basket->{creationdate} = ""            unless ( $basket->{creationdate} );
     $basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
@@ -368,6 +378,7 @@ my $total_est_gste;
         authorisedby         => $basket->{authorisedby},
         authorisedbyname     => $basket->{authorisedbyname},
         closedate            => C4::Dates->new($basket->{closedate},'iso')->output,
+        estimateddeliverydate => C4::Dates->new( $estimateddeliverydate, 'iso' )->output,
         active               => $bookseller->{'active'},
         booksellerid         => $bookseller->{'id'},
         name                 => $bookseller->{'name'},
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 86b1300..913d121 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -66,14 +66,14 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
 
 my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0
 my $delay      = $input->param('delay');
+my $estimateddeliverydatefrom = $input->param('estimateddeliverydatefrom');
+my $estimateddeliverydateto   = $input->param('estimateddeliverydateto');
 my $branch     = $input->param('branch');
 my $op         = $input->param('op');
 
 my @errors = ();
-$delay = 30 unless defined $delay;
-unless ($delay =~ /^\d{1,3}$/) {
-	push @errors, {delay_digits => 1, bad_delay => $delay};
-	$delay = 30;	#default value for delay
+if ( defined $delay and not $delay =~ /^\d{1,3}$/ ) {
+    push @errors, {delay_digits => 1, bad_delay => $delay};
 }
 
 if ($op and $op eq "send_alert"){
@@ -92,7 +92,13 @@ if ($op and $op eq "send_alert"){
     }
 }
 
-my %supplierlist = GetBooksellersWithLateOrders($delay);
+my %supplierlist = GetBooksellersWithLateOrders(
+    $delay,
+    $branch,
+    C4::Dates->new($estimateddeliverydatefrom)->output("iso"),
+    C4::Dates->new($estimateddeliverydateto)->output("iso")
+);
+
 my (@sloopy);	# supplier loop
 foreach (keys %supplierlist){
 	push @sloopy, (($booksellerid and $booksellerid eq $_ )            ?
@@ -104,7 +110,7 @@ $template->param(SUPPLIER_LOOP => \@sloopy);
 $template->param(Supplier=>$supplierlist{$booksellerid}) if ($booksellerid);
 $template->param(booksellerid=>$booksellerid) if ($booksellerid);
 
-my @lateorders = GetLateOrders($delay,$booksellerid,$branch);
+my @lateorders = GetLateOrders( $delay, $booksellerid, $branch, $estimateddeliverydatefrom, $estimateddeliverydateto );
 
 my $total;
 foreach (@lateorders){
@@ -122,7 +128,10 @@ $template->param(ERROR_LOOP => \@errors) if (@errors);
 $template->param(
 	lateorders => \@lateorders,
 	delay => $delay,
+    estimateddeliverydatefrom => $estimateddeliverydatefrom,
+    estimateddeliverydateto   => $estimateddeliverydateto,
 	total => $total,
 	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 8896b3b..f533a80 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -109,6 +109,7 @@ if ( $op eq 'display' ) {
         listincgst    => $supplier->{'listincgst'},
         invoiceincgst => $supplier->{'invoiceincgst'},
         discount      => $supplier->{'discount'},
+        deliverytime  => $supplier->{deliverytime},
         invoiceprice  => $supplier->{'invoiceprice'},
         listprice     => $supplier->{'listprice'},
         GST           => $tax_rate,
@@ -171,6 +172,7 @@ if ( $op eq 'display' ) {
         invoiceincgst => $supplier->{'invoiceincgst'},
         gstrate       => $gstrate,
         discount      => $supplier->{'discount'},
+        deliverytime  => $supplier->{deliverytime},
         loop_currency => $loop_currency,
         GST           => $tax_rate,
         enter         => 1,
diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index 3e79362..81136d7 100755
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -107,6 +107,7 @@ if ($gstrate eq '') {
     $data{'gstrate'} = $input->param('gstrate')/100;
 }
 $data{'discount'}=$input->param('discount');
+$data{deliverytime} = $input->param('deliverytime');
 $data{'active'}=$input->param('status');
 if($data{'name'}) {
 	if ($data{'booksellerid'}){
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 67149c9d..89cb71d 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2496,6 +2496,7 @@ CREATE TABLE `aqbooksellers` ( -- information about the vendors listed in acquis
   `gstrate` decimal(6,4) default NULL, -- the tax rate the library is charged
   `discount` float(6,4) default NULL, -- discount offered on all items ordered from this vendor
   `fax` varchar(50) default NULL, -- vendor fax number
+  `deliverytime` int(11) default NULL, -- vendor delivery time
   PRIMARY KEY  (`id`),
   KEY `listprice` (`listprice`),
   KEY `invoiceprice` (`invoiceprice`),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index d2d9d97..32b027f 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4712,6 +4712,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE aqbooksellers ADD deliverytime INT DEFAULT NULL");
+    print "Upgrade to $DBversion done (Add deliverytime field in aqbooksellers table)";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 59f647c..b77bd26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -180,6 +181,7 @@
                 [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span>  [% authorisedbyname %]</li>[% END %]
                 [% IF ( creationdate ) %]<li><span class="label">Opened on:</span>  [% creationdate %]</li>[% END %]
                 [% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate %]</li>[% END %]
+                [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates  %]</li>[% END %]
 
                 </ol>
                 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index cdb8711..1495215 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -1,7 +1,9 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
+[% INCLUDE 'calendar.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
@@ -60,6 +62,7 @@ $(document).ready(function() {
     <table id="late_orders">
         <tr>
             <th>Order Date</th>
+            <th>Estimated delivery date</th>
             <th>Vendor</th>
             <th>Information</th>
             <th>Total cost</th>
@@ -81,6 +84,9 @@ $(document).ready(function() {
                 ([% lateorder.latesince %] days)
             </td>
             <td>
+                [% lateorder.estimateddeliverydate | $KohaDates  %]
+            </td>
+            <td>
                 [% lateorder.supplier %]
             </td>
             <td>
@@ -117,7 +123,7 @@ $(document).ready(function() {
         [% END %]
         <tr> 
             <th>Total</th>
-            <th colspan="2">&nbsp;</th>
+            <th colspan="3">&nbsp;</th>
             <th>[% total %]</th>
             <th>&nbsp;</th>
             <th>&nbsp;</th>
@@ -140,7 +146,38 @@ $(document).ready(function() {
 [% FOREACH ERROR_LOO IN ERROR_LOOP %]
 [% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.</p>[% END %]
 [% END %]
-<ol><li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay %]" /> days ago</li>
+<ol>
+    <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay %]" /> days ago</li>
+    <li><label for="delay">Estimated Delivery date from: </label>
+        <input type="text" size="10" id="estimateddeliverydatefrom" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom %]" />
+        <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
+        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+    </li>
+    <li><label for="delay">To: </label>
+        <input type="text" size="10" id="estimateddeliverydateto" name="estimateddeliverydateto" value="[% estimateddeliverydateto %]" />
+        <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" />
+        <script type="text/javascript">
+            // return true if the date is blocked.
+            function disable_from(date) {var limit = get_Calendar_limit(date,'estimateddeliverydatefrom'); return (limit && limit < date);}
+            function disable_to(date) {var limit = get_Calendar_limit(date,'estimateddeliverydateto'); return (limit && limit < date);}
+            Calendar.setup({
+                inputField : "estimateddeliverydatefrom",
+                ifFormat : "[% DHTMLcalendar_dateformat %]",
+                button : "openCalendarFrom",
+                disableFunc : disable_from,
+                dateStatusFunc : disable_from
+            });
+            Calendar.setup({
+                inputField : "estimateddeliverydateto",
+                ifFormat : "[% DHTMLcalendar_dateformat %]",
+                button : "openCalendarTo",
+                disableFunc : disable_to,
+                dateStatusFunc : disable_to
+             });
+        </script>
+        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+    </li>
+
 	<li><label for="booksellerid">Vendor:</label>
 		<select id="booksellerid" size="1" tabindex="" name="booksellerid">
 			<option value=""/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index d4bfe72..e370706 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -137,6 +137,10 @@ if (f.company.value == "") {
             <li><label for="discount">Discount</label>
                 <input type="text" size="6" id="discount" name="discount" value="[% discount %]" />%</li>
             <li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="6" value="[% gstrate %]"/>% (leave blank for default tax of [% default_gst_rate %]%)</li>
+            <li>
+                <label for="deliverytime">Delivery time</label>
+                <input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime %]" /> days
+            </li>
             <li><label for="notes">Notes</label>
                 <textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>
         </fieldset>
@@ -197,6 +201,10 @@ if (f.company.value == "") {
                 [% discount %] %</p>
             <p><strong>Tax rate: </strong>
                 [% GST %]%[% UNLESS ( default_tax ) %] (default)[% END %]</p>
+            [% IF deliverytime.defined %]
+                <p><strong>Delivery time: </strong>
+                    [% deliverytime %] days</p>
+            [% END %]
             [% IF ( notes ) %]<p><strong>Notes: </strong>
                 [% notes %]</p>[% END %]
         </div>
-- 
1.7.7.3


From jonathan.druart at biblibre.com  Wed Feb 22 15:39:40 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Wed, 22 Feb 2012 15:39:40 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH_1/1=5D_Bug_7577=3A_Adds_a_displ?=
	=?utf-8?q?ay_page_for_suggestions?=
Message-ID: <1329921580-20859-1-git-send-email-jonathan.druart@biblibre.com>

---
 .../prog/en/modules/acqui/neworderempty.tt         |    2 +-
 .../prog/en/modules/acqui/orderreceive.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    4 +-
 .../prog/en/modules/suggestion/suggestion.tt       |  141 ++++++++++++++++++--
 suggestion/suggestion.pl                           |   17 ++-
 5 files changed, 148 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index a27d151..e6464f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -326,7 +326,7 @@ $(document).ready(function()
         <ol>
           <li>
             <span class="label">Suggested by: </span>
-            [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %],?[% firstnamesuggestedby %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid %]">suggestion #[% suggestionid %]</a>)
+            [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %],?[% firstnamesuggestedby %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid %]&amp;op=show">suggestion #[% suggestionid %]</a>)
           </li>
         </ol>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index e238278..3eb3e23 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -42,7 +42,7 @@
         <ol>
           <li>
             <span class="label">Suggested by: </span>
-            [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %],?[% firstnamesuggestedby %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid %]">suggestion #[% suggestionid %]</a>)
+            [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %],?[% firstnamesuggestedby %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid %]&amp;op=show">suggestion #[% suggestionid %]</a>)
           </li>
         </ol>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index afc9b65..786c5be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -244,7 +244,7 @@
                 [% IF ( loop_order.suggestionid ) %]
                     <br/>
                     Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %],?[% loop_order.firstnamesuggestedby %] [% END %]
-                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid %]">suggestion #[% loop_order.suggestionid %]</a>)
+                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid %]&amp;op=show">suggestion #[% loop_order.suggestionid %]</a>)
                 [% END %]
                 </td>
                 <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
@@ -369,7 +369,7 @@
                 [% IF ( loop_receive.suggestionid ) %]
                     <br/>
                     Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %],?[% loop_receive.firstnamesuggestedby %] [% END %]
-                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_receive.suggestionid %]">suggestion #[% loop_receive.suggestionid %]</a>)
+                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_receive.suggestionid %]&amp;op=show">suggestion #[% loop_receive.suggestionid %]</a>)
                 [% END %]
                 </td>
                 <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 47ee96a..1f72e4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -1,5 +1,19 @@
-[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Acquisitions  &rsaquo;
-[% IF ( op_save ) %][% IF ( suttesionid ) %]Edit purchase suggestion #[% suggestionid %][% ELSE %]Enter a new purchase suggestion[% END %][% ELSE %]Suggestions Management[% END %]</title>
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Acquisitions  &rsaquo;
+    [% IF ( op_save ) %]
+        [% IF ( suggestionid) %]
+            [% IF ( op == 'show' ) %]
+                Show purchase suggestion #[% suggestionid %]
+            [% ELSE %]
+                Edit purchase suggestion #[% suggestionid %]
+            [% END %]
+        [% ELSE %]
+            Enter a new purchase suggestion
+        [% END %]
+    [% ELSE %]
+        Suggestions Management
+    [% END %]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 [% IF ( op_else ) %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
@@ -91,7 +105,114 @@ $(document).ready(function() { calcNewsuggTotal(); });
 <body>
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( op_save ) %] <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> &rsaquo; [% IF ( suggestionid ) %]Suggestion edit #[% suggestionid %][% ELSE %]New purchase suggestion[% END %][% ELSE %]Suggestions Management[% END %] </div>
+<div id="breadcrumbs">
+    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; 
+    [% IF ( op_save ) %]
+        <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> &rsaquo;
+        [% IF ( op == 'show' ) %]
+            Show suggestion #[% suggestionid %]
+        [% ELSE %]
+            Suggestion edit #[% suggestionid %]
+        [% END %]
+    [% ELSE %]
+        Suggestions Management
+    [% END %]
+</div>
+
+[% IF ( op == 'show' ) %]
+<div id="doc" class="yui-t7"> <!-- <div id="doc3" class="yui-t2"> -->
+<div id="bd">
+    <div id="yui-main">
+    <div class="yui-b">
+
+    <fieldset class="rows">
+      <legend>Bibliographic information</legend>
+      <ol>
+        <li><label for="title">Title:</label>[% title |html %]</li>
+        <li><label for="author">Author:</label>[% author %]</li>
+        <li><label for="copyrightdate">Copyright date:</label>[% copyrightdate %]</li>
+        <li><label for="isbn">ISBN or ISSN or other standard number:</label>[% isbn %]</li>
+        <li><label for="publishercode">Publisher:</label>[% publishercode %]</li>
+        <li><label for="place">Publication Place:</label>[% place %]</li>
+        <li><label for="collectiontitle">Collection Title:</label>[% collectiontitle %]</li>
+        <li><label for="itemtype">Document Type:</label>
+            [% FOREACH itemtypeloo IN itemtypeloop %]
+                [% IF ( itemtypeloo.selected ) %][% itemtypeloo.description %][% END %]
+            [% END %]
+        </li>
+        [% IF ( patron_reason_loop ) %]
+          <li><label for="patronreason">Reason for suggestion: </label>
+            [% FOREACH patron_reason_loo IN patron_reason_loop %]
+              [% IF ( patron_reason_loo.selected ) %][% patron_reason_loo.lib %][% END %]
+            [% END %]
+          </li>
+        [% END %]
+        <li><label for="note">Notes:</label>[% note %]</li>
+      </ol>
+    </fieldset>
+    <fieldset class="rows"> <legend>Suggestion management</legend>
+      <ol>
+        <li>
+          <label for="status">Status:</label>
+          [% IF ( STATUS == 'ASKED' ) %]Pending
+          [% ELSIF ( STATUS == 'ACCEPTED' ) %]Accepted
+          [% ELSIF ( STATUS == 'CHECKED' ) %]Checked
+          [% ELSIF ( STATUS == 'REJECTED' ) %]Rejected
+          [% ELSE %]No Status
+          [% END %]
+        </li>
+        <li>
+          <table>
+            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
+            <tbody>
+            <tr>
+                <th><label for="suggesteddate">Suggestion creation</label> </th>
+                <td>[% suggesteddate %]</td>
+                <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode %] ([% suggestedby_description %])[% END %]
+                </td>
+            </tr>
+            <tr>
+                <th><label for="managedon">Suggestion management</label> </th>
+                <td>[% manageddate %]</td>
+                <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode %] ([% managedby_description %])[% END %]</td>
+            </tr>
+            <tr>
+                <th><label for="accepteddate">Suggestion Accepted</label> </th>
+                <td>[% accepteddate %]</td>
+                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]</td>
+            </tr>
+            </tbody>
+        </table></li></ol>
+    </fieldset>
+    <fieldset class="rows"> <legend>Acquisition information</legend>
+      <ol>
+        <li>
+          <label for="branchcode">Library:</label> [% branchname %]
+        </li>
+        <li>
+          <label for="budget">Budget:</label> [% budgetname %]
+        </li>
+        <li>
+          <label for="quantity">Copies:</label>[% quantity %]
+        </li>
+        <li>
+          <label for="currency">Currency:</label>[% currency %]
+        </li>
+        <li>
+          <label for="price">Price:</label>[% price %]
+        </li>
+        <li>
+          <label for="total">Total</label>[% total %]
+        </li>
+      </ol>
+    </fieldset>
+
+    <a class="cancel" href="suggestion.pl">&lt;&lt;Back to the list</a>
+
+    </div>
+    </div>
+</div>
+[% END %]
 
 [% IF ( op_save ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
 <div id="bd">
@@ -189,7 +310,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
 			<input type="text" readonly="readonly" id="total" name="total" size="10" value="[% total %]"/>
                 </li></ol>
     </fieldset><input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby %][% ELSE %]noone[% END %]"/>
-    <fieldset class="action"><input type="hidden" name="op" value="[% op %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby %]#suggestions[% ELSE %]suggestion.pl?suggestionid=[% suggestionid %][% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
+    <fieldset class="action"><input type="hidden" name="op" value="[% op %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby %]#suggestions[% ELSE %]suggestion.pl?suggestionid=[% suggestionid %]&amp;op=show[% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
     </fieldset>
     </form>
 [% END %]
@@ -245,9 +366,9 @@ $(document).ready(function() { calcNewsuggTotal(); });
                     <input type="checkbox" name="edit_field" value="[% suggestions_loo.suggestionid %]" />
                 </td>
                 <td>
-                    <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid %]&amp;op=edit" title="suggestion" >
-                        [% suggestions_loo.title |html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author %][% END %]
-                    </a>
+                    <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid %]&amp;op=show" title="suggestion" >
+                        [% suggestions_loo.title |html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author %][% END %]</a>
+                    [<a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid %]&amp;op=edit" title="suggestion" >edit</a>]
                     <br />
                     [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate %] [% END %]
                         [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc %]</i> [% END %]
@@ -314,7 +435,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
 </div>
 </div>
 
-      [% UNLESS ( op_save ) %] <div class="yui-b">
+      [% UNLESS ( op_save ) %] [% UNLESS ( op == 'show' ) %]<div class="yui-b">
 <form name="suggestionfilter" action="suggestion.pl" method="get">
 <fieldset class="brief"><ol style="display:block;"><li><label for="displayby">Organize by: </label>
                 <select name="displayby" id="displayby" style="width:auto;">
@@ -458,7 +579,9 @@ $(document).ready(function() { calcNewsuggTotal(); });
                 </fieldset>
     </div>
             </form>
-        </div>[% END %]
+        </div>
+    [% END %]
+    [% END %]
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]
 
diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 272ca6f..64f00d4 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -34,13 +34,13 @@ use C4::Debug;
 
 sub Init{
     my $suggestion= shift @_;
-    foreach my $date qw(suggesteddate manageddate){
+    foreach my $date ( qw(suggesteddate manageddate) ){
         $suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")?
                                 $suggestion->{$date}=C4::Dates->today:
                                 format_date($suggestion->{$date}) 
                               );
     }               
-    foreach my $date qw(rejecteddate accepteddate){
+    foreach my $date ( qw(rejecteddate accepteddate) ){
     $suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")?
                                 "":
                                 format_date($suggestion->{$date}) 
@@ -173,6 +173,13 @@ elsif ($op eq "change" ) {
     }
     $op = 'else';
 }
+elsif ( $op eq 'show' ) {
+    $suggestion_ref=&GetSuggestion($$suggestion_ref{'suggestionid'});
+    $$suggestion_ref{branchname} = GetBranchName $$suggestion_ref{branchcode};
+    my $budget = GetBudget $$suggestion_ref{budgetid};
+    $$suggestion_ref{budgetname} = $$budget{budget_name};
+    Init($suggestion_ref);
+}
 if ($op=~/else/) {
     $op='else';
     
@@ -193,7 +200,7 @@ if ($op=~/else/) {
                 my $budget = GetBudget($suggestion->{budgetid});
                 $suggestion->{budget_name}=$budget->{budget_name} if $budget;
             }
-            foreach my $date qw(suggesteddate manageddate accepteddate){
+            foreach my $date ( qw(suggesteddate manageddate accepteddate) ){
                 if ($suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ){
                 $suggestion->{$date}=format_date($suggestion->{$date}) ;
                 } else {
@@ -219,7 +226,7 @@ if ($op=~/else/) {
     );
 }
 
-foreach my $element qw(managedby suggestedby acceptedby) {
+foreach my $element ( qw(managedby suggestedby acceptedby) ) {
 #    $debug || warn $$suggestion_ref{$element};
     if ($$suggestion_ref{$element}){
         my $member=GetMember(borrowernumber=>$$suggestion_ref{$element});
@@ -333,7 +340,7 @@ $template->param(
 );
 
 my %hashlists;
-foreach my $field qw(managedby acceptedby suggestedby budgetid) {
+foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) {
     my $values_list;
     $values_list=GetDistinctValues("suggestions.".$field) ;
     my @codes_list = map{
-- 
1.7.7.3


From julian.maurice at biblibre.com  Wed Feb 22 16:51:10 2012
From: julian.maurice at biblibre.com (julian.maurice at biblibre.com)
Date: Wed, 22 Feb 2012 16:51:10 +0100
Subject: [Koha-patches] [PATCH] Bug 7178: Acquisition item creation
	improvement
Message-ID: <1329925870-21509-1-git-send-email-julian.maurice@biblibre.com>

From: Julian Maurice <julian.maurice at biblibre.com>

- Display a unique item block at once

On orderreceive.pl when AcqCreateItem is 'receiving', and on
neworderempty.pl when AcqCreateItem is 'ordering' it displays an
item block with item infos to fill, and a '+' button.
When user clicks on '+', the block is hidden and a list shows up with
the items that will be received. User can then edit or delete items in
the list and click 'Save' to receive items.

- PrepareItemrecordDisplay is now used for cloning block

Previous cloning function was duplicating ids, the side effect is that
plugins didn't work when several items were displayed.
PrepareItemrecordDisplay regenerate the form with new ids

- New system preference UniqueItemFields

Contains a space-separated list of sql column names (of items table).
This syspref is used in two ways:
 - Values corresponding to fields in syspref are not duplicated when
   adding a new item (button 'Add')
 - When saving the form, a check is made on fields in syspref for
   detecting duplicate (in DB and in the form)
---
 acqui/check_uniqueness.pl                          |   68 ++++
 acqui/neworderempty.pl                             |   16 +-
 acqui/orderreceive.pl                              |   15 +-
 installer/data/mysql/updatedatabase.pl             |   11 +
 .../intranet-tmpl/prog/en/includes/additem.js.inc  |   10 +
 koha-tmpl/intranet-tmpl/prog/en/js/additem.js      |  337 ++++++++++++++------
 .../prog/en/modules/acqui/neworderempty.tt         |  157 +++++-----
 .../prog/en/modules/acqui/orderreceive.tt          |  133 +++++---
 .../en/modules/admin/preferences/acquisitions.pref |    3 +
 .../prog/en/modules/services/itemrecorddisplay.tt  |   25 ++
 services/itemrecorddisplay.pl                      |   58 ++++
 11 files changed, 590 insertions(+), 243 deletions(-)
 create mode 100755 acqui/check_uniqueness.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
 create mode 100755 services/itemrecorddisplay.pl

diff --git a/acqui/check_uniqueness.pl b/acqui/check_uniqueness.pl
new file mode 100755
index 0000000..95b1992
--- /dev/null
+++ b/acqui/check_uniqueness.pl
@@ -0,0 +1,68 @@
+#!/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.
+
+# This script search in items table if a value for a given field exists.
+# It is used in check_additem (additem.js)
+# Parameters are a list of 'field', which must be field names in items table
+# and a list of 'value', which are the corresponding value to check
+# Eg. @field = ('barcode', 'barcode', 'stocknumber')
+#     @value = ('1234', '1235', 'ABC')
+#     The script will check if there is already an item with barcode '1234',
+#     then an item with barcode '1235', and finally check if there is an item
+#     with stocknumber 'ABC'
+# It returns a JSON string which contains what have been found
+# Eg. { barcode: ['1234', '1235'], stocknumber: ['ABC'] }
+
+use Modern::Perl;
+
+use CGI;
+use JSON;
+use C4::Context;
+use C4::Output;
+use C4::Auth;
+
+my $input = new CGI;
+my @field = $input->param('field');
+my @value = $input->param('value');
+
+my $dbh = C4::Context->dbh;
+
+my $query = "SHOW COLUMNS FROM items";
+my $sth = $dbh->prepare($query);
+$sth->execute;
+my $results = $sth->fetchall_hashref('Field');
+my @columns = keys %$results;
+
+my $r = {};
+my $index = 0;
+for my $f ( @field ) {
+    if(0 < grep /^$f$/, @columns) {
+        $query = "SELECT $f FROM items WHERE $f = ?";
+        $sth = $dbh->prepare( $query );
+        $sth->execute( $value[$index] );
+        my @values = $sth->fetchrow_array;
+
+        if ( @values ) {
+            push @{ $r->{$f} }, $values[0];
+        }
+    }
+    $index++;
+}
+
+output_with_http_headers $input, undef, to_json($r), 'json';
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 459dfe8..f173b82 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -317,17 +317,15 @@ if ($CGIsort2) {
 }
 
 if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
-    # prepare empty item form
-    my $cell = PrepareItemrecordDisplay('','','','ACQ');
-#     warn "==> ".Data::Dumper::Dumper($cell);
-    unless ($cell) {
-        $cell = PrepareItemrecordDisplay('','','','');
+    # Check if ACQ framework exists
+    my $marc = GetMarcStructure(1, 'ACQ');
+    unless($marc) {
         $template->param('NoACQframework' => 1);
     }
-    my @itemloop;
-    push @itemloop,$cell;
-    
-    $template->param(items => \@itemloop);
+    $template->param(
+        AcqCreateItemOrdering => 1,
+        UniqueItemFields => C4::Context->preference('UniqueItemFields'),
+    );
 }
 # Get the item types list, but only if item_level_itype is YES. Otherwise, it will be in the item, no need to display it in the biblio
 my @itemtypes;
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 753071d..8bf0146 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -116,16 +116,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 # prepare the form for receiving
 if ( $count == 1 ) {
     if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
-        # prepare empty item form
-        my $cell = PrepareItemrecordDisplay('','','','ACQ');
-        unless ($cell) {
-            $cell = PrepareItemrecordDisplay('','','','');
+        # Check if ACQ framework exists
+        my $marc = GetMarcStructure(1, 'ACQ');
+        unless($marc) {
             $template->param('NoACQframework' => 1);
         }
-        my @itemloop;
-        push @itemloop,$cell;
-        
-        $template->param(items => \@itemloop);
+        $template->param(
+            AcqCreateItemReceiving => 1,
+            UniqueItemFields => C4::Context->preference('UniqueItemFields'),
+        );
     }
 
     if ( @$results[0]->{'quantityreceived'} == 0 ) {
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 099dfb9..0da7009 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4663,6 +4663,17 @@ ENDOFRENEWAL
     print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n";
     SetVersion($DBversion);
 }
+
+$DBversion = "XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do(qq{
+        INSERT INTO systempreferences(variable,value,explanation,options,type)
+        VALUES('UniqueItemFields', 'barcode', 'Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table', '', 'Free')
+    });
+    print "Upgrade to $DBversion done (Added system preference 'UniqueItemFields')\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc
new file mode 100644
index 0000000..5ab37f4
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+//<![CDATA[
+var MSG_ADDITEM_JS_EDIT = _("Edit");
+var MSG_ADDITEM_JS_DELETE = _("Delete");
+var MSG_ADDITEM_JS_CLEAR = _("Clear");
+var MSG_ADDITEM_JS_CANT_RECEIVE_MORE_ITEMS = _("You can't receive any more items");
+var MSG_ADDITEM_JS_IS_DUPLICATE = _("is duplicated");
+var MSG_ADDITEM_JS_ALREADY_EXISTS_IN_DB = _("already exists in database");
+//]]>
+</script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
index 2f6c3fe..859fe02 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
@@ -1,110 +1,239 @@
-function deleteItemBlock(index) {
-    var aDiv = document.getElementById(index);
-    aDiv.parentNode.removeChild(aDiv);
-    var quantity = document.getElementById('quantity');
-    quantity.setAttribute('value',parseFloat(quantity.getAttribute('value'))-1);
+function addItem( node, unique_item_fields ) {
+    var index = $(node).parent().attr('id');
+    var current_qty = parseInt($("#quantity").val());
+    var max_qty;
+    if($("#quantity_to_receive").length != 0){
+        max_qty = parseInt($("#quantity_to_receive").val());
+    } else  {
+        max_qty = 99999;
+    }
+    if ( $("#items_list table").find('tr[idblock="' + index + '"]').length == 0 ) {
+        if ( current_qty < max_qty ) {
+            if ( current_qty < max_qty - 1 )
+                cloneItemBlock(index, unique_item_fields);
+            addItemInList(index, unique_item_fields);
+            $("#" + index).find("a[name='buttonPlus']").text("Update");
+            $("#quantity").val(current_qty + 1);
+        } else if ( current_qty >= max_qty ) {
+            alert(window.MSG_ADDITEM_JS_CANT_RECEIVE_MORE_ITEMS
+                || "You can't receive any more items.");
+        }
+    } else {
+        if ( current_qty < max_qty )
+            cloneItemBlock(index, unique_item_fields);
+        var tr = constructTrNode(index);
+        $("#items_list table").find('tr[idblock="' + index + '"]:first').replaceWith(tr);
+    }
+    $("#" + index).hide();
+}
+
+function showItem(index) {
+    $("#outeritemblock").children("div").each(function(){
+        if ( $(this).attr('id') == index ) {
+            $(this).show();
+        } else {
+            if ( $("#items_list table").find('tr[idblock="' + $(this).attr('id') + '"]').length == 0 ) {
+                $(this).remove();
+            } else {
+                $(this).hide();
+            }
+        }
+    });
+}
+
+function constructTrNode(index, unique_item_fields) {
+    var fields = ['barcode', 'homebranch', 'holdingbranch', 'notforloan',
+        'restricted', 'location', 'itemcallnumber', 'copynumber',
+        'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes'];
+
+    var result = "<tr idblock='" + index + "'>";
+    var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");'>"
+        + (window.MSG_ADDITEM_JS_EDIT || "Edit") + "</a>";
+    var del_link = "<a style='cursor:pointer' "
+        + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");'>"
+        + (window.MSG_ADDITEM_JS_DELETE || "Delete") + "</a>";
+    result += "<td>" + edit_link + "</td>";
+    result += "<td>" + del_link + "</td>";
+    for(i in fields) {
+        var field = fields[i];
+        var field_elt = $("#" + index)
+            .find("[name='kohafield'][value='items."+field+"']")
+            .prevAll("[name='field_value']")[0];
+        var field_value;
+        if($(field_elt).is('select')) {
+            field_value = $(field_elt).find("option:selected").text();
+        } else {
+            field_value = $(field_elt).val();
+        }
+        result += "<td>" + field_value + "</td>";
+    }
+    result += "</tr>";
+
+    return result;
+}
+
+function addItemInList(index, unique_item_fields) {
+    $("#items_list").show();
+    var tr = constructTrNode(index, unique_item_fields);
+    $("#items_list table tbody").append(tr);
+}
+
+function deleteItemBlock(node_a, index, unique_item_fields) {
+    $("#" + index).remove();
+    var current_qty = parseInt($("#quantity").val());
+    var max_qty;
+    if($("#quantity_to_receive").length != 0) {
+        max_qty = parseInt($("#quantity_to_receive").val());
+    } else {
+        max_qty = 99999;
+    }
+    $("#quantity").val(current_qty - 1);
+    $(node_a).parents('tr').remove();
+    if(current_qty - 1 == 0)
+        $("#items_list").hide();
+
+    if ( $("#quantity").val() <= max_qty - 1) {
+        if ( $("#outeritemblock").children("div :visible").length == 0 ) {
+            $("#outeritemblock").children("div:last").show();
+        }
+    }
+    if ( $("#quantity").val() == 0 && $("#outeritemblock > div").length == 0) {
+        cloneItemBlock(0, unique_item_fields);
+    }
 }
-function cloneItemBlock(index) {    
-    var original = document.getElementById(index); //original <div>
-    var clone = clone_with_selected(original)
+
+function cloneItemBlock(index, unique_item_fields) {
+    var original;
+    if(index) {
+        original = $("#" + index); //original <div>
+    }
+    var dont_copy_fields = new Array();
+    if(unique_item_fields) {
+        var dont_copy_fields = unique_item_fields.split(' ');
+        for(i in dont_copy_fields) {
+            dont_copy_fields[i] = "items." + dont_copy_fields[i];
+        }
+    }
+
     var random = Math.floor(Math.random()*100000); // get a random itemid.
-    // set the attribute for the new 'div' subfields
-    clone.setAttribute('id',index + random);//set another id.
-    var NumTabIndex;
-    NumTabIndex = parseInt(original.getAttribute('tabindex'));
-    if(isNaN(NumTabIndex)) NumTabIndex = 0;
-    clone.setAttribute('tabindex',NumTabIndex+1);
-    var CloneButtonPlus;
-    var CloneButtonMinus;
-  //  try{
-        var jclone = $(clone);
-        CloneButtonPlus = $("a.addItem", jclone).get(0);
-        CloneButtonPlus.setAttribute('onclick',"cloneItemBlock('" + index + random + "')");
-    CloneButtonMinus = $("a.delItem", jclone).get(0);
-    CloneButtonMinus.setAttribute('onclick',"deleteItemBlock('" + index + random + "')");
-    CloneButtonMinus.setAttribute('style',"display:inline");
-    // change itemids of the clone
-    var elems = clone.getElementsByTagName('input');
-    for( i = 0 ; elems[i] ; i++ )
-    {
-        if(elems[i].name.match(/^itemid/)) {
-            elems[i].value = random;
+    var clone = $("<div id='itemblock"+random+"'></div>")
+    $.ajax({
+        url: "/cgi-bin/koha/services/itemrecorddisplay.pl",
+        dataType: 'html',
+        data: {
+            frameworkcode: 'ACQ'
+        },
+        success: function(data, textStatus, jqXHR) {
+            /* Create the item block */
+            $(clone).append(data);
+            /* Change all itemid fields value */
+            $(clone).find("input[name='itemid']").each(function(){
+                $(this).val(random);
+            });
+            /* Add buttons + and Clear */
+            var buttonPlus = '<a name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')">Add</a>';
+            var buttonClear = '<a name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)">' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear') + '</a>';
+            $(clone).append(buttonPlus).append(buttonClear);
+            /* Copy values from the original block (input) */
+            $(original).find("input[name='field_value']").each(function(){
+                var kohafield = $(this).siblings("input[name='kohafield']").val();
+                if($(this).val() && dont_copy_fields.indexOf(kohafield) == -1) {
+                    $(this).parent("div").attr("id").match(/^(subfield.)/);
+                    var id = RegExp.$1;
+                    var value = $(this).val();
+                    $(clone).find("div[id^='"+id+"'] input[name='field_value']").val(value);
+                }
+            });
+            /* Copy values from the original block (select) */
+            $(original).find("select[name='field_value']").each(function(){
+                var kohafield = $(this).siblings("input[name='kohafield']").val();
+                if($(this).val() && dont_copy_fields.indexOf(kohafield) == -1) {
+                    $(this).parent("div").attr("id").match(/^(subfield.)/);
+                    var id = RegExp.$1;
+                    var value = $(this).val();
+                    $(clone).find("div[id^='"+id+"'] select[name='field_value']").val(value);
+                }
+            });
+
+            $("#outeritemblock").append(clone);
         }
-    }    
-   // }
-    //catch(e){        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
-    //}
-    // insert this line on the page    
-    original.parentNode.insertBefore(clone,original.nextSibling);
-    var quantity = document.getElementById('quantity');
-    quantity.setAttribute('value',parseFloat(quantity.getAttribute('value'))+1);
+    });
 }
-function check_additem() {
-	var	barcodes = document.getElementsByName('barcode');
-	var success = true;
-	for(i=0;i<barcodes.length;i++){
-		for(j=0;j<barcodes.length;j++){
-			if( (i > j) && (barcodes[i].value == barcodes[j].value) && barcodes[i].value !='') {
-				barcodes[i].className='error';
-				barcodes[j].className='error';
-				success = false;
-			}
-		}
-	}
-	// TODO : Add AJAX function to test against barcodes already in the database, not just 
-	// duplicates within the form.  
-	return success;
+
+function clearItemBlock(node) {
+    var index = $(node).parent().attr('id');
+    var block = $("#"+index);
+    $(block).find("input[type='text']").each(function(){
+        $(this).val("");
+    });
+    $(block).find("select").each(function(){
+        $(this).find("option:first").attr("selected", true);
+    });
+}
+
+function check_additem(unique_item_fields) {
+    var success = true;
+    var data = new Object();
+    data['field'] = new Array();
+    data['value'] = new Array();
+    var array_fields = unique_item_fields.split(' ');
+    $(".error").empty(); // Clear error div
+
+    // Check if a value is duplicated in form
+    for ( field in array_fields ) {
+        var fieldname = array_fields[field];
+        var values = new Array();
+        $("[name='kohafield'][value=items."+array_fields[field]+"]").each(function(){
+            var input = $(this).prevAll("input[name='field_value']")[0];
+            if($(input).val()) {
+                values.push($(input).val());
+                data['field'].push(fieldname);
+                data['value'].push($(input).val());
+            }
+        });
+
+        var sorted_arr = values.sort();
+        for (var i = 0; i < sorted_arr.length - 1; i += 1) {
+            if (sorted_arr[i + 1] == sorted_arr[i]) {
+                $(".error").append(
+                    fieldname + " '" + sorted_arr[i] + "' "
+                    + (window.MSG_ADDITEM_JS_IS_DUPLICATE || "is duplicated")
+                    + "<br/>");
+                success = false;
+            }
+        }
+    }
+
+    // If there is a duplication, we raise an error
+    if ( success == false ) {
+        $(".error").show();
+        return false;
+    }
+
+    $.ajax({
+        url: '/cgi-bin/koha/acqui/check_uniqueness.pl',
+        async: false,
+        dataType: 'json',
+        data: data,
+        success: function(data) {
+            for (field in data) {
+                success = false;
+                for (var i=0; i < data[field].length; i++) {
+                    var value = data[field][i];
+                    $(".error").append(
+                        field + " '" + value + "' "
+                        + (window.MSG_ADDITEM_JS_ALREADY_EXISTS_IN_DB
+                            || "already exists in database")
+                        + "<br />"
+                    );
+                }
+            }
+        }
+    });
+
+    if ( success == false ) {
+        $(".error").show();
+    }
+    return success;
 }
 
-function clone_with_selected (node) {
-	   var origin = node.getElementsByTagName("select");
-	   var tmp = node.cloneNode(true)
-	   var selectelem = tmp.getElementsByTagName("select");
-	   for (var i=0; i<origin.length; i++) {
-	       selectelem[i].selectedIndex = origin[i].selectedIndex;
-	   }
-	   origin = null;
-	   selectelem = null;
-	   return tmp;
-	}
-
-$(document).ready(function(){
-	$(".cloneItemBlock").click(function(){
-		var clonedRow = $(this).parent().parent().clone(true);
-		clonedRow.insertAfter($(this).parent().parent()).find("a.deleteItemBlock").show();
-		// find ID of cloned row so we can increment it for the clone
-		var count = $("input[id^=volinf]",clonedRow).attr("id");
-		var current = Number(count.replace("volinf",""));
-		var increment = current + 1;
-		// loop over inputs
-		var inputs = ["volinf","barcode"];
-		jQuery.each(inputs,function() {
-			// increment IDs of labels and inputs in the clone
-			$("label[for="+this+current+"]",clonedRow).attr("for",this+increment);
-			$("input[name="+this+"]",clonedRow).attr("id",this+increment);
-		});
-		// loop over selects
-		var selects = ["homebranch","location","itemtype","ccode"];
-		jQuery.each(selects,function() {
-			// increment IDs of labels and selects in the clone
-			$("label[for="+this+current+"]",clonedRow).attr("for",this+increment);
-			$("input[name="+this+"]",clonedRow).attr("id",this+increment);
-			$("select[name="+this+"]",clonedRow).attr("id",this+increment);
-			// find the selected option and select it in the clone
-			var selectedVal = $("select#"+this+current).find("option:selected").attr("value");
-			$("select[name="+this+"] option[value="+selectedVal+"]",clonedRow).attr("selected","selected");
-		});
-		
-		var quantityrec = parseFloat($("#quantityrec").attr("value"));
-		quantityrec++;
-		$("#quantityrec").attr("value",quantityrec);
-		return false;
-	});
-	$(".deleteItemBlock").click(function(){
-		$(this).parent().parent().remove();
-		var quantityrec = parseFloat($("#quantityrec").attr("value"));
-		quantityrec--;
-		$("#quantityrec").attr("value",quantityrec);
-		return false;
-	});
-});
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index e1dbbde..1438b8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -3,12 +3,28 @@
 [% INCLUDE 'doc-head-close.inc' %]
 
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+[% INCLUDE 'additem.js.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 actTotal = "";
 
 function Check(ff) {
+    [% IF (AcqCreateItemOrdering) %]
+        // Remove last itemblock if it is not in items_list
+        var lastitemblock = $("#outeritemblock > div:last");
+        var tobedeleted = true;
+        var listitems = $("#items_list tr");
+        $(listitems).each(function(){
+            if($(this).attr('idblock') == $(lastitemblock).attr('id')){
+                tobedeleted = false;
+            }
+        });
+        if(tobedeleted){
+            $(lastitemblock).remove();
+        }
+    [% END %]
+
     var ok=0;
     var _alertString= _("Form not submitted because of the following problem(s)")+"\n";
 
@@ -24,7 +40,7 @@ function Check(ff) {
 					_alertString += "\n- "+ _("You must select a budget");
     }
 
-    if (!(isNum(ff.quantity,0))){
+    if (!(isNum(ff.quantity,0)) || ff.quantity.value == 0){
         ok=1;
                     _alertString += "\n- " + _("Quantity must be greater than '0'");
     }
@@ -46,16 +62,12 @@ function Check(ff) {
     }
 
     if ( ff.field_value ) {
-        var barcodes = [];
         var empty_item_mandatory = 0;
         for (i = 0; i < ff.field_value.length; i++) {
             //alert("i = " + i + " => " + ff.kohafield[i] );
             if (ff.field_value[i].value.length == 0 && ff.mandatory[i].value == 1) {
                 empty_item_mandatory++;
             }
-            if(ff.subfield[i].value === '[% barcode_subfield %]' && ff.field_value[i].value.length != 0) {
-                barcodes.push(ff.field_value[i].value);
-            }
         }
         if (empty_item_mandatory > 0) {
             ok = 1;
@@ -63,56 +75,34 @@ function Check(ff) {
                 "\n- " + empty_item_mandatory + _(" item mandatory fields empty");
         }
 
-        if(barcodes.length > 0) {
-            // Check for duplicate barcodes in the form
-            barcodes = barcodes.sort();
-            for(var i=0; i<barcodes.length-1; i++) {
-                if(barcodes[i] == barcodes[i+1]) {
-                    ok = 1;
-                    _alertString += "\n- " + _("The barcode ") + barcodes[i] + _(" is used more than once in the form. Every barcode must be unique");
-                }
-            }
-
-            // Check for duplicate barcodes in the database via an ajax call
-            $.ajax({
-                url: "/cgi-bin/koha/acqui/check_duplicate_barcode_ajax.pl",
-                async:false,
-                method: "post",
-                data: {barcodes : barcodes},
-                dataType: 'json',
-
-                error: function(xhr) {
-                    alert("Error: \n" + xhr.responseText);
-                },
-                success: function(json) {
-                    switch(json.status) {
-                        case 'UNAUTHORIZED':
-                            ok = 1;
-                            _alertString += "\n- " + _("Error: Duplicate barcode verification failed. Insufficient user permissions.");
-                            break;
-                        case 'DUPLICATES':
-                            ok = 1;
-                            $.each(json.barcodes, function(index, barcode) {
-                                _alertString += "\n- " + _("The barcode ") + barcode + _(" already exists in the database");
-                            });
-                            break;
-                    }
-                },
-            });
-        }
     }
 
     if (ok) {
         alert(_alertString);
+        [% IF (AcqCreateItemOrdering) %]
+            if(tobedeleted) {
+                $(lastitemblock).appendTo('#outeritemblock');
+            }
+        [% END %]
         return false;
     }
 
-    ff.submit();
-
+    [% IF (AcqCreateItemOrdering) %]
+        if(check_additem('[% UniqueItemFields %]') == false) {
+            alert(_('Duplicate values detected. Please correct the errors and resubmit.') );
+            if(tobedeleted) {
+                $(lastitemblock).appendTo('#outeritemblock');
+            }
+            return false;
+        }
+    [% END %]
 }
 
 $(document).ready(function() 
     {
+        [% IF (AcqCreateItemOrdering) %]
+            cloneItemBlock(0, '[% UniqueItemFields %]');
+        [% END %]
         //We apply the fonction only for modify option
         [% IF ( quantityrec ) %]
         $('#quantity').blur(function() 
@@ -169,6 +159,8 @@ $(document).ready(function()
         [% IF ( suggestionid ) %](defined from suggestion #[% suggestionid %])[% END %]
 </h2>
 
+<div class="error" style="display:none"></div>
+
 [% IF ( basketno ) %]
     <div id="acqui_basket_summary"  class="yui-g">
 	<fieldset class="rows">
@@ -208,7 +200,7 @@ $(document).ready(function()
     </div>
 [% END %]
 
-<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform">
+<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform" onsubmit="return Check(this);">
 
 <fieldset class="rows">
         <legend>
@@ -310,41 +302,47 @@ $(document).ready(function()
             [% END %]
         </ol>
     </fieldset>
-    [% IF ( items ) %]
-    <fieldset class="rows">
+    [% IF (AcqCreateItemOrdering) %]
+
+    <div id="items_list" style="display:none">
+        <p><b>Items list</b></p>
+        <div style="width:100%;overflow:auto;">
+            <table>
+                <thead>
+                    <tr>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>Barcode</th>
+                        <th>Home branch</th>
+                        <th>Holding branch</th>
+                        <th>Not for loan</th>
+                        <th>Restricted</th>
+                        <th>Location</th>
+                        <th>Call number</th>
+                        <th>Copy number</th>
+                        <th>Stock number</th>
+                        <th>Collection code</th>
+                        <th>Item type</th>
+                        <th>Materials</th>
+                        <th>Notes</th>
+                    </tr>
+                </thead>
+                <tbody>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <fieldset class="rows" id="itemfieldset">
         <legend>Item</legend>
         [% IF ( NoACQframework ) %]
             <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
         [% END %]
 
-        [% FOREACH item IN items %]
-        <div id="outeritemblock">
-        <div id="itemblock">
-            <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li style="[% iteminformatio.hidden %];">
-                <div class="subfield_line" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
-
-                    <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
-                    [% iteminformatio.marc_value %]
-                    <input type="hidden" name="itemid" value="1" />
-                    <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
-                    <input type="hidden" name="tag" value="[% iteminformatio.tag %]" />
-                    <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
-                    <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
-                    [% IF ( iteminformatio.ITEM_SUBFIELDS_ARE_NOT_REPEATABLE ) %]
-                        <span class="buttonPlus" onclick="CloneSubfield('subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
-                    [% END %]
-
-                </div></li>
-            [% END %]
-            </ol>
-            <a class="addItem" onclick="cloneItemBlock('itemblock[% item.itemBlockIndex %]')">Add</a>
-            <a class="delItem" style="display:none;" onclick="deleteItemBlock('itemblock[% item.itemBlockIndex %]')">Delete</a>
-        </div><!-- /iteminformation -->
-        </div>
+        <div id="outeritemblock"></div>
 
-        [% END %] <!-- /items -->
     </fieldset>
-    [% END %] <!-- items -->
+    [% END %][%# IF (AcqCreateItemOrdering) %]
     <fieldset class="rows">
         <legend>Accounting Details</legend>
         <ol>
@@ -353,9 +351,9 @@ $(document).ready(function()
             <span class="label required">Quantity: </span>
                     <input type="hidden" size="20" name="quantity" value="[% quantity %]" />[% quantity %]
                 [% ELSE %]
-                <label class="required" for="quantity">Quantity: </label>
-                    [% IF ( items ) %]
-                        <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" onchange="calcNeworderTotal();" />
+                    <label class="required" for="quantity">Quantity: </label>
+                    [% IF (AcqCreateItemOrdering) %]
+                        <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="0" onchange="updateCosts();" />
                     [% ELSE %]
                         <input type="text" size="20" id="quantity" name="quantity" value="[% quantityrec %]" onchange="calcNeworderTotal();" />
                     [% END %]
@@ -507,7 +505,12 @@ $(document).ready(function()
 </ol>
     </fieldset>
     <fieldset class="action">
-        <input type="button" value="Save" onclick="Check(this.form)" /> [% IF ( suggestionid ) %]<a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Cancel</a>[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>[% END %]
+        <input type="submit" value="Save" />
+        [% IF (suggestionid) %]
+            <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Cancel</a>
+        [% ELSE %]
+            <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
+        [% END %]
     </fieldset>
 </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index ea422c8..a8361d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -1,7 +1,44 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'additem.js.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/additem.js"> </script>
+<script type="text/javascript">
+//<![CDATA[
+    function Check(form) {
+        [% IF (AcqCreateItemReceiving) %]
+            // Remove last itemblock if it is not in items_list
+            var lastitemblock = $("#outeritemblock > div:last");
+            var tobedeleted = true;
+            var listitems = $("#items_list tr");
+            $(listitems).each(function(){
+                if($(this).attr('idblock') == $(lastitemblock).attr('id')){
+                    tobedeleted = false;
+                }
+            });
+            if(tobedeleted){
+                $(lastitemblock).remove();
+            }
+
+            if(check_additem('[% UniqueItemFields %]') == false){
+                alert(_('Duplicate values detected. Please correct the errors and resubmit.') );
+                if(tobedeleted) {
+                    $(lastitemblock).appendTo("#outeritemblock");
+                }
+                return false;
+            };
+        [% END %]
+
+        return true;
+    }
+
+    $(document).ready(function() {
+        [% IF (AcqCreateItemReceiving) %]
+            cloneItemBlock(0, '[% UniqueItemFields %]');
+        [% END %]
+    });
+//]]>
+</script>
 </head>
 <body>
 [% INCLUDE 'header.inc' %]
@@ -18,10 +55,11 @@
 <h1>Receive items from : [% name %] [% IF ( invoice ) %][[% invoice %]] [% END %] (order #[% ordernumber %])</h1>
 
 [% IF ( count ) %]
-    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
+    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
 <div class="yui-g">
 <div class="yui-u first">
-    
+    <div class="error" style="display:none"></div>
+
     <fieldset class="rows">
     <legend>Catalog Details</legend>
     <ol><li><span class="label">Title: </span><span class="title">[% title |html %]</span></li>
@@ -35,48 +73,48 @@
         [% seriestitle %]</li>
     </ol>
 	</fieldset>
-    [% IF ( items ) %]
-    <fieldset class="rows">
-        <legend>Item</legend>
-        [% IF ( NoACQframework ) %]
-            <p class="required">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</p>
-        [% END %]
+    [% IF (AcqCreateItemReceiving) %]
+        <div id="items_list" style="display:none">
+            <p><b>Items list</b></p>
+            <div style="width:100%;overflow:auto;">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>&nbsp;</th>
+                            <th>&nbsp;</th>
+                            <th>Barcode</th>
+                            <th>Home branch</th>
+                            <th>Holding branch</th>
+                            <th>Not for loan</th>
+                            <th>Restricted</th>
+                            <th>Location</th>
+                            <th>Call number</th>
+                            <th>Copy number</th>
+                            <th>Stock number</th>
+                            <th>Collection code</th>
+                            <th>Item type</th>
+                            <th>Materials</th>
+                            <th>Notes</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
+            </div>
+        </div>
 
-        [% FOREACH item IN items %]
-        <div id="outeritemblock">
-        <div id="itemblock">
-            <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li style="[% iteminformatio.hidden %];">
-                <div class="subfield_line" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
-                                
-                    <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
-                    [% iteminformatio.marc_value %]
-                    <input type="hidden" name="itemid" value="1" />
-                    <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
-                    <input type="hidden" name="tag" value="[% iteminformatio.tag %]" />
-                    <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
-                    <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
-                    [% IF ( iteminformatio.ITEM_SUBFIELDS_ARE_NOT_REPEATABLE ) %]
-                        <span class="buttonPlus" onclick="CloneSubfield('subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
-                    [% END %]
-            
-                </div></li>
+        <fieldset class="rows" id="itemfieldset">
+            <legend>Item</legend>
+            [% IF ( NoACQframework ) %]
+                <p class="required">
+                    No ACQ framework, using default. You should create a
+                    framework with code ACQ, the items framework would be
+                    used
+                </p>
             [% END %]
-            </ol>
-            <a class="addItem" onclick="cloneItemBlock('itemblock[% item.itemBlockIndex %]')">Add</a>
-            <a class="delItem" style="display:none;" onclick="deleteItemBlock('itemblock[% item.itemBlockIndex %]')">Delete</a>
-        </div><!-- /iteminformation -->
-        </div>
-        
-        <input type="hidden" name="moditem" value="" /> 
-        <input type="hidden" name="tag" value="[% item.itemtagfield %]" />
-        <input type="hidden" name="subfield" value="[% item.itemtagsubfield %]" />
-        <input type="hidden" name="serial" value="[% item.serialid %]" />
-        <input type="hidden" name="bibnum" value="[% item.biblionumber %]" />
-        <input type="hidden" name="itemid" value="1" />
-        <input type="hidden" name="field_value" value="[% item.itemnumber %]" />
-        [% END %] <!-- /items -->
-    </fieldset>
-    [% END %] <!-- items -->
+            <div id="outeritemblock"></div>
+        </fieldset>
+    [% END %][%# IF (AcqCreateItemReceiving) %]
     <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
     <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
     <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
@@ -94,12 +132,15 @@
        <li><label for="creator">Created by: </label><span> [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]</span></li>
        <li><label for="quantityto">Quantity to receive: </label><span class="label">
            [% IF ( edit ) %]
-               <input type="text" name="quantity" value="[% quantity %]" />
+               <input type="text" id="quantity_to_receive" name="quantity" value="[% quantity %]" />
            [% ELSE %]
-               <input type="text" READONLY name="quantity" value="[% quantity %]" />
+               <input type="text" readonly="readonly" id="quantity_to_receive" name="quantity" value="[% quantity %]" />
            [% END %]
            </span></li>
         <li><label for="quantity">Quantity received: </label>
+          [% IF (AcqCreateItemReceiving) %]
+            <input readonly="readonly" type="text" size="20" name="quantityrec" id="quantity" value="0" />
+          [% ELSE %]
             [% IF ( quantityreceived ) %]
                 [% IF ( edit ) %]
                     <input type="text" size="20" name="quantityrec" id="quantity" value="[% quantityreceived %]" />
@@ -120,6 +161,7 @@
                 [% END %]
                 <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="0" />
             [% END %]
+          [% END %][%# IF (AcqCreateItemReceiving) %]
 		</li>
         <li><label for="rrp">Replacement cost: </label><input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /></li>
         <li><label for="ecost">Budgeted cost: </label><input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" /></li>
@@ -135,7 +177,8 @@
 
 </div>
 </div><div class="yui-g"><fieldset class="action">
-        <input type="button"  value="Save" onclick="javascript:if(check_additem()) { this.form.submit(); } else { alert( _('Duplicate barcodes detected.  Please correct the errors and resubmit.') ); return false };" /> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?supplierid=[% supplierid %]&amp;invoice=[% invoice %]&amp;gst=[% gst %]&amp;freight=[% freight %]">Cancel</a>
+        <input type="submit"  value="Save" />
+        <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?supplierid=[% supplierid %]&amp;invoice=[% invoice %]&amp;gst=[% gst %]&amp;freight=[% freight %]">Cancel</a>
 </fieldset></div>    </form>
 [% ELSE %]
 <div id="acqui_acquire_orderlist">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index 70e660d..d67954e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -9,6 +9,9 @@ Acquisitions:
               receiving: receiving an order.
               cataloguing: cataloging the record.
     -
+        - pref: UniqueItemFields
+        - (space-separated list of fields that should be unique for items, must be valid SQL fields of items table)
+    -
         - When closing or reopening a basket,
         - pref: BasketConfirmations
           default: 1
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
new file mode 100644
index 0000000..696aca4
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
@@ -0,0 +1,25 @@
+<ol>
+  [% FOREACH iteminfo IN iteminformation %]
+    <li>
+      <div class="subfield_line" style="[% iteminfo.hidden %];" id="subfield[% iteminfo.serialid %][% iteminfo.countitems %][% iteminfo.subfield %][% iteminfo.random %]">
+        <label>
+            [% iteminfo.subfield %] -
+            [% IF ( iteminfo.mandatory ) %]
+                <b>
+            [% END %]
+            [% iteminfo.marc_lib %]
+            [% IF ( iteminfo.mandatory ) %]
+                *</b>
+            [% END %]
+        </label>
+        [% iteminfo.marc_value %]
+        <input type="hidden" name="itemid" value="1" />
+        <input type="hidden" name="kohafield" value="[% iteminfo.kohafield %]" />
+        <input type="hidden" name="tag" value="[% iteminfo.tag %]" />
+        <input type="hidden" name="subfield" value="[% iteminfo.subfield %]" />
+        <input type="hidden" name="mandatory" value="[% iteminfo.mandatory %]" />
+      </div>
+    </li>
+  [% END %]
+</ol>
+
diff --git a/services/itemrecorddisplay.pl b/services/itemrecorddisplay.pl
new file mode 100755
index 0000000..af22c35
--- /dev/null
+++ b/services/itemrecorddisplay.pl
@@ -0,0 +1,58 @@
+#!/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
+
+itemrecorddisplay.pl
+
+=head1 DESCRIPTION
+
+Return a HTML form for Item record modification or creation.
+It uses PrepareItemrecordDisplay
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Biblio;
+
+my $input = new CGI;
+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
+    template_name   => 'services/itemrecorddisplay.tmpl',
+    query           => $input,
+    type            => 'intranet',
+    authnotrequired => 1,
+} );
+
+my $biblionumber = $input->param('biblionumber') || '';
+my $itemnumber = $input->param('itemnumber') || '';
+my $frameworkcode = $input->param('frameworkcode') || '';
+
+my $result = PrepareItemrecordDisplay($biblionumber, $itemnumber, undef, $frameworkcode);
+unless($result) {
+    $result = PrepareItemrecordDisplay($biblionumber, $itemnumber, undef, '');
+}
+
+$template->param(%$result);
+
+output_html_with_http_headers $input, $cookie, $template->output;
+
-- 
1.7.9


From jonathan.druart at biblibre.com  Wed Feb 22 17:25:32 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Wed, 22 Feb 2012 17:25:32 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7298: Export late orders as csv
Message-ID: <1329927932-23388-1-git-send-email-jonathan.druart@biblibre.com>

---
 C4/Acquisition.pm                                  |   33 +++++++--
 acqui/lateorders-excel.pl                          |   65 +++++++++++++++++
 acqui/lateorders.pl                                |    2 +-
 .../prog/en/modules/acqui/lateorders.tt            |   77 +++++++++++++-------
 4 files changed, 141 insertions(+), 36 deletions(-)
 create mode 100755 acqui/lateorders-excel.pl

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 0a96a02..7be1ba6 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -842,17 +842,34 @@ C<$order> are fields from the biblio, biblioitems, aqorders tables of the Koha d
 sub GetOrder {
     my ($ordernumber) = @_;
     my $dbh      = C4::Context->dbh;
-    my $query = "
-        SELECT biblioitems.*, biblio.*, aqorders.*
-        FROM   aqorders
-        LEFT JOIN biblio on           biblio.biblionumber=aqorders.biblionumber
-        LEFT JOIN biblioitems on       biblioitems.biblionumber=aqorders.biblionumber
-        WHERE aqorders.ordernumber=?
-
-    ";
+    my $query = qq{SELECT biblio.*,biblioitems.*,
+                aqorders.*,
+                aqbudgets.*,
+                aqbasket.*,
+                aqorders.rrp              AS unitpricesupplier,
+                aqorders.ecost            AS unitpricelib,
+                aqorders.claims_count     AS claims_count,
+                aqorders.claimed_date     AS claimed_date,
+                aqbudgets.budget_name     AS budget,
+                aqbooksellers.name        AS supplier,
+                aqbooksellers.id          AS supplierid,
+                biblioitems.publishercode AS publisher,
+                ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate,
+                DATE(aqbasket.closedate)  AS orderdate,
+                aqorders.quantity - IFNULL(aqorders.quantityreceived,0)                 AS quantity,
+                (aqorders.quantity - IFNULL(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
+                DATEDIFF(CURDATE( ),closedate) AS latesince
+                FROM aqorders LEFT JOIN biblio ON biblio.biblionumber = aqorders.biblionumber
+                LEFT JOIN biblioitems ON biblioitems.biblionumber = biblio.biblionumber
+                LEFT JOIN aqbudgets ON aqorders.budget_id = aqbudgets.budget_id,
+                aqbasket LEFT JOIN borrowers  ON aqbasket.authorisedby = borrowers.borrowernumber
+                LEFT JOIN aqbooksellers       ON aqbasket.booksellerid = aqbooksellers.id
+                WHERE aqorders.basketno = aqbasket.basketno
+                    AND ordernumber=?};
     my $sth= $dbh->prepare($query);
     $sth->execute($ordernumber);
     my $data = $sth->fetchrow_hashref;
+    $data->{orderdate} = format_date( $data->{orderdate} );
     $sth->finish;
     return $data;
 }
diff --git a/acqui/lateorders-excel.pl b/acqui/lateorders-excel.pl
new file mode 100755
index 0000000..253ec78
--- /dev/null
+++ b/acqui/lateorders-excel.pl
@@ -0,0 +1,65 @@
+#!/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.
+
+use Modern::Perl;
+use CGI;
+use C4::Auth;
+use C4::Serials;
+use C4::Acquisition;
+use C4::Output;
+use C4::Context;
+
+use Text::CSV::Encoded;
+use open qw/ :std :utf8 /;
+
+my $csv = Text::CSV::Encoded->new ({
+        encoding    => undef,
+        quote_char  => '"',
+        escape_char => '"',
+        sep_char    => ',',
+        binary      => 1,
+    });
+
+my $query        = new CGI;
+my @ordernumbers = $query->param('ordernumber');
+
+print $query->header(
+    -type       => 'text/csv',
+    -attachment => "lateorders.csv",
+);
+
+print "LATE ORDERS\n\n";
+print "ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE\n";
+
+for my $ordernumber ( @ordernumbers ) {
+    my $order = GetOrder $ordernumber;
+    $csv->combine(
+        "(" . $$order{supplierid} . ") " . $$order{orderdate} . " (" . $$order{latesince} . " days)",
+        $$order{estimateddeliverydate},
+        $$order{supplier},
+        $$order{title} . ( $$order{author} ? " Author: $$order{author}" : "" ) . ( $$order{publisher} ? " Published by: $$order{publisher}" : "" ),
+        $$order{unitpricesupplier} . "x" . $$order{quantity} . " = " . $$order{subtotal} . " (" . $$order{budget} . ")",
+        $$order{basketname} . " (" . $$order{basketno} . ")",
+        $$order{claims_count},
+        $$order{claimed_date}
+    );
+    my $string = $csv->string;
+    print $string, "\n";
+}
+
+print ",,Total Number Late, " . scalar @ordernumbers . "\n";
+
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 86b1300..cf5a107 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -77,7 +77,7 @@ unless ($delay =~ /^\d{1,3}$/) {
 }
 
 if ($op and $op eq "send_alert"){
-    my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
+    my @ordernums = $input->param("ordernumber");# FIXME: Fallback values?
     my $err;
     eval {
         $err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index cdb8711..5ec0e09 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -5,16 +5,38 @@
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
-    $("input:checkbox[name=claim_for]").click(function(){
+    $("input:checkbox[name=ordernumber]").click(function(){
         var booksellerid = $(this).attr('booksellerid');
-        if ( $("input:checkbox[name=claim_for]:checked").length > 0) {
-            $("input:checkbox[name=claim_for][booksellerid!="+booksellerid+"]").attr('disabled', true);
+        if ( $("input:checkbox[name=ordernumber]:checked").length > 0) {
+            $("input:checkbox[name=ordernumber][booksellerid!="+booksellerid+"]").attr('disabled', true);
         } else {
-            $("input:checkbox[name=claim_for]").attr('disabled', false);
+            $("input:checkbox[name=ordernumber]").attr('disabled', false);
         }
     });
+
+    $("span.exportSelected").html("<a id=\"ExportSelected\" href=\"/cgi-bin/koha/acqui/lateorders.pl\"> "+_("Export selected items data") +"<\/a>");
+
     $('#CheckAll').click(function(){ $("#late_orders td").checkCheckboxes();});
     $('#CheckNone').click(function(){ $("#late_orders td").unCheckCheckboxes();});
+
+    // Generates a dynamic link for exporting the selection's data as CSV
+    $("#ExportSelected").click(function() {
+        var selected = $("input[name='ordernumber']:checked");
+
+        if (selected.length == 0) {
+            alert(_('Please select at least one item to export.'));
+            return false;
+        }
+
+        // Building the url from currently checked boxes
+        var url = '/cgi-bin/koha/acqui/lateorders-excel.pl?op=export';
+        for (var i = 0; i < selected.length; i++) {
+            url += '&amp;ordernumber=' + selected[i].value;
+        }
+        // And redirecting to the CSV page
+        location.href = url;
+        return false;
+    });
 });
 //]]>
 </script>
@@ -59,6 +81,11 @@ $(document).ready(function() {
 	[% END %]
     <table id="late_orders">
         <tr>
+            [% IF Supplier %]
+                <th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
+            [% ELSE %]
+                <th></th>
+            [% END %]
             <th>Order Date</th>
             <th>Vendor</th>
             <th>Information</th>
@@ -66,16 +93,14 @@ $(document).ready(function() {
             <th>Basket</th>
             <th>Claims count</th>
             <th>Claimed date</th>
-            [% IF Supplier %]
-                <th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
-            [% ELSE %]
-                <th></th>
-            [% END %]
         </tr>
     [% FOREACH lateorder IN lateorders %]
         [% UNLESS ( loop.odd ) %]<tr class="highlight">
         [% ELSE %]<tr>[% END %]
             <td>
+                <input type="checkbox" value="[% lateorder.ordernumber %]" booksellerid="[% lateorder.supplierid %]" name="ordernumber">
+            </td>
+            <td>
                 ([% lateorder.supplierid %])
                 [% lateorder.orderdate %]
                 ([% lateorder.latesince %] days)
@@ -107,27 +132,25 @@ $(document).ready(function() {
             </td>
             <td>[% lateorder.claims_count %]</td>
             <td>[% lateorder.claimed_date %]</td>
-            <td>
-                [% UNLESS lateorder.budget_lock %]
-                    <input type="checkbox" class="checkbox" name="claim_for" value="[% lateorder.ordernumber %]"  booksellerid="[% lateorder.supplierid %]"/>
-                [% END %]
-             </td>
-            </td>
         </tr>
         [% END %]
-        <tr> 
-            <th>Total</th>
-            <th colspan="2">&nbsp;</th>
-            <th>[% total %]</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <td>
-                <input type="submit" value="Claim Order" />
-            </td>
-        </tr>
+        <tfoot>
+            <tr>
+                <th>Total</th>
+                <th colspan="3">&nbsp;</th>
+                <th>[% total %]</th>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+            </tr>
+        </tfoot>
     </table>
-     </form>
+    <div class="spacer"></div>
+    <p style="display:block;"><span class="exportSelected"></span></p>
+    [% UNLESS lateorder.budget_lock %]
+        <p style="display:block;"><input type="submit"  value="Claim Order" /></p>
+    [% END %]
+</form>
 [% ELSE %]<p>There are no late orders.</p>
 [% END %]
 </div>
-- 
1.7.7.3


From julian.maurice at biblibre.com  Thu Feb 23 10:41:09 2012
From: julian.maurice at biblibre.com (julian.maurice at biblibre.com)
Date: Thu, 23 Feb 2012 10:41:09 +0100
Subject: [Koha-patches] [SIGNED-OFF] [PATCH] Bug 7579 - Icons for authorized
	values/item types not showing in OPAC
Message-ID: <1329990069-6133-1-git-send-email-julian.maurice@biblibre.com>

From: Kyle M Hall <kyle at bywatersolutions.com>

The functions getitemtypeimagedir and getitemtypeimagesrc
in Koha.pm were using the system preference 'template'
when they should be using 'opacthemes' instead.

Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
---
 C4/Koha.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 976b46a..43bfdf5 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -452,7 +452,7 @@ sub getitemtypeimagedir {
 	if ($src eq 'intranet') {
 		return C4::Context->config('intrahtdocs') . '/' .C4::Context->preference('template') . '/img/itemtypeimg';
 	} else {
-		return C4::Context->config('opachtdocs') . '/' . C4::Context->preference('template') . '/itemtypeimg';
+		return C4::Context->config('opachtdocs') . '/' . C4::Context->preference('opacthemes') . '/itemtypeimg';
 	}
 }
 
@@ -461,7 +461,7 @@ sub getitemtypeimagesrc {
 	if ($src eq 'intranet') {
 		return '/intranet-tmpl' . '/' .	C4::Context->preference('template') . '/img/itemtypeimg';
 	} else {
-		return '/opac-tmpl' . '/' . C4::Context->preference('template') . '/itemtypeimg';
+		return '/opac-tmpl' . '/' . C4::Context->preference('opacthemes') . '/itemtypeimg';
 	}
 }
 
-- 
1.7.9


From julian.maurice at biblibre.com  Thu Feb 23 10:42:15 2012
From: julian.maurice at biblibre.com (julian.maurice at biblibre.com)
Date: Thu, 23 Feb 2012 10:42:15 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 7558: Serial issue note
	doubled up in full history
Message-ID: <1329990135-6187-1-git-send-email-julian.maurice@biblibre.com>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

Removes the note behind the status, because there is a separate column.

To test:
- Add a subscription
- Receive an issue, add a note for it
- Search record in OPAC and check the full history tab for the note

Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
---
 .../prog/en/modules/opac-full-serial-issues.tt     |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
index 0729ea6..2f956e8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
@@ -206,7 +206,6 @@ function showlayer(numlayer){
 			[% IF ( serial.status4 ) %]Missing[% END %]
 			[% IF ( serial.status5 ) %]Not Available[% END %]
 			[% IF ( serial.status7 ) %]Claimed[% END %]
-			[% IF ( serial.notes ) %]([% serial.notes %])[% END %]
 		    </td>
 		    <td class="subscriptionidfilterclass">    [% serial.subscriptionid %]
 		    </td>
-- 
1.7.9


From julian.maurice at biblibre.com  Thu Feb 23 10:42:36 2012
From: julian.maurice at biblibre.com (julian.maurice at biblibre.com)
Date: Thu, 23 Feb 2012 10:42:36 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 7523: Improve checks for
	routing permissions
Message-ID: <1329990156-6248-1-git-send-email-julian.maurice@biblibre.com>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

- system preference RoutingSerials and user permission routing
  should be taken into account
- print routing list should be independent from routing permission

To test, compare to master and check:

1) If system preference RoutingSerials is OFF, routing list functionality is
not visible in the templates.

2) If system preference RoutingSerials is ON, but user doesn't have routing
permission, routing list functionality is not visible in templates,
with exception of 'print list' on the serial collection page.

3) If system preference RoutingSerials is ON and user has routing permissions,
all routing links are visible (serial collection, serials navigation,
result list of serial search)

Additional changes:
Changed labels on templates to match HTML4 rule from coding guidelines.
http://wiki.koha-community.org/wiki/Coding_Guidelines#Upper_and_Lower_cases_in_strings

Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
---
 .../prog/en/includes/serials-menu.inc              |   14 ++++----
 .../prog/en/modules/serials/routing-preview.tt     |    4 +-
 .../prog/en/modules/serials/serials-collection.tt  |   30 +++++++++++--------
 .../prog/en/modules/serials/serials-edit.tt        |   10 +++---
 .../prog/en/modules/serials/serials-home.tt        |   28 +++++++++---------
 serials/routing-preview.pl                         |    4 +-
 serials/serials-collection.pl                      |    1 +
 serials/subscription-detail.pl                     |    1 +
 8 files changed, 49 insertions(+), 43 deletions(-)

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 b54c842..0feafda 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
@@ -1,13 +1,13 @@
 [% IF ( subscriptionid ) %]
 <ul>
-<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial Collection</a></li>
-	[% IF ( CAN_user_serials_routing ) %]
+<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial collection</a></li>
+    [% 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/routing.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>
-		[% END %]
-	[% END %]
+            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
+        [% END %]
+    [% END %]
 </ul>
 [% END %]
 
@@ -16,6 +16,6 @@
 	<li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
     [% END %]
     [% IF ( CAN_user_serials_check_expiration ) %]
-	<li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a></li>
+	<li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Check expiration</a></li>
     [% END %]
 </ul>
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
index 2cc1936..b48e902 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
@@ -24,14 +24,14 @@ function print_slip(subscriptionid,issue){
 	<div id="yui-main">
 	<div class="yui-b">
 
-<h2>Preview Routing List for <i>[% title |html %]</i></h2>
+<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;">
+		<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>
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 7b8efef..1db30c1 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
@@ -64,7 +64,7 @@ $(document).ready(function() {
 [% UNLESS ( popup ) %]
 	[% INCLUDE 'serials-toolbar.inc' %]
 
-	<h1>Serial Collection information for  <i>[% bibliotitle %]</i>
+	<h1>Serial collection information for  <i>[% bibliotitle %]</i>
         [% IF location %] ([% location %] ) [% END %]
 		[% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]</h1>
 [% END %]
@@ -72,18 +72,18 @@ $(document).ready(function() {
 [% IF ( subscriptions ) %]
 <table>
 [% IF ( subscriptions.size == 1 ) %]
-<caption> Subscription Summary</caption>
+<caption> Subscription summary</caption>
 [% ELSE %]
-<caption> Subscription Summaries</caption>
+<caption> Subscription summaries</caption>
 [% END %]
 <tr>
-  <th>Subscription Num. </th>
+  <th>Subscription num. </th>
   <th>Frequency</th>
   <th>Numbering pattern</th>
   <th>Library</th>
   <th>Call number</th>
   <th>Notes</th>
-  <th>Routing</th>
+  [% IF ( routing && CAN_user_serials_routing ) %]<th>Routing</th>[% END %]
   <th>Renew</th>
 </tr>
 [% FOREACH subscription IN subscriptions %]
@@ -146,10 +146,14 @@ $(document).ready(function() {
                 [% END %]</td>
             <td> [% subscription.branchcode %]</td>
             <td> [% subscription.callnumber %]</td>
-        <td> [% subscription.notes %]        [% IF ( subscription.subscriptionexpired ) %]<br /><span class="problem"> Subscription Expired</span>
+        <td> [% subscription.notes %]        [% IF ( subscription.subscriptionexpired ) %]<br /><span class="problem"> Subscription expired</span>
         [% END %]
         </td>
-			<td><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit Routing List</a></td>
+        [% IF ( routing && CAN_user_serials_routing ) %]
+        <td>
+            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
+        </td>
+        [% END %]
         [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
         [% ELSE %]
         [% IF ( subscription.subscriptionexpired ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
@@ -199,9 +203,7 @@ $(document).ready(function() {
                 </th>
                 <th>Branch
                 </th>
-		<th>Routing
-		</th>
-
+                [% IF ( routing ) %]<th>Routing</th>[% END %]
                 [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
             </tr>
       [% FOREACH serial IN year.serials %]
@@ -227,9 +229,11 @@ $(document).ready(function() {
                 <td>
                     [% serial.branchcode %]
                 </td>
-		<td>
-		   <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %]'); return false" >Print list</a>
-		</td>
+                [% IF ( routing ) %]
+                <td>
+                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %]'); return false" >Print list</a>
+                </td>
+                [% END %]
             [% IF ( CAN_user_serials_receive_serials ) %]
                 <td>
                   [% IF ( serial.cannotedit ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index f82f791..083580b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -431,12 +431,12 @@ $(document).ready(function() {
 [% INCLUDE 'serials-menu.inc' %]
 <ul>
     [% FOREACH subscription IN subscriptions %]
-    
-	<li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]" title="serial collection for [% subscription.bibliotitle %]">Serial collection</a></li>
-	<li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid %]</a></li>
-        [% IF ( subscription.abouttoexpire ) %]<a href="#" onclick="javascript:popup([% subscription.subscriptionid %])">Renew [% subscription.subscriptionid %]</a>
+        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]" title="serial collection for [% subscription.bibliotitle %]">Serial collection #[% subscription.subscriptionid %]</a></li>
+        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid %]</a></li>
+        [% IF ( subscription.abouttoexpire ) %]
+            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid %])">Renew #[% subscription.subscriptionid %]</a></li>
         [% END %]
-      [% END %]
+    [% END %]
     <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% biblionumber %]" title="go to [% bibliotitle %]">Show Biblio</a></li></ul>
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
index ec1faf3..8c50a17 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
@@ -84,9 +84,9 @@ Serials updated :
             <th>Title</th>
             <th> Notes </th>
             <th>
-                Library (Callnumber)
+                Library (callnumber)
             </th>
-            [% IF ( routing ) %]
+            [% IF ( routing && CAN_user_serials_routing ) %]
               <th>Routing list</th>
             [% END %]        
             <th>&nbsp;</th>
@@ -99,7 +99,7 @@ Serials updated :
             <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
             <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
             <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
-            <td></td>
+            [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %]
             <td></td>
             <td></td>
         </tr>
@@ -120,20 +120,20 @@ Serials updated :
                 [% IF ( subscription.branchcode ) %][% subscription.branchcode %][% END %]
                 [% IF ( subscription.callnumber ) %]([% subscription.callnumber %])[% END %]
                 </td>
-                [% IF ( routing ) %]
+                [% IF ( routing && CAN_user_serials_routing ) %]
                 <td>
-                [% IF ( subscription.cannotedit ) %]
-                  &nbsp;        
-                [% ELSE %]
-                    [% IF ( subscription.routingedit ) %]
-                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
-                	[% ELSE %]
-						<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
-					[% END %]
-                [% END %]
+                    [% IF ( subscription.cannotedit ) %]
+                        &nbsp;        
+                    [% ELSE %]
+                        [% IF ( subscription.routingedit ) %]
+                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
+                        [% ELSE %]
+                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
+                        [% END %]
+                    [% END %]
                 </td>
                 [% END %]
-                <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue History</a>
+                <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
                 </td>
                 <td>
                 [% IF ( subscription.cannotedit ) %]
diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 6746f53..6c8f184 100755
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -99,7 +99,7 @@ if($ok){
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {serials => 'routing'},
+				flagsrequired => {serials => '*'},
 				debug => 1,
 				});
     $template->param("libraryname"=>$branchname);
@@ -109,7 +109,7 @@ if($ok){
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {serials => 'routing'},
+				flagsrequired => {serials => '*'},
 				debug => 1,
 				});
 }
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 4fe55f0..7453e86 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -158,6 +158,7 @@ $template->param(
           bibliotitle => $title,
           suggestion => C4::Context->preference("suggestion"),
           virtualshelves => C4::Context->preference("virtualshelves"),
+          routing => C4::Context->preference("RoutingSerials"),
           subscr=>$query->param('subscriptionid'),
           subscriptioncount => $subscriptioncount,
     location	       => $locationlib,
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 0b6d35a..afe633e 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -124,6 +124,7 @@ $template->param(
 	subscriptionid => $subscriptionid,
     serialslist => \@serialslist,
     hasRouting  => $hasRouting,
+    routing => C4::Context->preference("RoutingSerials"),
     totalissues => $totalissues,
     hemisphere => $hemisphere,
     cannotedit =>(C4::Context->preference('IndependantBranches') &&
-- 
1.7.9


From cnighswonger at foundations.edu  Thu Feb 23 16:30:53 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 23 Feb 2012 10:30:53 -0500
Subject: [Koha-patches] [PATCH] Bug 7585 - Correct MARC 008 Value Builder
	Char 06 Default
Message-ID: <1330011053-30390-1-git-send-email-cnighswonger@foundations.edu>

This patch changes the default value of the 06 char in 008
from 't' to 'b.' This change allows for a valid 008 field
if no dates are entered in 07-14.

To test:

1. Create a new MARC record (prior to patch application).
2. Click on the 008 field to auto-populate.
3. Note that the 06 char is 't'.
4. Apply patch.
5. Create a new MARC record.
6. Click on the 008 field to auto-populate.
7. Note that the 06 char is now 'b'.
---
 cataloguing/value_builder/marc21_field_008.pl |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index 5b8a7e5..bb7e7ee 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -58,7 +58,7 @@ function Focus$function_name(subfield_managed) {
 	if ( document.getElementById(\"$field_number\").value ) {
 	}
 	else {
-		document.getElementById(\"$field_number\").value='$dateentered' + 't        xxu||||| |||| 00| 0 eng d';
+		document.getElementById(\"$field_number\").value='$dateentered' + 'b        xxu||||| |||| 00| 0 eng d';
 	}
     return 1;
 }
@@ -96,8 +96,7 @@ sub plugin {
         }
     );
 
-    #	$result = "      t        xxu           00  0 eng d" unless $result;
-    $result = "$dateentered" . "t        xxu||||| |||| 00| 0 eng d" unless $result;
+    $result = "$dateentered" . "b        xxu||||| |||| 00| 0 eng d" unless $result;
     my $errorXml = '';
     # Check if the xml, xsd exists and is validated
     my $dir = C4::Context->config('intrahtdocs') . '/prog/' . $template->{lang} . '/modules/cataloguing/value_builder/';
-- 
1.7.0.4


From gcollum at gmail.com  Sat Feb 25 21:18:38 2012
From: gcollum at gmail.com (Garry Collum)
Date: Sat, 25 Feb 2012 15:18:38 -0500
Subject: [Koha-patches] [PATCH] Bug 7517: Revised Patch. Patron category
	types not displaying <optgroup> in dropdown.
Message-ID: <1330201118-1304-1-git-send-email-gcollum@gmail.com>

The patron category drop-down box does not display the general category groups as it once did.  This patch fixes the display of the optgroups.

To test. Before applying the patch, go to a patron record.  Edit the patron. Select the category drop-down in Library Management to see if the general categories appear. After the patch is applied the dropdown will show the categories.  'Child' - child categories, 'Adult' - adult categories, etc.

Fixes XHTML errors.
1. Invalid end tag for cardnumber input.
2. Extra quote in textarea.
3. The label for debarredcomment did not have a corresponding id.  There are two instances of this id field because of an 'IF' statement, this patch failed QA in the prior patch because only one of these ids was changed.
---
 .../prog/en/modules/members/memberentrygen.tt      |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 7377ec6..ca158fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -176,7 +176,7 @@
 [% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 %]
 [%# Only put the cardnumber if we arent showing it in the form later %]
 [% IF cardnumber %]
-<input type="hidden" name="cardnumber" value="[% cardnumber %]">
+<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
 [% END %]
 [% END %]
 [% END %]
@@ -992,12 +992,12 @@
         [% FOREACH typeloo IN typeloop %]
 			[% FOREACH categoryloo IN typeloo.categoryloop %]
 				[% IF ( loop.first ) %]
-					[% IF ( categoryloo.typename_C ) %]<optgroup label="Child">[% END %]
-					[% IF ( categoryloo.typename_A ) %]<optgroup label="Adult">[% END %]
-					[% IF ( categoryloo.typename_S ) %]<optgroup label="Staff">[% END %]
-					[% IF ( categoryloo.typename_I ) %]<optgroup label="Organization">[% END %]
-					[% IF ( categoryloo.typename_P ) %]<optgroup label="Professional">[% END %]
-					[% IF ( categoryloo.typename_X ) %]<optgroup label="Statistical">[% END %]
+					[% IF ( typeloo.typename_C ) %]<optgroup label="Child">[% END %]
+					[% IF ( typeloo.typename_A ) %]<optgroup label="Adult">[% END %]
+					[% IF ( typeloo.typename_S ) %]<optgroup label="Staff">[% END %]
+					[% IF ( typeloo.typename_I ) %]<optgroup label="Organization">[% END %]
+					[% IF ( typeloo.typename_P ) %]<optgroup label="Professional">[% END %]
+					[% IF ( typeloo.typename_X ) %]<optgroup label="Statistical">[% END %]
 			    [% END %]
 				[% IF ( categoryloo.categorycodeselected ) %]
                <option value="[% categoryloo.categorycode %]" selected="selected">[% categoryloo.categoryname %]</option>
@@ -1307,9 +1307,9 @@
 				<br />
 				<label for="datedebarred" class="radio">until:</label> 
 				[% IF opduplicate %]
-				    <input type="text" name="datedebarred" id="debarred" class="debarred" value="[% datedebarred %]" onclick="this.value=''" />
+				    <input type="text" name="datedebarred" id="datedebarred" class="debarred" value="[% datedebarred %]" onclick="this.value=''" />
 				[% ELSE %]
-				    <input type="text" name="datedebarred" id="debarred" class="debarred" value="[% datedebarred %]" />
+				    <input type="text" name="datedebarred" id="datedebarred" class="debarred" value="[% datedebarred %]" />
 				[% END %]
 				<img src="[% themelang %]/lib/calendar/cal.gif" id="debarred_button" alt="Show Calendar" />
 		         <script language="JavaScript" type="text/javascript">
@@ -1326,7 +1326,7 @@
 			       [% IF ( opduplicate ) %] 
 			           <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
 			       [% ELSE %]
-				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" ">[% debarredcomment %]</textarea> 
+				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea> 
 			       [% END %]
 	        </li>
 
-- 
1.7.5.4


From alex.arnaud at biblibre.com  Mon Feb 27 11:49:40 2012
From: alex.arnaud at biblibre.com (alex.arnaud at biblibre.com)
Date: Mon, 27 Feb 2012 11:49:40 +0100
Subject: [Koha-patches] [PATCH] Bug 6919 - Follow up - call to
	XSLTParse4Display is now made twice in Search.pm
Message-ID: <1330339780-6231-1-git-send-email-alex.arnaud@biblibre.com>

From: Alex Arnaud <alex.arnaud at biblibre.com>

---
 C4/Search.pm |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 77a2aac..60635a3 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1783,7 +1783,7 @@ sub searchResults {
 	my $interface = $search_context eq 'opac' ? 'OPAC' : '';
 	if (!$scan && C4::Context->preference($interface . "XSLTResultsDisplay")) {
             $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, 'Results',
-                                                                $search_context, 1);
+                                                                $search_context, 1, \@hiddenitems);
 	    # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs
         }
 
@@ -1842,23 +1842,6 @@ sub searchResults {
             $oldbiblio->{'alternateholdings_count'} = $alternateholdingscount;
         }
 
-       # XSLT processing of some stuff
-        if (!$scan && $search_context eq 'opac' && C4::Context->preference("OPACXSLTResultsDisplay")) {
-            SetUTF8Flag($marcrecord);
-            $debug && warn $marcrecord->as_formatted;
-            # FIXME note that XSLTResultsDisplay (use of XSLT to format staff interface bib search results)
-            # is not implemented yet
-            $oldbiblio->{XSLTResultsRecord}
-              = XSLTParse4Display($oldbiblio->{biblionumber},
-                                  $marcrecord,
-                                  'Results',
-                                  $search_context,
-                                  1, # clean up the problematic ampersand entities that Zebra outputs
-                                  \@hiddenitems
-                                );
-
-        }
-
         push( @newresults, $oldbiblio );
     }
 
-- 
1.7.0.4


From stephane.delaune at biblibre.com  Mon Feb 27 14:46:37 2012
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Mon, 27 Feb 2012 14:46:37 +0100
Subject: [Koha-patches] [PATCH] Bug 4032:XSLT systempreference takes a path
	to file rather than YesNo
Message-ID: <1330350397-6564-1-git-send-email-stephane.delaune@biblibre.com>

---
 C4/Search.pm                                       |    3 +-
 C4/VirtualShelves/Page.pm                          |    2 +-
 C4/XSLT.pm                                         |   80 ++++++++++++++-----
 catalogue/detail.pl                                |    2 +-
 installer/data/mysql/sysprefs.sql                  |    8 +-
 installer/data/mysql/updatedatabase.pl             |   30 +++++++
 .../prog/en/modules/admin/preferences/opac.pref    |   14 ++--
 .../en/modules/admin/preferences/staff_client.pref |   14 ++--
 opac/opac-detail.pl                                |    2 +-
 9 files changed, 109 insertions(+), 46 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 60635a3..64133bc 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1782,8 +1782,7 @@ sub searchResults {
 	$debug && warn $marcrecord->as_formatted;
 	my $interface = $search_context eq 'opac' ? 'OPAC' : '';
 	if (!$scan && C4::Context->preference($interface . "XSLTResultsDisplay")) {
-            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, 'Results',
-                                                                $search_context, 1, \@hiddenitems);
+            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, $interface."XSLTResultsDisplay", 1, \@hiddenitems);
 	    # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs
         }
 
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 7cab246..45ae5ff 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -216,7 +216,7 @@ sub shelfpage ($$$$$) {
                     my $biblionumber = $this_item->{'biblionumber'};
                     my $record = GetMarcBiblio($biblionumber);
                     $this_item->{XSLTBloc} =
-                        XSLTParse4Display($biblionumber, $record, 'Results', 'opac')
+                        XSLTParse4Display($biblionumber, $record, "OPACXSLTResultsDisplay")
                             if C4::Context->preference("OPACXSLTResultsDisplay") && $type eq 'opac';
 
                     # the virtualshelfcontents table does not store these columns nor are they retrieved from the items
diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 06dfaf4..31039a5 100644
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -3,6 +3,7 @@ package C4::XSLT;
 # <jmf at liblime dot com>
 # Parts Copyright Katrin Fischer 2011
 # Parts Copyright ByWater Solutions 2011
+# Parts Copyright Biblibre 2012
 #
 # This file is part of Koha.
 #
@@ -32,6 +33,7 @@ use C4::Reserves;
 use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
+use LWP::Simple;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -41,6 +43,7 @@ BEGIN {
     @ISA = qw(Exporter);
     @EXPORT = qw(
         &XSLTParse4Display
+        &GetURI
     );
 }
 
@@ -50,6 +53,19 @@ C4::XSLT - Functions for displaying XSLT-generated content
 
 =head1 FUNCTIONS
 
+=head2 GetURI
+
+GetURI file and returns the xslt as a string
+
+=cut
+
+sub GetURI {
+    my ($uri) = @_;
+    my $string;
+    $string = get $uri ;
+    return $string;
+}
+
 =head2 transformMARCXML4XSLT
 
 Replaces codes with authorized values in a MARC::Record object
@@ -121,8 +137,39 @@ sub getAuthorisedValues4MARCSubfields {
 my $stylesheet;
 
 sub XSLTParse4Display {
-    my ( $biblionumber, $orig_record, $xsl_suffix, $interface, $fixamps, $hidden_items ) = @_;
-    $interface = 'opac' unless $interface;
+    my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items ) = @_;
+    my $xslfilename = C4::Context->preference($xslsyspref);
+    if ( $xslfilename =~ /^\s*"?default"?\s*$/i ) {
+        if ($xslsyspref eq "XSLTDetailsDisplay") {
+            $xslfilename = C4::Context->config('intrahtdocs') .
+                        '/' . C4::Context->preference("template") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2intranetDetail.xsl";
+        } elsif ($xslsyspref eq "XSLTResultsDisplay") {
+            $xslfilename = C4::Context->config('intrahtdocs') .
+                        '/' . C4::Context->preference("template") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2intranetResults.xsl";
+        } elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {
+            $xslfilename = C4::Context->config('opachtdocs') .
+                        '/' . C4::Context->preference("opacthemes") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2OPACDetail.xsl";
+        } elsif ($xslsyspref eq "OPACXSLTResultsDisplay") {
+            $xslfilename = C4::Context->config('opachtdocs') .
+                        '/' . C4::Context->preference("opacthemes") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2OPACResults.xsl";
+        }
+    }
     # grab the XML, run it through our stylesheet, push it out to the browser
     my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
     #return $record->as_formatted();
@@ -153,29 +200,20 @@ sub XSLTParse4Display {
     # don't die when you find &, >, etc
     $parser->recover_silently(0);
     my $source = $parser->parse_string($xmlrecord);
-    unless ( $stylesheet ) {
+    unless ( $stylesheet->{$xslfilename} ) {
         my $xslt = XML::LibXSLT->new();
-        my $xslfile;
-        if ($interface eq 'intranet') {
-            $xslfile = C4::Context->config('intrahtdocs') . 
-                      '/' . C4::Context->preference("template") . 
-                      '/' . C4::Templates::_current_language() .
-                      '/xslt/' .
-                      C4::Context->preference('marcflavour') .
-                      "slim2intranet$xsl_suffix.xsl";
+        my $style_doc;
+        if ( $xslfilename =~ /^https?:\/\// ) {
+            my $xsltstring = GetURI($xslfilename);
+            $style_doc = $parser->parse_string($xsltstring);
         } else {
-            $xslfile = C4::Context->config('opachtdocs') . 
-                      '/' . C4::Context->preference("opacthemes") . 
-                      '/' . C4::Templates::_current_language() .
-                      '/xslt/' .
-                      C4::Context->preference('marcflavour') .
-                      "slim2OPAC$xsl_suffix.xsl";
+            use Cwd;
+            $style_doc = $parser->parse_file($xslfilename);
         }
-        my $style_doc = $parser->parse_file($xslfile);
-        $stylesheet = $xslt->parse_stylesheet($style_doc);
+        $stylesheet->{$xslfilename} = $xslt->parse_stylesheet($style_doc);
     }
-    my $results = $stylesheet->transform($source);
-    my $newxmlrecord = $stylesheet->output_string($results);
+    my $results      = $stylesheet->{$xslfilename}->transform($source);
+    my $newxmlrecord = $stylesheet->{$xslfilename}->output_string($results);
     return $newxmlrecord;
 }
 
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index db38551..219d0f5 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -84,7 +84,7 @@ my $marcflavour  = C4::Context->preference("marcflavour");
 # XSLT processing of some stuff
 if (C4::Context->preference("XSLTDetailsDisplay") ) {
     $template->param('XSLTDetailsDisplay' =>'1',
-        'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail','intranet') );
+        'XSLTBloc' => XSLTParse4Display($biblionumber, $record, "XSLTDetailsDisplay") );
 }
 
 $template->param( 'SpineLabelShowPrintOnBibDetails' => C4::Context->preference("SpineLabelShowPrintOnBibDetails") );
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 0cc79b2..88b6eea 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -218,10 +218,10 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
 
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OPACShelfBrowser','1','','Enable/disable Shelf Browser on item details page. WARNING: this feature is very resource consuming on collections with large numbers of items.','YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
-('OPACXSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC','YesNo'),
-('OPACXSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC','YesNo'),
-('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),
-('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');
+('OPACXSLTDetailsDisplay','','','Enable XSL stylesheet control over details page display on OPAC','Free'),
+('OPACXSLTResultsDisplay','','','Enable XSL stylesheet control over results page display on OPAC','Free'),
+('XSLTDetailsDisplay','','','Enable XSL stylesheet control over details page display on intranet','Free'),
+('XSLTResultsDisplay','','','Enable XSL stylesheet control over results page display on intranet','Free');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index d2d9d97..2fa2718 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4712,6 +4712,36 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    my $countXSLTDetailsDisplay = 0;
+    my $valueXSLTDetailsDisplay = "";
+    my $valueXSLTResultsDisplay = "";
+    my $valueOPACXSLTDetailsDisplay = "";
+    my $valueOPACXSLTResultsDisplay = "";
+    #the line below test if database comes from a BibLibre's branch
+    $countXSLTDetailsDisplay = $dbh->do('SELECT 1 FROM `systempreferences` WHERE `variable`="IntranetXSLTDetailsDisplay"');
+    if ($countXSLTDetailsDisplay > 0)
+    {
+        #the two lines below will only be used to update the databases from the BibLibre's branch. They will not affect the others
+        $dbh->do(q|UPDATE `systempreferences` SET `variable`="XSLTDetailsDisplay" WHERE `variable`="IntranetXSLTDetailsDisplay"|);
+        $dbh->do(q|UPDATE `systempreferences` SET `variable`="XSLTResultsDisplay" WHERE `variable`="IntranetXSLTResultsDisplay"|);
+    }
+    else
+    {
+        $valueXSLTDetailsDisplay = "default" if (C4::Context->preference("XSLTDetailsDisplay"));
+        $valueXSLTResultsDisplay = "default" if (C4::Context->preference("XSLTResultsDisplay"));
+        $valueOPACXSLTDetailsDisplay = "default" if (C4::Context->preference("OPACXSLTDetailsDisplay"));
+        $valueOPACXSLTResultsDisplay = "default" if (C4::Context->preference("OPACXSLTResultsDisplay"));
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueXSLTDetailsDisplay\" WHERE variable='XSLTDetailsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueXSLTResultsDisplay\" WHERE variable='XSLTResultsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTDetailsDisplay\" WHERE variable='OPACXSLTDetailsDisplay'");
+        $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTResultsDisplay\" WHERE variable='OPACXSLTResultsDisplay'");
+    }
+    print "XSLT systempreference takes a path to file rather than YesNo\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 24856b8..f653c54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -48,17 +48,15 @@ OPAC:
                   no: Show
             - lost items on search and detail pages.
         -
-            - Show biblio records on OPAC result page
+            - 'Display OPAC results using XSLT stylesheet at: '
             - pref: OPACXSLTResultsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
+            - '<br />Options:<br />- leave empty for "no xslt"<br />- enter "default" for the default one<br />- put a path to define a xslt file<br />- put an URL for an external specific stylesheet.'
         -
-            - Show item details pages on the OPAC
+            - 'Display OPAC details using XSLT stylesheet at: '
             - pref: OPACXSLTDetailsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
+            - '<br />Options:<br />- leave empty for "no xslt"<br />- enter "default" for the default one<br />- put a path to define a xslt file<br />- put an URL for an external specific stylesheet.'
         -
             - On pages displayed with XSLT stylesheets on the OPAC,
             - pref: DisplayOPACiconsXSLT
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
index df0a434..008ef5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
@@ -51,17 +51,15 @@ Staff Client:
               class: url
             - for the Staff Client's favicon. (This should be a complete URL, starting with <code>http://</code>.)
         -
-            - Show biblio records on result page in the staff client
+            - 'Display results in the staff client using XSLT stylesheet at: '
             - pref: XSLTResultsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
+            - '<br />Options:<br />- leave empty for "no xslt"<br />- enter "default" for the default one<br />- put a path to define a xslt file<br />- put an URL for an external specific stylesheet.'
         -
-            - Show item details pages in the staff client
+            - 'Display details in the staff client using XSLT stylesheet at: '
             - pref: XSLTDetailsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
+              class: file
+            - '<br />Options:<br />- leave empty for "no xslt"<br />- enter "default" for the default one<br />- put a path to define a xslt file<br />- put an URL for an external specific stylesheet.'
         -
             - Use the Yahoo UI libraries
             - pref: yuipath
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 27684d4..d7a116e 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -91,7 +91,7 @@ SetUTF8Flag($record);
 
 # XSLT processing of some stuff
 if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
-    $template->param( 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail', 'opac') );
+    $template->param( 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, "OPACXSLTDetailsDisplay" ) );
 }
 
 
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Tue Feb 28 01:31:48 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue, 28 Feb 2012 10:31:48 +1000
Subject: [Koha-patches] [PATCH] bug_7264: Added opac_info field to branches
	table.
Message-ID: <4F4C2074.9040302@catalyst.net.nz>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-bug_7264-Added-opac_info-field-to-branches-table.patch
Type: text/x-patch
Size: 16271 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20120228/d8d8613c/attachment-0001.bin>

From cnighswonger at foundations.edu  Wed Feb 29 01:28:19 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Tue, 28 Feb 2012 19:28:19 -0500
Subject: [Koha-patches] [PATCH] Bug 7615 - Give option to use description
	for homebranch/holding branch in label creator instead of the
	branchcode
Message-ID: <1330475299-887-1-git-send-email-cnighswonger@foundations.edu>

This patch adds the ability to print the name of the item's homebranch on labels

Thanks to Shane Sammons <ssammons-at-npelem.com> for the modified SQL SELECT statement.

Document Manager: The documentation will need to be updated to reflect the added field 'branchname' to the list
of available fields for label printing.

To test:

1. Create a new label layout or modify an existing one to include 'branchname'
2. Create a new label batch or using an existing one, export the batch.
3. Verify that the resulting labels contain the home branch name for the respective items.
---
 C4/Labels/Label.pm         |    7 ++++---
 labels/label-create-pdf.pl |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm
index 0aec0a6..d1ab98a 100644
--- a/C4/Labels/Label.pm
+++ b/C4/Labels/Label.pm
@@ -78,7 +78,7 @@ sub _get_label_item {
 #        FIXME This makes for a very bulky data structure; data from tables w/duplicate col names also gets overwritten.
 #        Something like this, perhaps, but this also causes problems because we need more fields sometimes.
 #        SELECT i.barcode, i.itemcallnumber, i.itype, bi.isbn, bi.issn, b.title, b.author
-    my $sth = $dbh->prepare("SELECT bi.*, i.*, b.* FROM items AS i, biblioitems AS bi ,biblio AS b WHERE itemnumber=? AND i.biblioitemnumber=bi.biblioitemnumber AND bi.biblionumber=b.biblionumber;");
+    my $sth = $dbh->prepare("SELECT bi.*, i.*, b.*,br.* FROM items AS i, biblioitems AS bi ,biblio AS b, branches AS br WHERE itemnumber=? AND i.biblioitemnumber=bi.biblioitemnumber AND bi.biblionumber=b.biblionumber AND i.homebranch=br.branchcode;");
     $sth->execute($item_number);
     if ($sth->err) {
         warn sprintf('Database returned the following error: %s', $sth->errstr);
@@ -185,7 +185,8 @@ sub _get_barcode_data {
         (
             @{ $kohatables->{'biblio'} },
             @{ $kohatables->{'biblioitems'} },
-            @{ $kohatables->{'items'} }
+            @{ $kohatables->{'items'} },
+            @{ $kohatables->{'branches'} }
         )
     );
     FIELD_LIST:
@@ -249,7 +250,7 @@ sub _get_barcode_data {
 sub _desc_koha_tables {
 	my $dbh = C4::Context->dbh();
 	my $kohatables;
-	for my $table ( 'biblio','biblioitems','items' ) {
+	for my $table ( 'biblio','biblioitems','items','branches' ) {
 		my $sth = $dbh->column_info(undef,undef,$table,'%');
 		while (my $info = $sth->fetchrow_hashref()){
 		        push @{$kohatables->{$table}} , $info->{'COLUMN_NAME'} ;
diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl
index 106b37d..6d32c6c 100755
--- a/labels/label-create-pdf.pl
+++ b/labels/label-create-pdf.pl
@@ -29,7 +29,7 @@ use C4::Labels 1.000000;
 
 my $cgi = new CGI;
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
+my ( undef, $loggedinuser, $cookie ) = get_template_and_user({
 								     template_name   => "labels/label-home.tt",
 								     query           => $cgi,
 								     type            => "intranet",
-- 
1.7.0.4


From srdjan at catalyst.net.nz  Wed Feb 29 02:07:25 2012
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed, 29 Feb 2012 14:07:25 +1300
Subject: [Koha-patches] [PATCH] bug_7001: Added TRANSFERSLIP to the letters
In-Reply-To: <bug 7001>
References: <bug 7001>
Message-ID: <1330477645-12924-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Circulation.pm                                  |   30 ++++++++++++++++
 circ/transfer-slip.pl                              |   32 ++++++++++-------
 .../data/mysql/en/mandatory/sample_notices.sql     |   36 ++++++++++++--------
 installer/data/mysql/updatedatabase.pl             |   13 ++++++-
 4 files changed, 83 insertions(+), 28 deletions(-)
 mode change 100755 => 100644 installer/data/mysql/updatedatabase.pl

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index a62f26e..1ee0c34 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -99,6 +99,7 @@ BEGIN {
                 &IsBranchTransferAllowed
                 &CreateBranchTransferLimit
                 &DeleteBranchTransferLimits
+        &TransferSlip
 	);
 }
 
@@ -3036,6 +3037,35 @@ sub LostItem{
 }
 
 
+=head2 ReserveSlip
+
+  ReserveSlip($branchcode, $borrowernumber, $biblionumber)
+
+  Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef
+
+=cut
+
+sub TransferSlip {
+    my ($branch, $itemnumber, $to_branch) = @_;
+
+    my $item =  GetItem( $itemnumber )
+      or return;
+
+    my $pulldate = C4::Dates->new();
+
+    return C4::Letters::GetPreparedLetter (
+        module => 'circulation',
+        letter_code => 'TRANSFERSLIP',
+        branchcode => $branch,
+        tables => {
+            'branches'    => $to_branch,
+            'biblio'      => $item->{biblionumber},
+            'items'       => $item,
+        },
+    );
+}
+
+
 1;
 
 __END__
diff --git a/circ/transfer-slip.pl b/circ/transfer-slip.pl
index f054ca4..c8e97a0 100755
--- a/circ/transfer-slip.pl
+++ b/circ/transfer-slip.pl
@@ -24,11 +24,8 @@ use warnings;
 use C4::Context;
 use C4::Output;
 use CGI;
-use C4::Auth;
-use C4::Biblio;
-use C4::Items;
-use C4::Branch;
-use C4::Dates qw/format_date format_date_in_iso/;
+use C4::Auth qw/:DEFAULT get_session/;
+use C4::Circulation;
 
 use vars qw($debug);
 
@@ -37,12 +34,15 @@ BEGIN {
 }
 
 my $input = new CGI;
+my $sessionID = $input->cookie("CGISESSID");
+my $session = get_session($sessionID);
+
 my $itemnumber = $input->param('transferitem');
 my $branchcode = $input->param('branchcode');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/transfer-slip.tmpl",
+        template_name   => "circ/printslip.tmpl",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -51,15 +51,21 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $pulldate = C4::Dates->new();
-my $item =  GetItem( $itemnumber );
-my ( undef, $biblio ) = GetBiblio($item->{biblionumber});
 
+my $userenv = C4::Context->userenv;
+my ($slip, $is_html);
+if ( my $letter = TransferSlip ($session->param('branch') || $userenv->{branch}, $itemnumber, $branchcode) ) {
+    $slip = $letter->{content};
+    $is_html = $letter->{is_html};
+}
+else {
+    $slip = "Item not found";
+}
 $template->param(
-    pulldate => $pulldate->output(),
-    branchname => GetBranchName($branchcode),
-    biblio => $biblio,
-    item => $item,
+    slip => $slip,
+    plain => !$is_html,
+    title => "Koha -- Circulation: Transfers",
+    stylesheet => C4::Context->preference("SlipCSS"),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
index a600373..f5015bf 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -70,8 +70,6 @@ Date due: <<issues.date_due>><br />
 
 <h3> Transfer to/Hold in <<branches.branchname>></h3>
 
-<reserves>
-<div>
 <h3><<borrowers.surname>>, <<borrowers.firstname>></h3>
 
 <ul>
@@ -85,16 +83,26 @@ Date due: <<issues.date_due>><br />
 </ul>
 <br />
 <h3>ITEM ON HOLD</h3>
- <h4><<biblio.title>></h4>
- <h5><<biblio.author>></h5>
- <ul>
-    <li><<items.barcode>></li>
-    <li><<items.itemcallnumber>></li>
-    <li><<reserves.waitingdate>></li>
- </ul>
- <p>Notes:
- <pre><<reserves.reservenotes>></pre>
- </p>
-</div>
-</reserves>', 1);
+<h4><<biblio.title>></h4>
+<h5><<biblio.author>></h5>
+<ul>
+   <li><<items.barcode>></li>
+   <li><<items.itemcallnumber>></li>
+   <li><<reserves.waitingdate>></li>
+</ul>
+<p>Notes:
+<pre><<reserves.reservenotes>></pre>
+</p>
+', 1),
+('circulation','TRANSFERSLIP','Transfer Slip','Transfer Slip', '<h5>Date: <<today>></h5>
+
+<h3>Transfer to <<branches.branchname>></h3>
+
+<h3>ITEM</h3>
+<h4><<biblio.title>></h4>
+<h5><<biblio.author>></h5>
+<ul>
+   <li><<items.barcode>></li>
+   <li><<items.itemcallnumber>></li>
+</ul>', 1);
 
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
old mode 100755
new mode 100644
index 48c1333..11e4437
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4807,13 +4807,24 @@ Date due: <<issues.date_due>><br />
 <p>Notes:
 <pre><<reserves.reservenotes>></pre>
 </p>', 1)");
+    $dbh->do("INSERT INTO `letter` (module, code, name, title, content, is_html)
+              VALUES ('circulation','TRANSFERSLIP','Transfer Slip','Transfer Slip', '<h5>Date: <<today>></h5>
+<h3>Transfer to <<branches.branchname>></h3>
+
+<h3>ITEM</h3>
+<h4><<biblio.title>></h4>
+<h5><<biblio.author>></h5>
+<ul>
+   <li><<items.barcode>></li>
+   <li><<items.itemcallnumber>></li>
+</ul>', 1)");
 
     $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoticeCSS','','Notices CSS url.',NULL,'free')");
     $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free')");
 
     $dbh->do("UPDATE `letter` SET content = replace(content, '<<title>>', '<<biblio.title>>') WHERE code = 'HOLDPLACED'");
 
-    print "Upgrade to $DBversion done (Add branchcode and is_html to letter table; Default ISSUESLIP and RESERVESLIP letters; Add NoticeCSS and SlipCSS sysprefs)\n";
+    print "Upgrade to $DBversion done (Add branchcode and is_html to letter table; Default ISSUESLIP, RESERVESLIP and TRANSFERSLIP letters; Add NoticeCSS and SlipCSS sysprefs)\n";
     SetVersion($DBversion);
 }
 
-- 
1.6.5