From chrisc at catalyst.net.nz  Thu Dec  1 02:36:35 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu,  1 Dec 2011 14:36:35 +1300
Subject: [Koha-patches] [PATCH 2/2] Bug 7278 : Additional Materials
In-Reply-To: <1322703395-14153-1-git-send-email-chrisc@catalyst.net.nz>
References: <1322703395-14153-1-git-send-email-chrisc@catalyst.net.nz>
Message-ID: <1322703395-14153-2-git-send-email-chrisc@catalyst.net.nz>

Part 2: This patch shows the message at checkout and checkin

How to test:
* Add a note in cataloguing
* Check it displays at checkout and checkin
* Check items without a note don't display anything
---
 circ/circulation.pl                                |    1 +
 circ/returns.pl                                    |    1 +
 .../prog/en/modules/circ/circulation.tt            |    7 +++++++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    6 ++++++
 4 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index fa043dd..b6bc700 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -296,6 +296,7 @@ if ($barcode) {
         unless($issueconfirmed){
             #  Get the item title for more information
             my $getmessageiteminfo  = GetBiblioFromItemNumber(undef,$barcode);
+	    $template->{VARS}->{'additional_materials'} = $getmessageiteminfo->{'materials'};
             $template->param( itemhomebranch => $getmessageiteminfo->{'homebranch'} );
 
             # pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed.
diff --git a/circ/returns.pl b/circ/returns.pl
index 98d310e..167bc5f 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -238,6 +238,7 @@ if ($barcode) {
         itemtype         => $biblio->{'itemtype'},
         ccode            => $biblio->{'ccode'},
         itembiblionumber => $biblio->{'biblionumber'},    
+	additional_materials => $biblio->{'materials'}
     );
 
     my %input = (
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 5627109..f5ce307 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -226,6 +226,13 @@ function refocus(calendar) {
 </div>
 
 [% IF ( dateexpiry ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
+
+[% IF additional_materials %]
+    <div class="dialog message">This item contains multiple parts: <br />
+    [% additional_materials %]
+    </div>
+[% END %]
+
 [% IF ( NEEDSCONFIRMATION ) %]
 <div class="yui-g">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 70367ae..583af1b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -54,6 +54,12 @@ function Dopop(link) {
 
 <div class="yui-g">
 
+[% IF additional_materials %]
+    <div class="dialog message">This item contains multiple parts: <br />
+    [% additional_materials %]
+    </div>
+[% END %]
+
 [% IF ( collectionItemNeedsTransferred ) %]
 	<div class="dialog message">This item is part of a Rotating Collection and needs to be Transferred to [% collectionBranch %]</div>
 [% END %]
-- 
1.7.5.4


From chrisc at catalyst.net.nz  Thu Dec  1 02:36:34 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu,  1 Dec 2011 14:36:34 +1300
Subject: [Koha-patches] [PATCH 1/2] Bug 7728 : Materials Specified field
	made larger and displayed
Message-ID: <1322703395-14153-1-git-send-email-chrisc@catalyst.net.nz>

This first page makes the database change, and displays the field on
the detail.pl and moredetail.pl pages in the staff client

How to Test:

* Add a note to the materials specified page in cataloguing (952
subfield 3 for MARC21, but it shouldn't matter as long as you have a
field mapped to items.materials
* Check it displays at catalogue/detail.pl
* Check it displays at catalogue/moredetail.pl

Patch to follow to have the note display at checkin/checkout

http://bugs.koha-community.org/show_bug.cgi?id=7278
---
 catalogue/detail.pl                                |    6 +++++-
 installer/data/mysql/kohastructure.sql             |    2 +-
 installer/data/mysql/updatedatabase.pl             |    7 +++++++
 .../prog/en/modules/catalogue/detail.tt            |    4 ++++
 .../prog/en/modules/catalogue/moredetail.tt        |    1 +
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 580949d..a700b95 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -174,6 +174,7 @@ my $authvalcode_items_itemlost = GetAuthValCode('items.itemlost',$fw);
 my $authvalcode_items_damaged  = GetAuthValCode('items.damaged', $fw);
 
 my $analytics_flag;
+my $materials_flag; # set this if the items have anything in the materials field
 foreach my $item (@items) {
 
     $item->{homebranch}        = GetBranchName($item->{homebranch});
@@ -251,7 +252,9 @@ foreach my $item (@items) {
 		$analytics_flag=1;
 		$item->{countanalytics} = $countanalytics;
 	}
-
+    if ($item->{'materials'} ne ''){
+	$materials_flag = 1;
+    }
     push @itemloop, $item;
 }
 
@@ -276,6 +279,7 @@ $template->param(
         hostrecords         => $hostrecords,
 	analytics_flag	=> $analytics_flag,
 	C4::Search::enabled_staff_search_views,
+        materials       => $materials_flag,
 );
 
 if (C4::Context->preference("AlternateHoldingsField") && scalar @items == 0) {
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 452173d..494b0cb 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1031,7 +1031,7 @@ CREATE TABLE `items` (
   `cn_source` varchar(10) default NULL,
   `cn_sort` varchar(30) default NULL,
   `ccode` varchar(10) default NULL,
-  `materials` varchar(10) default NULL,
+  `materials` text default NULL,
   `uri` varchar(255) default NULL,
   `itype` varchar(10) default NULL,
   `more_subfields_xml` longtext default NULL,
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index efa9898..4c616ab 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4564,6 +4564,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 items MODIFY materials text;");
+    print "Upgrade to $DBversion done alter items.material from varchar(10) to text \n";
+    SetVersion ($DBversion);
+}
+
 
 =head1 FUNCTIONS
 
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 019fa10..2a4a975 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -243,6 +243,7 @@ function verify_images() {
                 <th>Status</th>
                 <th>Last seen</th>
                 <th>Barcode</th>
+		[% IF materials %]<th>Materials Specified</th>[% END %]
                 [% IF ( volinfo ) %]<th>Publication Details</th>[% END %]
                 [% IF ( itemdata_uri ) %]<th>url</th>[% END %]
                 [% IF ( itemdata_copynumber ) %]<th>Copy No.</th>[% END %]
@@ -372,6 +373,9 @@ function verify_images() {
 				[% IF ( itemdata_copynumber ) %]
 					<td class="copynumber">[% itemloo.copynumber %]</td>
 				[% END %]
+	        [% IF itemloo.materials %]
+		    <td> [% itemloo.materials %] </td>
+		[% END %]
                 [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
 		[% IF ( SpineLabelShowPrintOnBibDetails ) %]
 			<td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print Label</a></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 36e7149..59bcb35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -57,6 +57,7 @@
             <li><span class="label">Item Callnumber:</span> [% ITEM_DAT.itemcallnumber %]&nbsp;</li>
             [% IF ( ITEM_DAT.copyvol ) %]<li><span class="label">Copy / Vol :</span> [% ITEM_DAT.copyvol %]&nbsp;</li> [% END %]
             [% IF ( ITEM_DAT.replacementprice ) %]<li><span class="label">Replacement Price:</span> [% ITEM_DAT.replacementprice %]&nbsp;</li> [% END %]
+	    [% IF ITEM_DAT.materials %]<li><span class="label">Materials Specified:</span> [% ITEM_DAT.materials %] </li> [% END %]
             </ol></div>
            <div class="listgroup"><h4>Statuses [% IF ( ITEM_DAT.status_advisory ) %](
                 [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext %] [% END %]
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Fri Dec  2 01:34:48 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Fri,  2 Dec 2011 13:34:48 +1300
Subject: [Koha-patches] [PATCH] bug_5211: LostItem() - added charge_fee
	param to control fee charging
In-Reply-To: <bug 5211>
References: <bug 5211>
Message-ID: <1322786088-5727-1-git-send-email-srdjan@catalyst.net.nz>

Pass charge_fee = yes wherever is LostItem() called, which effectively
means tha there's no change.
---
 C4/Circulation.pm            |    5 +++--
 catalogue/updateitem.pl      |    2 +-
 misc/cronjobs/longoverdue.pl |    2 +-
 tools/batchMod.pl            |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index debef01..3d63224 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -3021,7 +3021,7 @@ sub ReturnLostItem{
 
 
 sub LostItem{
-    my ($itemnumber, $mark_returned) = @_;
+    my ($itemnumber, $mark_returned, $charge_fee) = @_;
 
     my $dbh = C4::Context->dbh();
     my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title 
@@ -3036,7 +3036,8 @@ sub LostItem{
     # if a borrower lost the item, add a replacement cost to the their record
     if ( my $borrowernumber = $issues->{borrowernumber} ){
 
-        C4::Accounts::chargelostitem($borrowernumber, $itemnumber, $issues->{'replacementprice'}, "Lost Item $issues->{'title'} $issues->{'barcode'}");
+        C4::Accounts::chargelostitem($borrowernumber, $itemnumber, $issues->{'replacementprice'}, "Lost Item $issues->{'title'} $issues->{'barcode'}")
+          if $charge_fee;
         #FIXME : Should probably have a way to distinguish this from an item that really was returned.
         #warn " $issues->{'borrowernumber'}  /  $itemnumber ";
         MarkIssueReturned($borrowernumber,$itemnumber) if $mark_returned;
diff --git a/catalogue/updateitem.pl b/catalogue/updateitem.pl
index 379c12c..7f93ee1 100755
--- a/catalogue/updateitem.pl
+++ b/catalogue/updateitem.pl
@@ -74,6 +74,6 @@ if (defined $itemnotes) { # i.e., itemnotes parameter passed from form
 
 ModItem($item_changes, $biblionumber, $itemnumber);
 
-LostItem($itemnumber, 'MARK RETURNED') if $itemlost;
+LostItem($itemnumber, 'MARK RETURNED', 'CHARGE FEE') if $itemlost;
 
 print $cgi->redirect("moredetail.pl?biblionumber=$biblionumber&itemnumber=$itemnumber#item$itemnumber");
diff --git a/misc/cronjobs/longoverdue.pl b/misc/cronjobs/longoverdue.pl
index 2179d10..3843544 100755
--- a/misc/cronjobs/longoverdue.pl
+++ b/misc/cronjobs/longoverdue.pl
@@ -154,7 +154,7 @@ foreach my $startrange (sort keys %$lost) {
             printf ("Due %s: item %5s from borrower %5s to lost: %s\n", $row->{date_due}, $row->{itemnumber}, $row->{borrowernumber}, $lostvalue) if($verbose);
             if($confirm) {
                 ModItem({ itemlost => $lostvalue }, $row->{'biblionumber'}, $row->{'itemnumber'});
-                LostItem($row->{'itemnumber'}) if( $charge && $charge eq $lostvalue);
+                LostItem($row->{'itemnumber'}, undef, 'CHARGE FEE') if( $charge && $charge eq $lostvalue);
             }
             $count++;
         }
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 701d421..94cfa69 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -177,7 +177,7 @@ if ($op eq "action") {
 			UpdateMarcWith( $marcitem, $localmarcitem );
 			eval{
                 if ( my $item = ModItemFromMarc( $localmarcitem, $itemdata->{biblionumber}, $itemnumber ) ) {
-                    LostItem($itemnumber, 'MARK RETURNED') if $item->{itemlost};
+                    LostItem($itemnumber, 'MARK RETURNED', 'CHARGE FEE') if $item->{itemlost};
                 }
             };
 		    }
-- 
1.6.5


From srdjan at catalyst.net.nz  Fri Dec  2 05:05:12 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Fri,  2 Dec 2011 17:05:12 +1300
Subject: [Koha-patches] [PATCH] bug_6489: Do not raise WrongTransfer if it
	is transrerring to reserve branch
In-Reply-To: <bug 6489>
References: <bug 6489>
Message-ID: <1322798712-4615-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Circulation.pm |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index debef01..6a1e9cd 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1606,6 +1606,14 @@ sub AddReturn {
     # check if we have a transfer for this document
     my ($datesent,$frombranch,$tobranch) = GetTransfers( $item->{'itemnumber'} );
 
+    # find reserves.....
+    # if we don't have a reserve with the status W, we launch the Checkreserves routine
+    my ($resfound, $resrec) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
+    if ($resfound) {
+          $resrec->{'ResFound'} = $resfound;
+        $messages->{'ResFound'} = $resrec;
+    }
+
     # if we have a transfer to do, we update the line of transfers with the datearrived
     if ($datesent) {
         if ( $tobranch eq $branch ) {
@@ -1615,7 +1623,8 @@ sub AddReturn {
             $sth->execute( $item->{'itemnumber'} );
             # if we have a reservation with valid transfer, we can set it's status to 'W'
             C4::Reserves::ModReserveStatus($item->{'itemnumber'}, 'W');
-        } else {
+        } elsif ( !($resrec && $resrec->{branchcode} eq $tobranch) ) {
+            # Do not raise WrongTransfer if it is transrerring to reserve branch
             $messages->{'WrongTransfer'}     = $tobranch;
             $messages->{'WrongTransferItem'} = $item->{'itemnumber'};
         }
@@ -1638,14 +1647,6 @@ sub AddReturn {
         $messages->{'Debarred'} = $debardate if ($debardate);
     }
 
-    # find reserves.....
-    # if we don't have a reserve with the status W, we launch the Checkreserves routine
-    my ($resfound, $resrec) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
-    if ($resfound) {
-          $resrec->{'ResFound'} = $resfound;
-        $messages->{'ResFound'} = $resrec;
-    }
-
     # update stats?
     # Record the fact that this book was returned.
     UpdateStats(
-- 
1.6.5


From alex.arnaud at biblibre.com  Fri Dec  2 09:19:55 2011
From: alex.arnaud at biblibre.com (alex.arnaud at biblibre.com)
Date: Fri,  2 Dec 2011 09:19:55 +0100
Subject: [Koha-patches] [PATCH] bug/7285 Use C4::Auth::checkpw instead of
	checkpw only
Message-ID: <1322813995-29673-1-git-send-email-alex.arnaud@biblibre.com>

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

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

diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index 90f741a..067afd7 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -315,7 +315,7 @@ sub AuthenticatePatron {
     my ($cgi) = @_;
 
     # Check if borrower exists, using a C4::Auth function...
-    unless( checkpw( C4::Context->dbh, $cgi->param('username'), $cgi->param('password') ) ) {
+    unless( C4::Auth::checkpw( C4::Context->dbh, $cgi->param('username'), $cgi->param('password') ) ) {
         return { code => 'PatronNotFound' };
     }
 
-- 
1.7.0.4


From alex.arnaud at biblibre.com  Fri Dec  2 10:53:35 2011
From: alex.arnaud at biblibre.com (alex.arnaud at biblibre.com)
Date: Fri,  2 Dec 2011 10:53:35 +0100
Subject: [Koha-patches] [PATCH] Bug 7299 - Changes AddReserve parameters in
	HoldItem ILSDI service
Message-ID: <1322819615-31160-1-git-send-email-alex.arnaud@biblibre.com>

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

---
 C4/ILSDI/Services.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index 90f741a..0722888 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -700,8 +700,8 @@ sub HoldItem {
     }
 
     # Add the reserve
-    #          $branch, $borrowernumber, $biblionumber, $constraint, $bibitems,  $priority, $notes, $title, $checkitem,  $found
-    AddReserve( $branch, $borrowernumber, $biblionumber, 'a', undef, $rank, undef, $title, $itemnumber, $found );
+    # $branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$resdate,$expdate,$notes,$title,$checkitem,$found
+    AddReserve( $branch, $borrowernumber, $biblionumber, 'a', [$biblionumber], $rank, '', '', '', $title, $itemnumber, $found );
 
     # Hashref building
     my $out;
-- 
1.7.0.4


From julian.maurice at biblibre.com  Fri Dec  2 12:38:22 2011
From: julian.maurice at biblibre.com (Julian Maurice)
Date: Fri,  2 Dec 2011 12:38:22 +0100
Subject: [Koha-patches] [PATCH 1/4] Bug 6836: Add jQuery dataTables plugin
Message-ID: <1322825905-18185-1-git-send-email-julian.maurice@biblibre.com>

This patch add the javascript library, a CSS (and image files from
datatables.net) and another javascript file which provides some extra
features.
It also add a Perl module C4::Utils::Datatables which provides helpful
functions for server-side processing
---
 C4/Utils/DataTables.pm                             |  306 ++++++++++++++++++++
 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css |  114 ++++++++
 .../prog/en/includes/datatables-strings.inc        |   17 +
 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js   |  281 ++++++++++++++++++
 .../en/lib/jquery/plugins/jquery.dataTables.min.js |  153 ++++++++++
 .../prog/img/datatables/back_disabled.jpg          |  Bin 0 -> 612 bytes
 .../prog/img/datatables/back_enabled.jpg           |  Bin 0 -> 807 bytes
 .../prog/img/datatables/forward_disabled.jpg       |  Bin 0 -> 635 bytes
 .../prog/img/datatables/forward_enabled.jpg        |  Bin 0 -> 852 bytes
 .../intranet-tmpl/prog/img/datatables/sort_asc.png |  Bin 0 -> 263 bytes
 .../prog/img/datatables/sort_asc_disabled.png      |  Bin 0 -> 252 bytes
 .../prog/img/datatables/sort_both.png              |  Bin 0 -> 282 bytes
 .../prog/img/datatables/sort_desc.png              |  Bin 0 -> 260 bytes
 .../prog/img/datatables/sort_desc_disabled.png     |  Bin 0 -> 251 bytes
 koha-tmpl/opac-tmpl/prog/en/css/datatables.css     |  114 ++++++++
 .../prog/en/includes/datatables-strings.inc        |   17 +
 koha-tmpl/opac-tmpl/prog/en/js/datatables.js       |  281 ++++++++++++++++++
 .../en/lib/jquery/plugins/jquery.dataTables.min.js |  153 ++++++++++
 .../prog/images/datatables/back_disabled.jpg       |  Bin 0 -> 612 bytes
 .../prog/images/datatables/back_enabled.jpg        |  Bin 0 -> 807 bytes
 .../prog/images/datatables/forward_disabled.jpg    |  Bin 0 -> 635 bytes
 .../prog/images/datatables/forward_enabled.jpg     |  Bin 0 -> 852 bytes
 .../opac-tmpl/prog/images/datatables/sort_asc.png  |  Bin 0 -> 263 bytes
 .../prog/images/datatables/sort_asc_disabled.png   |  Bin 0 -> 252 bytes
 .../opac-tmpl/prog/images/datatables/sort_both.png |  Bin 0 -> 282 bytes
 .../opac-tmpl/prog/images/datatables/sort_desc.png |  Bin 0 -> 260 bytes
 .../prog/images/datatables/sort_desc_disabled.png  |  Bin 0 -> 251 bytes
 27 files changed, 1436 insertions(+), 0 deletions(-)
 create mode 100644 C4/Utils/DataTables.pm
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/back_disabled.jpg
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/back_enabled.jpg
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/forward_disabled.jpg
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/forward_enabled.jpg
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc_disabled.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_both.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc_disabled.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/css/datatables.css
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/js/datatables.js
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/back_disabled.jpg
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/back_enabled.jpg
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/forward_disabled.jpg
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/forward_enabled.jpg
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc_disabled.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_both.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc_disabled.png

diff --git a/C4/Utils/DataTables.pm b/C4/Utils/DataTables.pm
new file mode 100644
index 0000000..901cafc
--- /dev/null
+++ b/C4/Utils/DataTables.pm
@@ -0,0 +1,306 @@
+package C4::Utils::DataTables;
+
+# 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.
+
+use Modern::Perl;
+require Exporter;
+
+use vars qw($VERSION @ISA @EXPORT);
+
+BEGIN {
+    $VERSION    = 3.04,
+
+    @ISA        = qw(Exporter);
+    @EXPORT     = qw(dt_build_orderby dt_build_having dt_get_params dt_build_query);
+}
+
+=head1 NAME
+
+C4::Utils::DataTables - Utility subs for building query when DataTables source is AJAX
+
+=head1 SYNOPSYS
+
+    use CGI;
+    use C4::Context;
+    use C4::Utils::DataTables;
+
+    my $input = new CGI;
+    my $vars = $input->Vars;
+
+    my $query = qq{
+        SELECT surname, firstname
+        FROM borrowers
+        WHERE borrowernumber = ?
+    };
+    my ($having, $having_params) = dt_build_having($vars);
+    $query .= $having;
+    $query .= dt_build_orderby($vars);
+    $query .= " LIMIT ?,? ";
+
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute(
+        $vars->{'borrowernumber'},
+        @$having_params,
+        $vars->{'iDisplayStart'},
+        $vars->{'iDisplayLength'}
+    );
+    ...
+
+=head1 DESCRIPTION
+
+    This module provide two utility functions to build a part of the SQL query,
+    depending on DataTables parameters.
+    One function build the 'ORDER BY' part, and the other the 'HAVING' part.
+
+=head1 FUNCTIONS
+
+=over 2
+
+=item dt_build_orderby
+
+    my $orderby = dt_build_orderby($dt_param);
+
+    This function takes a reference to a hash containing DataTables parameters
+    and build the corresponding 'ORDER BY' clause.
+    This hash must contains the following keys:
+
+        iSortCol_N, where N is a number from 0 to the number of columns to sort on minus 1
+
+        sSortDir_N is the sorting order ('asc' or 'desc) for the corresponding column
+
+        mDataProp_N is a mapping between the column index, and the name of a SQL field
+
+=cut
+
+sub dt_build_orderby {
+    my $param = shift;
+
+    my $i = 0;
+    my @orderbys;
+    while(exists $param->{'iSortCol_'.$i}){
+        my $iSortCol = $param->{'iSortCol_'.$i};
+        my $sSortDir = $param->{'sSortDir_'.$i};
+        my $mDataProp = $param->{'mDataProp_'.$iSortCol};
+        my @sort_fields = $param->{$mDataProp.'_sorton'}
+            ? split(' ', $param->{$mDataProp.'_sorton'})
+            : ();
+        if(@sort_fields > 0) {
+            push @orderbys, "$_ $sSortDir" foreach (@sort_fields);
+        } else {
+            push @orderbys, "$mDataProp $sSortDir";
+        }
+        $i++;
+    }
+
+    my $orderby = " ORDER BY " . join(',', @orderbys) . " " if @orderbys;
+    return $orderby;
+}
+
+=item dt_build_having
+
+    my ($having, $having_params) = dt_build_having($dt_params)
+
+    This function takes a reference to a hash containing DataTables parameters
+    and build the corresponding 'HAVING' clause.
+    This hash must contains the following keys:
+
+        sSearch is the text entered in the global filter
+
+        iColumns is the number of columns
+
+        bSearchable_N is a boolean value that is true if the column is searchable
+
+        mDataProp_N is a mapping between the column index, and the name of a SQL field
+
+        sSearch_N is the text entered in individual filter for column N
+
+=back
+
+=cut
+
+sub dt_build_having {
+    my $param = shift;
+
+    my @filters;
+    my @params;
+
+    # Global filter
+    if($param->{'sSearch'}) {
+        my $sSearch = $param->{'sSearch'};
+        my $i = 0;
+        my @gFilters;
+        my @gParams;
+        while($i < $param->{'iColumns'}) {
+            if($param->{'bSearchable_'.$i} eq 'true') {
+                my $mDataProp = $param->{'mDataProp_'.$i};
+                my @filter_fields = $param->{$mDataProp.'_filteron'}
+                    ? split(' ', $param->{$mDataProp.'_filteron'})
+                    : ();
+                if(@filter_fields > 0) {
+                    foreach my $field (@filter_fields) {
+                        push @gFilters, " $field LIKE ? ";
+                        push @gParams, "%$sSearch%";
+                    }
+                } else {
+                    push @gFilters, " $mDataProp LIKE ? ";
+                    push @gParams, "%$sSearch%";
+                }
+            }
+            $i++;
+        }
+        push @filters, " (" . join(" OR ", @gFilters) . ") ";
+        push @params, @gParams;
+    }
+
+    # Individual filters
+    my $i = 0;
+    while($i < $param->{'iColumns'}) {
+        my $sSearch = $param->{'sSearch_'.$i};
+        if($sSearch) {
+            my $mDataProp = $param->{'mDataProp_'.$i};
+            my @filter_fields = $param->{$mDataProp.'_filteron'}
+                ? split(' ', $param->{$mDataProp.'_filteron'})
+                : ();
+            if(@filter_fields > 0) {
+                my @localfilters;
+                foreach my $field (@filter_fields) {
+                    push @localfilters, " $field LIKE ? ";
+                    push @params, "%$sSearch%";
+                }
+                push @filters, " ( ". join(" OR ", @localfilters) ." ) ";
+            } else {
+                push @filters, " $mDataProp LIKE ? ";
+                push @params, "%$sSearch%";
+            }
+        }
+        $i++;
+    }
+
+    return (\@filters, \@params);
+}
+
+=item dt_get_params
+
+    my %dtparam = = dt_get_params( $input )
+
+    This function takes a reference to a new CGI object.
+
+    It prepares a hash containing Datatable parameters.
+
+=back
+
+=cut
+sub dt_get_params {
+    my $input = shift;
+    my %dtparam;
+    my $vars = $input->Vars;
+
+    foreach(qw/ iDisplayStart iDisplayLength iColumns sSearch bRegex iSortingCols sEcho /) {
+        $dtparam{$_} = $input->param($_);
+    }
+    foreach(grep /(?:_sorton|_filteron)$/, keys %$vars) {
+        $dtparam{$_} = $vars->{$_};
+    }
+    for(my $i=0; $i<$dtparam{'iColumns'}; $i++) {
+        foreach(qw/ bSearchable sSearch bRegex bSortable iSortCol mDataProp sSortDir /) {
+            my $key = $_ . '_' . $i;
+            $dtparam{$key} = $input->param($key) if defined $input->param($key);
+        }
+    }
+    return %dtparam;
+}
+
+=item dt_build_query_simple
+
+    my ( $query, $params )= dt_build_query_simple( $value, $field )
+
+    This function takes a value and a field (table.field).
+
+    It returns (undef, []) if not $value.
+    Else, returns a SQL where string and an arrayref containing parameters
+    for the execute method of the statement.
+
+=back
+
+=cut
+sub dt_build_query_simple {
+    my ( $value, $field ) = @_;
+    my $query;
+    my @params;
+    if( $value ) {
+        $query .= " AND $field = ? ";
+        push @params, $value;
+    }
+    return ( $query, \@params );
+}
+
+=item dt_build_query_dates
+
+    my ( $query, $params )= dt_build_query_dates( $datefrom, $dateto, $field)
+
+    This function takes a datefrom, dateto and a field (table.field).
+
+    It returns (undef, []) if not $value.
+    Else, returns a SQL where string and an arrayref containing parameters
+    for the execute method of the statement.
+
+=back
+
+=cut
+sub dt_build_query_dates {
+    my ( $datefrom, $dateto, $field ) = @_;
+    my $query;
+    my @params;
+    if ( $datefrom ) {
+        $query .= " AND $field >= ? ";
+        push @params, C4::Dates->new($datefrom)->output('iso');
+    }
+    if ( $dateto ) {
+        $query .= " AND $field <= ? ";
+        push @params, C4::Dates->new($dateto)->output('iso');
+    }
+    return ( $query, \@params );
+}
+
+=item dt_build_query
+
+    my ( $query, $filter ) = dt_build_query( $type, @params )
+
+    This function takes a value and a list of parameters.
+
+    It calls dt_build_query_dates or dt_build_query_simple fonction of $type.
+
+    $type can be 'simple' or 'rage_dates'.
+
+=back
+
+=cut
+sub dt_build_query {
+    my ( $type, @params ) = @_;
+    given ( $type ) {
+        when ( /simple/ ) {
+            return dt_build_query_simple( @params );
+        }
+        when ( /range_dates/ ) {
+            return dt_build_query_dates( @params );
+        }
+    }
+}
+
+1;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
new file mode 100644
index 0000000..e069b93
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
@@ -0,0 +1,114 @@
+input.search_init {
+    color: #999999;
+}
+.sorting_asc {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_asc.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_desc.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_both.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_asc_disabled {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_asc_disabled.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc_disabled {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_desc_disabled.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_disabled {
+    padding-right: 19px;
+    background-color: #EEEEEE;
+}
+
+table.display {
+    width: 100%;
+}
+table.display thead th {
+    border-bottom: 1px solid black;
+    cursor: pointer;
+    font-weight: bold;
+    padding: 3px 18px 3px 10px;
+}
+.dataTables_wrapper {
+    clear: both;
+    position: relative;
+}
+.dataTables_processing {
+    background-color: white;
+    border: 1px solid #DDDDDD;
+    color: #999999;
+    font-size: 14px;
+    height: 30px;
+    left: 50%;
+    margin-left: -125px;
+    margin-top: -15px;
+    padding: 14px 0 2px;
+    position: fixed;
+    text-align: center;
+    top: 50%;
+    width: 250px;
+}
+.dataTables_info {
+    float: left;
+    width: 60%;
+}
+.dataTables_paginate {
+    float: right;
+    text-align: right;
+    width: 44px;
+}
+.paging_full_numbers {
+    height: 22px;
+    line-height: 22px;
+    width: 400px;
+}
+.paging_full_numbers span.paginate_button,
+     .paging_full_numbers span.paginate_active {
+    border: 1px solid #aaa;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    padding: 2px 5px;
+    margin: 0 3px;
+    cursor: pointer;
+    *cursor: hand;
+}
+
+.paging_full_numbers span.paginate_button {
+    background-color: #ddd;
+}
+
+.paging_full_numbers span.paginate_button:hover {
+    background-color: #ccc;
+}
+
+.paging_full_numbers span.paginate_active {
+    background-color: #99B3FF;
+}
+.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
+    float: left;
+    height: 19px;
+    margin-left: 3px;
+    width: 19px;
+}
+.paginate_disabled_previous {
+    background-image: url("../../img/datatables/back_disabled.jpg");
+}
+.paginate_enabled_previous {
+    background-image: url("../../img/datatables/back_enabled.jpg");
+}
+.paginate_disabled_next {
+    background-image: url("../../img/datatables/forward_disabled.jpg");
+}
+.paginate_enabled_next {
+    background-image: url("../../img/datatables/forward_enabled.jpg");
+}
+.spacer {
+    clear: both;
+    height: 20px;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
new file mode 100644
index 0000000..183f511
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
@@ -0,0 +1,17 @@
+<script type="text/javascript">
+//<![CDATA[
+    var MSG_DT_FIRST = _("First");
+    var MSG_DT_LAST = _("Last");
+    var MSG_DT_NEXT = _("Next");
+    var MSG_DT_PREVIOUS = _("Previous");
+    var MSG_DT_EMPTY_TABLE = _("No data available in table");
+    var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
+    var MSG_DT_INFO_EMPTY = _("No entries to show");
+    var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
+    var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
+    var MSG_DT_LOADING_RECORDS = _("Loading...");
+    var MSG_DT_PROCESSING = _("Processing...");
+    var MSG_DT_SEARCH = _("Search:");
+    var MSG_DT_ZERO_RECORDS = _("No matching records found");
+//]]>
+</script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
new file mode 100644
index 0000000..38dd1d5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
@@ -0,0 +1,281 @@
+// These default options are for translation but can be used
+// for any other datatables settings
+// MSG_DT_* variables comes from datatables-strings.inc
+// To use it, write:
+//  $("#table_id").dataTable($.extend(true, {}, dataTableDefaults, {
+//      // other settings
+//  } ) );
+var dataTablesDefaults = {
+    "oLanguage": {
+        "oPaginate": {
+            "sFirst"    : window.MSG_DT_FIRST || "First",
+            "sLast"     : window.MSG_DT_LAST || "Last",
+            "sNext"     : window.MSG_DT_NEXT || "Next",
+            "sPrevious" : window.MSG_DT_PREVIOUS || "Previous"
+        },
+        "sEmptyTable"       : window.MSG_DT_EMPTY_TABLE || "No data available in table",
+        "sInfo"             : window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries",
+        "sInfoEmpty"        : window.MSG_DT_INFO_EMPTY || "No entries to show",
+        "sInfoFiltered"     : window.MSG_DT_INFO_FILTERED || "(filtered from _MAX_ total entries)",
+        "sLengthMenu"       : window.MSG_DT_LENGTH_MENU || "Show _MENU_ entries",
+        "sLoadingRecords"   : window.MSG_DT_LOADING_RECORDS || "Loading...",
+        "sProcessing"       : window.MSG_DT_PROCESSING || "Processing...",
+        "sSearch"           : window.MSG_DT_SEARCH || "Search:",
+        "sZeroRecords"      : window.MSG_DT_ZERO_RECORDS || "No matching records found"
+    }
+};
+
+
+// Return an array of string containing the values of a particular column
+$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
+    // check that we have a column id
+    if ( typeof iColumn == "undefined" ) return new Array();
+    // by default we only wany unique data
+    if ( typeof bUnique == "undefined" ) bUnique = true;
+    // by default we do want to only look at filtered data
+    if ( typeof bFiltered == "undefined" ) bFiltered = true;
+    // by default we do not wany to include empty values
+    if ( typeof bIgnoreEmpty == "undefined" ) bIgnoreEmpty = true;
+    // list of rows which we're going to loop through
+    var aiRows;
+    // use only filtered rows
+    if (bFiltered == true) aiRows = oSettings.aiDisplay;
+    // use all rows
+    else aiRows = oSettings.aiDisplayMaster; // all row numbers
+
+    // set up data array
+    var asResultData = new Array();
+    for (var i=0,c=aiRows.length; i<c; i++) {
+        iRow = aiRows[i];
+        var aData = this.fnGetData(iRow);
+        var sValue = aData[iColumn];
+        // ignore empty values?
+        if (bIgnoreEmpty == true && sValue.length == 0) continue;
+        // ignore unique values?
+        else if (bUnique == true && jQuery.inArray(sValue, asResultData) > -1) continue;
+        // else push the value onto the result data array
+        else asResultData.push(sValue);
+    }
+    return asResultData;
+}
+
+// List of unbind keys (Ctrl, Alt, Direction keys, etc.)
+// These keys must not launch filtering
+var blacklist_keys = new Array(0, 16, 17, 18, 37, 38, 39, 40);
+
+// Set a filtering delay for global search field
+jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay ) {
+    /*
+     * Inputs:      object:oSettings - dataTables settings object - automatically given
+     *              integer:iDelay - delay in milliseconds
+     * Usage:       $('#example').dataTable().fnSetFilteringDelay(250);
+     * Author:      Zygimantas Berziunas (www.zygimantas.com) and Allan Jardine
+     * License:     GPL v2 or BSD 3 point style
+     * Contact:     zygimantas.berziunas /AT\ hotmail.com
+     */
+    var
+        _that = this,
+        iDelay = (typeof iDelay == 'undefined') ? 250 : iDelay;
+
+    this.each( function ( i ) {
+        $.fn.dataTableExt.iApiIndex = i;
+        var
+            $this = this,
+            oTimerId = null,
+            sPreviousSearch = null,
+            anControl = $( 'input', _that.fnSettings().aanFeatures.f );
+
+        anControl.unbind( 'keyup.DT' ).bind( 'keyup.DT', function(event) {
+            var $$this = $this;
+            if (blacklist_keys.indexOf(event.keyCode) != -1) {
+                return this;
+            }else if ( event.keyCode == '13' ) {
+                $.fn.dataTableExt.iApiIndex = i;
+                _that.fnFilter( $(this).val() );
+            } else {
+                if (sPreviousSearch === null || sPreviousSearch != anControl.val()) {
+                    window.clearTimeout(oTimerId);
+                    sPreviousSearch = anControl.val();
+                    oTimerId = window.setTimeout(function() {
+                        $.fn.dataTableExt.iApiIndex = i;
+                        _that.fnFilter( anControl.val() );
+                    }, iDelay);
+                }
+            }
+        });
+
+        return this;
+    } );
+    return this;
+}
+
+// Add a filtering delay on general search and on all input (with a class 'filter')
+jQuery.fn.dataTableExt.oApi.fnAddFilters = function ( oSettings, sClass, iDelay ) {
+    var table = this;
+    this.fnSetFilteringDelay(iDelay);
+    var filterTimerId = null;
+    $("input."+sClass).keyup(function(event) {
+      if (blacklist_keys.indexOf(event.keyCode) != -1) {
+        return this;
+      }else if ( event.keyCode == '13' ) {
+        table.fnFilter( $(this).val(), $(this).attr('data-column_num') );
+      } else {
+        window.clearTimeout(filterTimerId);
+        var input = this;
+        filterTimerId = window.setTimeout(function() {
+          table.fnFilter($(input).val(), $(input).attr('data-column_num'));
+        }, iDelay);
+      }
+    });
+}
+
+// Useful if you want to filter on dates with 2 inputs (start date and end date)
+// You have to include calendar.inc to use it
+function dt_add_rangedate_filter(begindate_id, enddate_id, dateCol) {
+    $.fn.dataTableExt.afnFiltering.push(
+        function( oSettings, aData, iDataIndex ) {
+
+            var beginDate = Date_from_syspref($("#"+begindate_id).val()).getTime();
+            var endDate   = Date_from_syspref($("#"+enddate_id).val()).getTime();
+
+            var data = Date_from_syspref(aData[dateCol]).getTime();
+
+            if ( !parseInt(beginDate) && ! parseInt(endDate) ) {
+                return true;
+            }
+            else if ( beginDate <= data && !parseInt(endDate) ) {
+                return true;
+            }
+            else if ( data <= endDate && !parseInt(beginDate) ) {
+                return true;
+            }
+            else if ( beginDate <= data && data <= endDate) {
+                return true;
+            }
+            return false;
+        }
+    );
+}
+
+//Sorting for dates (uk format)
+function dt_add_type_uk_date() {
+  jQuery.fn.dataTableExt.aTypes.unshift(
+    function ( sData )
+    {
+      if (sData.match(/(0[1-9]|[12][0-9]|3[01])\/(0[1-9]|1[012])\/(19|20|21)\d\d/))
+      {
+        return 'uk_date';
+      }
+      return null;
+    }
+  );
+
+  jQuery.fn.dataTableExt.oSort['uk_date-asc']  = function(a,b) {
+    var re = /(\d{2}\/\d{2}\/\d{4})/;
+    a.match(re);
+    var ukDatea = RegExp.$1.split("/");
+    b.match(re);
+    var ukDateb = RegExp.$1.split("/");
+
+    var x = (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+    var y = (ukDateb[2] + ukDateb[1] + ukDateb[0]) * 1;
+
+    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+  };
+
+  jQuery.fn.dataTableExt.oSort['uk_date-desc'] = function(a,b) {
+    var re = /(\d{2}\/\d{2}\/\d{4})/;
+    a.match(re);
+    var ukDatea = RegExp.$1.split("/");
+    b.match(re);
+    var ukDateb = RegExp.$1.split("/");
+
+    var x = (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+    var y = (ukDateb[2] + ukDateb[1] + ukDateb[0]) * 1;
+
+    return ((x < y) ? 1 : ((x > y) ?  -1 : 0));
+  };
+}
+
+// Sorting on html contains
+// <a href="foo.pl">bar</a> sort on 'bar'
+function dt_overwrite_html_sorting_localeCompare() {
+    jQuery.fn.dataTableExt.oSort['html-asc']  = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if (typeof(a.localeCompare == "function")) {
+           return a.localeCompare(b);
+        } else {
+           return (a > b) ? 1 : ((a < b) ? -1 : 0);
+        }
+    };
+
+    jQuery.fn.dataTableExt.oSort['html-desc'] = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if(typeof(b.localeCompare == "function")) {
+            return b.localeCompare(a);
+        } else {
+            return (b > a) ? 1 : ((b < a) ? -1 : 0);
+        }
+    };
+}
+
+// Sorting on string without accentued characters
+function dt_overwrite_string_sorting_localeCompare() {
+    jQuery.fn.dataTableExt.oSort['string-asc']  = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if (typeof(a.localeCompare == "function")) {
+           return a.localeCompare(b);
+        } else {
+           return (a > b) ? 1 : ((a < b) ? -1 : 0);
+        }
+    };
+
+    jQuery.fn.dataTableExt.oSort['string-desc'] = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if(typeof(b.localeCompare == "function")) {
+            return b.localeCompare(a);
+        } else {
+            return (b > a) ? 1 : ((b < a) ? -1 : 0);
+        }
+    };
+}
+
+// Replace a node with a html and js contain.
+function replace_html( original_node, type ) {
+    switch ( $(original_node).attr('data-type') ) {
+        case "range_dates":
+            var id = $(original_node).attr("data-id");
+            var format = $(original_node).attr("data-format");
+            replace_html_date( original_node, id, format );
+            break;
+        default:
+            alert("_(This node can't be replaced)");
+    }
+}
+
+// Replace a node with a "From [date] To [date]" element
+// Used on tfoot > td
+function replace_html_date( original_node, id, format ) {
+    var node = $('<span style="white-space:nowrap">' + _("From") + '<input type="text" id="' + id + 'from" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'from").val("").change();\' >&times;</a></span><br/><span style="white-space:nowrap">' + _("To") + '<input type="text" id="' + id + 'to" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'to").val("").change();\' >&times;</a></span>');
+    $(original_node).replaceWith(node);
+    var script = document.createElement( 'script' );
+    script.type = 'text/javascript';
+    var script_content = "Calendar.setup({";
+    script_content += "    inputField: \"" + id + "from\",";
+    script_content += "    ifFormat: \"" + format + "\",";
+    script_content += "    button: \"" + id + "from\",";
+    script_content += "    onClose: function(){ $(\"#" + id + "from\").change(); this.hide();}";
+    script_content += "  });";
+    script_content += "  Calendar.setup({";
+    script_content += "    inputField: \"" + id + "to\",";
+    script_content += "    ifFormat: \"" + format + "\",";
+    script_content += "    button: \"" + id + "to\",";
+    script_content += "    onClose: function(){ $(\"#" + id + "to\").change(); this.hide();}";
+    script_content += "  });";
+    script.text = script_content;
+    $(original_node).append( script );
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
new file mode 100644
index 0000000..9035a2e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
@@ -0,0 +1,153 @@
+/*
+ * File:        jquery.dataTables.min.js
+ * Version:     1.8.1
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Info:        www.datatables.net
+ * 
+ * Copyright 2008-2010 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ * 
+ * This source file 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 license files for details.
+ */
+(function(i,wa,p){i.fn.dataTableSettings=[];var D=i.fn.dataTableSettings;i.fn.dataTableExt={};var o=i.fn.dataTableExt;o.sVersion="1.8.1";o.sErrMode="alert";o.iApiIndex=0;o.oApi={};o.afnFiltering=[];o.aoFeatures=[];o.ofnSearch={};o.afnSortData=[];o.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
+sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
+sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};o.oJUIClasses={sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",
+sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",
+sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last ui-corner-tr ui-corner-br",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",
+sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollWrapper:"dataTables_scroll",
+sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};o.oPagination={two_button:{fnInit:function(g,l,r){var s,w,y;if(g.bJUI){s=p.createElement("a");w=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;w.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;
+s.appendChild(y)}else{s=p.createElement("div");w=p.createElement("div")}s.className=g.oClasses.sPagePrevDisabled;w.className=g.oClasses.sPageNextDisabled;s.title=g.oLanguage.oPaginate.sPrevious;w.title=g.oLanguage.oPaginate.sNext;l.appendChild(s);l.appendChild(w);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(s).bind("selectstart.DT",function(){return false});i(w).bind("selectstart.DT",function(){return false});
+if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_previous");w.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l=g.aanFeatures.p,r=0,s=l.length;r<s;r++)if(l[r].childNodes.length!==0){l[r].childNodes[0].className=g._iDisplayStart===0?g.oClasses.sPagePrevDisabled:g.oClasses.sPagePrevEnabled;l[r].childNodes[1].className=g.fnDisplayEnd()==g.fnRecordsDisplay()?g.oClasses.sPageNextDisabled:
+g.oClasses.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(g,l,r){var s=p.createElement("span"),w=p.createElement("span"),y=p.createElement("span"),G=p.createElement("span"),x=p.createElement("span");s.innerHTML=g.oLanguage.oPaginate.sFirst;w.innerHTML=g.oLanguage.oPaginate.sPrevious;G.innerHTML=g.oLanguage.oPaginate.sNext;x.innerHTML=g.oLanguage.oPaginate.sLast;var v=g.oClasses;s.className=v.sPageButton+" "+v.sPageFirst;w.className=v.sPageButton+" "+v.sPagePrevious;G.className=
+v.sPageButton+" "+v.sPageNext;x.className=v.sPageButton+" "+v.sPageLast;l.appendChild(s);l.appendChild(w);l.appendChild(y);l.appendChild(G);l.appendChild(x);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"first")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(G).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(x).bind("click.DT",function(){g.oApi._fnPageChange(g,"last")&&r(g)});i("span",l).bind("mousedown.DT",function(){return false}).bind("selectstart.DT",
+function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_first");w.setAttribute("id",g.sTableId+"_previous");G.setAttribute("id",g.sTableId+"_next");x.setAttribute("id",g.sTableId+"_last")}},fnUpdate:function(g,l){if(g.aanFeatures.p){var r=o.oPagination.iFullNumbersShowPages,s=Math.floor(r/2),w=Math.ceil(g.fnRecordsDisplay()/g._iDisplayLength),y=Math.ceil(g._iDisplayStart/g._iDisplayLength)+1,G=
+"",x,v=g.oClasses;if(w<r){s=1;x=w}else if(y<=s){s=1;x=r}else if(y>=w-s){s=w-r+1;x=w}else{s=y-Math.ceil(r/2)+1;x=s+r-1}for(r=s;r<=x;r++)G+=y!=r?'<span class="'+v.sPageButton+'">'+r+"</span>":'<span class="'+v.sPageButtonActive+'">'+r+"</span>";x=g.aanFeatures.p;var z,Y=function(L){g._iDisplayStart=(this.innerHTML*1-1)*g._iDisplayLength;l(g);L.preventDefault()},V=function(){return false};r=0;for(s=x.length;r<s;r++)if(x[r].childNodes.length!==0){z=i("span:eq(2)",x[r]);z.html(G);i("span",z).bind("click.DT",
+Y).bind("mousedown.DT",V).bind("selectstart.DT",V);z=x[r].getElementsByTagName("span");z=[z[0],z[1],z[z.length-2],z[z.length-1]];i(z).removeClass(v.sPageButton+" "+v.sPageButtonActive+" "+v.sPageButtonStaticDisabled);if(y==1){z[0].className+=" "+v.sPageButtonStaticDisabled;z[1].className+=" "+v.sPageButtonStaticDisabled}else{z[0].className+=" "+v.sPageButton;z[1].className+=" "+v.sPageButton}if(w===0||y==w||g._iDisplayLength==-1){z[2].className+=" "+v.sPageButtonStaticDisabled;z[3].className+=" "+
+v.sPageButtonStaticDisabled}else{z[2].className+=" "+v.sPageButton;z[3].className+=" "+v.sPageButton}}}}}};o.oSort={"string-asc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?-1:g>l?1:0},"string-desc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?1:g>l?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<
+l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?1:g>l?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return l-
+g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};o.aTypes=[function(g){if(typeof g=="number")return"numeric";else if(typeof g!="string")return null;var l,r=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var s=1;s<g.length;s++){l=g.charAt(s);if("0123456789.".indexOf(l)==-1)return null;if(l=="."){if(r)return null;r=true}}return"numeric"},function(g){var l=Date.parse(g);
+if(l!==null&&!isNaN(l)||typeof g=="string"&&g.length===0)return"date";return null},function(g){if(typeof g=="string"&&g.indexOf("<")!=-1&&g.indexOf(">")!=-1)return"html";return null}];o.fnVersionCheck=function(g){var l=function(x,v){for(;x.length<v;)x+="0";return x},r=o.sVersion.split(".");g=g.split(".");for(var s="",w="",y=0,G=g.length;y<G;y++){s+=l(r[y],3);w+=l(g[y],3)}return parseInt(s,10)>=parseInt(w,10)};o._oExternConfig={iNextUnique:0};i.fn.dataTable=function(g){function l(){this.fnRecordsTotal=
+function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false||this._iDisplayLength==-1?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd};this.sInstance=
+this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false,bDeferRender:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,bInfinite:false,iLoadGap:100,iBarWidth:0,bAutoCss:true};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",
+sLoadingRecords:"Loading...",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"},fnInfoCallback:null};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.aoHeader=[];this.aoFooter=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false,
+bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.sDestroyWidth=0;this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];this.fnInitComplete=this.fnPreDrawCallback=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.bInitialised=this.bDeferLoading=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button";
+this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.fnCookieCallback=null;this.aoStateSave=[];this.aoStateLoad=[];this.sAjaxSource=this.oLoadedState=null;this.sAjaxDataProp="aaData";this.bAjaxDataGet=true;this.jqXHR=null;this.fnServerData=function(a,b,c,d){d.jqXHR=i.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(f,e){e=="parsererror"&&alert("DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})};
+this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d<b;d++){if(d%3===0&&d!==0)c=","+c;c=a[b-d-1]+c}}return c};this.aLengthMenu=[10,25,50,100];this.bDrawing=this.iDraw=0;this.iDrawError=-1;this._iDisplayLength=10;this._iDisplayStart=0;this._iDisplayEnd=10;this._iRecordsDisplay=this._iRecordsTotal=0;this.bJUI=false;this.oClasses=o.oStdClasses;this.bSortCellsTop=this.bSorted=this.bFiltered=false;this.oInit=null}function r(a){return function(){var b=
+[A(this[o.iApiIndex])].concat(Array.prototype.slice.call(arguments));return o.oApi[a].apply(this,b)}}function s(a){var b,c,d=a.iInitDisplayStart;if(a.bInitialised===false)setTimeout(function(){s(a)},200);else{xa(a);V(a);L(a,a.aoHeader);a.nTFoot&&L(a,a.aoFooter);K(a,true);a.oFeatures.bAutoWidth&&ea(a);b=0;for(c=a.aoColumns.length;b<c;b++)if(a.aoColumns[b].sWidth!==null)a.aoColumns[b].nTh.style.width=u(a.aoColumns[b].sWidth);if(a.oFeatures.bSort)R(a);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);
+else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}if(a.sAjaxSource!==null&&!a.oFeatures.bServerSide)a.fnServerData.call(a.oInstance,a.sAjaxSource,[],function(f){var e=f;if(a.sAjaxDataProp!=="")e=Z(a.sAjaxDataProp)(f);for(b=0;b<e.length;b++)v(a,e[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)R(a);else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}K(a,false);w(a,f)},a);else if(!a.oFeatures.bServerSide){K(a,false);w(a)}}}function w(a,b){a._bInitComplete=true;if(typeof a.fnInitComplete=="function")typeof b!=
+"undefined"?a.fnInitComplete.call(a.oInstance,a,b):a.fnInitComplete.call(a.oInstance,a)}function y(a,b,c){n(a.oLanguage,b,"sProcessing");n(a.oLanguage,b,"sLengthMenu");n(a.oLanguage,b,"sEmptyTable");n(a.oLanguage,b,"sLoadingRecords");n(a.oLanguage,b,"sZeroRecords");n(a.oLanguage,b,"sInfo");n(a.oLanguage,b,"sInfoEmpty");n(a.oLanguage,b,"sInfoFiltered");n(a.oLanguage,b,"sInfoPostFix");n(a.oLanguage,b,"sSearch");if(typeof b.oPaginate!="undefined"){n(a.oLanguage.oPaginate,b.oPaginate,"sFirst");n(a.oLanguage.oPaginate,
+b.oPaginate,"sPrevious");n(a.oLanguage.oPaginate,b.oPaginate,"sNext");n(a.oLanguage.oPaginate,b.oPaginate,"sLast")}typeof b.sEmptyTable=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sEmptyTable");typeof b.sLoadingRecords=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sLoadingRecords");c&&s(a)}function G(a,b){var c=a.aoColumns.length;b={sType:null,_bAutoType:true,bVisible:true,bSearchable:true,bSortable:true,asSorting:["asc","desc"],
+sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,sTitle:b?b.innerHTML:"",sName:"",sWidth:null,sWidthOrig:null,sClass:null,fnRender:null,bUseRendered:true,iDataSort:c,mDataProp:c,fnGetData:null,fnSetData:null,sSortDataType:"std",sDefaultContent:null,sContentPadding:"",nTh:b?b:p.createElement("th"),nTf:null};a.aoColumns.push(b);if(typeof a.aoPreSearchCols[c]=="undefined"||a.aoPreSearchCols[c]===null)a.aoPreSearchCols[c]={sSearch:"",bRegex:false,bSmart:true};else{if(typeof a.aoPreSearchCols[c].bRegex==
+"undefined")a.aoPreSearchCols[c].bRegex=true;if(typeof a.aoPreSearchCols[c].bSmart=="undefined")a.aoPreSearchCols[c].bSmart=true}x(a,c,null)}function x(a,b,c){b=a.aoColumns[b];if(typeof c!="undefined"&&c!==null){if(typeof c.sType!="undefined"){b.sType=c.sType;b._bAutoType=false}n(b,c,"bVisible");n(b,c,"bSearchable");n(b,c,"bSortable");n(b,c,"sTitle");n(b,c,"sName");n(b,c,"sWidth");n(b,c,"sWidth","sWidthOrig");n(b,c,"sClass");n(b,c,"fnRender");n(b,c,"bUseRendered");n(b,c,"iDataSort");n(b,c,"mDataProp");
+n(b,c,"asSorting");n(b,c,"sSortDataType");n(b,c,"sDefaultContent");n(b,c,"sContentPadding")}b.fnGetData=Z(b.mDataProp);b.fnSetData=ya(b.mDataProp);if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortable;b.sSortingClassJUI=a.oClasses.sSortJUI}else if(i.inArray("asc",
+b.asSorting)!=-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function v(a,b){var c;c=typeof b.length=="number"?b.slice():i.extend(true,{},b);b=a.aoData.length;var d={nTr:null,_iId:a.iNextId++,_aData:c,_anHidden:[],_sRowStripe:""};a.aoData.push(d);for(var f,
+e=0,h=a.aoColumns.length;e<h;e++){c=a.aoColumns[e];typeof c.fnRender=="function"&&c.bUseRendered&&c.mDataProp!==null&&N(a,b,e,c.fnRender({iDataRow:b,iDataColumn:e,aData:d._aData,oSettings:a}));if(c._bAutoType&&c.sType!="string"){f=H(a,b,e,"type");if(f!==null&&f!==""){f=fa(f);if(c.sType===null)c.sType=f;else if(c.sType!=f)c.sType="string"}}}a.aiDisplayMaster.push(b);a.oFeatures.bDeferRender||z(a,b);return b}function z(a,b){var c=a.aoData[b],d;if(c.nTr===null){c.nTr=p.createElement("tr");typeof c._aData.DT_RowId!=
+"undefined"&&c.nTr.setAttribute("id",c._aData.DT_RowId);typeof c._aData.DT_RowClass!="undefined"&&i(c.nTr).addClass(c._aData.DT_RowClass);for(var f=0,e=a.aoColumns.length;f<e;f++){var h=a.aoColumns[f];d=p.createElement("td");d.innerHTML=typeof h.fnRender=="function"&&(!h.bUseRendered||h.mDataProp===null)?h.fnRender({iDataRow:b,iDataColumn:f,aData:c._aData,oSettings:a}):H(a,b,f,"display");if(h.sClass!==null)d.className=h.sClass;if(h.bVisible){c.nTr.appendChild(d);c._anHidden[f]=null}else c._anHidden[f]=
+d}}}function Y(a){var b,c,d,f,e,h,j,k,m;if(a.bDeferLoading||a.sAjaxSource===null){j=a.nTBody.childNodes;b=0;for(c=j.length;b<c;b++)if(j[b].nodeName.toUpperCase()=="TR"){k=a.aoData.length;a.aoData.push({nTr:j[b],_iId:a.iNextId++,_aData:[],_anHidden:[],_sRowStripe:""});a.aiDisplayMaster.push(k);h=j[b].childNodes;d=e=0;for(f=h.length;d<f;d++){m=h[d].nodeName.toUpperCase();if(m=="TD"||m=="TH"){N(a,k,e,i.trim(h[d].innerHTML));e++}}}}j=$(a);h=[];b=0;for(c=j.length;b<c;b++){d=0;for(f=j[b].childNodes.length;d<
+f;d++){e=j[b].childNodes[d];m=e.nodeName.toUpperCase();if(m=="TD"||m=="TH")h.push(e)}}h.length!=j.length*a.aoColumns.length&&J(a,1,"Unexpected number of TD elements. Expected "+j.length*a.aoColumns.length+" and got "+h.length+". DataTables does not support rowspan / colspan in the table body, and there must be one cell for each row/column combination.");d=0;for(f=a.aoColumns.length;d<f;d++){if(a.aoColumns[d].sTitle===null)a.aoColumns[d].sTitle=a.aoColumns[d].nTh.innerHTML;j=a.aoColumns[d]._bAutoType;
+m=typeof a.aoColumns[d].fnRender=="function";e=a.aoColumns[d].sClass!==null;k=a.aoColumns[d].bVisible;var t,q;if(j||m||e||!k){b=0;for(c=a.aoData.length;b<c;b++){t=h[b*f+d];if(j&&a.aoColumns[d].sType!="string"){q=H(a,b,d,"type");if(q!==""){q=fa(q);if(a.aoColumns[d].sType===null)a.aoColumns[d].sType=q;else if(a.aoColumns[d].sType!=q)a.aoColumns[d].sType="string"}}if(m){q=a.aoColumns[d].fnRender({iDataRow:b,iDataColumn:d,aData:a.aoData[b]._aData,oSettings:a});t.innerHTML=q;a.aoColumns[d].bUseRendered&&
+N(a,b,d,q)}if(e)t.className+=" "+a.aoColumns[d].sClass;if(k)a.aoData[b]._anHidden[d]=null;else{a.aoData[b]._anHidden[d]=t;t.parentNode.removeChild(t)}}}}}function V(a){var b,c,d;a.nTHead.getElementsByTagName("tr");if(a.nTHead.getElementsByTagName("th").length!==0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}}else{var f=p.createElement("tr");b=0;
+for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);f.appendChild(c)}i(a.nTHead).html("")[0].appendChild(f);W(a.aoHeader,a.nTHead)}if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;f=p.createElement("div");f.className=a.oClasses.sSortJUIWrapper;i(c).contents().appendTo(f);var e=p.createElement("span");e.className=a.oClasses.sSortIcon;f.appendChild(e);c.appendChild(f)}}d=function(){this.onselectstart=
+function(){return false};return false};if(a.oFeatures.bSort)for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable!==false){ga(a,a.aoColumns[b].nTh,b);i(a.aoColumns[b].nTh).bind("mousedown.DT",d)}else i(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);a.oClasses.sFooterTH!==""&&i(">tr>th",a.nTFoot).addClass(a.oClasses.sFooterTH);if(a.nTFoot!==null){c=S(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)if(typeof c[b]!="undefined")a.aoColumns[b].nTf=c[b]}}function L(a,b,c){var d,f,
+e,h=[],j=[],k=a.aoColumns.length;if(typeof c=="undefined")c=false;d=0;for(f=b.length;d<f;d++){h[d]=b[d].slice();h[d].nTr=b[d].nTr;for(e=k-1;e>=0;e--)!a.aoColumns[e].bVisible&&!c&&h[d].splice(e,1);j.push([])}d=0;for(f=h.length;d<f;d++){if(h[d].nTr){a=0;for(e=h[d].nTr.childNodes.length;a<e;a++)h[d].nTr.removeChild(h[d].nTr.childNodes[0])}e=0;for(b=h[d].length;e<b;e++){k=c=1;if(typeof j[d][e]=="undefined"){h[d].nTr.appendChild(h[d][e].cell);for(j[d][e]=1;typeof h[d+c]!="undefined"&&h[d][e].cell==h[d+
+c][e].cell;){j[d+c][e]=1;c++}for(;typeof h[d][e+k]!="undefined"&&h[d][e].cell==h[d][e+k].cell;){for(a=0;a<c;a++)j[d+a][e+k]=1;k++}h[d][e].cell.setAttribute("rowspan",c);h[d][e].cell.setAttribute("colspan",k)}}}}function C(a){var b,c,d=[],f=0,e=false;b=a.asStripClasses.length;c=a.aoOpenRows.length;if(!(a.fnPreDrawCallback!==null&&a.fnPreDrawCallback.call(a.oInstance,a)===false)){a.bDrawing=true;if(typeof a.iInitDisplayStart!="undefined"&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?
+a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;E(a)}if(a.bDeferLoading){a.bDeferLoading=false;a.iDraw++}else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!za(a))return}else a.iDraw++;if(a.aiDisplay.length!==0){var h=a._iDisplayStart,j=a._iDisplayEnd;if(a.oFeatures.bServerSide){h=0;j=a.aoData.length}for(h=h;h<j;h++){var k=a.aoData[a.aiDisplay[h]];k.nTr===null&&z(a,a.aiDisplay[h]);var m=k.nTr;if(b!==0){var t=a.asStripClasses[f%b];if(k._sRowStripe!=
+t){i(m).removeClass(k._sRowStripe).addClass(t);k._sRowStripe=t}}if(typeof a.fnRowCallback=="function"){m=a.fnRowCallback.call(a.oInstance,m,a.aoData[a.aiDisplay[h]]._aData,f,h);if(!m&&!e){J(a,0,"A node was not returned by fnRowCallback");e=true}}d.push(m);f++;if(c!==0)for(k=0;k<c;k++)m==a.aoOpenRows[k].nParent&&d.push(a.aoOpenRows[k].nTr)}}else{d[0]=p.createElement("tr");if(typeof a.asStripClasses[0]!="undefined")d[0].className=a.asStripClasses[0];e=a.oLanguage.sZeroRecords.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()));
+if(a.iDraw==1&&a.sAjaxSource!==null&&!a.oFeatures.bServerSide)e=a.oLanguage.sLoadingRecords;else if(typeof a.oLanguage.sEmptyTable!="undefined"&&a.fnRecordsTotal()===0)e=a.oLanguage.sEmptyTable;b=p.createElement("td");b.setAttribute("valign","top");b.colSpan=X(a);b.className=a.oClasses.sRowEmpty;b.innerHTML=e;d[f].appendChild(b)}typeof a.fnHeaderCallback=="function"&&a.fnHeaderCallback.call(a.oInstance,i(">tr",a.nTHead)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback==
+"function"&&a.fnFooterCallback.call(a.oInstance,i(">tr",a.nTFoot)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f=p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered){c=a.nTBody.childNodes;for(b=c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b])}b=0;for(c=d.length;b<c;b++)f.appendChild(d[b]);a.nTBody.appendChild(f);e!==null&&e.appendChild(a.nTBody)}for(b=a.aoDrawCallback.length-
+1;b>=0;b--)a.aoDrawCallback[b].fn.call(a.oInstance,a);a.bSorted=false;a.bFiltered=false;a.bDrawing=false;if(a.oFeatures.bServerSide){K(a,false);typeof a._bInitComplete=="undefined"&&w(a)}}}function ba(a){if(a.oFeatures.bSort)R(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);else{E(a);C(a)}}function za(a){if(a.bAjaxDataGet){K(a,true);var b=a.aoColumns.length,c=[],d,f;a.iDraw++;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:ha(a)});
+c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==false?a._iDisplayLength:-1});for(f=0;f<b;f++){d=a.aoColumns[f].mDataProp;c.push({name:"mDataProp_"+f,value:typeof d=="function"?"function":d})}if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++){c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch});c.push({name:"bRegex_"+
+f,value:a.aoPreSearchCols[f].bRegex});c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}}if(a.oFeatures.bSort!==false){d=a.aaSortingFixed!==null?a.aaSortingFixed.length:0;var e=a.aaSorting.length;c.push({name:"iSortingCols",value:d+e});for(f=0;f<d;f++){c.push({name:"iSortCol_"+f,value:a.aaSortingFixed[f][0]});c.push({name:"sSortDir_"+f,value:a.aaSortingFixed[f][1]})}for(f=0;f<e;f++){c.push({name:"iSortCol_"+(f+d),value:a.aaSorting[f][0]});c.push({name:"sSortDir_"+(f+d),value:a.aaSorting[f][1]})}for(f=
+0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(h){Aa(a,h)},a);return false}else return true}function Aa(a,b){if(typeof b.sEcho!="undefined")if(b.sEcho*1<a.iDraw)return;else a.iDraw=b.sEcho*1;if(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))ia(a);a._iRecordsTotal=b.iTotalRecords;a._iRecordsDisplay=b.iTotalDisplayRecords;var c=ha(a);if(c=typeof b.sColumns!="undefined"&&c!==""&&b.sColumns!=c)var d=
+Ba(a,b.sColumns);b=Z(a.sAjaxDataProp)(b);for(var f=0,e=b.length;f<e;f++)if(c){for(var h=[],j=0,k=a.aoColumns.length;j<k;j++)h.push(b[f][d[j]]);v(a,h)}else v(a,b[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;C(a);a.bAjaxDataGet=true;K(a,false)}function xa(a){var b=p.createElement("div");a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=p.createElement("div");a.nTableWrapper.className=a.oClasses.sWrapper;a.sTableId!==""&&a.nTableWrapper.setAttribute("id",a.sTableId+"_wrapper");
+a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),f,e,h,j,k,m,t,q=0;q<d.length;q++){e=0;h=d[q];if(h=="<"){j=p.createElement("div");k=d[q+1];if(k=="'"||k=='"'){m="";for(t=2;d[q+t]!=k;){m+=d[q+t];t++}if(m=="H")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(m=="F")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";if(m.indexOf(".")!=-1){k=m.split(".");j.setAttribute("id",k[0].substr(1,
+k[0].length-1));j.className=k[1]}else if(m.charAt(0)=="#")j.setAttribute("id",m.substr(1,m.length-1));else j.className=m;q+=t}c.appendChild(j);c=j}else if(h==">")c=c.parentNode;else if(h=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=Ca(a);e=1}else if(h=="f"&&a.oFeatures.bFilter){f=Da(a);e=1}else if(h=="r"&&a.oFeatures.bProcessing){f=Ea(a);e=1}else if(h=="t"){f=Fa(a);e=1}else if(h=="i"&&a.oFeatures.bInfo){f=Ga(a);e=1}else if(h=="p"&&a.oFeatures.bPaginate){f=Ha(a);e=1}else if(o.aoFeatures.length!==
+0){j=o.aoFeatures;t=0;for(k=j.length;t<k;t++)if(h==j[t].cFeature){if(f=j[t].fnInit(a))e=1;break}}if(e==1&&f!==null){if(typeof a.aanFeatures[h]!="object")a.aanFeatures[h]=[];a.aanFeatures[h].push(f);c.appendChild(f)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function Fa(a){if(a.oScroll.sX===""&&a.oScroll.sY==="")return a.nTable;var b=p.createElement("div"),c=p.createElement("div"),d=p.createElement("div"),f=p.createElement("div"),e=p.createElement("div"),h=p.createElement("div"),j=a.nTable.cloneNode(false),
+k=a.nTable.cloneNode(false),m=a.nTable.getElementsByTagName("thead")[0],t=a.nTable.getElementsByTagName("tfoot").length===0?null:a.nTable.getElementsByTagName("tfoot")[0],q=typeof g.bJQueryUI!="undefined"&&g.bJQueryUI?o.oJUIClasses:o.oStdClasses;c.appendChild(d);e.appendChild(h);f.appendChild(a.nTable);b.appendChild(c);b.appendChild(f);d.appendChild(j);j.appendChild(m);if(t!==null){b.appendChild(e);h.appendChild(k);k.appendChild(t)}b.className=q.sScrollWrapper;c.className=q.sScrollHead;d.className=
+q.sScrollHeadInner;f.className=q.sScrollBody;e.className=q.sScrollFoot;h.className=q.sScrollFootInner;if(a.oScroll.bAutoCss){c.style.overflow="hidden";c.style.position="relative";e.style.overflow="hidden";f.style.overflow="auto"}c.style.border="0";c.style.width="100%";e.style.border="0";d.style.width="150%";j.removeAttribute("id");j.style.marginLeft="0";a.nTable.style.marginLeft="0";if(t!==null){k.removeAttribute("id");k.style.marginLeft="0"}d=i(">caption",a.nTable);h=0;for(k=d.length;h<k;h++)j.appendChild(d[h]);
+if(a.oScroll.sX!==""){c.style.width=u(a.oScroll.sX);f.style.width=u(a.oScroll.sX);if(t!==null)e.style.width=u(a.oScroll.sX);i(f).scroll(function(){c.scrollLeft=this.scrollLeft;if(t!==null)e.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!=="")f.style.height=u(a.oScroll.sY);a.aoDrawCallback.push({fn:Ia,sName:"scrolling"});a.oScroll.bInfinite&&i(f).scroll(function(){if(!a.bDrawing)if(i(this).scrollTop()+i(this).height()>i(a.nTable).height()-a.oScroll.iLoadGap)if(a.fnDisplayEnd()<a.fnRecordsDisplay()){ja(a,
+"next");E(a);C(a)}});a.nScrollHead=c;a.nScrollFoot=e;return b}function Ia(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,f,e,h,j,k,m,t,q,I=[];h=a.nTable.getElementsByTagName("thead");h.length>0&&a.nTable.removeChild(h[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}h=a.nTHead.cloneNode(true);a.nTable.insertBefore(h,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);
+a.nTable.insertBefore(k,a.nTable.childNodes[1])}if(a.oScroll.sX===""){d.style.width="100%";b.parentNode.style.width="100%"}var O=S(a,h);f=0;for(e=O.length;f<e;f++){t=Ja(a,f);O[f].style.width=a.aoColumns[t].sWidth}a.nTFoot!==null&&P(function(B){B.style.width=""},k.getElementsByTagName("tr"));f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(i.browser.msie&&i.browser.version<=7)a.nTable.style.width=u(i(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!==
+"")a.nTable.style.width=u(a.oScroll.sXInner);else if(f==i(d).width()&&i(d).height()<i(a.nTable).height()){a.nTable.style.width=u(f-a.oScroll.iBarWidth);if(i(a.nTable).outerWidth()>f-a.oScroll.iBarWidth)a.nTable.style.width=u(f)}else a.nTable.style.width=u(f);f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){d.style.width=u(f+a.oScroll.iBarWidth);b.parentNode.style.width=u(f+a.oScroll.iBarWidth)}e=a.nTHead.getElementsByTagName("tr");h=h.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop=
+"0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},h,e);i(h).height(0);if(a.nTFoot!==null){j=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},j,k);i(j).height(0)}P(function(B){B.innerHTML="";B.style.width=u(I.shift())},h);a.nTFoot!==null&&P(function(B){B.innerHTML=
+"";B.style.width=u(I.shift())},j);if(i(a.nTable).outerWidth()<f)if(a.oScroll.sX==="")J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you enable x-scrolling or increase the width the table has in which to be drawn");else a.oScroll.sXInner!==""&&J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you increase the sScrollXInner property to allow it to draw in a larger area, or simply remove that parameter to allow automatic calculation");
+if(a.oScroll.sY==="")if(i.browser.msie&&i.browser.version<=7)d.style.height=u(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=u(a.oScroll.sY);j=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=u(i(a.nTable).height()+j)}j=i(a.nTable).outerWidth();c.style.width=u(j);b.style.width=u(j+a.oScroll.iBarWidth);if(a.nTFoot!==null){b=a.nScrollFoot.getElementsByTagName("div")[0];
+c=b.getElementsByTagName("table")[0];b.style.width=u(a.nTable.offsetWidth+a.oScroll.iBarWidth);c.style.width=u(a.nTable.offsetWidth)}if(a.bSorted||a.bFiltered)d.scrollTop=0}function ca(a){if(a.oFeatures.bAutoWidth===false)return false;ea(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function Da(a){var b=a.oLanguage.sSearch;b=b.indexOf("_INPUT_")!==-1?b.replace("_INPUT_",'<input type="text" />'):b===""?'<input type="text" />':b+' <input type="text" />';
+var c=p.createElement("div");c.className=a.oClasses.sFilter;c.innerHTML="<label>"+b+"</label>";a.sTableId!==""&&typeof a.aanFeatures.f=="undefined"&&c.setAttribute("id",a.sTableId+"_filter");b=i("input",c);b.val(a.oPreviousSearch.sSearch.replace('"',"&quot;"));b.bind("keyup.DT",function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f<e;f++)d[f]!=this.parentNode&&i("input",d[f]).val(this.value);this.value!=a.oPreviousSearch.sSearch&&M(a,{sSearch:this.value,bRegex:a.oPreviousSearch.bRegex,bSmart:a.oPreviousSearch.bSmart})});
+b.bind("keypress.DT",function(d){if(d.keyCode==13)return false});return c}function M(a,b,c){Ka(a,b.sSearch,c,b.bRegex,b.bSmart);for(b=0;b<a.aoPreSearchCols.length;b++)La(a,a.aoPreSearchCols[b].sSearch,b,a.aoPreSearchCols[b].bRegex,a.aoPreSearchCols[b].bSmart);o.afnFiltering.length!==0&&Ma(a);a.bFiltered=true;a._iDisplayStart=0;E(a);C(a);ka(a,0)}function Ma(a){for(var b=o.afnFiltering,c=0,d=b.length;c<d;c++)for(var f=0,e=0,h=a.aiDisplay.length;e<h;e++){var j=a.aiDisplay[e-f];if(!b[c](a,da(a,j,"filter"),
+j)){a.aiDisplay.splice(e-f,1);f++}}}function La(a,b,c,d,f){if(b!==""){var e=0;b=la(b,d,f);for(d=a.aiDisplay.length-1;d>=0;d--){f=ma(H(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d,1);e++}}}}function Ka(a,b,c,d,f){var e=la(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(o.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||a.oPreviousSearch.sSearch.length>
+b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);ka(a,1);for(c=0;c<a.aiDisplayMaster.length;c++)e.test(a.asDataSearch[c])&&a.aiDisplay.push(a.aiDisplayMaster[c])}else{var h=0;for(c=0;c<a.asDataSearch.length;c++)if(!e.test(a.asDataSearch[c])){a.aiDisplay.splice(c-h,1);h++}}a.oPreviousSearch.sSearch=b;a.oPreviousSearch.bRegex=d;a.oPreviousSearch.bSmart=f}function ka(a,b){a.asDataSearch.splice(0,a.asDataSearch.length);b=typeof b!="undefined"&&b==1?a.aiDisplayMaster:
+a.aiDisplay;for(var c=0,d=b.length;c<d;c++)a.asDataSearch[c]=na(a,da(a,b[c],"filter"))}function na(a,b){var c="";if(typeof a.__nTmpFilter=="undefined")a.__nTmpFilter=p.createElement("div");for(var d=a.__nTmpFilter,f=0,e=a.aoColumns.length;f<e;f++)if(a.aoColumns[f].bSearchable)c+=ma(b[f],a.aoColumns[f].sType)+"  ";if(c.indexOf("&")!==-1){d.innerHTML=c;c=d.textContent?d.textContent:d.innerText;c=c.replace(/\n/g," ").replace(/\r/g,"")}return c}function la(a,b,c){if(c){a=b?a.split(" "):oa(a).split(" ");
+a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,"i")}else{a=b?a:oa(a);return new RegExp(a,"i")}}function ma(a,b){if(typeof o.ofnSearch[b]=="function")return o.ofnSearch[b](a);else if(b=="html")return a.replace(/\n/g," ").replace(/<.*?>/g,"");else if(typeof a=="string")return a.replace(/\n/g," ");else if(a===null)return"";return a}function R(a,b){var c,d,f,e,h=[],j=[],k=o.oSort;d=a.aoData;var m=a.aoColumns;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||a.aaSortingFixed!==null)){h=a.aaSortingFixed!==
+null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<h.length;c++){var t=h[c][0];f=pa(a,t);e=a.aoColumns[t].sSortDataType;if(typeof o.afnSortData[e]!="undefined"){var q=o.afnSortData[e](a,t,f);f=0;for(e=d.length;f<e;f++)N(a,f,t,q[f])}}c=0;for(d=a.aiDisplayMaster.length;c<d;c++)j[a.aiDisplayMaster[c]]=c;var I=h.length;a.aiDisplayMaster.sort(function(O,B){var F,qa;for(c=0;c<I;c++){F=m[h[c][0]].iDataSort;qa=m[F].sType;F=k[(qa?qa:"string")+"-"+h[c][1]](H(a,O,F,"sort"),H(a,B,F,"sort"));
+if(F!==0)return F}return k["numeric-asc"](j[O],j[B])})}if((typeof b=="undefined"||b)&&!a.oFeatures.bDeferRender)T(a);a.bSorted=true;if(a.oFeatures.bFilter)M(a,a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;E(a);C(a)}}function ga(a,b,c,d){i(b).bind("click.DT",function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var h,j;if(f.shiftKey){for(var k=false,m=0;m<a.aaSorting.length;m++)if(a.aaSorting[m][0]==c){k=true;h=a.aaSorting[m][0];j=a.aaSorting[m][2]+
+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")a.aaSorting.splice(m,1);else{a.aaSorting[m][1]=a.aoColumns[h].asSorting[j];a.aaSorting[m][2]=j}break}k===false&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){h=a.aaSorting[0][0];j=a.aaSorting[0][2]+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")j=0;a.aaSorting[0][1]=a.aoColumns[h].asSorting[j];a.aaSorting[0][2]=j}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],
+0])}R(a)};if(a.oFeatures.bProcessing){K(a,true);setTimeout(function(){e();a.oFeatures.bServerSide||K(a,false)},0)}else e();typeof d=="function"&&d(a)}})}function T(a){var b,c,d,f,e,h=a.aoColumns.length,j=a.oClasses;for(b=0;b<h;b++)a.aoColumns[b].bSortable&&i(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);f=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){e=a.aoColumns[b].sSortingClass;
+d=-1;for(c=0;c<f.length;c++)if(f[c][0]==b){e=f[c][1]=="asc"?j.sSortAsc:j.sSortDesc;d=c;break}i(a.aoColumns[b].nTh).addClass(e);if(a.bJUI){c=i("span",a.aoColumns[b].nTh);c.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:f[d][1]=="asc"?j.sSortJUIAsc:j.sSortJUIDesc)}}else i(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);e=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=
+Q(a);if(a.oFeatures.bDeferRender)i(d).removeClass(e+"1 "+e+"2 "+e+"3");else if(d.length>=h)for(b=0;b<h;b++)if(d[b].className.indexOf(e+"1")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"1",""))}else if(d[b].className.indexOf(e+"2")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"2",""))}else if(d[b].className.indexOf(e+"3")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(" "+
+e+"3",""))}j=1;var k;for(b=0;b<f.length;b++){k=parseInt(f[b][0],10);c=0;for(a=d.length/h;c<a;c++)d[h*c+k].className+=" "+e+j;j<3&&j++}}}function Ha(a){if(a.oScroll.bInfinite)return null;var b=p.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;o.oPagination[a.sPaginationType].fnInit(a,b,function(c){E(c);C(c)});typeof a.aanFeatures.p=="undefined"&&a.aoDrawCallback.push({fn:function(c){o.oPagination[c.sPaginationType].fnUpdate(c,function(d){E(d);C(d)})},sName:"pagination"});return b}
+function ja(a,b){var c=a._iDisplayStart;if(b=="first")a._iDisplayStart=0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=
+0;else J(a,0,"Unknown paging action: "+b);return c!=a._iDisplayStart}function Ga(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Na,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b}function Na(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=a._iDisplayStart+1,c=a.fnDisplayEnd(),d=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),e=a.fnFormatNumber(b),h=a.fnFormatNumber(c),j=
+a.fnFormatNumber(d),k=a.fnFormatNumber(f);if(a.oScroll.bInfinite)e=a.fnFormatNumber(1);e=a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()===0?a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",j)+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfo.replace("_START_",e).replace("_END_",h).replace("_TOTAL_",k)+a.oLanguage.sInfoPostFix:a.oLanguage.sInfo.replace("_START_",
+e).replace("_END_",h).replace("_TOTAL_",k)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix;if(a.oLanguage.fnInfoCallback!==null)e=a.oLanguage.fnInfoCallback(a,b,c,d,f,e);a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)i(a[b]).html(e)}}function Ca(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+(a.sTableId===""?"":'name="'+a.sTableId+'_length"')+">",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]==
+"object"){c=0;for(d=a.aLengthMenu[0].length;c<d;c++)b+='<option value="'+a.aLengthMenu[0][c]+'">'+a.aLengthMenu[1][c]+"</option>"}else{c=0;for(d=a.aLengthMenu.length;c<d;c++)b+='<option value="'+a.aLengthMenu[c]+'">'+a.aLengthMenu[c]+"</option>"}b+="</select>";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+"_length");f.className=a.oClasses.sLength;f.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";i('select option[value="'+
+a._iDisplayLength+'"]',f).attr("selected",true);i("select",f).bind("change.DT",function(){var e=i(this).val(),h=a.aanFeatures.l;c=0;for(d=h.length;c<d;c++)h[c]!=this.parentNode&&i("select",h[c]).val(e);a._iDisplayLength=parseInt(e,10);E(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=0}if(a._iDisplayLength==-1)a._iDisplayStart=0;C(a)});return f}function Ea(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.r==
+"undefined"&&b.setAttribute("id",a.sTableId+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function K(a,b){if(a.oFeatures.bProcessing){a=a.aanFeatures.r;for(var c=0,d=a.length;c<d;c++)a[c].style.visibility=b?"visible":"hidden"}}function Ja(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(c==b)return d}return null}function pa(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===
+true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function U(a,b){var c,d;c=a._iDisplayStart;for(d=a._iDisplayEnd;c<d;c++)if(a.aoData[a.aiDisplay[c]].nTr==b)return a.aiDisplay[c];c=0;for(d=a.aoData.length;c<d;c++)if(a.aoData[c].nTr==b)return c;return null}function X(a){for(var b=0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===true&&b++;return b}function E(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||
+a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Oa(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=u(a);b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ea(a){var b=0,c,d=0,f=a.aoColumns.length,e,h=i("th",a.nTHead);for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d++;if(a.aoColumns[e].sWidth!==null){c=Oa(a.aoColumns[e].sWidthOrig,a.nTable.parentNode);if(c!==
+null)a.aoColumns[e].sWidth=u(c);b++}}if(f==h.length&&b===0&&d==f&&a.oScroll.sX===""&&a.oScroll.sY==="")for(e=0;e<a.aoColumns.length;e++){c=i(h[e]).width();if(c!==null)a.aoColumns[e].sWidth=u(c)}else{b=a.nTable.cloneNode(false);e=a.nTHead.cloneNode(true);d=p.createElement("tbody");c=p.createElement("tr");b.removeAttribute("id");b.appendChild(e);if(a.nTFoot!==null){b.appendChild(a.nTFoot.cloneNode(true));P(function(k){k.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(d);d.appendChild(c);
+d=i("thead th",b);if(d.length===0)d=i("tbody tr:eq(0)>td",b);h=S(a,e);for(e=d=0;e<f;e++){var j=a.aoColumns[e];if(j.bVisible&&j.sWidthOrig!==null&&j.sWidthOrig!=="")h[e-d].style.width=u(j.sWidthOrig);else if(j.bVisible)h[e-d].style.width="";else d++}for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d=Pa(a,e);if(d!==null){d=d.cloneNode(true);if(a.aoColumns[e].sContentPadding!=="")d.innerHTML+=a.aoColumns[e].sContentPadding;c.appendChild(d)}}f=a.nTable.parentNode;f.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!==
+"")b.style.width=u(a.oScroll.sXInner);else if(a.oScroll.sX!==""){b.style.width="";if(i(b).width()<f.offsetWidth)b.style.width=u(f.offsetWidth)}else if(a.oScroll.sY!=="")b.style.width=u(f.offsetWidth);b.style.visibility="hidden";Qa(a,b);f=i("tbody tr:eq(0)",b).children();if(f.length===0)f=S(a,i("thead",b)[0]);if(a.oScroll.sX!==""){for(e=d=c=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c+=a.aoColumns[e].sWidthOrig===null?i(f[d]).outerWidth():parseInt(a.aoColumns[e].sWidth.replace("px",""),
+10)+(i(f[d]).outerWidth()-i(f[d]).width());d++}b.style.width=u(c);a.nTable.style.width=u(c)}for(e=d=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c=i(f[d]).width();if(c!==null&&c>0)a.aoColumns[e].sWidth=u(c);d++}a.nTable.style.width=u(i(b).outerWidth());b.parentNode.removeChild(b)}}function Qa(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==""){i(b).width();b.style.width=u(i(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=u(i(b).outerWidth())}function Pa(a,b){var c=
+Ra(a,b);if(c<0)return null;if(a.aoData[c].nTr===null){var d=p.createElement("td");d.innerHTML=H(a,c,b,"");return d}return Q(a,c)[b]}function Ra(a,b){for(var c=-1,d=-1,f=0;f<a.aoData.length;f++){var e=H(a,f,b,"display")+"";e=e.replace(/<.*?>/g,"");if(e.length>c){c=e.length;d=f}}return d}function u(a){if(a===null)return"0px";if(typeof a=="number"){if(a<0)return"0px";return a+"px"}var b=a.charCodeAt(a.length-1);if(b<48||b>57)return a;return a+"px"}function Va(a,b){if(a.length!=b.length)return 1;for(var c=
+0;c<a.length;c++)if(a[c]!=b[c])return 2;return 0}function fa(a){for(var b=o.aTypes,c=b.length,d=0;d<c;d++){var f=b[d](a);if(f!==null)return f}return"string"}function A(a){for(var b=0;b<D.length;b++)if(D[b].nTable==a)return D[b];return null}function aa(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function $(a){for(var b=[],c=0,d=a.aoData.length;c<d;c++)a.aoData[c].nTr!==null&&b.push(a.aoData[c].nTr);return b}function Q(a,b){var c=[],d,f,e,h,j;f=0;var k=a.aoData.length;
+if(typeof b!="undefined"){f=b;k=b+1}for(f=f;f<k;f++){j=a.aoData[f];if(j.nTr!==null){b=[];e=0;for(h=j.nTr.childNodes.length;e<h;e++){d=j.nTr.childNodes[e].nodeName.toLowerCase();if(d=="td"||d=="th")b.push(j.nTr.childNodes[e])}e=d=0;for(h=a.aoColumns.length;e<h;e++)if(a.aoColumns[e].bVisible)c.push(b[e-d]);else{c.push(j._anHidden[e]);d++}}}return c}function oa(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)","g"),"\\$1")}function ra(a,b){for(var c=-1,d=
+0,f=a.length;d<f;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function Ba(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d<f;d++)for(var e=0;e<f;e++)if(a.aoColumns[d].sName==b[e]){c.push(e);break}return c}function ha(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function J(a,b,c){a=a.sTableId===""?"DataTables warning: "+c:"DataTables warning (table id = '"+a.sTableId+"'): "+c;if(b===0)if(o.sErrMode==
+"alert")alert(a);else throw a;else typeof console!="undefined"&&typeof console.log!="undefined"&&console.log(a)}function ia(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,a.aiDisplayMaster.length);a.aiDisplay.splice(0,a.aiDisplay.length);E(a)}function sa(a){if(!(!a.oFeatures.bStateSave||typeof a.bDestroying!="undefined")){var b,c,d,f="{";f+='"iCreate":'+(new Date).getTime()+",";f+='"iStart":'+(a.oScroll.bInfinite?0:a._iDisplayStart)+",";f+='"iEnd":'+(a.oScroll.bInfinite?a._iDisplayLength:
+a._iDisplayEnd)+",";f+='"iLength":'+a._iDisplayLength+",";f+='"sFilter":"'+encodeURIComponent(a.oPreviousSearch.sSearch)+'",';f+='"sFilterEsc":'+!a.oPreviousSearch.bRegex+",";f+='"aaSorting":[ ';for(b=0;b<a.aaSorting.length;b++)f+="["+a.aaSorting[b][0]+',"'+a.aaSorting[b][1]+'"],';f=f.substring(0,f.length-1);f+="],";f+='"aaSearchCols":[ ';for(b=0;b<a.aoPreSearchCols.length;b++)f+='["'+encodeURIComponent(a.aoPreSearchCols[b].sSearch)+'",'+!a.aoPreSearchCols[b].bRegex+"],";f=f.substring(0,f.length-
+1);f+="],";f+='"abVisCols":[ ';for(b=0;b<a.aoColumns.length;b++)f+=a.aoColumns[b].bVisible+",";f=f.substring(0,f.length-1);f+="]";b=0;for(c=a.aoStateSave.length;b<c;b++){d=a.aoStateSave[b].fn(a,f);if(d!=="")f=d}f+="}";Sa(a.sCookiePrefix+a.sInstance,f,a.iCookieDuration,a.sCookiePrefix,a.fnCookieCallback)}}function Ta(a,b){if(a.oFeatures.bStateSave){var c,d,f;d=ta(a.sCookiePrefix+a.sInstance);if(d!==null&&d!==""){try{c=typeof i.parseJSON=="function"?i.parseJSON(d.replace(/'/g,'"')):eval("("+d+")")}catch(e){return}d=
+0;for(f=a.aoStateLoad.length;d<f;d++)if(!a.aoStateLoad[d].fn(a,c))return;a.oLoadedState=i.extend(true,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.oPreviousSearch.sSearch=decodeURIComponent(c.sFilter);a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();if(typeof c.sFilterEsc!="undefined")a.oPreviousSearch.bRegex=!c.sFilterEsc;if(typeof c.aaSearchCols!="undefined")for(d=0;d<c.aaSearchCols.length;d++)a.aoPreSearchCols[d]=
+{sSearch:decodeURIComponent(c.aaSearchCols[d][0]),bRegex:!c.aaSearchCols[d][1]};if(typeof c.abVisCols!="undefined"){b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}}}}}function Sa(a,b,c,d,f){var e=new Date;e.setTime(e.getTime()+c*1E3);c=wa.location.pathname.split("/");a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();var h;if(f!==null){h=typeof i.parseJSON=="function"?i.parseJSON(b):eval("("+b+")");b=f(a,h,e.toGMTString(),
+c.join("/")+"/")}else b=a+"="+encodeURIComponent(b)+"; expires="+e.toGMTString()+"; path="+c.join("/")+"/";f="";e=9999999999999;if((ta(a)!==null?p.cookie.length:b.length+p.cookie.length)+10>4096){a=p.cookie.split(";");for(var j=0,k=a.length;j<k;j++)if(a[j].indexOf(d)!=-1){var m=a[j].split("=");try{h=eval("("+decodeURIComponent(m[1])+")")}catch(t){continue}if(typeof h.iCreate!="undefined"&&h.iCreate<e){f=m[0];e=h.iCreate}}if(f!=="")p.cookie=f+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+
+"/"}p.cookie=b}function ta(a){var b=wa.location.pathname.split("/");a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=p.cookie.split(";");for(var c=0;c<b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function W(a,b){b=b.getElementsByTagName("tr");var c,d,f,e,h,j,k,m,t=function(O,B,F){for(;typeof O[B][F]!="undefined";)F++;return F};a.splice(0,a.length);d=0;for(j=b.length;d<
+j;d++)a.push([]);d=0;for(j=b.length;d<j;d++){f=0;for(k=b[d].childNodes.length;f<k;f++){c=b[d].childNodes[f];if(c.nodeName.toUpperCase()=="TD"||c.nodeName.toUpperCase()=="TH"){var q=c.getAttribute("colspan")*1,I=c.getAttribute("rowspan")*1;q=!q||q===0||q===1?1:q;I=!I||I===0||I===1?1:I;m=t(a,d,0);for(h=0;h<q;h++)for(e=0;e<I;e++){a[d+e][m+h]={cell:c,unique:q==1?true:false};a[d+e].nTr=b[d]}}}}}function S(a,b,c){var d=[];if(typeof c=="undefined"){c=a.aoHeader;if(typeof b!="undefined"){c=[];W(c,b)}}b=0;
+for(var f=c.length;b<f;b++)for(var e=0,h=c[b].length;e<h;e++)if(c[b][e].unique&&(typeof d[e]=="undefined"||!a.bSortCellsTop))d[e]=c[b][e].cell;return d}function Ua(){var a=p.createElement("p"),b=a.style;b.width="100%";b.height="200px";var c=p.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.overflow="hidden";c.appendChild(a);p.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;if(b==a)a=
+c.clientWidth;p.body.removeChild(c);return b-a}function P(a,b,c){for(var d=0,f=b.length;d<f;d++)for(var e=0,h=b[d].childNodes.length;e<h;e++)if(b[d].childNodes[e].nodeType==1)typeof c!="undefined"?a(b[d].childNodes[e],c[d].childNodes[e]):a(b[d].childNodes[e])}function n(a,b,c,d){if(typeof d=="undefined")d=c;if(typeof b[c]!="undefined")a[d]=b[c]}function da(a,b,c){for(var d=[],f=0,e=a.aoColumns.length;f<e;f++)d.push(H(a,b,f,c));return d}function H(a,b,c,d){var f=a.aoColumns[c];if((c=f.fnGetData(a.aoData[b]._aData))===
+undefined){if(a.iDrawError!=a.iDraw&&f.sDefaultContent===null){J(a,0,"Requested unknown parameter '"+f.mDataProp+"' from the data source for row "+b);a.iDrawError=a.iDraw}return f.sDefaultContent}if(c===null&&f.sDefaultContent!==null)c=f.sDefaultContent;if(d=="display"&&c===null)return"";return c}function N(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function Z(a){if(a===null)return function(){return null};else if(typeof a=="function")return function(c){return a(c)};else if(typeof a==
+"string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c){return c[b[0]][b[1]]}:b.length==3?function(c){return c[b[0]][b[1]][b[2]]}:function(c){for(var d=0,f=b.length;d<f;d++)c=c[b[d]];return c}}else return function(c){return c[a]}}function ya(a){if(a===null)return function(){};else if(typeof a=="function")return function(c,d){return a(c,d)};else if(typeof a=="string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c,d){c[b[0]][b[1]]=d}:b.length==3?function(c,
+d){c[b[0]][b[1]][b[2]]=d}:function(c,d){for(var f=0,e=b.length-1;f<e;f++)c=c[b[f]];c[b[b.length-1]]=d}}else return function(c,d){c[a]=d}}this.oApi={};this.fnDraw=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined"&&a===false){E(b);C(b)}else ba(b)};this.fnFilter=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);if(e.oFeatures.bFilter){if(typeof c=="undefined")c=false;if(typeof d=="undefined")d=true;if(typeof f=="undefined")f=true;if(typeof b=="undefined"||b===null){M(e,{sSearch:a,bRegex:c,
+bSmart:d},1);if(f&&typeof e.aanFeatures.f!="undefined"){b=e.aanFeatures.f;c=0;for(d=b.length;c<d;c++)i("input",b[c]).val(a)}}else{e.aoPreSearchCols[b].sSearch=a;e.aoPreSearchCols[b].bRegex=c;e.aoPreSearchCols[b].bSmart=d;M(e,e.oPreviousSearch,1)}}};this.fnSettings=function(){return A(this[o.iApiIndex])};this.fnVersionCheck=o.fnVersionCheck;this.fnSort=function(a){var b=A(this[o.iApiIndex]);b.aaSorting=a;R(b)};this.fnSortListener=function(a,b,c){ga(A(this[o.iApiIndex]),a,b,c)};this.fnAddData=function(a,
+b){if(a.length===0)return[];var c=[],d,f=A(this[o.iApiIndex]);if(typeof a[0]=="object")for(var e=0;e<a.length;e++){d=v(f,a[e]);if(d==-1)return c;c.push(d)}else{d=v(f,a);if(d==-1)return c;c.push(d)}f.aiDisplay=f.aiDisplayMaster.slice();if(typeof b=="undefined"||b)ba(f);return c};this.fnDeleteRow=function(a,b,c){var d=A(this[o.iApiIndex]);a=typeof a=="object"?U(d,a):a;var f=d.aoData.splice(a,1),e=i.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,1);ra(d.aiDisplayMaster,a);ra(d.aiDisplay,a);typeof b==
+"function"&&b.call(this,d,f);if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){E(d);C(d)}return f};this.fnClearTable=function(a){var b=A(this[o.iApiIndex]);ia(b);if(typeof a=="undefined"||a)C(b)};this.fnOpen=function(a,b,c){var d=A(this[o.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;e.colSpan=X(d);if(typeof b.jquery!="undefined"||typeof b==
+"object")e.appendChild(b);else e.innerHTML=b;b=i("tr",d.nTBody);i.inArray(a,b)!=-1&&i(f).insertAfter(a);d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=A(this[o.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnGetData=function(a,b){var c=A(this[o.iApiIndex]);if(typeof a!="undefined"){a=typeof a=="object"?U(c,a):a;if(typeof b!=
+"undefined")return H(c,a,b,"");return typeof c.aoData[a]!="undefined"?c.aoData[a]._aData:null}return aa(c)};this.fnGetNodes=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined")return typeof b.aoData[a]!="undefined"?b.aoData[a].nTr:null;return $(b)};this.fnGetPosition=function(a){var b=A(this[o.iApiIndex]),c=a.nodeName.toUpperCase();if(c=="TR")return U(b,a);else if(c=="TD"||c=="TH"){c=U(b,a.parentNode);for(var d=Q(b,c),f=0;f<b.aoColumns.length;f++)if(d[f]==a)return[c,pa(b,f),f]}return null};
+this.fnUpdate=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);b=typeof b=="object"?U(e,b):b;if(i.isArray(a)&&typeof a=="object"){e.aoData[b]._aData=a.slice();for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else if(typeof a=="object"){e.aoData[b]._aData=i.extend(true,{},a);for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else{a=a;N(e,b,c,a);if(e.aoColumns[c].fnRender!==null){a=e.aoColumns[c].fnRender({iDataRow:b,iDataColumn:c,aData:e.aoData[b]._aData,
+oSettings:e});e.aoColumns[c].bUseRendered&&N(e,b,c,a)}if(e.aoData[b].nTr!==null)Q(e,b)[c].innerHTML=a}c=i.inArray(b,e.aiDisplay);e.asDataSearch[c]=na(e,da(e,b,"filter"));if(typeof f=="undefined"||f)ca(e);if(typeof d=="undefined"||d)ba(e);return 0};this.fnSetColumnVis=function(a,b,c){var d=A(this[o.iApiIndex]),f,e;e=d.aoColumns.length;var h,j;if(d.aoColumns[a].bVisible!=b){if(b){for(f=j=0;f<a;f++)d.aoColumns[f].bVisible&&j++;j=j>=X(d);if(!j)for(f=a;f<e;f++)if(d.aoColumns[f].bVisible){h=f;break}f=0;
+for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null)j?d.aoData[f].nTr.appendChild(d.aoData[f]._anHidden[a]):d.aoData[f].nTr.insertBefore(d.aoData[f]._anHidden[a],Q(d,f)[h])}else{f=0;for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null){h=Q(d,f)[a];d.aoData[f]._anHidden[a]=h;h.parentNode.removeChild(h)}}d.aoColumns[a].bVisible=b;L(d,d.aoHeader);d.nTFoot&&L(d,d.aoFooter);f=0;for(e=d.aoOpenRows.length;f<e;f++)d.aoOpenRows[f].nTr.colSpan=X(d);if(typeof c=="undefined"||c){ca(d);C(d)}sa(d)}};this.fnPageChange=
+function(a,b){var c=A(this[o.iApiIndex]);ja(c,a);E(c);if(typeof b=="undefined"||b)C(c)};this.fnDestroy=function(){var a=A(this[o.iApiIndex]),b=a.nTableWrapper.parentNode,c=a.nTBody,d,f;a.bDestroying=true;d=0;for(f=a.aoColumns.length;d<f;d++)a.aoColumns[d].bVisible===false&&this.fnSetColumnVis(d,true);i(a.nTableWrapper).find("*").andSelf().unbind(".DT");i("tbody>tr>td."+a.oClasses.sRowEmpty,a.nTable).parent().remove();if(a.nTable!=a.nTHead.parentNode){i(">thead",a.nTable).remove();a.nTable.appendChild(a.nTHead)}if(a.nTFoot&&
+a.nTable!=a.nTFoot.parentNode){i(">tfoot",a.nTable).remove();a.nTable.appendChild(a.nTFoot)}a.nTable.parentNode.removeChild(a.nTable);i(a.nTableWrapper).remove();a.aaSorting=[];a.aaSortingFixed=[];T(a);i($(a)).removeClass(a.asStripClasses.join(" "));if(a.bJUI){i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oJUIClasses.sSortableAsc,o.oJUIClasses.sSortableDesc,o.oJUIClasses.sSortableNone].join(" "));i("th span."+o.oJUIClasses.sSortIcon,a.nTHead).remove();i("th",a.nTHead).each(function(){var e=
+i("div."+o.oJUIClasses.sSortJUIWrapper,this),h=e.contents();i(this).append(h);e.remove()})}else i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oStdClasses.sSortableAsc,o.oStdClasses.sSortableDesc,o.oStdClasses.sSortableNone].join(" "));a.nTableReinsertBefore?b.insertBefore(a.nTable,a.nTableReinsertBefore):b.appendChild(a.nTable);d=0;for(f=a.aoData.length;d<f;d++)a.aoData[d].nTr!==null&&c.appendChild(a.aoData[d].nTr);if(a.oFeatures.bAutoWidth===true)a.nTable.style.width=u(a.sDestroyWidth);
+i(">tr:even",c).addClass(a.asDestoryStrips[0]);i(">tr:odd",c).addClass(a.asDestoryStrips[1]);d=0;for(f=D.length;d<f;d++)D[d]==a&&D.splice(d,1);a=null};this.fnAdjustColumnSizing=function(a){var b=A(this[o.iApiIndex]);ca(b);if(typeof a=="undefined"||a)this.fnDraw(false);else if(b.oScroll.sX!==""||b.oScroll.sY!=="")this.oApi._fnScrollDraw(b)};for(var ua in o.oApi)if(ua)this[ua]=r(ua);this.oApi._fnExternApiFunc=r;this.oApi._fnInitalise=s;this.oApi._fnInitComplete=w;this.oApi._fnLanguageProcess=y;this.oApi._fnAddColumn=
+G;this.oApi._fnColumnOptions=x;this.oApi._fnAddData=v;this.oApi._fnCreateTr=z;this.oApi._fnGatherData=Y;this.oApi._fnBuildHead=V;this.oApi._fnDrawHead=L;this.oApi._fnDraw=C;this.oApi._fnReDraw=ba;this.oApi._fnAjaxUpdate=za;this.oApi._fnAjaxUpdateDraw=Aa;this.oApi._fnAddOptionsHtml=xa;this.oApi._fnFeatureHtmlTable=Fa;this.oApi._fnScrollDraw=Ia;this.oApi._fnAjustColumnSizing=ca;this.oApi._fnFeatureHtmlFilter=Da;this.oApi._fnFilterComplete=M;this.oApi._fnFilterCustom=Ma;this.oApi._fnFilterColumn=La;
+this.oApi._fnFilter=Ka;this.oApi._fnBuildSearchArray=ka;this.oApi._fnBuildSearchRow=na;this.oApi._fnFilterCreateSearch=la;this.oApi._fnDataToSearch=ma;this.oApi._fnSort=R;this.oApi._fnSortAttachListener=ga;this.oApi._fnSortingClasses=T;this.oApi._fnFeatureHtmlPaginate=Ha;this.oApi._fnPageChange=ja;this.oApi._fnFeatureHtmlInfo=Ga;this.oApi._fnUpdateInfo=Na;this.oApi._fnFeatureHtmlLength=Ca;this.oApi._fnFeatureHtmlProcessing=Ea;this.oApi._fnProcessingDisplay=K;this.oApi._fnVisibleToColumnIndex=Ja;this.oApi._fnColumnIndexToVisible=
+pa;this.oApi._fnNodeToDataIndex=U;this.oApi._fnVisbleColumns=X;this.oApi._fnCalculateEnd=E;this.oApi._fnConvertToWidth=Oa;this.oApi._fnCalculateColumnWidths=ea;this.oApi._fnScrollingWidthAdjust=Qa;this.oApi._fnGetWidestNode=Pa;this.oApi._fnGetMaxLenString=Ra;this.oApi._fnStringToCss=u;this.oApi._fnArrayCmp=Va;this.oApi._fnDetectType=fa;this.oApi._fnSettingsFromNode=A;this.oApi._fnGetDataMaster=aa;this.oApi._fnGetTrNodes=$;this.oApi._fnGetTdNodes=Q;this.oApi._fnEscapeRegex=oa;this.oApi._fnDeleteIndex=
+ra;this.oApi._fnReOrderIndex=Ba;this.oApi._fnColumnOrdering=ha;this.oApi._fnLog=J;this.oApi._fnClearTable=ia;this.oApi._fnSaveState=sa;this.oApi._fnLoadState=Ta;this.oApi._fnCreateCookie=Sa;this.oApi._fnReadCookie=ta;this.oApi._fnDetectHeader=W;this.oApi._fnGetUniqueThs=S;this.oApi._fnScrollBarWidth=Ua;this.oApi._fnApplyToChildren=P;this.oApi._fnMap=n;this.oApi._fnGetRowData=da;this.oApi._fnGetCellData=H;this.oApi._fnSetCellData=N;this.oApi._fnGetObjectDataFn=Z;this.oApi._fnSetObjectDataFn=ya;var va=
+this;return this.each(function(){var a=0,b,c,d,f;a=0;for(b=D.length;a<b;a++){if(D[a].nTable==this)if(typeof g=="undefined"||typeof g.bRetrieve!="undefined"&&g.bRetrieve===true)return D[a].oInstance;else if(typeof g.bDestroy!="undefined"&&g.bDestroy===true){D[a].oInstance.fnDestroy();break}else{J(D[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, please pass either no arguments to the dataTable() function, or set bRetrieve to true. Alternatively, to destory the old table and create a new one, set bDestroy to true (note that a lot of changes to the configuration can be made through the API which is usually much faster).");
+return}if(D[a].sTableId!==""&&D[a].sTableId==this.getAttribute("id")){D.splice(a,1);break}}var e=new l;D.push(e);var h=false,j=false;a=this.getAttribute("id");if(a!==null){e.sTableId=a;e.sInstance=a}else e.sInstance=o._oExternConfig.iNextUnique++;if(this.nodeName.toLowerCase()!="table")J(e,0,"Attempted to initialise DataTables on a node which is not a table: "+this.nodeName);else{e.nTable=this;e.oInstance=va.length==1?va:i(this).dataTable();e.oApi=va.oApi;e.sDestroyWidth=i(this).width();if(typeof g!=
+"undefined"&&g!==null){e.oInit=g;n(e.oFeatures,g,"bPaginate");n(e.oFeatures,g,"bLengthChange");n(e.oFeatures,g,"bFilter");n(e.oFeatures,g,"bSort");n(e.oFeatures,g,"bInfo");n(e.oFeatures,g,"bProcessing");n(e.oFeatures,g,"bAutoWidth");n(e.oFeatures,g,"bSortClasses");n(e.oFeatures,g,"bServerSide");n(e.oFeatures,g,"bDeferRender");n(e.oScroll,g,"sScrollX","sX");n(e.oScroll,g,"sScrollXInner","sXInner");n(e.oScroll,g,"sScrollY","sY");n(e.oScroll,g,"bScrollCollapse","bCollapse");n(e.oScroll,g,"bScrollInfinite",
+"bInfinite");n(e.oScroll,g,"iScrollLoadGap","iLoadGap");n(e.oScroll,g,"bScrollAutoCss","bAutoCss");n(e,g,"asStripClasses");n(e,g,"fnPreDrawCallback");n(e,g,"fnRowCallback");n(e,g,"fnHeaderCallback");n(e,g,"fnFooterCallback");n(e,g,"fnCookieCallback");n(e,g,"fnInitComplete");n(e,g,"fnServerData");n(e,g,"fnFormatNumber");n(e,g,"aaSorting");n(e,g,"aaSortingFixed");n(e,g,"aLengthMenu");n(e,g,"sPaginationType");n(e,g,"sAjaxSource");n(e,g,"sAjaxDataProp");n(e,g,"iCookieDuration");n(e,g,"sCookiePrefix");
+n(e,g,"sDom");n(e,g,"bSortCellsTop");n(e,g,"oSearch","oPreviousSearch");n(e,g,"aoSearchCols","aoPreSearchCols");n(e,g,"iDisplayLength","_iDisplayLength");n(e,g,"bJQueryUI","bJUI");n(e.oLanguage,g,"fnInfoCallback");typeof g.fnDrawCallback=="function"&&e.aoDrawCallback.push({fn:g.fnDrawCallback,sName:"user"});typeof g.fnStateSaveCallback=="function"&&e.aoStateSave.push({fn:g.fnStateSaveCallback,sName:"user"});typeof g.fnStateLoadCallback=="function"&&e.aoStateLoad.push({fn:g.fnStateLoadCallback,sName:"user"});
+if(e.oFeatures.bServerSide&&e.oFeatures.bSort&&e.oFeatures.bSortClasses)e.aoDrawCallback.push({fn:T,sName:"server_side_sort_classes"});else e.oFeatures.bDeferRender&&e.aoDrawCallback.push({fn:T,sName:"defer_sort_classes"});if(typeof g.bJQueryUI!="undefined"&&g.bJQueryUI){e.oClasses=o.oJUIClasses;if(typeof g.sDom=="undefined")e.sDom='<"H"lfr>t<"F"ip>'}if(e.oScroll.sX!==""||e.oScroll.sY!=="")e.oScroll.iBarWidth=Ua();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=
+g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Ta(e,g);e.aoDrawCallback.push({fn:sa,sName:"state_save"})}if(typeof g.iDeferLoading!="undefined"){e.bDeferLoading=true;e._iRecordsTotal=g.iDeferLoading;e._iRecordsDisplay=g.iDeferLoading}if(typeof g.aaData!="undefined")j=true;if(typeof g!="undefined"&&typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!="undefined"&&g.oLanguage.sUrl!==
+""){e.oLanguage.sUrl=g.oLanguage.sUrl;i.getJSON(e.oLanguage.sUrl,null,function(t){y(e,t,true)});h=true}else y(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"){e.asStripClasses.push(e.oClasses.sStripOdd);e.asStripClasses.push(e.oClasses.sStripEven)}c=false;d=i(">tbody>tr",this);a=0;for(b=e.asStripClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(e.asStripClasses[a])){c=true;break}if(c){e.asDestoryStrips=["",""];if(i(d[0]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[0]+=
+e.oClasses.sStripOdd+" ";if(i(d[0]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[0]+=e.oClasses.sStripEven;if(i(d[1]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[1]+=e.oClasses.sStripOdd+" ";if(i(d[1]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[1]+=e.oClasses.sStripEven;d.removeClass(e.asStripClasses.join(" "))}c=[];var k;a=this.getElementsByTagName("thead");if(a.length!==0){W(e.aoHeader,a[0]);c=S(e)}if(typeof g.aoColumns=="undefined"){k=[];a=0;for(b=c.length;a<b;a++)k.push(null)}else k=
+g.aoColumns;a=0;for(b=k.length;a<b;a++){if(typeof g.saved_aoColumns!="undefined"&&g.saved_aoColumns.length==b){if(k[a]===null)k[a]={};k[a].bVisible=g.saved_aoColumns[a].bVisible}G(e,c?c[a]:null)}if(typeof g.aoColumnDefs!="undefined")for(a=g.aoColumnDefs.length-1;a>=0;a--){var m=g.aoColumnDefs[a].aTargets;i.isArray(m)||J(e,1,"aTargets must be an array of targets, not a "+typeof m);c=0;for(d=m.length;c<d;c++)if(typeof m[c]=="number"&&m[c]>=0){for(;e.aoColumns.length<=m[c];)G(e);x(e,m[c],g.aoColumnDefs[a])}else if(typeof m[c]==
+"number"&&m[c]<0)x(e,e.aoColumns.length+m[c],g.aoColumnDefs[a]);else if(typeof m[c]=="string"){b=0;for(f=e.aoColumns.length;b<f;b++)if(m[c]=="_all"||i(e.aoColumns[b].nTh).hasClass(m[c]))x(e,b,g.aoColumnDefs[a])}}if(typeof k!="undefined"){a=0;for(b=k.length;a<b;a++)x(e,a,k[a])}a=0;for(b=e.aaSorting.length;a<b;a++){if(e.aaSorting[a][0]>=e.aoColumns.length)e.aaSorting[a][0]=0;k=e.aoColumns[e.aaSorting[a][0]];if(typeof e.aaSorting[a][2]=="undefined")e.aaSorting[a][2]=0;if(typeof g.aaSorting=="undefined"&&
+typeof e.saved_aaSorting=="undefined")e.aaSorting[a][1]=k.asSorting[0];c=0;for(d=k.asSorting.length;c<d;c++)if(e.aaSorting[a][1]==k.asSorting[c]){e.aaSorting[a][2]=c;break}}T(e);a=i(">thead",this);if(a.length===0){a=[p.createElement("thead")];this.appendChild(a[0])}e.nTHead=a[0];a=i(">tbody",this);if(a.length===0){a=[p.createElement("tbody")];this.appendChild(a[0])}e.nTBody=a[0];a=i(">tfoot",this);if(a.length>0){e.nTFoot=a[0];W(e.aoFooter,e.nTFoot)}if(j)for(a=0;a<g.aaData.length;a++)v(e,g.aaData[a]);
+else Y(e);e.aiDisplay=e.aiDisplayMaster.slice();e.bInitialised=true;h===false&&s(e)}})}})(jQuery,window,document);
diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/back_disabled.jpg b/koha-tmpl/intranet-tmpl/prog/img/datatables/back_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1e73a546e3609636f9cf4c543c2a4fe4050866c3
GIT binary patch
literal 612
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tyUn
z+02YUSHb}sD?0}l&^EXLguy7lz`(-H!phDIlVN0HVHIR%V-ON%S2Pq6HFFG{Xryc+
zmRQ($@S#&sld*HEn>dFcBLmQ_$YwDLDjGT#PW*q1fd^<YlOVGogFVCRyQwLwf|@66
ze!$4fpt!)cj7zNLKSN?_SjIEf$Z0nVqZh4{&j?Wu4PU>^;oX+iLI)z|@;wX;U8Xr>
zT8Qgxn;R!Cottl}#(8Ri${a3d=J*$R5qBRbK9bRJe*4BYwq9(uIM4mLS9%TSY?*y6
zE==owYH)vf>dq6(Uzum+IyVJqc3N&dRPD57vW(=l(=(DZ-K_<Unt1pe8#qknGCi3V
zkh;vl;B4~gY1f{Kz2M5sJrOKuSm0ZhaMrL}#<_9H6t<5or9~0qKc;W}wfIQk>!LSx
zwPk@>bN at 4B-OI9gCf>Wc_;CDAS%c at BJZ}k<t>BlbDz~@y-*&Y^_U+@};q`xNUthN}
On^Cj9W}Eu@|2F})$f79#

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/back_enabled.jpg b/koha-tmpl/intranet-tmpl/prog/img/datatables/back_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a6d764c79c7a2047b6bf65bf9d96fcafd5161e38
GIT binary patch
literal 807
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2*U&h
z1}0{pBN2d|gO!bok%5r~RhW^Pm5qg+Lx6#Sm5Gs^od+h%$i&RTD#*spplB#0EW!~u
z(MZ`u)XXulu<_tSr=TWdXR%Z_aiE1jZ7eM8Fl&IpCkWK1$Y$s$#2&a&N#sM~M5iWU
z<^Q)Bc$gW1&SMs2uxGfw`}E06etb^r9k|jMc at Dlk(IlSD-Wwx*G{%4ThHhR%HnTsw
zbu3z!=BtbC=-In5f5nt;je{+vrKZdWckk$U`c^FEYC6}Jn=<Phg&RGxWowtu+j4vL
zuDrGP=1IPrb~kp*>lG)17QB>6z3khm7PHhg<-pEGSO0F>VA}N6`w53!8pr$>MbUW|
zME<s?dezw;U%dR;`Kd)lCauvOXRNpVXgK`4pX=Sp- at CZj9x15&y*j<b<JPA<K_*#K
z<@>sFn=(%w+^5v0yp7Lmb+~3PpI4(#G~bQ$y_;t)oo+U5`bnSHZcn){CH~m7Ys2rz
z2!R at xgGrCtcPz?eOPOzKr2P26p~(mTGjR1-c<x%~cJ0>3?psA>uUGsyt|R2Ts3~!B
zN71DGSrW%W*`w8#2{O$LX)%%8*<4Ycyr;tN(Hm<XHM0xJ?{xF0EskFCh5u=&<iulr
zYNyl=#<wqXD&+4u8oF^$)m7<lY at VgXk9azsKIKz?vp4^)yx{evPw)J-Dth+P<;w$q
z`@Q9}`(-Xi+_IiGtB&jWay`d}j~$NpR at hm5{cf*szhAZWsp!3Z`)}>8|M=_HtvR>P
P+Rcr(b5Xx$|NkZcT0jT?

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/forward_disabled.jpg b/koha-tmpl/intranet-tmpl/prog/img/datatables/forward_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..28a9dc53fa232919299ac980dc9b61167c1868bd
GIT binary patch
literal 635
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tySE
z1JEp>E8&2Nm4%I+g9~UMTnNHo6kuRrVP;|B;)Y2uGBL9Vva&G<iLfgg3UfFHPBdy#
zHW3vwODt at B=oDn^oa!bn$jHFNjA9g{prWDU#Q(P#c!1(eg3N*p_6)E5E7rbHvEH7V
z8#+gHc2rxYci=nCmS=BPhUq>lzGLeh=CM*_u2I6%$1L~6;-1yGa|?*Fva<AVW}f$w
zM|jiv%AS4aZbfpP)?S?%8?6+<6*?uQG at xF)s3 at 1Q<(tn>vCW+<XI6GdMB6yB9$3U&
z#>Av>{Flt>+*?d?iZ`9)^O?_H|D3t8;Og6lD<#WHQvW(mo1ETsD>A at mr8@sqg(?1R
z%d at qrmWLWmIn1#pQuo}{brVW*C8t%EDXbOt_DabwXgGW3;wDX1;~7hWrYL+ZX=qre
z&-y^2q0zm?-FJb#(AWJTHOJ-3`S`D|JEhzC{KvY_h0kZinXP-?w!g_L at p#JQO^!z$
mYCgVwS7#SryXs@?>&L&t^Z(SozHVt~@Z#>58}s)6zX<@qORf(9

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/forward_enabled.jpg b/koha-tmpl/intranet-tmpl/prog/img/datatables/forward_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..598c075f13ab0e4bbe05a4eeea7cf777ba73cf03
GIT binary patch
literal 852
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tywO
z0~0eN(3Nn&%Fe>Z!NthH$ciG&$iU3P%Em6hz`z1zu=B#yGcqx=2(q#<2(fb*3M-3<
zDh5t8G7&R#Oe}1C=oHjs?40T*F37+LbR`oj+(bq}CT0c}Rz*W0Hg?Cv#)(EB0yioN
zi~PUEzyov)lOVGogFVA5dn3uE%Z<*rn&ugY^FIG9<<=87L*?mOy^~u`Rq(Eg+UDw^
z@^Uh}zJ$t~P2YpRT#sm2p`oEt8zJ-EBRfY;>b?DxZo!24Z)Q(O&}!Mbt}27`dKa(x
zr)AHkZg5MjKa&4$syaupXWNXgp32dQs<o<XGr#5u9@=#E+?+!}FI~Pa)LWslJ}B36
z`Lb3YheKCCm%VOu;VpX6(0MkYSk}6t at aOKz+;_*D4{7|~^5)^QORgNty2^@M51##X
zueaWLX7+9e=RH;{oZr5)jkOooU8VU}TQps%p>_rj-?|M=Q9pN^hZg^mV7=UWs>}D5
z$40(ME7Q1T4h8p}ZJ8O!G-Xk84;P~#ci!&o`A5I3kG at gLm*VlJbn%kvSqIh?3Y?HQ
zAX0NL>XIkpf=MN83*!%}9-aN5)p7^py2Am>F9gW&pFSp#V0dxX#ZPW;UoD(gaI at 8E
z(rNQz1DBIiM13!LtZ|85lHB@$wW~n0fhRz-$?R&m{@z;uI}N|35As;}zdXB<<FOu#
z{FTp-PcAia6ML~>I#+N1k=r*G-&mI78vJ_Ezs!yIV%J}l7d*c9>7Bn;xyLT84V&`$
z at 9WMTAJ6DZyR)~=FS6P2e3MDv7lHB>{C&1H^7EJ9PIf=EdUwUYtGE9%$X9(m*ZWLf
M_rC2^{;K~s0TRp{r2qf`

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a56d0e21902ce620cd57f87fa58a6d3e804135cf
GIT binary patch
literal 263
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45 at 5J;
zXU0OHl&hzUV at SoVE9Xw~GAQscA1s)^?0*rXqM}DeLv7?|BU8z at Q<ntt9<njnJ|j`Y
znD at ZlWoHa-oW7$XVs$3z>COGupVzP9Hek5&L+Gnl%BD>~0~tJB{an^LB{Ts5b0m7=

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc_disabled.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7e621ef1c68da839ce077cec6e201a55c1ba168
GIT binary patch
literal 252
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnW*L
z7srr_TUXBQ7Ge<Kak=PnB>V6G?@}f$7k6Jhw{qGm$-QDzD`qrDaZ3s$b2XF;fBBPU
nqjNDy&Nw~puHFA+-v&m8`?>-yUFVHK{$ucT^>bP0l+XkKhw^g=

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_both.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_both.png
new file mode 100644
index 0000000000000000000000000000000000000000..839ac4bb5b0b414834c950de9deafff6dd94ed2d
GIT binary patch
literal 282
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0K#2rT
z7srr_TRjsz`4|*ASOSl%eg6Ob+(JtRwX|O at S}a^IES<M^Rar)~R7{gT(8t-3AepQp
zDW<l1NyH(qlCXQ0 at AfT`xZ2rtb0gcPuhQK|E$f?fe^;k=XM|b({WbrT_5p at zx%{&^
T>QC<i+Qs1M>gTe~DWM4fR9b+X

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b295159df995329b3a84340d32761f3d1dbade
GIT binary patch
literal 260
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45 at 5J;
zXU0OHl#{26V at SoVqz8vtc$~v}dc~O{CLEF2anNavMpdMP)0v(X&o(k0opIq!LdvtJ
wj~up7 at 0`wiSoe($&y07EkGxK6U|?nlJSz0{?wJWUfu=Edy85}Sb4q9e0C9MGu>b%7

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc_disabled.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..2409653dc94cd21a281a31c0e3819323b84704b7
GIT binary patch
literal 251
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnX`r
z7srr_TS*TNvhX;E^>j)zMNBv%VR68zN24n8K+>5N&kUJbBQCy4c=qgBiu3mAQ)hD?
n)_oJhGvi(If!Apb49pB3GXz|UGFKJ=4P)?h^>bP0l+XkK*57ji

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/datatables.css b/koha-tmpl/opac-tmpl/prog/en/css/datatables.css
new file mode 100644
index 0000000..e069b93
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/css/datatables.css
@@ -0,0 +1,114 @@
+input.search_init {
+    color: #999999;
+}
+.sorting_asc {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_asc.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_desc.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_both.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_asc_disabled {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_asc_disabled.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc_disabled {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_desc_disabled.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_disabled {
+    padding-right: 19px;
+    background-color: #EEEEEE;
+}
+
+table.display {
+    width: 100%;
+}
+table.display thead th {
+    border-bottom: 1px solid black;
+    cursor: pointer;
+    font-weight: bold;
+    padding: 3px 18px 3px 10px;
+}
+.dataTables_wrapper {
+    clear: both;
+    position: relative;
+}
+.dataTables_processing {
+    background-color: white;
+    border: 1px solid #DDDDDD;
+    color: #999999;
+    font-size: 14px;
+    height: 30px;
+    left: 50%;
+    margin-left: -125px;
+    margin-top: -15px;
+    padding: 14px 0 2px;
+    position: fixed;
+    text-align: center;
+    top: 50%;
+    width: 250px;
+}
+.dataTables_info {
+    float: left;
+    width: 60%;
+}
+.dataTables_paginate {
+    float: right;
+    text-align: right;
+    width: 44px;
+}
+.paging_full_numbers {
+    height: 22px;
+    line-height: 22px;
+    width: 400px;
+}
+.paging_full_numbers span.paginate_button,
+     .paging_full_numbers span.paginate_active {
+    border: 1px solid #aaa;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    padding: 2px 5px;
+    margin: 0 3px;
+    cursor: pointer;
+    *cursor: hand;
+}
+
+.paging_full_numbers span.paginate_button {
+    background-color: #ddd;
+}
+
+.paging_full_numbers span.paginate_button:hover {
+    background-color: #ccc;
+}
+
+.paging_full_numbers span.paginate_active {
+    background-color: #99B3FF;
+}
+.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
+    float: left;
+    height: 19px;
+    margin-left: 3px;
+    width: 19px;
+}
+.paginate_disabled_previous {
+    background-image: url("../../img/datatables/back_disabled.jpg");
+}
+.paginate_enabled_previous {
+    background-image: url("../../img/datatables/back_enabled.jpg");
+}
+.paginate_disabled_next {
+    background-image: url("../../img/datatables/forward_disabled.jpg");
+}
+.paginate_enabled_next {
+    background-image: url("../../img/datatables/forward_enabled.jpg");
+}
+.spacer {
+    clear: both;
+    height: 20px;
+}
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc b/koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc
new file mode 100644
index 0000000..183f511
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc
@@ -0,0 +1,17 @@
+<script type="text/javascript">
+//<![CDATA[
+    var MSG_DT_FIRST = _("First");
+    var MSG_DT_LAST = _("Last");
+    var MSG_DT_NEXT = _("Next");
+    var MSG_DT_PREVIOUS = _("Previous");
+    var MSG_DT_EMPTY_TABLE = _("No data available in table");
+    var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
+    var MSG_DT_INFO_EMPTY = _("No entries to show");
+    var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
+    var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
+    var MSG_DT_LOADING_RECORDS = _("Loading...");
+    var MSG_DT_PROCESSING = _("Processing...");
+    var MSG_DT_SEARCH = _("Search:");
+    var MSG_DT_ZERO_RECORDS = _("No matching records found");
+//]]>
+</script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/datatables.js b/koha-tmpl/opac-tmpl/prog/en/js/datatables.js
new file mode 100644
index 0000000..38dd1d5
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/js/datatables.js
@@ -0,0 +1,281 @@
+// These default options are for translation but can be used
+// for any other datatables settings
+// MSG_DT_* variables comes from datatables-strings.inc
+// To use it, write:
+//  $("#table_id").dataTable($.extend(true, {}, dataTableDefaults, {
+//      // other settings
+//  } ) );
+var dataTablesDefaults = {
+    "oLanguage": {
+        "oPaginate": {
+            "sFirst"    : window.MSG_DT_FIRST || "First",
+            "sLast"     : window.MSG_DT_LAST || "Last",
+            "sNext"     : window.MSG_DT_NEXT || "Next",
+            "sPrevious" : window.MSG_DT_PREVIOUS || "Previous"
+        },
+        "sEmptyTable"       : window.MSG_DT_EMPTY_TABLE || "No data available in table",
+        "sInfo"             : window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries",
+        "sInfoEmpty"        : window.MSG_DT_INFO_EMPTY || "No entries to show",
+        "sInfoFiltered"     : window.MSG_DT_INFO_FILTERED || "(filtered from _MAX_ total entries)",
+        "sLengthMenu"       : window.MSG_DT_LENGTH_MENU || "Show _MENU_ entries",
+        "sLoadingRecords"   : window.MSG_DT_LOADING_RECORDS || "Loading...",
+        "sProcessing"       : window.MSG_DT_PROCESSING || "Processing...",
+        "sSearch"           : window.MSG_DT_SEARCH || "Search:",
+        "sZeroRecords"      : window.MSG_DT_ZERO_RECORDS || "No matching records found"
+    }
+};
+
+
+// Return an array of string containing the values of a particular column
+$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
+    // check that we have a column id
+    if ( typeof iColumn == "undefined" ) return new Array();
+    // by default we only wany unique data
+    if ( typeof bUnique == "undefined" ) bUnique = true;
+    // by default we do want to only look at filtered data
+    if ( typeof bFiltered == "undefined" ) bFiltered = true;
+    // by default we do not wany to include empty values
+    if ( typeof bIgnoreEmpty == "undefined" ) bIgnoreEmpty = true;
+    // list of rows which we're going to loop through
+    var aiRows;
+    // use only filtered rows
+    if (bFiltered == true) aiRows = oSettings.aiDisplay;
+    // use all rows
+    else aiRows = oSettings.aiDisplayMaster; // all row numbers
+
+    // set up data array
+    var asResultData = new Array();
+    for (var i=0,c=aiRows.length; i<c; i++) {
+        iRow = aiRows[i];
+        var aData = this.fnGetData(iRow);
+        var sValue = aData[iColumn];
+        // ignore empty values?
+        if (bIgnoreEmpty == true && sValue.length == 0) continue;
+        // ignore unique values?
+        else if (bUnique == true && jQuery.inArray(sValue, asResultData) > -1) continue;
+        // else push the value onto the result data array
+        else asResultData.push(sValue);
+    }
+    return asResultData;
+}
+
+// List of unbind keys (Ctrl, Alt, Direction keys, etc.)
+// These keys must not launch filtering
+var blacklist_keys = new Array(0, 16, 17, 18, 37, 38, 39, 40);
+
+// Set a filtering delay for global search field
+jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay ) {
+    /*
+     * Inputs:      object:oSettings - dataTables settings object - automatically given
+     *              integer:iDelay - delay in milliseconds
+     * Usage:       $('#example').dataTable().fnSetFilteringDelay(250);
+     * Author:      Zygimantas Berziunas (www.zygimantas.com) and Allan Jardine
+     * License:     GPL v2 or BSD 3 point style
+     * Contact:     zygimantas.berziunas /AT\ hotmail.com
+     */
+    var
+        _that = this,
+        iDelay = (typeof iDelay == 'undefined') ? 250 : iDelay;
+
+    this.each( function ( i ) {
+        $.fn.dataTableExt.iApiIndex = i;
+        var
+            $this = this,
+            oTimerId = null,
+            sPreviousSearch = null,
+            anControl = $( 'input', _that.fnSettings().aanFeatures.f );
+
+        anControl.unbind( 'keyup.DT' ).bind( 'keyup.DT', function(event) {
+            var $$this = $this;
+            if (blacklist_keys.indexOf(event.keyCode) != -1) {
+                return this;
+            }else if ( event.keyCode == '13' ) {
+                $.fn.dataTableExt.iApiIndex = i;
+                _that.fnFilter( $(this).val() );
+            } else {
+                if (sPreviousSearch === null || sPreviousSearch != anControl.val()) {
+                    window.clearTimeout(oTimerId);
+                    sPreviousSearch = anControl.val();
+                    oTimerId = window.setTimeout(function() {
+                        $.fn.dataTableExt.iApiIndex = i;
+                        _that.fnFilter( anControl.val() );
+                    }, iDelay);
+                }
+            }
+        });
+
+        return this;
+    } );
+    return this;
+}
+
+// Add a filtering delay on general search and on all input (with a class 'filter')
+jQuery.fn.dataTableExt.oApi.fnAddFilters = function ( oSettings, sClass, iDelay ) {
+    var table = this;
+    this.fnSetFilteringDelay(iDelay);
+    var filterTimerId = null;
+    $("input."+sClass).keyup(function(event) {
+      if (blacklist_keys.indexOf(event.keyCode) != -1) {
+        return this;
+      }else if ( event.keyCode == '13' ) {
+        table.fnFilter( $(this).val(), $(this).attr('data-column_num') );
+      } else {
+        window.clearTimeout(filterTimerId);
+        var input = this;
+        filterTimerId = window.setTimeout(function() {
+          table.fnFilter($(input).val(), $(input).attr('data-column_num'));
+        }, iDelay);
+      }
+    });
+}
+
+// Useful if you want to filter on dates with 2 inputs (start date and end date)
+// You have to include calendar.inc to use it
+function dt_add_rangedate_filter(begindate_id, enddate_id, dateCol) {
+    $.fn.dataTableExt.afnFiltering.push(
+        function( oSettings, aData, iDataIndex ) {
+
+            var beginDate = Date_from_syspref($("#"+begindate_id).val()).getTime();
+            var endDate   = Date_from_syspref($("#"+enddate_id).val()).getTime();
+
+            var data = Date_from_syspref(aData[dateCol]).getTime();
+
+            if ( !parseInt(beginDate) && ! parseInt(endDate) ) {
+                return true;
+            }
+            else if ( beginDate <= data && !parseInt(endDate) ) {
+                return true;
+            }
+            else if ( data <= endDate && !parseInt(beginDate) ) {
+                return true;
+            }
+            else if ( beginDate <= data && data <= endDate) {
+                return true;
+            }
+            return false;
+        }
+    );
+}
+
+//Sorting for dates (uk format)
+function dt_add_type_uk_date() {
+  jQuery.fn.dataTableExt.aTypes.unshift(
+    function ( sData )
+    {
+      if (sData.match(/(0[1-9]|[12][0-9]|3[01])\/(0[1-9]|1[012])\/(19|20|21)\d\d/))
+      {
+        return 'uk_date';
+      }
+      return null;
+    }
+  );
+
+  jQuery.fn.dataTableExt.oSort['uk_date-asc']  = function(a,b) {
+    var re = /(\d{2}\/\d{2}\/\d{4})/;
+    a.match(re);
+    var ukDatea = RegExp.$1.split("/");
+    b.match(re);
+    var ukDateb = RegExp.$1.split("/");
+
+    var x = (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+    var y = (ukDateb[2] + ukDateb[1] + ukDateb[0]) * 1;
+
+    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+  };
+
+  jQuery.fn.dataTableExt.oSort['uk_date-desc'] = function(a,b) {
+    var re = /(\d{2}\/\d{2}\/\d{4})/;
+    a.match(re);
+    var ukDatea = RegExp.$1.split("/");
+    b.match(re);
+    var ukDateb = RegExp.$1.split("/");
+
+    var x = (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+    var y = (ukDateb[2] + ukDateb[1] + ukDateb[0]) * 1;
+
+    return ((x < y) ? 1 : ((x > y) ?  -1 : 0));
+  };
+}
+
+// Sorting on html contains
+// <a href="foo.pl">bar</a> sort on 'bar'
+function dt_overwrite_html_sorting_localeCompare() {
+    jQuery.fn.dataTableExt.oSort['html-asc']  = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if (typeof(a.localeCompare == "function")) {
+           return a.localeCompare(b);
+        } else {
+           return (a > b) ? 1 : ((a < b) ? -1 : 0);
+        }
+    };
+
+    jQuery.fn.dataTableExt.oSort['html-desc'] = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if(typeof(b.localeCompare == "function")) {
+            return b.localeCompare(a);
+        } else {
+            return (b > a) ? 1 : ((b < a) ? -1 : 0);
+        }
+    };
+}
+
+// Sorting on string without accentued characters
+function dt_overwrite_string_sorting_localeCompare() {
+    jQuery.fn.dataTableExt.oSort['string-asc']  = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if (typeof(a.localeCompare == "function")) {
+           return a.localeCompare(b);
+        } else {
+           return (a > b) ? 1 : ((a < b) ? -1 : 0);
+        }
+    };
+
+    jQuery.fn.dataTableExt.oSort['string-desc'] = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if(typeof(b.localeCompare == "function")) {
+            return b.localeCompare(a);
+        } else {
+            return (b > a) ? 1 : ((b < a) ? -1 : 0);
+        }
+    };
+}
+
+// Replace a node with a html and js contain.
+function replace_html( original_node, type ) {
+    switch ( $(original_node).attr('data-type') ) {
+        case "range_dates":
+            var id = $(original_node).attr("data-id");
+            var format = $(original_node).attr("data-format");
+            replace_html_date( original_node, id, format );
+            break;
+        default:
+            alert("_(This node can't be replaced)");
+    }
+}
+
+// Replace a node with a "From [date] To [date]" element
+// Used on tfoot > td
+function replace_html_date( original_node, id, format ) {
+    var node = $('<span style="white-space:nowrap">' + _("From") + '<input type="text" id="' + id + 'from" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'from").val("").change();\' >&times;</a></span><br/><span style="white-space:nowrap">' + _("To") + '<input type="text" id="' + id + 'to" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'to").val("").change();\' >&times;</a></span>');
+    $(original_node).replaceWith(node);
+    var script = document.createElement( 'script' );
+    script.type = 'text/javascript';
+    var script_content = "Calendar.setup({";
+    script_content += "    inputField: \"" + id + "from\",";
+    script_content += "    ifFormat: \"" + format + "\",";
+    script_content += "    button: \"" + id + "from\",";
+    script_content += "    onClose: function(){ $(\"#" + id + "from\").change(); this.hide();}";
+    script_content += "  });";
+    script_content += "  Calendar.setup({";
+    script_content += "    inputField: \"" + id + "to\",";
+    script_content += "    ifFormat: \"" + format + "\",";
+    script_content += "    button: \"" + id + "to\",";
+    script_content += "    onClose: function(){ $(\"#" + id + "to\").change(); this.hide();}";
+    script_content += "  });";
+    script.text = script_content;
+    $(original_node).append( script );
+}
diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js b/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
new file mode 100644
index 0000000..9035a2e
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
@@ -0,0 +1,153 @@
+/*
+ * File:        jquery.dataTables.min.js
+ * Version:     1.8.1
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Info:        www.datatables.net
+ * 
+ * Copyright 2008-2010 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ * 
+ * This source file 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 license files for details.
+ */
+(function(i,wa,p){i.fn.dataTableSettings=[];var D=i.fn.dataTableSettings;i.fn.dataTableExt={};var o=i.fn.dataTableExt;o.sVersion="1.8.1";o.sErrMode="alert";o.iApiIndex=0;o.oApi={};o.afnFiltering=[];o.aoFeatures=[];o.ofnSearch={};o.afnSortData=[];o.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
+sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
+sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};o.oJUIClasses={sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",
+sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",
+sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last ui-corner-tr ui-corner-br",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",
+sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollWrapper:"dataTables_scroll",
+sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};o.oPagination={two_button:{fnInit:function(g,l,r){var s,w,y;if(g.bJUI){s=p.createElement("a");w=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;w.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;
+s.appendChild(y)}else{s=p.createElement("div");w=p.createElement("div")}s.className=g.oClasses.sPagePrevDisabled;w.className=g.oClasses.sPageNextDisabled;s.title=g.oLanguage.oPaginate.sPrevious;w.title=g.oLanguage.oPaginate.sNext;l.appendChild(s);l.appendChild(w);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(s).bind("selectstart.DT",function(){return false});i(w).bind("selectstart.DT",function(){return false});
+if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_previous");w.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l=g.aanFeatures.p,r=0,s=l.length;r<s;r++)if(l[r].childNodes.length!==0){l[r].childNodes[0].className=g._iDisplayStart===0?g.oClasses.sPagePrevDisabled:g.oClasses.sPagePrevEnabled;l[r].childNodes[1].className=g.fnDisplayEnd()==g.fnRecordsDisplay()?g.oClasses.sPageNextDisabled:
+g.oClasses.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(g,l,r){var s=p.createElement("span"),w=p.createElement("span"),y=p.createElement("span"),G=p.createElement("span"),x=p.createElement("span");s.innerHTML=g.oLanguage.oPaginate.sFirst;w.innerHTML=g.oLanguage.oPaginate.sPrevious;G.innerHTML=g.oLanguage.oPaginate.sNext;x.innerHTML=g.oLanguage.oPaginate.sLast;var v=g.oClasses;s.className=v.sPageButton+" "+v.sPageFirst;w.className=v.sPageButton+" "+v.sPagePrevious;G.className=
+v.sPageButton+" "+v.sPageNext;x.className=v.sPageButton+" "+v.sPageLast;l.appendChild(s);l.appendChild(w);l.appendChild(y);l.appendChild(G);l.appendChild(x);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"first")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(G).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(x).bind("click.DT",function(){g.oApi._fnPageChange(g,"last")&&r(g)});i("span",l).bind("mousedown.DT",function(){return false}).bind("selectstart.DT",
+function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_first");w.setAttribute("id",g.sTableId+"_previous");G.setAttribute("id",g.sTableId+"_next");x.setAttribute("id",g.sTableId+"_last")}},fnUpdate:function(g,l){if(g.aanFeatures.p){var r=o.oPagination.iFullNumbersShowPages,s=Math.floor(r/2),w=Math.ceil(g.fnRecordsDisplay()/g._iDisplayLength),y=Math.ceil(g._iDisplayStart/g._iDisplayLength)+1,G=
+"",x,v=g.oClasses;if(w<r){s=1;x=w}else if(y<=s){s=1;x=r}else if(y>=w-s){s=w-r+1;x=w}else{s=y-Math.ceil(r/2)+1;x=s+r-1}for(r=s;r<=x;r++)G+=y!=r?'<span class="'+v.sPageButton+'">'+r+"</span>":'<span class="'+v.sPageButtonActive+'">'+r+"</span>";x=g.aanFeatures.p;var z,Y=function(L){g._iDisplayStart=(this.innerHTML*1-1)*g._iDisplayLength;l(g);L.preventDefault()},V=function(){return false};r=0;for(s=x.length;r<s;r++)if(x[r].childNodes.length!==0){z=i("span:eq(2)",x[r]);z.html(G);i("span",z).bind("click.DT",
+Y).bind("mousedown.DT",V).bind("selectstart.DT",V);z=x[r].getElementsByTagName("span");z=[z[0],z[1],z[z.length-2],z[z.length-1]];i(z).removeClass(v.sPageButton+" "+v.sPageButtonActive+" "+v.sPageButtonStaticDisabled);if(y==1){z[0].className+=" "+v.sPageButtonStaticDisabled;z[1].className+=" "+v.sPageButtonStaticDisabled}else{z[0].className+=" "+v.sPageButton;z[1].className+=" "+v.sPageButton}if(w===0||y==w||g._iDisplayLength==-1){z[2].className+=" "+v.sPageButtonStaticDisabled;z[3].className+=" "+
+v.sPageButtonStaticDisabled}else{z[2].className+=" "+v.sPageButton;z[3].className+=" "+v.sPageButton}}}}}};o.oSort={"string-asc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?-1:g>l?1:0},"string-desc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?1:g>l?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<
+l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?1:g>l?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return l-
+g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};o.aTypes=[function(g){if(typeof g=="number")return"numeric";else if(typeof g!="string")return null;var l,r=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var s=1;s<g.length;s++){l=g.charAt(s);if("0123456789.".indexOf(l)==-1)return null;if(l=="."){if(r)return null;r=true}}return"numeric"},function(g){var l=Date.parse(g);
+if(l!==null&&!isNaN(l)||typeof g=="string"&&g.length===0)return"date";return null},function(g){if(typeof g=="string"&&g.indexOf("<")!=-1&&g.indexOf(">")!=-1)return"html";return null}];o.fnVersionCheck=function(g){var l=function(x,v){for(;x.length<v;)x+="0";return x},r=o.sVersion.split(".");g=g.split(".");for(var s="",w="",y=0,G=g.length;y<G;y++){s+=l(r[y],3);w+=l(g[y],3)}return parseInt(s,10)>=parseInt(w,10)};o._oExternConfig={iNextUnique:0};i.fn.dataTable=function(g){function l(){this.fnRecordsTotal=
+function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false||this._iDisplayLength==-1?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd};this.sInstance=
+this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false,bDeferRender:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,bInfinite:false,iLoadGap:100,iBarWidth:0,bAutoCss:true};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",
+sLoadingRecords:"Loading...",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"},fnInfoCallback:null};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.aoHeader=[];this.aoFooter=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false,
+bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.sDestroyWidth=0;this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];this.fnInitComplete=this.fnPreDrawCallback=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.bInitialised=this.bDeferLoading=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button";
+this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.fnCookieCallback=null;this.aoStateSave=[];this.aoStateLoad=[];this.sAjaxSource=this.oLoadedState=null;this.sAjaxDataProp="aaData";this.bAjaxDataGet=true;this.jqXHR=null;this.fnServerData=function(a,b,c,d){d.jqXHR=i.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(f,e){e=="parsererror"&&alert("DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})};
+this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d<b;d++){if(d%3===0&&d!==0)c=","+c;c=a[b-d-1]+c}}return c};this.aLengthMenu=[10,25,50,100];this.bDrawing=this.iDraw=0;this.iDrawError=-1;this._iDisplayLength=10;this._iDisplayStart=0;this._iDisplayEnd=10;this._iRecordsDisplay=this._iRecordsTotal=0;this.bJUI=false;this.oClasses=o.oStdClasses;this.bSortCellsTop=this.bSorted=this.bFiltered=false;this.oInit=null}function r(a){return function(){var b=
+[A(this[o.iApiIndex])].concat(Array.prototype.slice.call(arguments));return o.oApi[a].apply(this,b)}}function s(a){var b,c,d=a.iInitDisplayStart;if(a.bInitialised===false)setTimeout(function(){s(a)},200);else{xa(a);V(a);L(a,a.aoHeader);a.nTFoot&&L(a,a.aoFooter);K(a,true);a.oFeatures.bAutoWidth&&ea(a);b=0;for(c=a.aoColumns.length;b<c;b++)if(a.aoColumns[b].sWidth!==null)a.aoColumns[b].nTh.style.width=u(a.aoColumns[b].sWidth);if(a.oFeatures.bSort)R(a);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);
+else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}if(a.sAjaxSource!==null&&!a.oFeatures.bServerSide)a.fnServerData.call(a.oInstance,a.sAjaxSource,[],function(f){var e=f;if(a.sAjaxDataProp!=="")e=Z(a.sAjaxDataProp)(f);for(b=0;b<e.length;b++)v(a,e[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)R(a);else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}K(a,false);w(a,f)},a);else if(!a.oFeatures.bServerSide){K(a,false);w(a)}}}function w(a,b){a._bInitComplete=true;if(typeof a.fnInitComplete=="function")typeof b!=
+"undefined"?a.fnInitComplete.call(a.oInstance,a,b):a.fnInitComplete.call(a.oInstance,a)}function y(a,b,c){n(a.oLanguage,b,"sProcessing");n(a.oLanguage,b,"sLengthMenu");n(a.oLanguage,b,"sEmptyTable");n(a.oLanguage,b,"sLoadingRecords");n(a.oLanguage,b,"sZeroRecords");n(a.oLanguage,b,"sInfo");n(a.oLanguage,b,"sInfoEmpty");n(a.oLanguage,b,"sInfoFiltered");n(a.oLanguage,b,"sInfoPostFix");n(a.oLanguage,b,"sSearch");if(typeof b.oPaginate!="undefined"){n(a.oLanguage.oPaginate,b.oPaginate,"sFirst");n(a.oLanguage.oPaginate,
+b.oPaginate,"sPrevious");n(a.oLanguage.oPaginate,b.oPaginate,"sNext");n(a.oLanguage.oPaginate,b.oPaginate,"sLast")}typeof b.sEmptyTable=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sEmptyTable");typeof b.sLoadingRecords=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sLoadingRecords");c&&s(a)}function G(a,b){var c=a.aoColumns.length;b={sType:null,_bAutoType:true,bVisible:true,bSearchable:true,bSortable:true,asSorting:["asc","desc"],
+sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,sTitle:b?b.innerHTML:"",sName:"",sWidth:null,sWidthOrig:null,sClass:null,fnRender:null,bUseRendered:true,iDataSort:c,mDataProp:c,fnGetData:null,fnSetData:null,sSortDataType:"std",sDefaultContent:null,sContentPadding:"",nTh:b?b:p.createElement("th"),nTf:null};a.aoColumns.push(b);if(typeof a.aoPreSearchCols[c]=="undefined"||a.aoPreSearchCols[c]===null)a.aoPreSearchCols[c]={sSearch:"",bRegex:false,bSmart:true};else{if(typeof a.aoPreSearchCols[c].bRegex==
+"undefined")a.aoPreSearchCols[c].bRegex=true;if(typeof a.aoPreSearchCols[c].bSmart=="undefined")a.aoPreSearchCols[c].bSmart=true}x(a,c,null)}function x(a,b,c){b=a.aoColumns[b];if(typeof c!="undefined"&&c!==null){if(typeof c.sType!="undefined"){b.sType=c.sType;b._bAutoType=false}n(b,c,"bVisible");n(b,c,"bSearchable");n(b,c,"bSortable");n(b,c,"sTitle");n(b,c,"sName");n(b,c,"sWidth");n(b,c,"sWidth","sWidthOrig");n(b,c,"sClass");n(b,c,"fnRender");n(b,c,"bUseRendered");n(b,c,"iDataSort");n(b,c,"mDataProp");
+n(b,c,"asSorting");n(b,c,"sSortDataType");n(b,c,"sDefaultContent");n(b,c,"sContentPadding")}b.fnGetData=Z(b.mDataProp);b.fnSetData=ya(b.mDataProp);if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortable;b.sSortingClassJUI=a.oClasses.sSortJUI}else if(i.inArray("asc",
+b.asSorting)!=-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function v(a,b){var c;c=typeof b.length=="number"?b.slice():i.extend(true,{},b);b=a.aoData.length;var d={nTr:null,_iId:a.iNextId++,_aData:c,_anHidden:[],_sRowStripe:""};a.aoData.push(d);for(var f,
+e=0,h=a.aoColumns.length;e<h;e++){c=a.aoColumns[e];typeof c.fnRender=="function"&&c.bUseRendered&&c.mDataProp!==null&&N(a,b,e,c.fnRender({iDataRow:b,iDataColumn:e,aData:d._aData,oSettings:a}));if(c._bAutoType&&c.sType!="string"){f=H(a,b,e,"type");if(f!==null&&f!==""){f=fa(f);if(c.sType===null)c.sType=f;else if(c.sType!=f)c.sType="string"}}}a.aiDisplayMaster.push(b);a.oFeatures.bDeferRender||z(a,b);return b}function z(a,b){var c=a.aoData[b],d;if(c.nTr===null){c.nTr=p.createElement("tr");typeof c._aData.DT_RowId!=
+"undefined"&&c.nTr.setAttribute("id",c._aData.DT_RowId);typeof c._aData.DT_RowClass!="undefined"&&i(c.nTr).addClass(c._aData.DT_RowClass);for(var f=0,e=a.aoColumns.length;f<e;f++){var h=a.aoColumns[f];d=p.createElement("td");d.innerHTML=typeof h.fnRender=="function"&&(!h.bUseRendered||h.mDataProp===null)?h.fnRender({iDataRow:b,iDataColumn:f,aData:c._aData,oSettings:a}):H(a,b,f,"display");if(h.sClass!==null)d.className=h.sClass;if(h.bVisible){c.nTr.appendChild(d);c._anHidden[f]=null}else c._anHidden[f]=
+d}}}function Y(a){var b,c,d,f,e,h,j,k,m;if(a.bDeferLoading||a.sAjaxSource===null){j=a.nTBody.childNodes;b=0;for(c=j.length;b<c;b++)if(j[b].nodeName.toUpperCase()=="TR"){k=a.aoData.length;a.aoData.push({nTr:j[b],_iId:a.iNextId++,_aData:[],_anHidden:[],_sRowStripe:""});a.aiDisplayMaster.push(k);h=j[b].childNodes;d=e=0;for(f=h.length;d<f;d++){m=h[d].nodeName.toUpperCase();if(m=="TD"||m=="TH"){N(a,k,e,i.trim(h[d].innerHTML));e++}}}}j=$(a);h=[];b=0;for(c=j.length;b<c;b++){d=0;for(f=j[b].childNodes.length;d<
+f;d++){e=j[b].childNodes[d];m=e.nodeName.toUpperCase();if(m=="TD"||m=="TH")h.push(e)}}h.length!=j.length*a.aoColumns.length&&J(a,1,"Unexpected number of TD elements. Expected "+j.length*a.aoColumns.length+" and got "+h.length+". DataTables does not support rowspan / colspan in the table body, and there must be one cell for each row/column combination.");d=0;for(f=a.aoColumns.length;d<f;d++){if(a.aoColumns[d].sTitle===null)a.aoColumns[d].sTitle=a.aoColumns[d].nTh.innerHTML;j=a.aoColumns[d]._bAutoType;
+m=typeof a.aoColumns[d].fnRender=="function";e=a.aoColumns[d].sClass!==null;k=a.aoColumns[d].bVisible;var t,q;if(j||m||e||!k){b=0;for(c=a.aoData.length;b<c;b++){t=h[b*f+d];if(j&&a.aoColumns[d].sType!="string"){q=H(a,b,d,"type");if(q!==""){q=fa(q);if(a.aoColumns[d].sType===null)a.aoColumns[d].sType=q;else if(a.aoColumns[d].sType!=q)a.aoColumns[d].sType="string"}}if(m){q=a.aoColumns[d].fnRender({iDataRow:b,iDataColumn:d,aData:a.aoData[b]._aData,oSettings:a});t.innerHTML=q;a.aoColumns[d].bUseRendered&&
+N(a,b,d,q)}if(e)t.className+=" "+a.aoColumns[d].sClass;if(k)a.aoData[b]._anHidden[d]=null;else{a.aoData[b]._anHidden[d]=t;t.parentNode.removeChild(t)}}}}}function V(a){var b,c,d;a.nTHead.getElementsByTagName("tr");if(a.nTHead.getElementsByTagName("th").length!==0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}}else{var f=p.createElement("tr");b=0;
+for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);f.appendChild(c)}i(a.nTHead).html("")[0].appendChild(f);W(a.aoHeader,a.nTHead)}if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;f=p.createElement("div");f.className=a.oClasses.sSortJUIWrapper;i(c).contents().appendTo(f);var e=p.createElement("span");e.className=a.oClasses.sSortIcon;f.appendChild(e);c.appendChild(f)}}d=function(){this.onselectstart=
+function(){return false};return false};if(a.oFeatures.bSort)for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable!==false){ga(a,a.aoColumns[b].nTh,b);i(a.aoColumns[b].nTh).bind("mousedown.DT",d)}else i(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);a.oClasses.sFooterTH!==""&&i(">tr>th",a.nTFoot).addClass(a.oClasses.sFooterTH);if(a.nTFoot!==null){c=S(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)if(typeof c[b]!="undefined")a.aoColumns[b].nTf=c[b]}}function L(a,b,c){var d,f,
+e,h=[],j=[],k=a.aoColumns.length;if(typeof c=="undefined")c=false;d=0;for(f=b.length;d<f;d++){h[d]=b[d].slice();h[d].nTr=b[d].nTr;for(e=k-1;e>=0;e--)!a.aoColumns[e].bVisible&&!c&&h[d].splice(e,1);j.push([])}d=0;for(f=h.length;d<f;d++){if(h[d].nTr){a=0;for(e=h[d].nTr.childNodes.length;a<e;a++)h[d].nTr.removeChild(h[d].nTr.childNodes[0])}e=0;for(b=h[d].length;e<b;e++){k=c=1;if(typeof j[d][e]=="undefined"){h[d].nTr.appendChild(h[d][e].cell);for(j[d][e]=1;typeof h[d+c]!="undefined"&&h[d][e].cell==h[d+
+c][e].cell;){j[d+c][e]=1;c++}for(;typeof h[d][e+k]!="undefined"&&h[d][e].cell==h[d][e+k].cell;){for(a=0;a<c;a++)j[d+a][e+k]=1;k++}h[d][e].cell.setAttribute("rowspan",c);h[d][e].cell.setAttribute("colspan",k)}}}}function C(a){var b,c,d=[],f=0,e=false;b=a.asStripClasses.length;c=a.aoOpenRows.length;if(!(a.fnPreDrawCallback!==null&&a.fnPreDrawCallback.call(a.oInstance,a)===false)){a.bDrawing=true;if(typeof a.iInitDisplayStart!="undefined"&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?
+a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;E(a)}if(a.bDeferLoading){a.bDeferLoading=false;a.iDraw++}else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!za(a))return}else a.iDraw++;if(a.aiDisplay.length!==0){var h=a._iDisplayStart,j=a._iDisplayEnd;if(a.oFeatures.bServerSide){h=0;j=a.aoData.length}for(h=h;h<j;h++){var k=a.aoData[a.aiDisplay[h]];k.nTr===null&&z(a,a.aiDisplay[h]);var m=k.nTr;if(b!==0){var t=a.asStripClasses[f%b];if(k._sRowStripe!=
+t){i(m).removeClass(k._sRowStripe).addClass(t);k._sRowStripe=t}}if(typeof a.fnRowCallback=="function"){m=a.fnRowCallback.call(a.oInstance,m,a.aoData[a.aiDisplay[h]]._aData,f,h);if(!m&&!e){J(a,0,"A node was not returned by fnRowCallback");e=true}}d.push(m);f++;if(c!==0)for(k=0;k<c;k++)m==a.aoOpenRows[k].nParent&&d.push(a.aoOpenRows[k].nTr)}}else{d[0]=p.createElement("tr");if(typeof a.asStripClasses[0]!="undefined")d[0].className=a.asStripClasses[0];e=a.oLanguage.sZeroRecords.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()));
+if(a.iDraw==1&&a.sAjaxSource!==null&&!a.oFeatures.bServerSide)e=a.oLanguage.sLoadingRecords;else if(typeof a.oLanguage.sEmptyTable!="undefined"&&a.fnRecordsTotal()===0)e=a.oLanguage.sEmptyTable;b=p.createElement("td");b.setAttribute("valign","top");b.colSpan=X(a);b.className=a.oClasses.sRowEmpty;b.innerHTML=e;d[f].appendChild(b)}typeof a.fnHeaderCallback=="function"&&a.fnHeaderCallback.call(a.oInstance,i(">tr",a.nTHead)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback==
+"function"&&a.fnFooterCallback.call(a.oInstance,i(">tr",a.nTFoot)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f=p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered){c=a.nTBody.childNodes;for(b=c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b])}b=0;for(c=d.length;b<c;b++)f.appendChild(d[b]);a.nTBody.appendChild(f);e!==null&&e.appendChild(a.nTBody)}for(b=a.aoDrawCallback.length-
+1;b>=0;b--)a.aoDrawCallback[b].fn.call(a.oInstance,a);a.bSorted=false;a.bFiltered=false;a.bDrawing=false;if(a.oFeatures.bServerSide){K(a,false);typeof a._bInitComplete=="undefined"&&w(a)}}}function ba(a){if(a.oFeatures.bSort)R(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);else{E(a);C(a)}}function za(a){if(a.bAjaxDataGet){K(a,true);var b=a.aoColumns.length,c=[],d,f;a.iDraw++;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:ha(a)});
+c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==false?a._iDisplayLength:-1});for(f=0;f<b;f++){d=a.aoColumns[f].mDataProp;c.push({name:"mDataProp_"+f,value:typeof d=="function"?"function":d})}if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++){c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch});c.push({name:"bRegex_"+
+f,value:a.aoPreSearchCols[f].bRegex});c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}}if(a.oFeatures.bSort!==false){d=a.aaSortingFixed!==null?a.aaSortingFixed.length:0;var e=a.aaSorting.length;c.push({name:"iSortingCols",value:d+e});for(f=0;f<d;f++){c.push({name:"iSortCol_"+f,value:a.aaSortingFixed[f][0]});c.push({name:"sSortDir_"+f,value:a.aaSortingFixed[f][1]})}for(f=0;f<e;f++){c.push({name:"iSortCol_"+(f+d),value:a.aaSorting[f][0]});c.push({name:"sSortDir_"+(f+d),value:a.aaSorting[f][1]})}for(f=
+0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(h){Aa(a,h)},a);return false}else return true}function Aa(a,b){if(typeof b.sEcho!="undefined")if(b.sEcho*1<a.iDraw)return;else a.iDraw=b.sEcho*1;if(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))ia(a);a._iRecordsTotal=b.iTotalRecords;a._iRecordsDisplay=b.iTotalDisplayRecords;var c=ha(a);if(c=typeof b.sColumns!="undefined"&&c!==""&&b.sColumns!=c)var d=
+Ba(a,b.sColumns);b=Z(a.sAjaxDataProp)(b);for(var f=0,e=b.length;f<e;f++)if(c){for(var h=[],j=0,k=a.aoColumns.length;j<k;j++)h.push(b[f][d[j]]);v(a,h)}else v(a,b[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;C(a);a.bAjaxDataGet=true;K(a,false)}function xa(a){var b=p.createElement("div");a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=p.createElement("div");a.nTableWrapper.className=a.oClasses.sWrapper;a.sTableId!==""&&a.nTableWrapper.setAttribute("id",a.sTableId+"_wrapper");
+a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),f,e,h,j,k,m,t,q=0;q<d.length;q++){e=0;h=d[q];if(h=="<"){j=p.createElement("div");k=d[q+1];if(k=="'"||k=='"'){m="";for(t=2;d[q+t]!=k;){m+=d[q+t];t++}if(m=="H")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(m=="F")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";if(m.indexOf(".")!=-1){k=m.split(".");j.setAttribute("id",k[0].substr(1,
+k[0].length-1));j.className=k[1]}else if(m.charAt(0)=="#")j.setAttribute("id",m.substr(1,m.length-1));else j.className=m;q+=t}c.appendChild(j);c=j}else if(h==">")c=c.parentNode;else if(h=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=Ca(a);e=1}else if(h=="f"&&a.oFeatures.bFilter){f=Da(a);e=1}else if(h=="r"&&a.oFeatures.bProcessing){f=Ea(a);e=1}else if(h=="t"){f=Fa(a);e=1}else if(h=="i"&&a.oFeatures.bInfo){f=Ga(a);e=1}else if(h=="p"&&a.oFeatures.bPaginate){f=Ha(a);e=1}else if(o.aoFeatures.length!==
+0){j=o.aoFeatures;t=0;for(k=j.length;t<k;t++)if(h==j[t].cFeature){if(f=j[t].fnInit(a))e=1;break}}if(e==1&&f!==null){if(typeof a.aanFeatures[h]!="object")a.aanFeatures[h]=[];a.aanFeatures[h].push(f);c.appendChild(f)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function Fa(a){if(a.oScroll.sX===""&&a.oScroll.sY==="")return a.nTable;var b=p.createElement("div"),c=p.createElement("div"),d=p.createElement("div"),f=p.createElement("div"),e=p.createElement("div"),h=p.createElement("div"),j=a.nTable.cloneNode(false),
+k=a.nTable.cloneNode(false),m=a.nTable.getElementsByTagName("thead")[0],t=a.nTable.getElementsByTagName("tfoot").length===0?null:a.nTable.getElementsByTagName("tfoot")[0],q=typeof g.bJQueryUI!="undefined"&&g.bJQueryUI?o.oJUIClasses:o.oStdClasses;c.appendChild(d);e.appendChild(h);f.appendChild(a.nTable);b.appendChild(c);b.appendChild(f);d.appendChild(j);j.appendChild(m);if(t!==null){b.appendChild(e);h.appendChild(k);k.appendChild(t)}b.className=q.sScrollWrapper;c.className=q.sScrollHead;d.className=
+q.sScrollHeadInner;f.className=q.sScrollBody;e.className=q.sScrollFoot;h.className=q.sScrollFootInner;if(a.oScroll.bAutoCss){c.style.overflow="hidden";c.style.position="relative";e.style.overflow="hidden";f.style.overflow="auto"}c.style.border="0";c.style.width="100%";e.style.border="0";d.style.width="150%";j.removeAttribute("id");j.style.marginLeft="0";a.nTable.style.marginLeft="0";if(t!==null){k.removeAttribute("id");k.style.marginLeft="0"}d=i(">caption",a.nTable);h=0;for(k=d.length;h<k;h++)j.appendChild(d[h]);
+if(a.oScroll.sX!==""){c.style.width=u(a.oScroll.sX);f.style.width=u(a.oScroll.sX);if(t!==null)e.style.width=u(a.oScroll.sX);i(f).scroll(function(){c.scrollLeft=this.scrollLeft;if(t!==null)e.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!=="")f.style.height=u(a.oScroll.sY);a.aoDrawCallback.push({fn:Ia,sName:"scrolling"});a.oScroll.bInfinite&&i(f).scroll(function(){if(!a.bDrawing)if(i(this).scrollTop()+i(this).height()>i(a.nTable).height()-a.oScroll.iLoadGap)if(a.fnDisplayEnd()<a.fnRecordsDisplay()){ja(a,
+"next");E(a);C(a)}});a.nScrollHead=c;a.nScrollFoot=e;return b}function Ia(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,f,e,h,j,k,m,t,q,I=[];h=a.nTable.getElementsByTagName("thead");h.length>0&&a.nTable.removeChild(h[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}h=a.nTHead.cloneNode(true);a.nTable.insertBefore(h,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);
+a.nTable.insertBefore(k,a.nTable.childNodes[1])}if(a.oScroll.sX===""){d.style.width="100%";b.parentNode.style.width="100%"}var O=S(a,h);f=0;for(e=O.length;f<e;f++){t=Ja(a,f);O[f].style.width=a.aoColumns[t].sWidth}a.nTFoot!==null&&P(function(B){B.style.width=""},k.getElementsByTagName("tr"));f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(i.browser.msie&&i.browser.version<=7)a.nTable.style.width=u(i(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!==
+"")a.nTable.style.width=u(a.oScroll.sXInner);else if(f==i(d).width()&&i(d).height()<i(a.nTable).height()){a.nTable.style.width=u(f-a.oScroll.iBarWidth);if(i(a.nTable).outerWidth()>f-a.oScroll.iBarWidth)a.nTable.style.width=u(f)}else a.nTable.style.width=u(f);f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){d.style.width=u(f+a.oScroll.iBarWidth);b.parentNode.style.width=u(f+a.oScroll.iBarWidth)}e=a.nTHead.getElementsByTagName("tr");h=h.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop=
+"0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},h,e);i(h).height(0);if(a.nTFoot!==null){j=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},j,k);i(j).height(0)}P(function(B){B.innerHTML="";B.style.width=u(I.shift())},h);a.nTFoot!==null&&P(function(B){B.innerHTML=
+"";B.style.width=u(I.shift())},j);if(i(a.nTable).outerWidth()<f)if(a.oScroll.sX==="")J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you enable x-scrolling or increase the width the table has in which to be drawn");else a.oScroll.sXInner!==""&&J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you increase the sScrollXInner property to allow it to draw in a larger area, or simply remove that parameter to allow automatic calculation");
+if(a.oScroll.sY==="")if(i.browser.msie&&i.browser.version<=7)d.style.height=u(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=u(a.oScroll.sY);j=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=u(i(a.nTable).height()+j)}j=i(a.nTable).outerWidth();c.style.width=u(j);b.style.width=u(j+a.oScroll.iBarWidth);if(a.nTFoot!==null){b=a.nScrollFoot.getElementsByTagName("div")[0];
+c=b.getElementsByTagName("table")[0];b.style.width=u(a.nTable.offsetWidth+a.oScroll.iBarWidth);c.style.width=u(a.nTable.offsetWidth)}if(a.bSorted||a.bFiltered)d.scrollTop=0}function ca(a){if(a.oFeatures.bAutoWidth===false)return false;ea(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function Da(a){var b=a.oLanguage.sSearch;b=b.indexOf("_INPUT_")!==-1?b.replace("_INPUT_",'<input type="text" />'):b===""?'<input type="text" />':b+' <input type="text" />';
+var c=p.createElement("div");c.className=a.oClasses.sFilter;c.innerHTML="<label>"+b+"</label>";a.sTableId!==""&&typeof a.aanFeatures.f=="undefined"&&c.setAttribute("id",a.sTableId+"_filter");b=i("input",c);b.val(a.oPreviousSearch.sSearch.replace('"',"&quot;"));b.bind("keyup.DT",function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f<e;f++)d[f]!=this.parentNode&&i("input",d[f]).val(this.value);this.value!=a.oPreviousSearch.sSearch&&M(a,{sSearch:this.value,bRegex:a.oPreviousSearch.bRegex,bSmart:a.oPreviousSearch.bSmart})});
+b.bind("keypress.DT",function(d){if(d.keyCode==13)return false});return c}function M(a,b,c){Ka(a,b.sSearch,c,b.bRegex,b.bSmart);for(b=0;b<a.aoPreSearchCols.length;b++)La(a,a.aoPreSearchCols[b].sSearch,b,a.aoPreSearchCols[b].bRegex,a.aoPreSearchCols[b].bSmart);o.afnFiltering.length!==0&&Ma(a);a.bFiltered=true;a._iDisplayStart=0;E(a);C(a);ka(a,0)}function Ma(a){for(var b=o.afnFiltering,c=0,d=b.length;c<d;c++)for(var f=0,e=0,h=a.aiDisplay.length;e<h;e++){var j=a.aiDisplay[e-f];if(!b[c](a,da(a,j,"filter"),
+j)){a.aiDisplay.splice(e-f,1);f++}}}function La(a,b,c,d,f){if(b!==""){var e=0;b=la(b,d,f);for(d=a.aiDisplay.length-1;d>=0;d--){f=ma(H(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d,1);e++}}}}function Ka(a,b,c,d,f){var e=la(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(o.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||a.oPreviousSearch.sSearch.length>
+b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);ka(a,1);for(c=0;c<a.aiDisplayMaster.length;c++)e.test(a.asDataSearch[c])&&a.aiDisplay.push(a.aiDisplayMaster[c])}else{var h=0;for(c=0;c<a.asDataSearch.length;c++)if(!e.test(a.asDataSearch[c])){a.aiDisplay.splice(c-h,1);h++}}a.oPreviousSearch.sSearch=b;a.oPreviousSearch.bRegex=d;a.oPreviousSearch.bSmart=f}function ka(a,b){a.asDataSearch.splice(0,a.asDataSearch.length);b=typeof b!="undefined"&&b==1?a.aiDisplayMaster:
+a.aiDisplay;for(var c=0,d=b.length;c<d;c++)a.asDataSearch[c]=na(a,da(a,b[c],"filter"))}function na(a,b){var c="";if(typeof a.__nTmpFilter=="undefined")a.__nTmpFilter=p.createElement("div");for(var d=a.__nTmpFilter,f=0,e=a.aoColumns.length;f<e;f++)if(a.aoColumns[f].bSearchable)c+=ma(b[f],a.aoColumns[f].sType)+"  ";if(c.indexOf("&")!==-1){d.innerHTML=c;c=d.textContent?d.textContent:d.innerText;c=c.replace(/\n/g," ").replace(/\r/g,"")}return c}function la(a,b,c){if(c){a=b?a.split(" "):oa(a).split(" ");
+a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,"i")}else{a=b?a:oa(a);return new RegExp(a,"i")}}function ma(a,b){if(typeof o.ofnSearch[b]=="function")return o.ofnSearch[b](a);else if(b=="html")return a.replace(/\n/g," ").replace(/<.*?>/g,"");else if(typeof a=="string")return a.replace(/\n/g," ");else if(a===null)return"";return a}function R(a,b){var c,d,f,e,h=[],j=[],k=o.oSort;d=a.aoData;var m=a.aoColumns;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||a.aaSortingFixed!==null)){h=a.aaSortingFixed!==
+null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<h.length;c++){var t=h[c][0];f=pa(a,t);e=a.aoColumns[t].sSortDataType;if(typeof o.afnSortData[e]!="undefined"){var q=o.afnSortData[e](a,t,f);f=0;for(e=d.length;f<e;f++)N(a,f,t,q[f])}}c=0;for(d=a.aiDisplayMaster.length;c<d;c++)j[a.aiDisplayMaster[c]]=c;var I=h.length;a.aiDisplayMaster.sort(function(O,B){var F,qa;for(c=0;c<I;c++){F=m[h[c][0]].iDataSort;qa=m[F].sType;F=k[(qa?qa:"string")+"-"+h[c][1]](H(a,O,F,"sort"),H(a,B,F,"sort"));
+if(F!==0)return F}return k["numeric-asc"](j[O],j[B])})}if((typeof b=="undefined"||b)&&!a.oFeatures.bDeferRender)T(a);a.bSorted=true;if(a.oFeatures.bFilter)M(a,a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;E(a);C(a)}}function ga(a,b,c,d){i(b).bind("click.DT",function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var h,j;if(f.shiftKey){for(var k=false,m=0;m<a.aaSorting.length;m++)if(a.aaSorting[m][0]==c){k=true;h=a.aaSorting[m][0];j=a.aaSorting[m][2]+
+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")a.aaSorting.splice(m,1);else{a.aaSorting[m][1]=a.aoColumns[h].asSorting[j];a.aaSorting[m][2]=j}break}k===false&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){h=a.aaSorting[0][0];j=a.aaSorting[0][2]+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")j=0;a.aaSorting[0][1]=a.aoColumns[h].asSorting[j];a.aaSorting[0][2]=j}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],
+0])}R(a)};if(a.oFeatures.bProcessing){K(a,true);setTimeout(function(){e();a.oFeatures.bServerSide||K(a,false)},0)}else e();typeof d=="function"&&d(a)}})}function T(a){var b,c,d,f,e,h=a.aoColumns.length,j=a.oClasses;for(b=0;b<h;b++)a.aoColumns[b].bSortable&&i(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);f=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){e=a.aoColumns[b].sSortingClass;
+d=-1;for(c=0;c<f.length;c++)if(f[c][0]==b){e=f[c][1]=="asc"?j.sSortAsc:j.sSortDesc;d=c;break}i(a.aoColumns[b].nTh).addClass(e);if(a.bJUI){c=i("span",a.aoColumns[b].nTh);c.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:f[d][1]=="asc"?j.sSortJUIAsc:j.sSortJUIDesc)}}else i(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);e=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=
+Q(a);if(a.oFeatures.bDeferRender)i(d).removeClass(e+"1 "+e+"2 "+e+"3");else if(d.length>=h)for(b=0;b<h;b++)if(d[b].className.indexOf(e+"1")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"1",""))}else if(d[b].className.indexOf(e+"2")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"2",""))}else if(d[b].className.indexOf(e+"3")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(" "+
+e+"3",""))}j=1;var k;for(b=0;b<f.length;b++){k=parseInt(f[b][0],10);c=0;for(a=d.length/h;c<a;c++)d[h*c+k].className+=" "+e+j;j<3&&j++}}}function Ha(a){if(a.oScroll.bInfinite)return null;var b=p.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;o.oPagination[a.sPaginationType].fnInit(a,b,function(c){E(c);C(c)});typeof a.aanFeatures.p=="undefined"&&a.aoDrawCallback.push({fn:function(c){o.oPagination[c.sPaginationType].fnUpdate(c,function(d){E(d);C(d)})},sName:"pagination"});return b}
+function ja(a,b){var c=a._iDisplayStart;if(b=="first")a._iDisplayStart=0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=
+0;else J(a,0,"Unknown paging action: "+b);return c!=a._iDisplayStart}function Ga(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Na,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b}function Na(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=a._iDisplayStart+1,c=a.fnDisplayEnd(),d=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),e=a.fnFormatNumber(b),h=a.fnFormatNumber(c),j=
+a.fnFormatNumber(d),k=a.fnFormatNumber(f);if(a.oScroll.bInfinite)e=a.fnFormatNumber(1);e=a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()===0?a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",j)+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfo.replace("_START_",e).replace("_END_",h).replace("_TOTAL_",k)+a.oLanguage.sInfoPostFix:a.oLanguage.sInfo.replace("_START_",
+e).replace("_END_",h).replace("_TOTAL_",k)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix;if(a.oLanguage.fnInfoCallback!==null)e=a.oLanguage.fnInfoCallback(a,b,c,d,f,e);a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)i(a[b]).html(e)}}function Ca(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+(a.sTableId===""?"":'name="'+a.sTableId+'_length"')+">",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]==
+"object"){c=0;for(d=a.aLengthMenu[0].length;c<d;c++)b+='<option value="'+a.aLengthMenu[0][c]+'">'+a.aLengthMenu[1][c]+"</option>"}else{c=0;for(d=a.aLengthMenu.length;c<d;c++)b+='<option value="'+a.aLengthMenu[c]+'">'+a.aLengthMenu[c]+"</option>"}b+="</select>";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+"_length");f.className=a.oClasses.sLength;f.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";i('select option[value="'+
+a._iDisplayLength+'"]',f).attr("selected",true);i("select",f).bind("change.DT",function(){var e=i(this).val(),h=a.aanFeatures.l;c=0;for(d=h.length;c<d;c++)h[c]!=this.parentNode&&i("select",h[c]).val(e);a._iDisplayLength=parseInt(e,10);E(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=0}if(a._iDisplayLength==-1)a._iDisplayStart=0;C(a)});return f}function Ea(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.r==
+"undefined"&&b.setAttribute("id",a.sTableId+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function K(a,b){if(a.oFeatures.bProcessing){a=a.aanFeatures.r;for(var c=0,d=a.length;c<d;c++)a[c].style.visibility=b?"visible":"hidden"}}function Ja(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(c==b)return d}return null}function pa(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===
+true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function U(a,b){var c,d;c=a._iDisplayStart;for(d=a._iDisplayEnd;c<d;c++)if(a.aoData[a.aiDisplay[c]].nTr==b)return a.aiDisplay[c];c=0;for(d=a.aoData.length;c<d;c++)if(a.aoData[c].nTr==b)return c;return null}function X(a){for(var b=0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===true&&b++;return b}function E(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||
+a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Oa(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=u(a);b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ea(a){var b=0,c,d=0,f=a.aoColumns.length,e,h=i("th",a.nTHead);for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d++;if(a.aoColumns[e].sWidth!==null){c=Oa(a.aoColumns[e].sWidthOrig,a.nTable.parentNode);if(c!==
+null)a.aoColumns[e].sWidth=u(c);b++}}if(f==h.length&&b===0&&d==f&&a.oScroll.sX===""&&a.oScroll.sY==="")for(e=0;e<a.aoColumns.length;e++){c=i(h[e]).width();if(c!==null)a.aoColumns[e].sWidth=u(c)}else{b=a.nTable.cloneNode(false);e=a.nTHead.cloneNode(true);d=p.createElement("tbody");c=p.createElement("tr");b.removeAttribute("id");b.appendChild(e);if(a.nTFoot!==null){b.appendChild(a.nTFoot.cloneNode(true));P(function(k){k.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(d);d.appendChild(c);
+d=i("thead th",b);if(d.length===0)d=i("tbody tr:eq(0)>td",b);h=S(a,e);for(e=d=0;e<f;e++){var j=a.aoColumns[e];if(j.bVisible&&j.sWidthOrig!==null&&j.sWidthOrig!=="")h[e-d].style.width=u(j.sWidthOrig);else if(j.bVisible)h[e-d].style.width="";else d++}for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d=Pa(a,e);if(d!==null){d=d.cloneNode(true);if(a.aoColumns[e].sContentPadding!=="")d.innerHTML+=a.aoColumns[e].sContentPadding;c.appendChild(d)}}f=a.nTable.parentNode;f.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!==
+"")b.style.width=u(a.oScroll.sXInner);else if(a.oScroll.sX!==""){b.style.width="";if(i(b).width()<f.offsetWidth)b.style.width=u(f.offsetWidth)}else if(a.oScroll.sY!=="")b.style.width=u(f.offsetWidth);b.style.visibility="hidden";Qa(a,b);f=i("tbody tr:eq(0)",b).children();if(f.length===0)f=S(a,i("thead",b)[0]);if(a.oScroll.sX!==""){for(e=d=c=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c+=a.aoColumns[e].sWidthOrig===null?i(f[d]).outerWidth():parseInt(a.aoColumns[e].sWidth.replace("px",""),
+10)+(i(f[d]).outerWidth()-i(f[d]).width());d++}b.style.width=u(c);a.nTable.style.width=u(c)}for(e=d=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c=i(f[d]).width();if(c!==null&&c>0)a.aoColumns[e].sWidth=u(c);d++}a.nTable.style.width=u(i(b).outerWidth());b.parentNode.removeChild(b)}}function Qa(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==""){i(b).width();b.style.width=u(i(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=u(i(b).outerWidth())}function Pa(a,b){var c=
+Ra(a,b);if(c<0)return null;if(a.aoData[c].nTr===null){var d=p.createElement("td");d.innerHTML=H(a,c,b,"");return d}return Q(a,c)[b]}function Ra(a,b){for(var c=-1,d=-1,f=0;f<a.aoData.length;f++){var e=H(a,f,b,"display")+"";e=e.replace(/<.*?>/g,"");if(e.length>c){c=e.length;d=f}}return d}function u(a){if(a===null)return"0px";if(typeof a=="number"){if(a<0)return"0px";return a+"px"}var b=a.charCodeAt(a.length-1);if(b<48||b>57)return a;return a+"px"}function Va(a,b){if(a.length!=b.length)return 1;for(var c=
+0;c<a.length;c++)if(a[c]!=b[c])return 2;return 0}function fa(a){for(var b=o.aTypes,c=b.length,d=0;d<c;d++){var f=b[d](a);if(f!==null)return f}return"string"}function A(a){for(var b=0;b<D.length;b++)if(D[b].nTable==a)return D[b];return null}function aa(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function $(a){for(var b=[],c=0,d=a.aoData.length;c<d;c++)a.aoData[c].nTr!==null&&b.push(a.aoData[c].nTr);return b}function Q(a,b){var c=[],d,f,e,h,j;f=0;var k=a.aoData.length;
+if(typeof b!="undefined"){f=b;k=b+1}for(f=f;f<k;f++){j=a.aoData[f];if(j.nTr!==null){b=[];e=0;for(h=j.nTr.childNodes.length;e<h;e++){d=j.nTr.childNodes[e].nodeName.toLowerCase();if(d=="td"||d=="th")b.push(j.nTr.childNodes[e])}e=d=0;for(h=a.aoColumns.length;e<h;e++)if(a.aoColumns[e].bVisible)c.push(b[e-d]);else{c.push(j._anHidden[e]);d++}}}return c}function oa(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)","g"),"\\$1")}function ra(a,b){for(var c=-1,d=
+0,f=a.length;d<f;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function Ba(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d<f;d++)for(var e=0;e<f;e++)if(a.aoColumns[d].sName==b[e]){c.push(e);break}return c}function ha(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function J(a,b,c){a=a.sTableId===""?"DataTables warning: "+c:"DataTables warning (table id = '"+a.sTableId+"'): "+c;if(b===0)if(o.sErrMode==
+"alert")alert(a);else throw a;else typeof console!="undefined"&&typeof console.log!="undefined"&&console.log(a)}function ia(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,a.aiDisplayMaster.length);a.aiDisplay.splice(0,a.aiDisplay.length);E(a)}function sa(a){if(!(!a.oFeatures.bStateSave||typeof a.bDestroying!="undefined")){var b,c,d,f="{";f+='"iCreate":'+(new Date).getTime()+",";f+='"iStart":'+(a.oScroll.bInfinite?0:a._iDisplayStart)+",";f+='"iEnd":'+(a.oScroll.bInfinite?a._iDisplayLength:
+a._iDisplayEnd)+",";f+='"iLength":'+a._iDisplayLength+",";f+='"sFilter":"'+encodeURIComponent(a.oPreviousSearch.sSearch)+'",';f+='"sFilterEsc":'+!a.oPreviousSearch.bRegex+",";f+='"aaSorting":[ ';for(b=0;b<a.aaSorting.length;b++)f+="["+a.aaSorting[b][0]+',"'+a.aaSorting[b][1]+'"],';f=f.substring(0,f.length-1);f+="],";f+='"aaSearchCols":[ ';for(b=0;b<a.aoPreSearchCols.length;b++)f+='["'+encodeURIComponent(a.aoPreSearchCols[b].sSearch)+'",'+!a.aoPreSearchCols[b].bRegex+"],";f=f.substring(0,f.length-
+1);f+="],";f+='"abVisCols":[ ';for(b=0;b<a.aoColumns.length;b++)f+=a.aoColumns[b].bVisible+",";f=f.substring(0,f.length-1);f+="]";b=0;for(c=a.aoStateSave.length;b<c;b++){d=a.aoStateSave[b].fn(a,f);if(d!=="")f=d}f+="}";Sa(a.sCookiePrefix+a.sInstance,f,a.iCookieDuration,a.sCookiePrefix,a.fnCookieCallback)}}function Ta(a,b){if(a.oFeatures.bStateSave){var c,d,f;d=ta(a.sCookiePrefix+a.sInstance);if(d!==null&&d!==""){try{c=typeof i.parseJSON=="function"?i.parseJSON(d.replace(/'/g,'"')):eval("("+d+")")}catch(e){return}d=
+0;for(f=a.aoStateLoad.length;d<f;d++)if(!a.aoStateLoad[d].fn(a,c))return;a.oLoadedState=i.extend(true,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.oPreviousSearch.sSearch=decodeURIComponent(c.sFilter);a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();if(typeof c.sFilterEsc!="undefined")a.oPreviousSearch.bRegex=!c.sFilterEsc;if(typeof c.aaSearchCols!="undefined")for(d=0;d<c.aaSearchCols.length;d++)a.aoPreSearchCols[d]=
+{sSearch:decodeURIComponent(c.aaSearchCols[d][0]),bRegex:!c.aaSearchCols[d][1]};if(typeof c.abVisCols!="undefined"){b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}}}}}function Sa(a,b,c,d,f){var e=new Date;e.setTime(e.getTime()+c*1E3);c=wa.location.pathname.split("/");a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();var h;if(f!==null){h=typeof i.parseJSON=="function"?i.parseJSON(b):eval("("+b+")");b=f(a,h,e.toGMTString(),
+c.join("/")+"/")}else b=a+"="+encodeURIComponent(b)+"; expires="+e.toGMTString()+"; path="+c.join("/")+"/";f="";e=9999999999999;if((ta(a)!==null?p.cookie.length:b.length+p.cookie.length)+10>4096){a=p.cookie.split(";");for(var j=0,k=a.length;j<k;j++)if(a[j].indexOf(d)!=-1){var m=a[j].split("=");try{h=eval("("+decodeURIComponent(m[1])+")")}catch(t){continue}if(typeof h.iCreate!="undefined"&&h.iCreate<e){f=m[0];e=h.iCreate}}if(f!=="")p.cookie=f+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+
+"/"}p.cookie=b}function ta(a){var b=wa.location.pathname.split("/");a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=p.cookie.split(";");for(var c=0;c<b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function W(a,b){b=b.getElementsByTagName("tr");var c,d,f,e,h,j,k,m,t=function(O,B,F){for(;typeof O[B][F]!="undefined";)F++;return F};a.splice(0,a.length);d=0;for(j=b.length;d<
+j;d++)a.push([]);d=0;for(j=b.length;d<j;d++){f=0;for(k=b[d].childNodes.length;f<k;f++){c=b[d].childNodes[f];if(c.nodeName.toUpperCase()=="TD"||c.nodeName.toUpperCase()=="TH"){var q=c.getAttribute("colspan")*1,I=c.getAttribute("rowspan")*1;q=!q||q===0||q===1?1:q;I=!I||I===0||I===1?1:I;m=t(a,d,0);for(h=0;h<q;h++)for(e=0;e<I;e++){a[d+e][m+h]={cell:c,unique:q==1?true:false};a[d+e].nTr=b[d]}}}}}function S(a,b,c){var d=[];if(typeof c=="undefined"){c=a.aoHeader;if(typeof b!="undefined"){c=[];W(c,b)}}b=0;
+for(var f=c.length;b<f;b++)for(var e=0,h=c[b].length;e<h;e++)if(c[b][e].unique&&(typeof d[e]=="undefined"||!a.bSortCellsTop))d[e]=c[b][e].cell;return d}function Ua(){var a=p.createElement("p"),b=a.style;b.width="100%";b.height="200px";var c=p.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.overflow="hidden";c.appendChild(a);p.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;if(b==a)a=
+c.clientWidth;p.body.removeChild(c);return b-a}function P(a,b,c){for(var d=0,f=b.length;d<f;d++)for(var e=0,h=b[d].childNodes.length;e<h;e++)if(b[d].childNodes[e].nodeType==1)typeof c!="undefined"?a(b[d].childNodes[e],c[d].childNodes[e]):a(b[d].childNodes[e])}function n(a,b,c,d){if(typeof d=="undefined")d=c;if(typeof b[c]!="undefined")a[d]=b[c]}function da(a,b,c){for(var d=[],f=0,e=a.aoColumns.length;f<e;f++)d.push(H(a,b,f,c));return d}function H(a,b,c,d){var f=a.aoColumns[c];if((c=f.fnGetData(a.aoData[b]._aData))===
+undefined){if(a.iDrawError!=a.iDraw&&f.sDefaultContent===null){J(a,0,"Requested unknown parameter '"+f.mDataProp+"' from the data source for row "+b);a.iDrawError=a.iDraw}return f.sDefaultContent}if(c===null&&f.sDefaultContent!==null)c=f.sDefaultContent;if(d=="display"&&c===null)return"";return c}function N(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function Z(a){if(a===null)return function(){return null};else if(typeof a=="function")return function(c){return a(c)};else if(typeof a==
+"string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c){return c[b[0]][b[1]]}:b.length==3?function(c){return c[b[0]][b[1]][b[2]]}:function(c){for(var d=0,f=b.length;d<f;d++)c=c[b[d]];return c}}else return function(c){return c[a]}}function ya(a){if(a===null)return function(){};else if(typeof a=="function")return function(c,d){return a(c,d)};else if(typeof a=="string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c,d){c[b[0]][b[1]]=d}:b.length==3?function(c,
+d){c[b[0]][b[1]][b[2]]=d}:function(c,d){for(var f=0,e=b.length-1;f<e;f++)c=c[b[f]];c[b[b.length-1]]=d}}else return function(c,d){c[a]=d}}this.oApi={};this.fnDraw=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined"&&a===false){E(b);C(b)}else ba(b)};this.fnFilter=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);if(e.oFeatures.bFilter){if(typeof c=="undefined")c=false;if(typeof d=="undefined")d=true;if(typeof f=="undefined")f=true;if(typeof b=="undefined"||b===null){M(e,{sSearch:a,bRegex:c,
+bSmart:d},1);if(f&&typeof e.aanFeatures.f!="undefined"){b=e.aanFeatures.f;c=0;for(d=b.length;c<d;c++)i("input",b[c]).val(a)}}else{e.aoPreSearchCols[b].sSearch=a;e.aoPreSearchCols[b].bRegex=c;e.aoPreSearchCols[b].bSmart=d;M(e,e.oPreviousSearch,1)}}};this.fnSettings=function(){return A(this[o.iApiIndex])};this.fnVersionCheck=o.fnVersionCheck;this.fnSort=function(a){var b=A(this[o.iApiIndex]);b.aaSorting=a;R(b)};this.fnSortListener=function(a,b,c){ga(A(this[o.iApiIndex]),a,b,c)};this.fnAddData=function(a,
+b){if(a.length===0)return[];var c=[],d,f=A(this[o.iApiIndex]);if(typeof a[0]=="object")for(var e=0;e<a.length;e++){d=v(f,a[e]);if(d==-1)return c;c.push(d)}else{d=v(f,a);if(d==-1)return c;c.push(d)}f.aiDisplay=f.aiDisplayMaster.slice();if(typeof b=="undefined"||b)ba(f);return c};this.fnDeleteRow=function(a,b,c){var d=A(this[o.iApiIndex]);a=typeof a=="object"?U(d,a):a;var f=d.aoData.splice(a,1),e=i.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,1);ra(d.aiDisplayMaster,a);ra(d.aiDisplay,a);typeof b==
+"function"&&b.call(this,d,f);if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){E(d);C(d)}return f};this.fnClearTable=function(a){var b=A(this[o.iApiIndex]);ia(b);if(typeof a=="undefined"||a)C(b)};this.fnOpen=function(a,b,c){var d=A(this[o.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;e.colSpan=X(d);if(typeof b.jquery!="undefined"||typeof b==
+"object")e.appendChild(b);else e.innerHTML=b;b=i("tr",d.nTBody);i.inArray(a,b)!=-1&&i(f).insertAfter(a);d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=A(this[o.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnGetData=function(a,b){var c=A(this[o.iApiIndex]);if(typeof a!="undefined"){a=typeof a=="object"?U(c,a):a;if(typeof b!=
+"undefined")return H(c,a,b,"");return typeof c.aoData[a]!="undefined"?c.aoData[a]._aData:null}return aa(c)};this.fnGetNodes=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined")return typeof b.aoData[a]!="undefined"?b.aoData[a].nTr:null;return $(b)};this.fnGetPosition=function(a){var b=A(this[o.iApiIndex]),c=a.nodeName.toUpperCase();if(c=="TR")return U(b,a);else if(c=="TD"||c=="TH"){c=U(b,a.parentNode);for(var d=Q(b,c),f=0;f<b.aoColumns.length;f++)if(d[f]==a)return[c,pa(b,f),f]}return null};
+this.fnUpdate=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);b=typeof b=="object"?U(e,b):b;if(i.isArray(a)&&typeof a=="object"){e.aoData[b]._aData=a.slice();for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else if(typeof a=="object"){e.aoData[b]._aData=i.extend(true,{},a);for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else{a=a;N(e,b,c,a);if(e.aoColumns[c].fnRender!==null){a=e.aoColumns[c].fnRender({iDataRow:b,iDataColumn:c,aData:e.aoData[b]._aData,
+oSettings:e});e.aoColumns[c].bUseRendered&&N(e,b,c,a)}if(e.aoData[b].nTr!==null)Q(e,b)[c].innerHTML=a}c=i.inArray(b,e.aiDisplay);e.asDataSearch[c]=na(e,da(e,b,"filter"));if(typeof f=="undefined"||f)ca(e);if(typeof d=="undefined"||d)ba(e);return 0};this.fnSetColumnVis=function(a,b,c){var d=A(this[o.iApiIndex]),f,e;e=d.aoColumns.length;var h,j;if(d.aoColumns[a].bVisible!=b){if(b){for(f=j=0;f<a;f++)d.aoColumns[f].bVisible&&j++;j=j>=X(d);if(!j)for(f=a;f<e;f++)if(d.aoColumns[f].bVisible){h=f;break}f=0;
+for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null)j?d.aoData[f].nTr.appendChild(d.aoData[f]._anHidden[a]):d.aoData[f].nTr.insertBefore(d.aoData[f]._anHidden[a],Q(d,f)[h])}else{f=0;for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null){h=Q(d,f)[a];d.aoData[f]._anHidden[a]=h;h.parentNode.removeChild(h)}}d.aoColumns[a].bVisible=b;L(d,d.aoHeader);d.nTFoot&&L(d,d.aoFooter);f=0;for(e=d.aoOpenRows.length;f<e;f++)d.aoOpenRows[f].nTr.colSpan=X(d);if(typeof c=="undefined"||c){ca(d);C(d)}sa(d)}};this.fnPageChange=
+function(a,b){var c=A(this[o.iApiIndex]);ja(c,a);E(c);if(typeof b=="undefined"||b)C(c)};this.fnDestroy=function(){var a=A(this[o.iApiIndex]),b=a.nTableWrapper.parentNode,c=a.nTBody,d,f;a.bDestroying=true;d=0;for(f=a.aoColumns.length;d<f;d++)a.aoColumns[d].bVisible===false&&this.fnSetColumnVis(d,true);i(a.nTableWrapper).find("*").andSelf().unbind(".DT");i("tbody>tr>td."+a.oClasses.sRowEmpty,a.nTable).parent().remove();if(a.nTable!=a.nTHead.parentNode){i(">thead",a.nTable).remove();a.nTable.appendChild(a.nTHead)}if(a.nTFoot&&
+a.nTable!=a.nTFoot.parentNode){i(">tfoot",a.nTable).remove();a.nTable.appendChild(a.nTFoot)}a.nTable.parentNode.removeChild(a.nTable);i(a.nTableWrapper).remove();a.aaSorting=[];a.aaSortingFixed=[];T(a);i($(a)).removeClass(a.asStripClasses.join(" "));if(a.bJUI){i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oJUIClasses.sSortableAsc,o.oJUIClasses.sSortableDesc,o.oJUIClasses.sSortableNone].join(" "));i("th span."+o.oJUIClasses.sSortIcon,a.nTHead).remove();i("th",a.nTHead).each(function(){var e=
+i("div."+o.oJUIClasses.sSortJUIWrapper,this),h=e.contents();i(this).append(h);e.remove()})}else i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oStdClasses.sSortableAsc,o.oStdClasses.sSortableDesc,o.oStdClasses.sSortableNone].join(" "));a.nTableReinsertBefore?b.insertBefore(a.nTable,a.nTableReinsertBefore):b.appendChild(a.nTable);d=0;for(f=a.aoData.length;d<f;d++)a.aoData[d].nTr!==null&&c.appendChild(a.aoData[d].nTr);if(a.oFeatures.bAutoWidth===true)a.nTable.style.width=u(a.sDestroyWidth);
+i(">tr:even",c).addClass(a.asDestoryStrips[0]);i(">tr:odd",c).addClass(a.asDestoryStrips[1]);d=0;for(f=D.length;d<f;d++)D[d]==a&&D.splice(d,1);a=null};this.fnAdjustColumnSizing=function(a){var b=A(this[o.iApiIndex]);ca(b);if(typeof a=="undefined"||a)this.fnDraw(false);else if(b.oScroll.sX!==""||b.oScroll.sY!=="")this.oApi._fnScrollDraw(b)};for(var ua in o.oApi)if(ua)this[ua]=r(ua);this.oApi._fnExternApiFunc=r;this.oApi._fnInitalise=s;this.oApi._fnInitComplete=w;this.oApi._fnLanguageProcess=y;this.oApi._fnAddColumn=
+G;this.oApi._fnColumnOptions=x;this.oApi._fnAddData=v;this.oApi._fnCreateTr=z;this.oApi._fnGatherData=Y;this.oApi._fnBuildHead=V;this.oApi._fnDrawHead=L;this.oApi._fnDraw=C;this.oApi._fnReDraw=ba;this.oApi._fnAjaxUpdate=za;this.oApi._fnAjaxUpdateDraw=Aa;this.oApi._fnAddOptionsHtml=xa;this.oApi._fnFeatureHtmlTable=Fa;this.oApi._fnScrollDraw=Ia;this.oApi._fnAjustColumnSizing=ca;this.oApi._fnFeatureHtmlFilter=Da;this.oApi._fnFilterComplete=M;this.oApi._fnFilterCustom=Ma;this.oApi._fnFilterColumn=La;
+this.oApi._fnFilter=Ka;this.oApi._fnBuildSearchArray=ka;this.oApi._fnBuildSearchRow=na;this.oApi._fnFilterCreateSearch=la;this.oApi._fnDataToSearch=ma;this.oApi._fnSort=R;this.oApi._fnSortAttachListener=ga;this.oApi._fnSortingClasses=T;this.oApi._fnFeatureHtmlPaginate=Ha;this.oApi._fnPageChange=ja;this.oApi._fnFeatureHtmlInfo=Ga;this.oApi._fnUpdateInfo=Na;this.oApi._fnFeatureHtmlLength=Ca;this.oApi._fnFeatureHtmlProcessing=Ea;this.oApi._fnProcessingDisplay=K;this.oApi._fnVisibleToColumnIndex=Ja;this.oApi._fnColumnIndexToVisible=
+pa;this.oApi._fnNodeToDataIndex=U;this.oApi._fnVisbleColumns=X;this.oApi._fnCalculateEnd=E;this.oApi._fnConvertToWidth=Oa;this.oApi._fnCalculateColumnWidths=ea;this.oApi._fnScrollingWidthAdjust=Qa;this.oApi._fnGetWidestNode=Pa;this.oApi._fnGetMaxLenString=Ra;this.oApi._fnStringToCss=u;this.oApi._fnArrayCmp=Va;this.oApi._fnDetectType=fa;this.oApi._fnSettingsFromNode=A;this.oApi._fnGetDataMaster=aa;this.oApi._fnGetTrNodes=$;this.oApi._fnGetTdNodes=Q;this.oApi._fnEscapeRegex=oa;this.oApi._fnDeleteIndex=
+ra;this.oApi._fnReOrderIndex=Ba;this.oApi._fnColumnOrdering=ha;this.oApi._fnLog=J;this.oApi._fnClearTable=ia;this.oApi._fnSaveState=sa;this.oApi._fnLoadState=Ta;this.oApi._fnCreateCookie=Sa;this.oApi._fnReadCookie=ta;this.oApi._fnDetectHeader=W;this.oApi._fnGetUniqueThs=S;this.oApi._fnScrollBarWidth=Ua;this.oApi._fnApplyToChildren=P;this.oApi._fnMap=n;this.oApi._fnGetRowData=da;this.oApi._fnGetCellData=H;this.oApi._fnSetCellData=N;this.oApi._fnGetObjectDataFn=Z;this.oApi._fnSetObjectDataFn=ya;var va=
+this;return this.each(function(){var a=0,b,c,d,f;a=0;for(b=D.length;a<b;a++){if(D[a].nTable==this)if(typeof g=="undefined"||typeof g.bRetrieve!="undefined"&&g.bRetrieve===true)return D[a].oInstance;else if(typeof g.bDestroy!="undefined"&&g.bDestroy===true){D[a].oInstance.fnDestroy();break}else{J(D[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, please pass either no arguments to the dataTable() function, or set bRetrieve to true. Alternatively, to destory the old table and create a new one, set bDestroy to true (note that a lot of changes to the configuration can be made through the API which is usually much faster).");
+return}if(D[a].sTableId!==""&&D[a].sTableId==this.getAttribute("id")){D.splice(a,1);break}}var e=new l;D.push(e);var h=false,j=false;a=this.getAttribute("id");if(a!==null){e.sTableId=a;e.sInstance=a}else e.sInstance=o._oExternConfig.iNextUnique++;if(this.nodeName.toLowerCase()!="table")J(e,0,"Attempted to initialise DataTables on a node which is not a table: "+this.nodeName);else{e.nTable=this;e.oInstance=va.length==1?va:i(this).dataTable();e.oApi=va.oApi;e.sDestroyWidth=i(this).width();if(typeof g!=
+"undefined"&&g!==null){e.oInit=g;n(e.oFeatures,g,"bPaginate");n(e.oFeatures,g,"bLengthChange");n(e.oFeatures,g,"bFilter");n(e.oFeatures,g,"bSort");n(e.oFeatures,g,"bInfo");n(e.oFeatures,g,"bProcessing");n(e.oFeatures,g,"bAutoWidth");n(e.oFeatures,g,"bSortClasses");n(e.oFeatures,g,"bServerSide");n(e.oFeatures,g,"bDeferRender");n(e.oScroll,g,"sScrollX","sX");n(e.oScroll,g,"sScrollXInner","sXInner");n(e.oScroll,g,"sScrollY","sY");n(e.oScroll,g,"bScrollCollapse","bCollapse");n(e.oScroll,g,"bScrollInfinite",
+"bInfinite");n(e.oScroll,g,"iScrollLoadGap","iLoadGap");n(e.oScroll,g,"bScrollAutoCss","bAutoCss");n(e,g,"asStripClasses");n(e,g,"fnPreDrawCallback");n(e,g,"fnRowCallback");n(e,g,"fnHeaderCallback");n(e,g,"fnFooterCallback");n(e,g,"fnCookieCallback");n(e,g,"fnInitComplete");n(e,g,"fnServerData");n(e,g,"fnFormatNumber");n(e,g,"aaSorting");n(e,g,"aaSortingFixed");n(e,g,"aLengthMenu");n(e,g,"sPaginationType");n(e,g,"sAjaxSource");n(e,g,"sAjaxDataProp");n(e,g,"iCookieDuration");n(e,g,"sCookiePrefix");
+n(e,g,"sDom");n(e,g,"bSortCellsTop");n(e,g,"oSearch","oPreviousSearch");n(e,g,"aoSearchCols","aoPreSearchCols");n(e,g,"iDisplayLength","_iDisplayLength");n(e,g,"bJQueryUI","bJUI");n(e.oLanguage,g,"fnInfoCallback");typeof g.fnDrawCallback=="function"&&e.aoDrawCallback.push({fn:g.fnDrawCallback,sName:"user"});typeof g.fnStateSaveCallback=="function"&&e.aoStateSave.push({fn:g.fnStateSaveCallback,sName:"user"});typeof g.fnStateLoadCallback=="function"&&e.aoStateLoad.push({fn:g.fnStateLoadCallback,sName:"user"});
+if(e.oFeatures.bServerSide&&e.oFeatures.bSort&&e.oFeatures.bSortClasses)e.aoDrawCallback.push({fn:T,sName:"server_side_sort_classes"});else e.oFeatures.bDeferRender&&e.aoDrawCallback.push({fn:T,sName:"defer_sort_classes"});if(typeof g.bJQueryUI!="undefined"&&g.bJQueryUI){e.oClasses=o.oJUIClasses;if(typeof g.sDom=="undefined")e.sDom='<"H"lfr>t<"F"ip>'}if(e.oScroll.sX!==""||e.oScroll.sY!=="")e.oScroll.iBarWidth=Ua();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=
+g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Ta(e,g);e.aoDrawCallback.push({fn:sa,sName:"state_save"})}if(typeof g.iDeferLoading!="undefined"){e.bDeferLoading=true;e._iRecordsTotal=g.iDeferLoading;e._iRecordsDisplay=g.iDeferLoading}if(typeof g.aaData!="undefined")j=true;if(typeof g!="undefined"&&typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!="undefined"&&g.oLanguage.sUrl!==
+""){e.oLanguage.sUrl=g.oLanguage.sUrl;i.getJSON(e.oLanguage.sUrl,null,function(t){y(e,t,true)});h=true}else y(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"){e.asStripClasses.push(e.oClasses.sStripOdd);e.asStripClasses.push(e.oClasses.sStripEven)}c=false;d=i(">tbody>tr",this);a=0;for(b=e.asStripClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(e.asStripClasses[a])){c=true;break}if(c){e.asDestoryStrips=["",""];if(i(d[0]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[0]+=
+e.oClasses.sStripOdd+" ";if(i(d[0]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[0]+=e.oClasses.sStripEven;if(i(d[1]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[1]+=e.oClasses.sStripOdd+" ";if(i(d[1]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[1]+=e.oClasses.sStripEven;d.removeClass(e.asStripClasses.join(" "))}c=[];var k;a=this.getElementsByTagName("thead");if(a.length!==0){W(e.aoHeader,a[0]);c=S(e)}if(typeof g.aoColumns=="undefined"){k=[];a=0;for(b=c.length;a<b;a++)k.push(null)}else k=
+g.aoColumns;a=0;for(b=k.length;a<b;a++){if(typeof g.saved_aoColumns!="undefined"&&g.saved_aoColumns.length==b){if(k[a]===null)k[a]={};k[a].bVisible=g.saved_aoColumns[a].bVisible}G(e,c?c[a]:null)}if(typeof g.aoColumnDefs!="undefined")for(a=g.aoColumnDefs.length-1;a>=0;a--){var m=g.aoColumnDefs[a].aTargets;i.isArray(m)||J(e,1,"aTargets must be an array of targets, not a "+typeof m);c=0;for(d=m.length;c<d;c++)if(typeof m[c]=="number"&&m[c]>=0){for(;e.aoColumns.length<=m[c];)G(e);x(e,m[c],g.aoColumnDefs[a])}else if(typeof m[c]==
+"number"&&m[c]<0)x(e,e.aoColumns.length+m[c],g.aoColumnDefs[a]);else if(typeof m[c]=="string"){b=0;for(f=e.aoColumns.length;b<f;b++)if(m[c]=="_all"||i(e.aoColumns[b].nTh).hasClass(m[c]))x(e,b,g.aoColumnDefs[a])}}if(typeof k!="undefined"){a=0;for(b=k.length;a<b;a++)x(e,a,k[a])}a=0;for(b=e.aaSorting.length;a<b;a++){if(e.aaSorting[a][0]>=e.aoColumns.length)e.aaSorting[a][0]=0;k=e.aoColumns[e.aaSorting[a][0]];if(typeof e.aaSorting[a][2]=="undefined")e.aaSorting[a][2]=0;if(typeof g.aaSorting=="undefined"&&
+typeof e.saved_aaSorting=="undefined")e.aaSorting[a][1]=k.asSorting[0];c=0;for(d=k.asSorting.length;c<d;c++)if(e.aaSorting[a][1]==k.asSorting[c]){e.aaSorting[a][2]=c;break}}T(e);a=i(">thead",this);if(a.length===0){a=[p.createElement("thead")];this.appendChild(a[0])}e.nTHead=a[0];a=i(">tbody",this);if(a.length===0){a=[p.createElement("tbody")];this.appendChild(a[0])}e.nTBody=a[0];a=i(">tfoot",this);if(a.length>0){e.nTFoot=a[0];W(e.aoFooter,e.nTFoot)}if(j)for(a=0;a<g.aaData.length;a++)v(e,g.aaData[a]);
+else Y(e);e.aiDisplay=e.aiDisplayMaster.slice();e.bInitialised=true;h===false&&s(e)}})}})(jQuery,window,document);
diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/back_disabled.jpg b/koha-tmpl/opac-tmpl/prog/images/datatables/back_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1e73a546e3609636f9cf4c543c2a4fe4050866c3
GIT binary patch
literal 612
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tyUn
z+02YUSHb}sD?0}l&^EXLguy7lz`(-H!phDIlVN0HVHIR%V-ON%S2Pq6HFFG{Xryc+
zmRQ($@S#&sld*HEn>dFcBLmQ_$YwDLDjGT#PW*q1fd^<YlOVGogFVCRyQwLwf|@66
ze!$4fpt!)cj7zNLKSN?_SjIEf$Z0nVqZh4{&j?Wu4PU>^;oX+iLI)z|@;wX;U8Xr>
zT8Qgxn;R!Cottl}#(8Ri${a3d=J*$R5qBRbK9bRJe*4BYwq9(uIM4mLS9%TSY?*y6
zE==owYH)vf>dq6(Uzum+IyVJqc3N&dRPD57vW(=l(=(DZ-K_<Unt1pe8#qknGCi3V
zkh;vl;B4~gY1f{Kz2M5sJrOKuSm0ZhaMrL}#<_9H6t<5or9~0qKc;W}wfIQk>!LSx
zwPk@>bN at 4B-OI9gCf>Wc_;CDAS%c at BJZ}k<t>BlbDz~@y-*&Y^_U+@};q`xNUthN}
On^Cj9W}Eu@|2F})$f79#

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/back_enabled.jpg b/koha-tmpl/opac-tmpl/prog/images/datatables/back_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a6d764c79c7a2047b6bf65bf9d96fcafd5161e38
GIT binary patch
literal 807
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2*U&h
z1}0{pBN2d|gO!bok%5r~RhW^Pm5qg+Lx6#Sm5Gs^od+h%$i&RTD#*spplB#0EW!~u
z(MZ`u)XXulu<_tSr=TWdXR%Z_aiE1jZ7eM8Fl&IpCkWK1$Y$s$#2&a&N#sM~M5iWU
z<^Q)Bc$gW1&SMs2uxGfw`}E06etb^r9k|jMc at Dlk(IlSD-Wwx*G{%4ThHhR%HnTsw
zbu3z!=BtbC=-In5f5nt;je{+vrKZdWckk$U`c^FEYC6}Jn=<Phg&RGxWowtu+j4vL
zuDrGP=1IPrb~kp*>lG)17QB>6z3khm7PHhg<-pEGSO0F>VA}N6`w53!8pr$>MbUW|
zME<s?dezw;U%dR;`Kd)lCauvOXRNpVXgK`4pX=Sp- at CZj9x15&y*j<b<JPA<K_*#K
z<@>sFn=(%w+^5v0yp7Lmb+~3PpI4(#G~bQ$y_;t)oo+U5`bnSHZcn){CH~m7Ys2rz
z2!R at xgGrCtcPz?eOPOzKr2P26p~(mTGjR1-c<x%~cJ0>3?psA>uUGsyt|R2Ts3~!B
zN71DGSrW%W*`w8#2{O$LX)%%8*<4Ycyr;tN(Hm<XHM0xJ?{xF0EskFCh5u=&<iulr
zYNyl=#<wqXD&+4u8oF^$)m7<lY at VgXk9azsKIKz?vp4^)yx{evPw)J-Dth+P<;w$q
z`@Q9}`(-Xi+_IiGtB&jWay`d}j~$NpR at hm5{cf*szhAZWsp!3Z`)}>8|M=_HtvR>P
P+Rcr(b5Xx$|NkZcT0jT?

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/forward_disabled.jpg b/koha-tmpl/opac-tmpl/prog/images/datatables/forward_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..28a9dc53fa232919299ac980dc9b61167c1868bd
GIT binary patch
literal 635
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tySE
z1JEp>E8&2Nm4%I+g9~UMTnNHo6kuRrVP;|B;)Y2uGBL9Vva&G<iLfgg3UfFHPBdy#
zHW3vwODt at B=oDn^oa!bn$jHFNjA9g{prWDU#Q(P#c!1(eg3N*p_6)E5E7rbHvEH7V
z8#+gHc2rxYci=nCmS=BPhUq>lzGLeh=CM*_u2I6%$1L~6;-1yGa|?*Fva<AVW}f$w
zM|jiv%AS4aZbfpP)?S?%8?6+<6*?uQG at xF)s3 at 1Q<(tn>vCW+<XI6GdMB6yB9$3U&
z#>Av>{Flt>+*?d?iZ`9)^O?_H|D3t8;Og6lD<#WHQvW(mo1ETsD>A at mr8@sqg(?1R
z%d at qrmWLWmIn1#pQuo}{brVW*C8t%EDXbOt_DabwXgGW3;wDX1;~7hWrYL+ZX=qre
z&-y^2q0zm?-FJb#(AWJTHOJ-3`S`D|JEhzC{KvY_h0kZinXP-?w!g_L at p#JQO^!z$
mYCgVwS7#SryXs@?>&L&t^Z(SozHVt~@Z#>58}s)6zX<@qORf(9

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/forward_enabled.jpg b/koha-tmpl/opac-tmpl/prog/images/datatables/forward_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..598c075f13ab0e4bbe05a4eeea7cf777ba73cf03
GIT binary patch
literal 852
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tywO
z0~0eN(3Nn&%Fe>Z!NthH$ciG&$iU3P%Em6hz`z1zu=B#yGcqx=2(q#<2(fb*3M-3<
zDh5t8G7&R#Oe}1C=oHjs?40T*F37+LbR`oj+(bq}CT0c}Rz*W0Hg?Cv#)(EB0yioN
zi~PUEzyov)lOVGogFVA5dn3uE%Z<*rn&ugY^FIG9<<=87L*?mOy^~u`Rq(Eg+UDw^
z@^Uh}zJ$t~P2YpRT#sm2p`oEt8zJ-EBRfY;>b?DxZo!24Z)Q(O&}!Mbt}27`dKa(x
zr)AHkZg5MjKa&4$syaupXWNXgp32dQs<o<XGr#5u9@=#E+?+!}FI~Pa)LWslJ}B36
z`Lb3YheKCCm%VOu;VpX6(0MkYSk}6t at aOKz+;_*D4{7|~^5)^QORgNty2^@M51##X
zueaWLX7+9e=RH;{oZr5)jkOooU8VU}TQps%p>_rj-?|M=Q9pN^hZg^mV7=UWs>}D5
z$40(ME7Q1T4h8p}ZJ8O!G-Xk84;P~#ci!&o`A5I3kG at gLm*VlJbn%kvSqIh?3Y?HQ
zAX0NL>XIkpf=MN83*!%}9-aN5)p7^py2Am>F9gW&pFSp#V0dxX#ZPW;UoD(gaI at 8E
z(rNQz1DBIiM13!LtZ|85lHB@$wW~n0fhRz-$?R&m{@z;uI}N|35As;}zdXB<<FOu#
z{FTp-PcAia6ML~>I#+N1k=r*G-&mI78vJ_Ezs!yIV%J}l7d*c9>7Bn;xyLT84V&`$
z at 9WMTAJ6DZyR)~=FS6P2e3MDv7lHB>{C&1H^7EJ9PIf=EdUwUYtGE9%$X9(m*ZWLf
M_rC2^{;K~s0TRp{r2qf`

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a56d0e21902ce620cd57f87fa58a6d3e804135cf
GIT binary patch
literal 263
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45 at 5J;
zXU0OHl&hzUV at SoVE9Xw~GAQscA1s)^?0*rXqM}DeLv7?|BU8z at Q<ntt9<njnJ|j`Y
znD at ZlWoHa-oW7$XVs$3z>COGupVzP9Hek5&L+Gnl%BD>~0~tJB{an^LB{Ts5b0m7=

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc_disabled.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7e621ef1c68da839ce077cec6e201a55c1ba168
GIT binary patch
literal 252
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnW*L
z7srr_TUXBQ7Ge<Kak=PnB>V6G?@}f$7k6Jhw{qGm$-QDzD`qrDaZ3s$b2XF;fBBPU
nqjNDy&Nw~puHFA+-v&m8`?>-yUFVHK{$ucT^>bP0l+XkKhw^g=

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_both.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_both.png
new file mode 100644
index 0000000000000000000000000000000000000000..839ac4bb5b0b414834c950de9deafff6dd94ed2d
GIT binary patch
literal 282
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0K#2rT
z7srr_TRjsz`4|*ASOSl%eg6Ob+(JtRwX|O at S}a^IES<M^Rar)~R7{gT(8t-3AepQp
zDW<l1NyH(qlCXQ0 at AfT`xZ2rtb0gcPuhQK|E$f?fe^;k=XM|b({WbrT_5p at zx%{&^
T>QC<i+Qs1M>gTe~DWM4fR9b+X

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b295159df995329b3a84340d32761f3d1dbade
GIT binary patch
literal 260
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45 at 5J;
zXU0OHl#{26V at SoVqz8vtc$~v}dc~O{CLEF2anNavMpdMP)0v(X&o(k0opIq!LdvtJ
wj~up7 at 0`wiSoe($&y07EkGxK6U|?nlJSz0{?wJWUfu=Edy85}Sb4q9e0C9MGu>b%7

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc_disabled.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..2409653dc94cd21a281a31c0e3819323b84704b7
GIT binary patch
literal 251
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnX`r
z7srr_TS*TNvhX;E^>j)zMNBv%VR68zN24n8K+>5N&kUJbBQCy4c=qgBiu3mAQ)hD?
n)_oJhGvi(If!Apb49pB3GXz|UGFKJ=4P)?h^>bP0l+XkK*57ji

literal 0
HcmV?d00001

-- 
1.7.7.3


From julian.maurice at biblibre.com  Fri Dec  2 12:40:07 2011
From: julian.maurice at biblibre.com (Julian Maurice)
Date: Fri,  2 Dec 2011 12:40:07 +0100
Subject: [Koha-patches] [PATCH 1/4] Bug 6836: Add jQuery dataTables plugin
Message-ID: <1322826009-18320-1-git-send-email-julian.maurice@biblibre.com>

This patch add the javascript library, a CSS (and image files from
datatables.net) and another javascript file which provides some extra
features.
It also add a Perl module C4::Utils::Datatables which provides helpful
functions for server-side processing
---
 C4/Utils/DataTables.pm                             |  306 ++++++++++++++++++++
 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css |  114 ++++++++
 .../prog/en/includes/datatables-strings.inc        |   17 +
 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js   |  281 ++++++++++++++++++
 .../en/lib/jquery/plugins/jquery.dataTables.min.js |  153 ++++++++++
 .../prog/img/datatables/back_disabled.jpg          |  Bin 0 -> 612 bytes
 .../prog/img/datatables/back_enabled.jpg           |  Bin 0 -> 807 bytes
 .../prog/img/datatables/forward_disabled.jpg       |  Bin 0 -> 635 bytes
 .../prog/img/datatables/forward_enabled.jpg        |  Bin 0 -> 852 bytes
 .../intranet-tmpl/prog/img/datatables/sort_asc.png |  Bin 0 -> 263 bytes
 .../prog/img/datatables/sort_asc_disabled.png      |  Bin 0 -> 252 bytes
 .../prog/img/datatables/sort_both.png              |  Bin 0 -> 282 bytes
 .../prog/img/datatables/sort_desc.png              |  Bin 0 -> 260 bytes
 .../prog/img/datatables/sort_desc_disabled.png     |  Bin 0 -> 251 bytes
 koha-tmpl/opac-tmpl/prog/en/css/datatables.css     |  114 ++++++++
 .../prog/en/includes/datatables-strings.inc        |   17 +
 koha-tmpl/opac-tmpl/prog/en/js/datatables.js       |  281 ++++++++++++++++++
 .../en/lib/jquery/plugins/jquery.dataTables.min.js |  153 ++++++++++
 .../prog/images/datatables/back_disabled.jpg       |  Bin 0 -> 612 bytes
 .../prog/images/datatables/back_enabled.jpg        |  Bin 0 -> 807 bytes
 .../prog/images/datatables/forward_disabled.jpg    |  Bin 0 -> 635 bytes
 .../prog/images/datatables/forward_enabled.jpg     |  Bin 0 -> 852 bytes
 .../opac-tmpl/prog/images/datatables/sort_asc.png  |  Bin 0 -> 263 bytes
 .../prog/images/datatables/sort_asc_disabled.png   |  Bin 0 -> 252 bytes
 .../opac-tmpl/prog/images/datatables/sort_both.png |  Bin 0 -> 282 bytes
 .../opac-tmpl/prog/images/datatables/sort_desc.png |  Bin 0 -> 260 bytes
 .../prog/images/datatables/sort_desc_disabled.png  |  Bin 0 -> 251 bytes
 27 files changed, 1436 insertions(+), 0 deletions(-)
 create mode 100644 C4/Utils/DataTables.pm
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/back_disabled.jpg
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/back_enabled.jpg
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/forward_disabled.jpg
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/forward_enabled.jpg
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc_disabled.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_both.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc_disabled.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/css/datatables.css
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/js/datatables.js
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/back_disabled.jpg
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/back_enabled.jpg
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/forward_disabled.jpg
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/forward_enabled.jpg
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc_disabled.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_both.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc_disabled.png

diff --git a/C4/Utils/DataTables.pm b/C4/Utils/DataTables.pm
new file mode 100644
index 0000000..901cafc
--- /dev/null
+++ b/C4/Utils/DataTables.pm
@@ -0,0 +1,306 @@
+package C4::Utils::DataTables;
+
+# 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.
+
+use Modern::Perl;
+require Exporter;
+
+use vars qw($VERSION @ISA @EXPORT);
+
+BEGIN {
+    $VERSION    = 3.04,
+
+    @ISA        = qw(Exporter);
+    @EXPORT     = qw(dt_build_orderby dt_build_having dt_get_params dt_build_query);
+}
+
+=head1 NAME
+
+C4::Utils::DataTables - Utility subs for building query when DataTables source is AJAX
+
+=head1 SYNOPSYS
+
+    use CGI;
+    use C4::Context;
+    use C4::Utils::DataTables;
+
+    my $input = new CGI;
+    my $vars = $input->Vars;
+
+    my $query = qq{
+        SELECT surname, firstname
+        FROM borrowers
+        WHERE borrowernumber = ?
+    };
+    my ($having, $having_params) = dt_build_having($vars);
+    $query .= $having;
+    $query .= dt_build_orderby($vars);
+    $query .= " LIMIT ?,? ";
+
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute(
+        $vars->{'borrowernumber'},
+        @$having_params,
+        $vars->{'iDisplayStart'},
+        $vars->{'iDisplayLength'}
+    );
+    ...
+
+=head1 DESCRIPTION
+
+    This module provide two utility functions to build a part of the SQL query,
+    depending on DataTables parameters.
+    One function build the 'ORDER BY' part, and the other the 'HAVING' part.
+
+=head1 FUNCTIONS
+
+=over 2
+
+=item dt_build_orderby
+
+    my $orderby = dt_build_orderby($dt_param);
+
+    This function takes a reference to a hash containing DataTables parameters
+    and build the corresponding 'ORDER BY' clause.
+    This hash must contains the following keys:
+
+        iSortCol_N, where N is a number from 0 to the number of columns to sort on minus 1
+
+        sSortDir_N is the sorting order ('asc' or 'desc) for the corresponding column
+
+        mDataProp_N is a mapping between the column index, and the name of a SQL field
+
+=cut
+
+sub dt_build_orderby {
+    my $param = shift;
+
+    my $i = 0;
+    my @orderbys;
+    while(exists $param->{'iSortCol_'.$i}){
+        my $iSortCol = $param->{'iSortCol_'.$i};
+        my $sSortDir = $param->{'sSortDir_'.$i};
+        my $mDataProp = $param->{'mDataProp_'.$iSortCol};
+        my @sort_fields = $param->{$mDataProp.'_sorton'}
+            ? split(' ', $param->{$mDataProp.'_sorton'})
+            : ();
+        if(@sort_fields > 0) {
+            push @orderbys, "$_ $sSortDir" foreach (@sort_fields);
+        } else {
+            push @orderbys, "$mDataProp $sSortDir";
+        }
+        $i++;
+    }
+
+    my $orderby = " ORDER BY " . join(',', @orderbys) . " " if @orderbys;
+    return $orderby;
+}
+
+=item dt_build_having
+
+    my ($having, $having_params) = dt_build_having($dt_params)
+
+    This function takes a reference to a hash containing DataTables parameters
+    and build the corresponding 'HAVING' clause.
+    This hash must contains the following keys:
+
+        sSearch is the text entered in the global filter
+
+        iColumns is the number of columns
+
+        bSearchable_N is a boolean value that is true if the column is searchable
+
+        mDataProp_N is a mapping between the column index, and the name of a SQL field
+
+        sSearch_N is the text entered in individual filter for column N
+
+=back
+
+=cut
+
+sub dt_build_having {
+    my $param = shift;
+
+    my @filters;
+    my @params;
+
+    # Global filter
+    if($param->{'sSearch'}) {
+        my $sSearch = $param->{'sSearch'};
+        my $i = 0;
+        my @gFilters;
+        my @gParams;
+        while($i < $param->{'iColumns'}) {
+            if($param->{'bSearchable_'.$i} eq 'true') {
+                my $mDataProp = $param->{'mDataProp_'.$i};
+                my @filter_fields = $param->{$mDataProp.'_filteron'}
+                    ? split(' ', $param->{$mDataProp.'_filteron'})
+                    : ();
+                if(@filter_fields > 0) {
+                    foreach my $field (@filter_fields) {
+                        push @gFilters, " $field LIKE ? ";
+                        push @gParams, "%$sSearch%";
+                    }
+                } else {
+                    push @gFilters, " $mDataProp LIKE ? ";
+                    push @gParams, "%$sSearch%";
+                }
+            }
+            $i++;
+        }
+        push @filters, " (" . join(" OR ", @gFilters) . ") ";
+        push @params, @gParams;
+    }
+
+    # Individual filters
+    my $i = 0;
+    while($i < $param->{'iColumns'}) {
+        my $sSearch = $param->{'sSearch_'.$i};
+        if($sSearch) {
+            my $mDataProp = $param->{'mDataProp_'.$i};
+            my @filter_fields = $param->{$mDataProp.'_filteron'}
+                ? split(' ', $param->{$mDataProp.'_filteron'})
+                : ();
+            if(@filter_fields > 0) {
+                my @localfilters;
+                foreach my $field (@filter_fields) {
+                    push @localfilters, " $field LIKE ? ";
+                    push @params, "%$sSearch%";
+                }
+                push @filters, " ( ". join(" OR ", @localfilters) ." ) ";
+            } else {
+                push @filters, " $mDataProp LIKE ? ";
+                push @params, "%$sSearch%";
+            }
+        }
+        $i++;
+    }
+
+    return (\@filters, \@params);
+}
+
+=item dt_get_params
+
+    my %dtparam = = dt_get_params( $input )
+
+    This function takes a reference to a new CGI object.
+
+    It prepares a hash containing Datatable parameters.
+
+=back
+
+=cut
+sub dt_get_params {
+    my $input = shift;
+    my %dtparam;
+    my $vars = $input->Vars;
+
+    foreach(qw/ iDisplayStart iDisplayLength iColumns sSearch bRegex iSortingCols sEcho /) {
+        $dtparam{$_} = $input->param($_);
+    }
+    foreach(grep /(?:_sorton|_filteron)$/, keys %$vars) {
+        $dtparam{$_} = $vars->{$_};
+    }
+    for(my $i=0; $i<$dtparam{'iColumns'}; $i++) {
+        foreach(qw/ bSearchable sSearch bRegex bSortable iSortCol mDataProp sSortDir /) {
+            my $key = $_ . '_' . $i;
+            $dtparam{$key} = $input->param($key) if defined $input->param($key);
+        }
+    }
+    return %dtparam;
+}
+
+=item dt_build_query_simple
+
+    my ( $query, $params )= dt_build_query_simple( $value, $field )
+
+    This function takes a value and a field (table.field).
+
+    It returns (undef, []) if not $value.
+    Else, returns a SQL where string and an arrayref containing parameters
+    for the execute method of the statement.
+
+=back
+
+=cut
+sub dt_build_query_simple {
+    my ( $value, $field ) = @_;
+    my $query;
+    my @params;
+    if( $value ) {
+        $query .= " AND $field = ? ";
+        push @params, $value;
+    }
+    return ( $query, \@params );
+}
+
+=item dt_build_query_dates
+
+    my ( $query, $params )= dt_build_query_dates( $datefrom, $dateto, $field)
+
+    This function takes a datefrom, dateto and a field (table.field).
+
+    It returns (undef, []) if not $value.
+    Else, returns a SQL where string and an arrayref containing parameters
+    for the execute method of the statement.
+
+=back
+
+=cut
+sub dt_build_query_dates {
+    my ( $datefrom, $dateto, $field ) = @_;
+    my $query;
+    my @params;
+    if ( $datefrom ) {
+        $query .= " AND $field >= ? ";
+        push @params, C4::Dates->new($datefrom)->output('iso');
+    }
+    if ( $dateto ) {
+        $query .= " AND $field <= ? ";
+        push @params, C4::Dates->new($dateto)->output('iso');
+    }
+    return ( $query, \@params );
+}
+
+=item dt_build_query
+
+    my ( $query, $filter ) = dt_build_query( $type, @params )
+
+    This function takes a value and a list of parameters.
+
+    It calls dt_build_query_dates or dt_build_query_simple fonction of $type.
+
+    $type can be 'simple' or 'rage_dates'.
+
+=back
+
+=cut
+sub dt_build_query {
+    my ( $type, @params ) = @_;
+    given ( $type ) {
+        when ( /simple/ ) {
+            return dt_build_query_simple( @params );
+        }
+        when ( /range_dates/ ) {
+            return dt_build_query_dates( @params );
+        }
+    }
+}
+
+1;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
new file mode 100644
index 0000000..e069b93
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
@@ -0,0 +1,114 @@
+input.search_init {
+    color: #999999;
+}
+.sorting_asc {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_asc.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_desc.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_both.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_asc_disabled {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_asc_disabled.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc_disabled {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_desc_disabled.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_disabled {
+    padding-right: 19px;
+    background-color: #EEEEEE;
+}
+
+table.display {
+    width: 100%;
+}
+table.display thead th {
+    border-bottom: 1px solid black;
+    cursor: pointer;
+    font-weight: bold;
+    padding: 3px 18px 3px 10px;
+}
+.dataTables_wrapper {
+    clear: both;
+    position: relative;
+}
+.dataTables_processing {
+    background-color: white;
+    border: 1px solid #DDDDDD;
+    color: #999999;
+    font-size: 14px;
+    height: 30px;
+    left: 50%;
+    margin-left: -125px;
+    margin-top: -15px;
+    padding: 14px 0 2px;
+    position: fixed;
+    text-align: center;
+    top: 50%;
+    width: 250px;
+}
+.dataTables_info {
+    float: left;
+    width: 60%;
+}
+.dataTables_paginate {
+    float: right;
+    text-align: right;
+    width: 44px;
+}
+.paging_full_numbers {
+    height: 22px;
+    line-height: 22px;
+    width: 400px;
+}
+.paging_full_numbers span.paginate_button,
+     .paging_full_numbers span.paginate_active {
+    border: 1px solid #aaa;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    padding: 2px 5px;
+    margin: 0 3px;
+    cursor: pointer;
+    *cursor: hand;
+}
+
+.paging_full_numbers span.paginate_button {
+    background-color: #ddd;
+}
+
+.paging_full_numbers span.paginate_button:hover {
+    background-color: #ccc;
+}
+
+.paging_full_numbers span.paginate_active {
+    background-color: #99B3FF;
+}
+.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
+    float: left;
+    height: 19px;
+    margin-left: 3px;
+    width: 19px;
+}
+.paginate_disabled_previous {
+    background-image: url("../../img/datatables/back_disabled.jpg");
+}
+.paginate_enabled_previous {
+    background-image: url("../../img/datatables/back_enabled.jpg");
+}
+.paginate_disabled_next {
+    background-image: url("../../img/datatables/forward_disabled.jpg");
+}
+.paginate_enabled_next {
+    background-image: url("../../img/datatables/forward_enabled.jpg");
+}
+.spacer {
+    clear: both;
+    height: 20px;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
new file mode 100644
index 0000000..183f511
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
@@ -0,0 +1,17 @@
+<script type="text/javascript">
+//<![CDATA[
+    var MSG_DT_FIRST = _("First");
+    var MSG_DT_LAST = _("Last");
+    var MSG_DT_NEXT = _("Next");
+    var MSG_DT_PREVIOUS = _("Previous");
+    var MSG_DT_EMPTY_TABLE = _("No data available in table");
+    var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
+    var MSG_DT_INFO_EMPTY = _("No entries to show");
+    var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
+    var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
+    var MSG_DT_LOADING_RECORDS = _("Loading...");
+    var MSG_DT_PROCESSING = _("Processing...");
+    var MSG_DT_SEARCH = _("Search:");
+    var MSG_DT_ZERO_RECORDS = _("No matching records found");
+//]]>
+</script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
new file mode 100644
index 0000000..38dd1d5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
@@ -0,0 +1,281 @@
+// These default options are for translation but can be used
+// for any other datatables settings
+// MSG_DT_* variables comes from datatables-strings.inc
+// To use it, write:
+//  $("#table_id").dataTable($.extend(true, {}, dataTableDefaults, {
+//      // other settings
+//  } ) );
+var dataTablesDefaults = {
+    "oLanguage": {
+        "oPaginate": {
+            "sFirst"    : window.MSG_DT_FIRST || "First",
+            "sLast"     : window.MSG_DT_LAST || "Last",
+            "sNext"     : window.MSG_DT_NEXT || "Next",
+            "sPrevious" : window.MSG_DT_PREVIOUS || "Previous"
+        },
+        "sEmptyTable"       : window.MSG_DT_EMPTY_TABLE || "No data available in table",
+        "sInfo"             : window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries",
+        "sInfoEmpty"        : window.MSG_DT_INFO_EMPTY || "No entries to show",
+        "sInfoFiltered"     : window.MSG_DT_INFO_FILTERED || "(filtered from _MAX_ total entries)",
+        "sLengthMenu"       : window.MSG_DT_LENGTH_MENU || "Show _MENU_ entries",
+        "sLoadingRecords"   : window.MSG_DT_LOADING_RECORDS || "Loading...",
+        "sProcessing"       : window.MSG_DT_PROCESSING || "Processing...",
+        "sSearch"           : window.MSG_DT_SEARCH || "Search:",
+        "sZeroRecords"      : window.MSG_DT_ZERO_RECORDS || "No matching records found"
+    }
+};
+
+
+// Return an array of string containing the values of a particular column
+$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
+    // check that we have a column id
+    if ( typeof iColumn == "undefined" ) return new Array();
+    // by default we only wany unique data
+    if ( typeof bUnique == "undefined" ) bUnique = true;
+    // by default we do want to only look at filtered data
+    if ( typeof bFiltered == "undefined" ) bFiltered = true;
+    // by default we do not wany to include empty values
+    if ( typeof bIgnoreEmpty == "undefined" ) bIgnoreEmpty = true;
+    // list of rows which we're going to loop through
+    var aiRows;
+    // use only filtered rows
+    if (bFiltered == true) aiRows = oSettings.aiDisplay;
+    // use all rows
+    else aiRows = oSettings.aiDisplayMaster; // all row numbers
+
+    // set up data array
+    var asResultData = new Array();
+    for (var i=0,c=aiRows.length; i<c; i++) {
+        iRow = aiRows[i];
+        var aData = this.fnGetData(iRow);
+        var sValue = aData[iColumn];
+        // ignore empty values?
+        if (bIgnoreEmpty == true && sValue.length == 0) continue;
+        // ignore unique values?
+        else if (bUnique == true && jQuery.inArray(sValue, asResultData) > -1) continue;
+        // else push the value onto the result data array
+        else asResultData.push(sValue);
+    }
+    return asResultData;
+}
+
+// List of unbind keys (Ctrl, Alt, Direction keys, etc.)
+// These keys must not launch filtering
+var blacklist_keys = new Array(0, 16, 17, 18, 37, 38, 39, 40);
+
+// Set a filtering delay for global search field
+jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay ) {
+    /*
+     * Inputs:      object:oSettings - dataTables settings object - automatically given
+     *              integer:iDelay - delay in milliseconds
+     * Usage:       $('#example').dataTable().fnSetFilteringDelay(250);
+     * Author:      Zygimantas Berziunas (www.zygimantas.com) and Allan Jardine
+     * License:     GPL v2 or BSD 3 point style
+     * Contact:     zygimantas.berziunas /AT\ hotmail.com
+     */
+    var
+        _that = this,
+        iDelay = (typeof iDelay == 'undefined') ? 250 : iDelay;
+
+    this.each( function ( i ) {
+        $.fn.dataTableExt.iApiIndex = i;
+        var
+            $this = this,
+            oTimerId = null,
+            sPreviousSearch = null,
+            anControl = $( 'input', _that.fnSettings().aanFeatures.f );
+
+        anControl.unbind( 'keyup.DT' ).bind( 'keyup.DT', function(event) {
+            var $$this = $this;
+            if (blacklist_keys.indexOf(event.keyCode) != -1) {
+                return this;
+            }else if ( event.keyCode == '13' ) {
+                $.fn.dataTableExt.iApiIndex = i;
+                _that.fnFilter( $(this).val() );
+            } else {
+                if (sPreviousSearch === null || sPreviousSearch != anControl.val()) {
+                    window.clearTimeout(oTimerId);
+                    sPreviousSearch = anControl.val();
+                    oTimerId = window.setTimeout(function() {
+                        $.fn.dataTableExt.iApiIndex = i;
+                        _that.fnFilter( anControl.val() );
+                    }, iDelay);
+                }
+            }
+        });
+
+        return this;
+    } );
+    return this;
+}
+
+// Add a filtering delay on general search and on all input (with a class 'filter')
+jQuery.fn.dataTableExt.oApi.fnAddFilters = function ( oSettings, sClass, iDelay ) {
+    var table = this;
+    this.fnSetFilteringDelay(iDelay);
+    var filterTimerId = null;
+    $("input."+sClass).keyup(function(event) {
+      if (blacklist_keys.indexOf(event.keyCode) != -1) {
+        return this;
+      }else if ( event.keyCode == '13' ) {
+        table.fnFilter( $(this).val(), $(this).attr('data-column_num') );
+      } else {
+        window.clearTimeout(filterTimerId);
+        var input = this;
+        filterTimerId = window.setTimeout(function() {
+          table.fnFilter($(input).val(), $(input).attr('data-column_num'));
+        }, iDelay);
+      }
+    });
+}
+
+// Useful if you want to filter on dates with 2 inputs (start date and end date)
+// You have to include calendar.inc to use it
+function dt_add_rangedate_filter(begindate_id, enddate_id, dateCol) {
+    $.fn.dataTableExt.afnFiltering.push(
+        function( oSettings, aData, iDataIndex ) {
+
+            var beginDate = Date_from_syspref($("#"+begindate_id).val()).getTime();
+            var endDate   = Date_from_syspref($("#"+enddate_id).val()).getTime();
+
+            var data = Date_from_syspref(aData[dateCol]).getTime();
+
+            if ( !parseInt(beginDate) && ! parseInt(endDate) ) {
+                return true;
+            }
+            else if ( beginDate <= data && !parseInt(endDate) ) {
+                return true;
+            }
+            else if ( data <= endDate && !parseInt(beginDate) ) {
+                return true;
+            }
+            else if ( beginDate <= data && data <= endDate) {
+                return true;
+            }
+            return false;
+        }
+    );
+}
+
+//Sorting for dates (uk format)
+function dt_add_type_uk_date() {
+  jQuery.fn.dataTableExt.aTypes.unshift(
+    function ( sData )
+    {
+      if (sData.match(/(0[1-9]|[12][0-9]|3[01])\/(0[1-9]|1[012])\/(19|20|21)\d\d/))
+      {
+        return 'uk_date';
+      }
+      return null;
+    }
+  );
+
+  jQuery.fn.dataTableExt.oSort['uk_date-asc']  = function(a,b) {
+    var re = /(\d{2}\/\d{2}\/\d{4})/;
+    a.match(re);
+    var ukDatea = RegExp.$1.split("/");
+    b.match(re);
+    var ukDateb = RegExp.$1.split("/");
+
+    var x = (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+    var y = (ukDateb[2] + ukDateb[1] + ukDateb[0]) * 1;
+
+    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+  };
+
+  jQuery.fn.dataTableExt.oSort['uk_date-desc'] = function(a,b) {
+    var re = /(\d{2}\/\d{2}\/\d{4})/;
+    a.match(re);
+    var ukDatea = RegExp.$1.split("/");
+    b.match(re);
+    var ukDateb = RegExp.$1.split("/");
+
+    var x = (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+    var y = (ukDateb[2] + ukDateb[1] + ukDateb[0]) * 1;
+
+    return ((x < y) ? 1 : ((x > y) ?  -1 : 0));
+  };
+}
+
+// Sorting on html contains
+// <a href="foo.pl">bar</a> sort on 'bar'
+function dt_overwrite_html_sorting_localeCompare() {
+    jQuery.fn.dataTableExt.oSort['html-asc']  = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if (typeof(a.localeCompare == "function")) {
+           return a.localeCompare(b);
+        } else {
+           return (a > b) ? 1 : ((a < b) ? -1 : 0);
+        }
+    };
+
+    jQuery.fn.dataTableExt.oSort['html-desc'] = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if(typeof(b.localeCompare == "function")) {
+            return b.localeCompare(a);
+        } else {
+            return (b > a) ? 1 : ((b < a) ? -1 : 0);
+        }
+    };
+}
+
+// Sorting on string without accentued characters
+function dt_overwrite_string_sorting_localeCompare() {
+    jQuery.fn.dataTableExt.oSort['string-asc']  = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if (typeof(a.localeCompare == "function")) {
+           return a.localeCompare(b);
+        } else {
+           return (a > b) ? 1 : ((a < b) ? -1 : 0);
+        }
+    };
+
+    jQuery.fn.dataTableExt.oSort['string-desc'] = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if(typeof(b.localeCompare == "function")) {
+            return b.localeCompare(a);
+        } else {
+            return (b > a) ? 1 : ((b < a) ? -1 : 0);
+        }
+    };
+}
+
+// Replace a node with a html and js contain.
+function replace_html( original_node, type ) {
+    switch ( $(original_node).attr('data-type') ) {
+        case "range_dates":
+            var id = $(original_node).attr("data-id");
+            var format = $(original_node).attr("data-format");
+            replace_html_date( original_node, id, format );
+            break;
+        default:
+            alert("_(This node can't be replaced)");
+    }
+}
+
+// Replace a node with a "From [date] To [date]" element
+// Used on tfoot > td
+function replace_html_date( original_node, id, format ) {
+    var node = $('<span style="white-space:nowrap">' + _("From") + '<input type="text" id="' + id + 'from" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'from").val("").change();\' >&times;</a></span><br/><span style="white-space:nowrap">' + _("To") + '<input type="text" id="' + id + 'to" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'to").val("").change();\' >&times;</a></span>');
+    $(original_node).replaceWith(node);
+    var script = document.createElement( 'script' );
+    script.type = 'text/javascript';
+    var script_content = "Calendar.setup({";
+    script_content += "    inputField: \"" + id + "from\",";
+    script_content += "    ifFormat: \"" + format + "\",";
+    script_content += "    button: \"" + id + "from\",";
+    script_content += "    onClose: function(){ $(\"#" + id + "from\").change(); this.hide();}";
+    script_content += "  });";
+    script_content += "  Calendar.setup({";
+    script_content += "    inputField: \"" + id + "to\",";
+    script_content += "    ifFormat: \"" + format + "\",";
+    script_content += "    button: \"" + id + "to\",";
+    script_content += "    onClose: function(){ $(\"#" + id + "to\").change(); this.hide();}";
+    script_content += "  });";
+    script.text = script_content;
+    $(original_node).append( script );
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
new file mode 100644
index 0000000..9035a2e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
@@ -0,0 +1,153 @@
+/*
+ * File:        jquery.dataTables.min.js
+ * Version:     1.8.1
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Info:        www.datatables.net
+ * 
+ * Copyright 2008-2010 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ * 
+ * This source file 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 license files for details.
+ */
+(function(i,wa,p){i.fn.dataTableSettings=[];var D=i.fn.dataTableSettings;i.fn.dataTableExt={};var o=i.fn.dataTableExt;o.sVersion="1.8.1";o.sErrMode="alert";o.iApiIndex=0;o.oApi={};o.afnFiltering=[];o.aoFeatures=[];o.ofnSearch={};o.afnSortData=[];o.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
+sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
+sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};o.oJUIClasses={sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",
+sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",
+sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last ui-corner-tr ui-corner-br",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",
+sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollWrapper:"dataTables_scroll",
+sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};o.oPagination={two_button:{fnInit:function(g,l,r){var s,w,y;if(g.bJUI){s=p.createElement("a");w=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;w.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;
+s.appendChild(y)}else{s=p.createElement("div");w=p.createElement("div")}s.className=g.oClasses.sPagePrevDisabled;w.className=g.oClasses.sPageNextDisabled;s.title=g.oLanguage.oPaginate.sPrevious;w.title=g.oLanguage.oPaginate.sNext;l.appendChild(s);l.appendChild(w);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(s).bind("selectstart.DT",function(){return false});i(w).bind("selectstart.DT",function(){return false});
+if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_previous");w.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l=g.aanFeatures.p,r=0,s=l.length;r<s;r++)if(l[r].childNodes.length!==0){l[r].childNodes[0].className=g._iDisplayStart===0?g.oClasses.sPagePrevDisabled:g.oClasses.sPagePrevEnabled;l[r].childNodes[1].className=g.fnDisplayEnd()==g.fnRecordsDisplay()?g.oClasses.sPageNextDisabled:
+g.oClasses.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(g,l,r){var s=p.createElement("span"),w=p.createElement("span"),y=p.createElement("span"),G=p.createElement("span"),x=p.createElement("span");s.innerHTML=g.oLanguage.oPaginate.sFirst;w.innerHTML=g.oLanguage.oPaginate.sPrevious;G.innerHTML=g.oLanguage.oPaginate.sNext;x.innerHTML=g.oLanguage.oPaginate.sLast;var v=g.oClasses;s.className=v.sPageButton+" "+v.sPageFirst;w.className=v.sPageButton+" "+v.sPagePrevious;G.className=
+v.sPageButton+" "+v.sPageNext;x.className=v.sPageButton+" "+v.sPageLast;l.appendChild(s);l.appendChild(w);l.appendChild(y);l.appendChild(G);l.appendChild(x);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"first")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(G).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(x).bind("click.DT",function(){g.oApi._fnPageChange(g,"last")&&r(g)});i("span",l).bind("mousedown.DT",function(){return false}).bind("selectstart.DT",
+function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_first");w.setAttribute("id",g.sTableId+"_previous");G.setAttribute("id",g.sTableId+"_next");x.setAttribute("id",g.sTableId+"_last")}},fnUpdate:function(g,l){if(g.aanFeatures.p){var r=o.oPagination.iFullNumbersShowPages,s=Math.floor(r/2),w=Math.ceil(g.fnRecordsDisplay()/g._iDisplayLength),y=Math.ceil(g._iDisplayStart/g._iDisplayLength)+1,G=
+"",x,v=g.oClasses;if(w<r){s=1;x=w}else if(y<=s){s=1;x=r}else if(y>=w-s){s=w-r+1;x=w}else{s=y-Math.ceil(r/2)+1;x=s+r-1}for(r=s;r<=x;r++)G+=y!=r?'<span class="'+v.sPageButton+'">'+r+"</span>":'<span class="'+v.sPageButtonActive+'">'+r+"</span>";x=g.aanFeatures.p;var z,Y=function(L){g._iDisplayStart=(this.innerHTML*1-1)*g._iDisplayLength;l(g);L.preventDefault()},V=function(){return false};r=0;for(s=x.length;r<s;r++)if(x[r].childNodes.length!==0){z=i("span:eq(2)",x[r]);z.html(G);i("span",z).bind("click.DT",
+Y).bind("mousedown.DT",V).bind("selectstart.DT",V);z=x[r].getElementsByTagName("span");z=[z[0],z[1],z[z.length-2],z[z.length-1]];i(z).removeClass(v.sPageButton+" "+v.sPageButtonActive+" "+v.sPageButtonStaticDisabled);if(y==1){z[0].className+=" "+v.sPageButtonStaticDisabled;z[1].className+=" "+v.sPageButtonStaticDisabled}else{z[0].className+=" "+v.sPageButton;z[1].className+=" "+v.sPageButton}if(w===0||y==w||g._iDisplayLength==-1){z[2].className+=" "+v.sPageButtonStaticDisabled;z[3].className+=" "+
+v.sPageButtonStaticDisabled}else{z[2].className+=" "+v.sPageButton;z[3].className+=" "+v.sPageButton}}}}}};o.oSort={"string-asc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?-1:g>l?1:0},"string-desc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?1:g>l?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<
+l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?1:g>l?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return l-
+g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};o.aTypes=[function(g){if(typeof g=="number")return"numeric";else if(typeof g!="string")return null;var l,r=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var s=1;s<g.length;s++){l=g.charAt(s);if("0123456789.".indexOf(l)==-1)return null;if(l=="."){if(r)return null;r=true}}return"numeric"},function(g){var l=Date.parse(g);
+if(l!==null&&!isNaN(l)||typeof g=="string"&&g.length===0)return"date";return null},function(g){if(typeof g=="string"&&g.indexOf("<")!=-1&&g.indexOf(">")!=-1)return"html";return null}];o.fnVersionCheck=function(g){var l=function(x,v){for(;x.length<v;)x+="0";return x},r=o.sVersion.split(".");g=g.split(".");for(var s="",w="",y=0,G=g.length;y<G;y++){s+=l(r[y],3);w+=l(g[y],3)}return parseInt(s,10)>=parseInt(w,10)};o._oExternConfig={iNextUnique:0};i.fn.dataTable=function(g){function l(){this.fnRecordsTotal=
+function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false||this._iDisplayLength==-1?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd};this.sInstance=
+this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false,bDeferRender:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,bInfinite:false,iLoadGap:100,iBarWidth:0,bAutoCss:true};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",
+sLoadingRecords:"Loading...",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"},fnInfoCallback:null};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.aoHeader=[];this.aoFooter=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false,
+bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.sDestroyWidth=0;this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];this.fnInitComplete=this.fnPreDrawCallback=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.bInitialised=this.bDeferLoading=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button";
+this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.fnCookieCallback=null;this.aoStateSave=[];this.aoStateLoad=[];this.sAjaxSource=this.oLoadedState=null;this.sAjaxDataProp="aaData";this.bAjaxDataGet=true;this.jqXHR=null;this.fnServerData=function(a,b,c,d){d.jqXHR=i.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(f,e){e=="parsererror"&&alert("DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})};
+this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d<b;d++){if(d%3===0&&d!==0)c=","+c;c=a[b-d-1]+c}}return c};this.aLengthMenu=[10,25,50,100];this.bDrawing=this.iDraw=0;this.iDrawError=-1;this._iDisplayLength=10;this._iDisplayStart=0;this._iDisplayEnd=10;this._iRecordsDisplay=this._iRecordsTotal=0;this.bJUI=false;this.oClasses=o.oStdClasses;this.bSortCellsTop=this.bSorted=this.bFiltered=false;this.oInit=null}function r(a){return function(){var b=
+[A(this[o.iApiIndex])].concat(Array.prototype.slice.call(arguments));return o.oApi[a].apply(this,b)}}function s(a){var b,c,d=a.iInitDisplayStart;if(a.bInitialised===false)setTimeout(function(){s(a)},200);else{xa(a);V(a);L(a,a.aoHeader);a.nTFoot&&L(a,a.aoFooter);K(a,true);a.oFeatures.bAutoWidth&&ea(a);b=0;for(c=a.aoColumns.length;b<c;b++)if(a.aoColumns[b].sWidth!==null)a.aoColumns[b].nTh.style.width=u(a.aoColumns[b].sWidth);if(a.oFeatures.bSort)R(a);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);
+else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}if(a.sAjaxSource!==null&&!a.oFeatures.bServerSide)a.fnServerData.call(a.oInstance,a.sAjaxSource,[],function(f){var e=f;if(a.sAjaxDataProp!=="")e=Z(a.sAjaxDataProp)(f);for(b=0;b<e.length;b++)v(a,e[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)R(a);else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}K(a,false);w(a,f)},a);else if(!a.oFeatures.bServerSide){K(a,false);w(a)}}}function w(a,b){a._bInitComplete=true;if(typeof a.fnInitComplete=="function")typeof b!=
+"undefined"?a.fnInitComplete.call(a.oInstance,a,b):a.fnInitComplete.call(a.oInstance,a)}function y(a,b,c){n(a.oLanguage,b,"sProcessing");n(a.oLanguage,b,"sLengthMenu");n(a.oLanguage,b,"sEmptyTable");n(a.oLanguage,b,"sLoadingRecords");n(a.oLanguage,b,"sZeroRecords");n(a.oLanguage,b,"sInfo");n(a.oLanguage,b,"sInfoEmpty");n(a.oLanguage,b,"sInfoFiltered");n(a.oLanguage,b,"sInfoPostFix");n(a.oLanguage,b,"sSearch");if(typeof b.oPaginate!="undefined"){n(a.oLanguage.oPaginate,b.oPaginate,"sFirst");n(a.oLanguage.oPaginate,
+b.oPaginate,"sPrevious");n(a.oLanguage.oPaginate,b.oPaginate,"sNext");n(a.oLanguage.oPaginate,b.oPaginate,"sLast")}typeof b.sEmptyTable=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sEmptyTable");typeof b.sLoadingRecords=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sLoadingRecords");c&&s(a)}function G(a,b){var c=a.aoColumns.length;b={sType:null,_bAutoType:true,bVisible:true,bSearchable:true,bSortable:true,asSorting:["asc","desc"],
+sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,sTitle:b?b.innerHTML:"",sName:"",sWidth:null,sWidthOrig:null,sClass:null,fnRender:null,bUseRendered:true,iDataSort:c,mDataProp:c,fnGetData:null,fnSetData:null,sSortDataType:"std",sDefaultContent:null,sContentPadding:"",nTh:b?b:p.createElement("th"),nTf:null};a.aoColumns.push(b);if(typeof a.aoPreSearchCols[c]=="undefined"||a.aoPreSearchCols[c]===null)a.aoPreSearchCols[c]={sSearch:"",bRegex:false,bSmart:true};else{if(typeof a.aoPreSearchCols[c].bRegex==
+"undefined")a.aoPreSearchCols[c].bRegex=true;if(typeof a.aoPreSearchCols[c].bSmart=="undefined")a.aoPreSearchCols[c].bSmart=true}x(a,c,null)}function x(a,b,c){b=a.aoColumns[b];if(typeof c!="undefined"&&c!==null){if(typeof c.sType!="undefined"){b.sType=c.sType;b._bAutoType=false}n(b,c,"bVisible");n(b,c,"bSearchable");n(b,c,"bSortable");n(b,c,"sTitle");n(b,c,"sName");n(b,c,"sWidth");n(b,c,"sWidth","sWidthOrig");n(b,c,"sClass");n(b,c,"fnRender");n(b,c,"bUseRendered");n(b,c,"iDataSort");n(b,c,"mDataProp");
+n(b,c,"asSorting");n(b,c,"sSortDataType");n(b,c,"sDefaultContent");n(b,c,"sContentPadding")}b.fnGetData=Z(b.mDataProp);b.fnSetData=ya(b.mDataProp);if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortable;b.sSortingClassJUI=a.oClasses.sSortJUI}else if(i.inArray("asc",
+b.asSorting)!=-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function v(a,b){var c;c=typeof b.length=="number"?b.slice():i.extend(true,{},b);b=a.aoData.length;var d={nTr:null,_iId:a.iNextId++,_aData:c,_anHidden:[],_sRowStripe:""};a.aoData.push(d);for(var f,
+e=0,h=a.aoColumns.length;e<h;e++){c=a.aoColumns[e];typeof c.fnRender=="function"&&c.bUseRendered&&c.mDataProp!==null&&N(a,b,e,c.fnRender({iDataRow:b,iDataColumn:e,aData:d._aData,oSettings:a}));if(c._bAutoType&&c.sType!="string"){f=H(a,b,e,"type");if(f!==null&&f!==""){f=fa(f);if(c.sType===null)c.sType=f;else if(c.sType!=f)c.sType="string"}}}a.aiDisplayMaster.push(b);a.oFeatures.bDeferRender||z(a,b);return b}function z(a,b){var c=a.aoData[b],d;if(c.nTr===null){c.nTr=p.createElement("tr");typeof c._aData.DT_RowId!=
+"undefined"&&c.nTr.setAttribute("id",c._aData.DT_RowId);typeof c._aData.DT_RowClass!="undefined"&&i(c.nTr).addClass(c._aData.DT_RowClass);for(var f=0,e=a.aoColumns.length;f<e;f++){var h=a.aoColumns[f];d=p.createElement("td");d.innerHTML=typeof h.fnRender=="function"&&(!h.bUseRendered||h.mDataProp===null)?h.fnRender({iDataRow:b,iDataColumn:f,aData:c._aData,oSettings:a}):H(a,b,f,"display");if(h.sClass!==null)d.className=h.sClass;if(h.bVisible){c.nTr.appendChild(d);c._anHidden[f]=null}else c._anHidden[f]=
+d}}}function Y(a){var b,c,d,f,e,h,j,k,m;if(a.bDeferLoading||a.sAjaxSource===null){j=a.nTBody.childNodes;b=0;for(c=j.length;b<c;b++)if(j[b].nodeName.toUpperCase()=="TR"){k=a.aoData.length;a.aoData.push({nTr:j[b],_iId:a.iNextId++,_aData:[],_anHidden:[],_sRowStripe:""});a.aiDisplayMaster.push(k);h=j[b].childNodes;d=e=0;for(f=h.length;d<f;d++){m=h[d].nodeName.toUpperCase();if(m=="TD"||m=="TH"){N(a,k,e,i.trim(h[d].innerHTML));e++}}}}j=$(a);h=[];b=0;for(c=j.length;b<c;b++){d=0;for(f=j[b].childNodes.length;d<
+f;d++){e=j[b].childNodes[d];m=e.nodeName.toUpperCase();if(m=="TD"||m=="TH")h.push(e)}}h.length!=j.length*a.aoColumns.length&&J(a,1,"Unexpected number of TD elements. Expected "+j.length*a.aoColumns.length+" and got "+h.length+". DataTables does not support rowspan / colspan in the table body, and there must be one cell for each row/column combination.");d=0;for(f=a.aoColumns.length;d<f;d++){if(a.aoColumns[d].sTitle===null)a.aoColumns[d].sTitle=a.aoColumns[d].nTh.innerHTML;j=a.aoColumns[d]._bAutoType;
+m=typeof a.aoColumns[d].fnRender=="function";e=a.aoColumns[d].sClass!==null;k=a.aoColumns[d].bVisible;var t,q;if(j||m||e||!k){b=0;for(c=a.aoData.length;b<c;b++){t=h[b*f+d];if(j&&a.aoColumns[d].sType!="string"){q=H(a,b,d,"type");if(q!==""){q=fa(q);if(a.aoColumns[d].sType===null)a.aoColumns[d].sType=q;else if(a.aoColumns[d].sType!=q)a.aoColumns[d].sType="string"}}if(m){q=a.aoColumns[d].fnRender({iDataRow:b,iDataColumn:d,aData:a.aoData[b]._aData,oSettings:a});t.innerHTML=q;a.aoColumns[d].bUseRendered&&
+N(a,b,d,q)}if(e)t.className+=" "+a.aoColumns[d].sClass;if(k)a.aoData[b]._anHidden[d]=null;else{a.aoData[b]._anHidden[d]=t;t.parentNode.removeChild(t)}}}}}function V(a){var b,c,d;a.nTHead.getElementsByTagName("tr");if(a.nTHead.getElementsByTagName("th").length!==0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}}else{var f=p.createElement("tr");b=0;
+for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);f.appendChild(c)}i(a.nTHead).html("")[0].appendChild(f);W(a.aoHeader,a.nTHead)}if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;f=p.createElement("div");f.className=a.oClasses.sSortJUIWrapper;i(c).contents().appendTo(f);var e=p.createElement("span");e.className=a.oClasses.sSortIcon;f.appendChild(e);c.appendChild(f)}}d=function(){this.onselectstart=
+function(){return false};return false};if(a.oFeatures.bSort)for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable!==false){ga(a,a.aoColumns[b].nTh,b);i(a.aoColumns[b].nTh).bind("mousedown.DT",d)}else i(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);a.oClasses.sFooterTH!==""&&i(">tr>th",a.nTFoot).addClass(a.oClasses.sFooterTH);if(a.nTFoot!==null){c=S(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)if(typeof c[b]!="undefined")a.aoColumns[b].nTf=c[b]}}function L(a,b,c){var d,f,
+e,h=[],j=[],k=a.aoColumns.length;if(typeof c=="undefined")c=false;d=0;for(f=b.length;d<f;d++){h[d]=b[d].slice();h[d].nTr=b[d].nTr;for(e=k-1;e>=0;e--)!a.aoColumns[e].bVisible&&!c&&h[d].splice(e,1);j.push([])}d=0;for(f=h.length;d<f;d++){if(h[d].nTr){a=0;for(e=h[d].nTr.childNodes.length;a<e;a++)h[d].nTr.removeChild(h[d].nTr.childNodes[0])}e=0;for(b=h[d].length;e<b;e++){k=c=1;if(typeof j[d][e]=="undefined"){h[d].nTr.appendChild(h[d][e].cell);for(j[d][e]=1;typeof h[d+c]!="undefined"&&h[d][e].cell==h[d+
+c][e].cell;){j[d+c][e]=1;c++}for(;typeof h[d][e+k]!="undefined"&&h[d][e].cell==h[d][e+k].cell;){for(a=0;a<c;a++)j[d+a][e+k]=1;k++}h[d][e].cell.setAttribute("rowspan",c);h[d][e].cell.setAttribute("colspan",k)}}}}function C(a){var b,c,d=[],f=0,e=false;b=a.asStripClasses.length;c=a.aoOpenRows.length;if(!(a.fnPreDrawCallback!==null&&a.fnPreDrawCallback.call(a.oInstance,a)===false)){a.bDrawing=true;if(typeof a.iInitDisplayStart!="undefined"&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?
+a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;E(a)}if(a.bDeferLoading){a.bDeferLoading=false;a.iDraw++}else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!za(a))return}else a.iDraw++;if(a.aiDisplay.length!==0){var h=a._iDisplayStart,j=a._iDisplayEnd;if(a.oFeatures.bServerSide){h=0;j=a.aoData.length}for(h=h;h<j;h++){var k=a.aoData[a.aiDisplay[h]];k.nTr===null&&z(a,a.aiDisplay[h]);var m=k.nTr;if(b!==0){var t=a.asStripClasses[f%b];if(k._sRowStripe!=
+t){i(m).removeClass(k._sRowStripe).addClass(t);k._sRowStripe=t}}if(typeof a.fnRowCallback=="function"){m=a.fnRowCallback.call(a.oInstance,m,a.aoData[a.aiDisplay[h]]._aData,f,h);if(!m&&!e){J(a,0,"A node was not returned by fnRowCallback");e=true}}d.push(m);f++;if(c!==0)for(k=0;k<c;k++)m==a.aoOpenRows[k].nParent&&d.push(a.aoOpenRows[k].nTr)}}else{d[0]=p.createElement("tr");if(typeof a.asStripClasses[0]!="undefined")d[0].className=a.asStripClasses[0];e=a.oLanguage.sZeroRecords.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()));
+if(a.iDraw==1&&a.sAjaxSource!==null&&!a.oFeatures.bServerSide)e=a.oLanguage.sLoadingRecords;else if(typeof a.oLanguage.sEmptyTable!="undefined"&&a.fnRecordsTotal()===0)e=a.oLanguage.sEmptyTable;b=p.createElement("td");b.setAttribute("valign","top");b.colSpan=X(a);b.className=a.oClasses.sRowEmpty;b.innerHTML=e;d[f].appendChild(b)}typeof a.fnHeaderCallback=="function"&&a.fnHeaderCallback.call(a.oInstance,i(">tr",a.nTHead)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback==
+"function"&&a.fnFooterCallback.call(a.oInstance,i(">tr",a.nTFoot)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f=p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered){c=a.nTBody.childNodes;for(b=c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b])}b=0;for(c=d.length;b<c;b++)f.appendChild(d[b]);a.nTBody.appendChild(f);e!==null&&e.appendChild(a.nTBody)}for(b=a.aoDrawCallback.length-
+1;b>=0;b--)a.aoDrawCallback[b].fn.call(a.oInstance,a);a.bSorted=false;a.bFiltered=false;a.bDrawing=false;if(a.oFeatures.bServerSide){K(a,false);typeof a._bInitComplete=="undefined"&&w(a)}}}function ba(a){if(a.oFeatures.bSort)R(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);else{E(a);C(a)}}function za(a){if(a.bAjaxDataGet){K(a,true);var b=a.aoColumns.length,c=[],d,f;a.iDraw++;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:ha(a)});
+c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==false?a._iDisplayLength:-1});for(f=0;f<b;f++){d=a.aoColumns[f].mDataProp;c.push({name:"mDataProp_"+f,value:typeof d=="function"?"function":d})}if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++){c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch});c.push({name:"bRegex_"+
+f,value:a.aoPreSearchCols[f].bRegex});c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}}if(a.oFeatures.bSort!==false){d=a.aaSortingFixed!==null?a.aaSortingFixed.length:0;var e=a.aaSorting.length;c.push({name:"iSortingCols",value:d+e});for(f=0;f<d;f++){c.push({name:"iSortCol_"+f,value:a.aaSortingFixed[f][0]});c.push({name:"sSortDir_"+f,value:a.aaSortingFixed[f][1]})}for(f=0;f<e;f++){c.push({name:"iSortCol_"+(f+d),value:a.aaSorting[f][0]});c.push({name:"sSortDir_"+(f+d),value:a.aaSorting[f][1]})}for(f=
+0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(h){Aa(a,h)},a);return false}else return true}function Aa(a,b){if(typeof b.sEcho!="undefined")if(b.sEcho*1<a.iDraw)return;else a.iDraw=b.sEcho*1;if(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))ia(a);a._iRecordsTotal=b.iTotalRecords;a._iRecordsDisplay=b.iTotalDisplayRecords;var c=ha(a);if(c=typeof b.sColumns!="undefined"&&c!==""&&b.sColumns!=c)var d=
+Ba(a,b.sColumns);b=Z(a.sAjaxDataProp)(b);for(var f=0,e=b.length;f<e;f++)if(c){for(var h=[],j=0,k=a.aoColumns.length;j<k;j++)h.push(b[f][d[j]]);v(a,h)}else v(a,b[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;C(a);a.bAjaxDataGet=true;K(a,false)}function xa(a){var b=p.createElement("div");a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=p.createElement("div");a.nTableWrapper.className=a.oClasses.sWrapper;a.sTableId!==""&&a.nTableWrapper.setAttribute("id",a.sTableId+"_wrapper");
+a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),f,e,h,j,k,m,t,q=0;q<d.length;q++){e=0;h=d[q];if(h=="<"){j=p.createElement("div");k=d[q+1];if(k=="'"||k=='"'){m="";for(t=2;d[q+t]!=k;){m+=d[q+t];t++}if(m=="H")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(m=="F")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";if(m.indexOf(".")!=-1){k=m.split(".");j.setAttribute("id",k[0].substr(1,
+k[0].length-1));j.className=k[1]}else if(m.charAt(0)=="#")j.setAttribute("id",m.substr(1,m.length-1));else j.className=m;q+=t}c.appendChild(j);c=j}else if(h==">")c=c.parentNode;else if(h=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=Ca(a);e=1}else if(h=="f"&&a.oFeatures.bFilter){f=Da(a);e=1}else if(h=="r"&&a.oFeatures.bProcessing){f=Ea(a);e=1}else if(h=="t"){f=Fa(a);e=1}else if(h=="i"&&a.oFeatures.bInfo){f=Ga(a);e=1}else if(h=="p"&&a.oFeatures.bPaginate){f=Ha(a);e=1}else if(o.aoFeatures.length!==
+0){j=o.aoFeatures;t=0;for(k=j.length;t<k;t++)if(h==j[t].cFeature){if(f=j[t].fnInit(a))e=1;break}}if(e==1&&f!==null){if(typeof a.aanFeatures[h]!="object")a.aanFeatures[h]=[];a.aanFeatures[h].push(f);c.appendChild(f)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function Fa(a){if(a.oScroll.sX===""&&a.oScroll.sY==="")return a.nTable;var b=p.createElement("div"),c=p.createElement("div"),d=p.createElement("div"),f=p.createElement("div"),e=p.createElement("div"),h=p.createElement("div"),j=a.nTable.cloneNode(false),
+k=a.nTable.cloneNode(false),m=a.nTable.getElementsByTagName("thead")[0],t=a.nTable.getElementsByTagName("tfoot").length===0?null:a.nTable.getElementsByTagName("tfoot")[0],q=typeof g.bJQueryUI!="undefined"&&g.bJQueryUI?o.oJUIClasses:o.oStdClasses;c.appendChild(d);e.appendChild(h);f.appendChild(a.nTable);b.appendChild(c);b.appendChild(f);d.appendChild(j);j.appendChild(m);if(t!==null){b.appendChild(e);h.appendChild(k);k.appendChild(t)}b.className=q.sScrollWrapper;c.className=q.sScrollHead;d.className=
+q.sScrollHeadInner;f.className=q.sScrollBody;e.className=q.sScrollFoot;h.className=q.sScrollFootInner;if(a.oScroll.bAutoCss){c.style.overflow="hidden";c.style.position="relative";e.style.overflow="hidden";f.style.overflow="auto"}c.style.border="0";c.style.width="100%";e.style.border="0";d.style.width="150%";j.removeAttribute("id");j.style.marginLeft="0";a.nTable.style.marginLeft="0";if(t!==null){k.removeAttribute("id");k.style.marginLeft="0"}d=i(">caption",a.nTable);h=0;for(k=d.length;h<k;h++)j.appendChild(d[h]);
+if(a.oScroll.sX!==""){c.style.width=u(a.oScroll.sX);f.style.width=u(a.oScroll.sX);if(t!==null)e.style.width=u(a.oScroll.sX);i(f).scroll(function(){c.scrollLeft=this.scrollLeft;if(t!==null)e.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!=="")f.style.height=u(a.oScroll.sY);a.aoDrawCallback.push({fn:Ia,sName:"scrolling"});a.oScroll.bInfinite&&i(f).scroll(function(){if(!a.bDrawing)if(i(this).scrollTop()+i(this).height()>i(a.nTable).height()-a.oScroll.iLoadGap)if(a.fnDisplayEnd()<a.fnRecordsDisplay()){ja(a,
+"next");E(a);C(a)}});a.nScrollHead=c;a.nScrollFoot=e;return b}function Ia(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,f,e,h,j,k,m,t,q,I=[];h=a.nTable.getElementsByTagName("thead");h.length>0&&a.nTable.removeChild(h[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}h=a.nTHead.cloneNode(true);a.nTable.insertBefore(h,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);
+a.nTable.insertBefore(k,a.nTable.childNodes[1])}if(a.oScroll.sX===""){d.style.width="100%";b.parentNode.style.width="100%"}var O=S(a,h);f=0;for(e=O.length;f<e;f++){t=Ja(a,f);O[f].style.width=a.aoColumns[t].sWidth}a.nTFoot!==null&&P(function(B){B.style.width=""},k.getElementsByTagName("tr"));f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(i.browser.msie&&i.browser.version<=7)a.nTable.style.width=u(i(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!==
+"")a.nTable.style.width=u(a.oScroll.sXInner);else if(f==i(d).width()&&i(d).height()<i(a.nTable).height()){a.nTable.style.width=u(f-a.oScroll.iBarWidth);if(i(a.nTable).outerWidth()>f-a.oScroll.iBarWidth)a.nTable.style.width=u(f)}else a.nTable.style.width=u(f);f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){d.style.width=u(f+a.oScroll.iBarWidth);b.parentNode.style.width=u(f+a.oScroll.iBarWidth)}e=a.nTHead.getElementsByTagName("tr");h=h.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop=
+"0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},h,e);i(h).height(0);if(a.nTFoot!==null){j=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},j,k);i(j).height(0)}P(function(B){B.innerHTML="";B.style.width=u(I.shift())},h);a.nTFoot!==null&&P(function(B){B.innerHTML=
+"";B.style.width=u(I.shift())},j);if(i(a.nTable).outerWidth()<f)if(a.oScroll.sX==="")J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you enable x-scrolling or increase the width the table has in which to be drawn");else a.oScroll.sXInner!==""&&J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you increase the sScrollXInner property to allow it to draw in a larger area, or simply remove that parameter to allow automatic calculation");
+if(a.oScroll.sY==="")if(i.browser.msie&&i.browser.version<=7)d.style.height=u(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=u(a.oScroll.sY);j=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=u(i(a.nTable).height()+j)}j=i(a.nTable).outerWidth();c.style.width=u(j);b.style.width=u(j+a.oScroll.iBarWidth);if(a.nTFoot!==null){b=a.nScrollFoot.getElementsByTagName("div")[0];
+c=b.getElementsByTagName("table")[0];b.style.width=u(a.nTable.offsetWidth+a.oScroll.iBarWidth);c.style.width=u(a.nTable.offsetWidth)}if(a.bSorted||a.bFiltered)d.scrollTop=0}function ca(a){if(a.oFeatures.bAutoWidth===false)return false;ea(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function Da(a){var b=a.oLanguage.sSearch;b=b.indexOf("_INPUT_")!==-1?b.replace("_INPUT_",'<input type="text" />'):b===""?'<input type="text" />':b+' <input type="text" />';
+var c=p.createElement("div");c.className=a.oClasses.sFilter;c.innerHTML="<label>"+b+"</label>";a.sTableId!==""&&typeof a.aanFeatures.f=="undefined"&&c.setAttribute("id",a.sTableId+"_filter");b=i("input",c);b.val(a.oPreviousSearch.sSearch.replace('"',"&quot;"));b.bind("keyup.DT",function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f<e;f++)d[f]!=this.parentNode&&i("input",d[f]).val(this.value);this.value!=a.oPreviousSearch.sSearch&&M(a,{sSearch:this.value,bRegex:a.oPreviousSearch.bRegex,bSmart:a.oPreviousSearch.bSmart})});
+b.bind("keypress.DT",function(d){if(d.keyCode==13)return false});return c}function M(a,b,c){Ka(a,b.sSearch,c,b.bRegex,b.bSmart);for(b=0;b<a.aoPreSearchCols.length;b++)La(a,a.aoPreSearchCols[b].sSearch,b,a.aoPreSearchCols[b].bRegex,a.aoPreSearchCols[b].bSmart);o.afnFiltering.length!==0&&Ma(a);a.bFiltered=true;a._iDisplayStart=0;E(a);C(a);ka(a,0)}function Ma(a){for(var b=o.afnFiltering,c=0,d=b.length;c<d;c++)for(var f=0,e=0,h=a.aiDisplay.length;e<h;e++){var j=a.aiDisplay[e-f];if(!b[c](a,da(a,j,"filter"),
+j)){a.aiDisplay.splice(e-f,1);f++}}}function La(a,b,c,d,f){if(b!==""){var e=0;b=la(b,d,f);for(d=a.aiDisplay.length-1;d>=0;d--){f=ma(H(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d,1);e++}}}}function Ka(a,b,c,d,f){var e=la(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(o.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||a.oPreviousSearch.sSearch.length>
+b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);ka(a,1);for(c=0;c<a.aiDisplayMaster.length;c++)e.test(a.asDataSearch[c])&&a.aiDisplay.push(a.aiDisplayMaster[c])}else{var h=0;for(c=0;c<a.asDataSearch.length;c++)if(!e.test(a.asDataSearch[c])){a.aiDisplay.splice(c-h,1);h++}}a.oPreviousSearch.sSearch=b;a.oPreviousSearch.bRegex=d;a.oPreviousSearch.bSmart=f}function ka(a,b){a.asDataSearch.splice(0,a.asDataSearch.length);b=typeof b!="undefined"&&b==1?a.aiDisplayMaster:
+a.aiDisplay;for(var c=0,d=b.length;c<d;c++)a.asDataSearch[c]=na(a,da(a,b[c],"filter"))}function na(a,b){var c="";if(typeof a.__nTmpFilter=="undefined")a.__nTmpFilter=p.createElement("div");for(var d=a.__nTmpFilter,f=0,e=a.aoColumns.length;f<e;f++)if(a.aoColumns[f].bSearchable)c+=ma(b[f],a.aoColumns[f].sType)+"  ";if(c.indexOf("&")!==-1){d.innerHTML=c;c=d.textContent?d.textContent:d.innerText;c=c.replace(/\n/g," ").replace(/\r/g,"")}return c}function la(a,b,c){if(c){a=b?a.split(" "):oa(a).split(" ");
+a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,"i")}else{a=b?a:oa(a);return new RegExp(a,"i")}}function ma(a,b){if(typeof o.ofnSearch[b]=="function")return o.ofnSearch[b](a);else if(b=="html")return a.replace(/\n/g," ").replace(/<.*?>/g,"");else if(typeof a=="string")return a.replace(/\n/g," ");else if(a===null)return"";return a}function R(a,b){var c,d,f,e,h=[],j=[],k=o.oSort;d=a.aoData;var m=a.aoColumns;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||a.aaSortingFixed!==null)){h=a.aaSortingFixed!==
+null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<h.length;c++){var t=h[c][0];f=pa(a,t);e=a.aoColumns[t].sSortDataType;if(typeof o.afnSortData[e]!="undefined"){var q=o.afnSortData[e](a,t,f);f=0;for(e=d.length;f<e;f++)N(a,f,t,q[f])}}c=0;for(d=a.aiDisplayMaster.length;c<d;c++)j[a.aiDisplayMaster[c]]=c;var I=h.length;a.aiDisplayMaster.sort(function(O,B){var F,qa;for(c=0;c<I;c++){F=m[h[c][0]].iDataSort;qa=m[F].sType;F=k[(qa?qa:"string")+"-"+h[c][1]](H(a,O,F,"sort"),H(a,B,F,"sort"));
+if(F!==0)return F}return k["numeric-asc"](j[O],j[B])})}if((typeof b=="undefined"||b)&&!a.oFeatures.bDeferRender)T(a);a.bSorted=true;if(a.oFeatures.bFilter)M(a,a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;E(a);C(a)}}function ga(a,b,c,d){i(b).bind("click.DT",function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var h,j;if(f.shiftKey){for(var k=false,m=0;m<a.aaSorting.length;m++)if(a.aaSorting[m][0]==c){k=true;h=a.aaSorting[m][0];j=a.aaSorting[m][2]+
+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")a.aaSorting.splice(m,1);else{a.aaSorting[m][1]=a.aoColumns[h].asSorting[j];a.aaSorting[m][2]=j}break}k===false&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){h=a.aaSorting[0][0];j=a.aaSorting[0][2]+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")j=0;a.aaSorting[0][1]=a.aoColumns[h].asSorting[j];a.aaSorting[0][2]=j}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],
+0])}R(a)};if(a.oFeatures.bProcessing){K(a,true);setTimeout(function(){e();a.oFeatures.bServerSide||K(a,false)},0)}else e();typeof d=="function"&&d(a)}})}function T(a){var b,c,d,f,e,h=a.aoColumns.length,j=a.oClasses;for(b=0;b<h;b++)a.aoColumns[b].bSortable&&i(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);f=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){e=a.aoColumns[b].sSortingClass;
+d=-1;for(c=0;c<f.length;c++)if(f[c][0]==b){e=f[c][1]=="asc"?j.sSortAsc:j.sSortDesc;d=c;break}i(a.aoColumns[b].nTh).addClass(e);if(a.bJUI){c=i("span",a.aoColumns[b].nTh);c.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:f[d][1]=="asc"?j.sSortJUIAsc:j.sSortJUIDesc)}}else i(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);e=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=
+Q(a);if(a.oFeatures.bDeferRender)i(d).removeClass(e+"1 "+e+"2 "+e+"3");else if(d.length>=h)for(b=0;b<h;b++)if(d[b].className.indexOf(e+"1")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"1",""))}else if(d[b].className.indexOf(e+"2")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"2",""))}else if(d[b].className.indexOf(e+"3")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(" "+
+e+"3",""))}j=1;var k;for(b=0;b<f.length;b++){k=parseInt(f[b][0],10);c=0;for(a=d.length/h;c<a;c++)d[h*c+k].className+=" "+e+j;j<3&&j++}}}function Ha(a){if(a.oScroll.bInfinite)return null;var b=p.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;o.oPagination[a.sPaginationType].fnInit(a,b,function(c){E(c);C(c)});typeof a.aanFeatures.p=="undefined"&&a.aoDrawCallback.push({fn:function(c){o.oPagination[c.sPaginationType].fnUpdate(c,function(d){E(d);C(d)})},sName:"pagination"});return b}
+function ja(a,b){var c=a._iDisplayStart;if(b=="first")a._iDisplayStart=0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=
+0;else J(a,0,"Unknown paging action: "+b);return c!=a._iDisplayStart}function Ga(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Na,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b}function Na(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=a._iDisplayStart+1,c=a.fnDisplayEnd(),d=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),e=a.fnFormatNumber(b),h=a.fnFormatNumber(c),j=
+a.fnFormatNumber(d),k=a.fnFormatNumber(f);if(a.oScroll.bInfinite)e=a.fnFormatNumber(1);e=a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()===0?a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",j)+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfo.replace("_START_",e).replace("_END_",h).replace("_TOTAL_",k)+a.oLanguage.sInfoPostFix:a.oLanguage.sInfo.replace("_START_",
+e).replace("_END_",h).replace("_TOTAL_",k)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix;if(a.oLanguage.fnInfoCallback!==null)e=a.oLanguage.fnInfoCallback(a,b,c,d,f,e);a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)i(a[b]).html(e)}}function Ca(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+(a.sTableId===""?"":'name="'+a.sTableId+'_length"')+">",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]==
+"object"){c=0;for(d=a.aLengthMenu[0].length;c<d;c++)b+='<option value="'+a.aLengthMenu[0][c]+'">'+a.aLengthMenu[1][c]+"</option>"}else{c=0;for(d=a.aLengthMenu.length;c<d;c++)b+='<option value="'+a.aLengthMenu[c]+'">'+a.aLengthMenu[c]+"</option>"}b+="</select>";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+"_length");f.className=a.oClasses.sLength;f.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";i('select option[value="'+
+a._iDisplayLength+'"]',f).attr("selected",true);i("select",f).bind("change.DT",function(){var e=i(this).val(),h=a.aanFeatures.l;c=0;for(d=h.length;c<d;c++)h[c]!=this.parentNode&&i("select",h[c]).val(e);a._iDisplayLength=parseInt(e,10);E(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=0}if(a._iDisplayLength==-1)a._iDisplayStart=0;C(a)});return f}function Ea(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.r==
+"undefined"&&b.setAttribute("id",a.sTableId+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function K(a,b){if(a.oFeatures.bProcessing){a=a.aanFeatures.r;for(var c=0,d=a.length;c<d;c++)a[c].style.visibility=b?"visible":"hidden"}}function Ja(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(c==b)return d}return null}function pa(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===
+true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function U(a,b){var c,d;c=a._iDisplayStart;for(d=a._iDisplayEnd;c<d;c++)if(a.aoData[a.aiDisplay[c]].nTr==b)return a.aiDisplay[c];c=0;for(d=a.aoData.length;c<d;c++)if(a.aoData[c].nTr==b)return c;return null}function X(a){for(var b=0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===true&&b++;return b}function E(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||
+a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Oa(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=u(a);b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ea(a){var b=0,c,d=0,f=a.aoColumns.length,e,h=i("th",a.nTHead);for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d++;if(a.aoColumns[e].sWidth!==null){c=Oa(a.aoColumns[e].sWidthOrig,a.nTable.parentNode);if(c!==
+null)a.aoColumns[e].sWidth=u(c);b++}}if(f==h.length&&b===0&&d==f&&a.oScroll.sX===""&&a.oScroll.sY==="")for(e=0;e<a.aoColumns.length;e++){c=i(h[e]).width();if(c!==null)a.aoColumns[e].sWidth=u(c)}else{b=a.nTable.cloneNode(false);e=a.nTHead.cloneNode(true);d=p.createElement("tbody");c=p.createElement("tr");b.removeAttribute("id");b.appendChild(e);if(a.nTFoot!==null){b.appendChild(a.nTFoot.cloneNode(true));P(function(k){k.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(d);d.appendChild(c);
+d=i("thead th",b);if(d.length===0)d=i("tbody tr:eq(0)>td",b);h=S(a,e);for(e=d=0;e<f;e++){var j=a.aoColumns[e];if(j.bVisible&&j.sWidthOrig!==null&&j.sWidthOrig!=="")h[e-d].style.width=u(j.sWidthOrig);else if(j.bVisible)h[e-d].style.width="";else d++}for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d=Pa(a,e);if(d!==null){d=d.cloneNode(true);if(a.aoColumns[e].sContentPadding!=="")d.innerHTML+=a.aoColumns[e].sContentPadding;c.appendChild(d)}}f=a.nTable.parentNode;f.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!==
+"")b.style.width=u(a.oScroll.sXInner);else if(a.oScroll.sX!==""){b.style.width="";if(i(b).width()<f.offsetWidth)b.style.width=u(f.offsetWidth)}else if(a.oScroll.sY!=="")b.style.width=u(f.offsetWidth);b.style.visibility="hidden";Qa(a,b);f=i("tbody tr:eq(0)",b).children();if(f.length===0)f=S(a,i("thead",b)[0]);if(a.oScroll.sX!==""){for(e=d=c=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c+=a.aoColumns[e].sWidthOrig===null?i(f[d]).outerWidth():parseInt(a.aoColumns[e].sWidth.replace("px",""),
+10)+(i(f[d]).outerWidth()-i(f[d]).width());d++}b.style.width=u(c);a.nTable.style.width=u(c)}for(e=d=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c=i(f[d]).width();if(c!==null&&c>0)a.aoColumns[e].sWidth=u(c);d++}a.nTable.style.width=u(i(b).outerWidth());b.parentNode.removeChild(b)}}function Qa(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==""){i(b).width();b.style.width=u(i(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=u(i(b).outerWidth())}function Pa(a,b){var c=
+Ra(a,b);if(c<0)return null;if(a.aoData[c].nTr===null){var d=p.createElement("td");d.innerHTML=H(a,c,b,"");return d}return Q(a,c)[b]}function Ra(a,b){for(var c=-1,d=-1,f=0;f<a.aoData.length;f++){var e=H(a,f,b,"display")+"";e=e.replace(/<.*?>/g,"");if(e.length>c){c=e.length;d=f}}return d}function u(a){if(a===null)return"0px";if(typeof a=="number"){if(a<0)return"0px";return a+"px"}var b=a.charCodeAt(a.length-1);if(b<48||b>57)return a;return a+"px"}function Va(a,b){if(a.length!=b.length)return 1;for(var c=
+0;c<a.length;c++)if(a[c]!=b[c])return 2;return 0}function fa(a){for(var b=o.aTypes,c=b.length,d=0;d<c;d++){var f=b[d](a);if(f!==null)return f}return"string"}function A(a){for(var b=0;b<D.length;b++)if(D[b].nTable==a)return D[b];return null}function aa(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function $(a){for(var b=[],c=0,d=a.aoData.length;c<d;c++)a.aoData[c].nTr!==null&&b.push(a.aoData[c].nTr);return b}function Q(a,b){var c=[],d,f,e,h,j;f=0;var k=a.aoData.length;
+if(typeof b!="undefined"){f=b;k=b+1}for(f=f;f<k;f++){j=a.aoData[f];if(j.nTr!==null){b=[];e=0;for(h=j.nTr.childNodes.length;e<h;e++){d=j.nTr.childNodes[e].nodeName.toLowerCase();if(d=="td"||d=="th")b.push(j.nTr.childNodes[e])}e=d=0;for(h=a.aoColumns.length;e<h;e++)if(a.aoColumns[e].bVisible)c.push(b[e-d]);else{c.push(j._anHidden[e]);d++}}}return c}function oa(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)","g"),"\\$1")}function ra(a,b){for(var c=-1,d=
+0,f=a.length;d<f;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function Ba(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d<f;d++)for(var e=0;e<f;e++)if(a.aoColumns[d].sName==b[e]){c.push(e);break}return c}function ha(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function J(a,b,c){a=a.sTableId===""?"DataTables warning: "+c:"DataTables warning (table id = '"+a.sTableId+"'): "+c;if(b===0)if(o.sErrMode==
+"alert")alert(a);else throw a;else typeof console!="undefined"&&typeof console.log!="undefined"&&console.log(a)}function ia(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,a.aiDisplayMaster.length);a.aiDisplay.splice(0,a.aiDisplay.length);E(a)}function sa(a){if(!(!a.oFeatures.bStateSave||typeof a.bDestroying!="undefined")){var b,c,d,f="{";f+='"iCreate":'+(new Date).getTime()+",";f+='"iStart":'+(a.oScroll.bInfinite?0:a._iDisplayStart)+",";f+='"iEnd":'+(a.oScroll.bInfinite?a._iDisplayLength:
+a._iDisplayEnd)+",";f+='"iLength":'+a._iDisplayLength+",";f+='"sFilter":"'+encodeURIComponent(a.oPreviousSearch.sSearch)+'",';f+='"sFilterEsc":'+!a.oPreviousSearch.bRegex+",";f+='"aaSorting":[ ';for(b=0;b<a.aaSorting.length;b++)f+="["+a.aaSorting[b][0]+',"'+a.aaSorting[b][1]+'"],';f=f.substring(0,f.length-1);f+="],";f+='"aaSearchCols":[ ';for(b=0;b<a.aoPreSearchCols.length;b++)f+='["'+encodeURIComponent(a.aoPreSearchCols[b].sSearch)+'",'+!a.aoPreSearchCols[b].bRegex+"],";f=f.substring(0,f.length-
+1);f+="],";f+='"abVisCols":[ ';for(b=0;b<a.aoColumns.length;b++)f+=a.aoColumns[b].bVisible+",";f=f.substring(0,f.length-1);f+="]";b=0;for(c=a.aoStateSave.length;b<c;b++){d=a.aoStateSave[b].fn(a,f);if(d!=="")f=d}f+="}";Sa(a.sCookiePrefix+a.sInstance,f,a.iCookieDuration,a.sCookiePrefix,a.fnCookieCallback)}}function Ta(a,b){if(a.oFeatures.bStateSave){var c,d,f;d=ta(a.sCookiePrefix+a.sInstance);if(d!==null&&d!==""){try{c=typeof i.parseJSON=="function"?i.parseJSON(d.replace(/'/g,'"')):eval("("+d+")")}catch(e){return}d=
+0;for(f=a.aoStateLoad.length;d<f;d++)if(!a.aoStateLoad[d].fn(a,c))return;a.oLoadedState=i.extend(true,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.oPreviousSearch.sSearch=decodeURIComponent(c.sFilter);a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();if(typeof c.sFilterEsc!="undefined")a.oPreviousSearch.bRegex=!c.sFilterEsc;if(typeof c.aaSearchCols!="undefined")for(d=0;d<c.aaSearchCols.length;d++)a.aoPreSearchCols[d]=
+{sSearch:decodeURIComponent(c.aaSearchCols[d][0]),bRegex:!c.aaSearchCols[d][1]};if(typeof c.abVisCols!="undefined"){b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}}}}}function Sa(a,b,c,d,f){var e=new Date;e.setTime(e.getTime()+c*1E3);c=wa.location.pathname.split("/");a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();var h;if(f!==null){h=typeof i.parseJSON=="function"?i.parseJSON(b):eval("("+b+")");b=f(a,h,e.toGMTString(),
+c.join("/")+"/")}else b=a+"="+encodeURIComponent(b)+"; expires="+e.toGMTString()+"; path="+c.join("/")+"/";f="";e=9999999999999;if((ta(a)!==null?p.cookie.length:b.length+p.cookie.length)+10>4096){a=p.cookie.split(";");for(var j=0,k=a.length;j<k;j++)if(a[j].indexOf(d)!=-1){var m=a[j].split("=");try{h=eval("("+decodeURIComponent(m[1])+")")}catch(t){continue}if(typeof h.iCreate!="undefined"&&h.iCreate<e){f=m[0];e=h.iCreate}}if(f!=="")p.cookie=f+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+
+"/"}p.cookie=b}function ta(a){var b=wa.location.pathname.split("/");a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=p.cookie.split(";");for(var c=0;c<b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function W(a,b){b=b.getElementsByTagName("tr");var c,d,f,e,h,j,k,m,t=function(O,B,F){for(;typeof O[B][F]!="undefined";)F++;return F};a.splice(0,a.length);d=0;for(j=b.length;d<
+j;d++)a.push([]);d=0;for(j=b.length;d<j;d++){f=0;for(k=b[d].childNodes.length;f<k;f++){c=b[d].childNodes[f];if(c.nodeName.toUpperCase()=="TD"||c.nodeName.toUpperCase()=="TH"){var q=c.getAttribute("colspan")*1,I=c.getAttribute("rowspan")*1;q=!q||q===0||q===1?1:q;I=!I||I===0||I===1?1:I;m=t(a,d,0);for(h=0;h<q;h++)for(e=0;e<I;e++){a[d+e][m+h]={cell:c,unique:q==1?true:false};a[d+e].nTr=b[d]}}}}}function S(a,b,c){var d=[];if(typeof c=="undefined"){c=a.aoHeader;if(typeof b!="undefined"){c=[];W(c,b)}}b=0;
+for(var f=c.length;b<f;b++)for(var e=0,h=c[b].length;e<h;e++)if(c[b][e].unique&&(typeof d[e]=="undefined"||!a.bSortCellsTop))d[e]=c[b][e].cell;return d}function Ua(){var a=p.createElement("p"),b=a.style;b.width="100%";b.height="200px";var c=p.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.overflow="hidden";c.appendChild(a);p.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;if(b==a)a=
+c.clientWidth;p.body.removeChild(c);return b-a}function P(a,b,c){for(var d=0,f=b.length;d<f;d++)for(var e=0,h=b[d].childNodes.length;e<h;e++)if(b[d].childNodes[e].nodeType==1)typeof c!="undefined"?a(b[d].childNodes[e],c[d].childNodes[e]):a(b[d].childNodes[e])}function n(a,b,c,d){if(typeof d=="undefined")d=c;if(typeof b[c]!="undefined")a[d]=b[c]}function da(a,b,c){for(var d=[],f=0,e=a.aoColumns.length;f<e;f++)d.push(H(a,b,f,c));return d}function H(a,b,c,d){var f=a.aoColumns[c];if((c=f.fnGetData(a.aoData[b]._aData))===
+undefined){if(a.iDrawError!=a.iDraw&&f.sDefaultContent===null){J(a,0,"Requested unknown parameter '"+f.mDataProp+"' from the data source for row "+b);a.iDrawError=a.iDraw}return f.sDefaultContent}if(c===null&&f.sDefaultContent!==null)c=f.sDefaultContent;if(d=="display"&&c===null)return"";return c}function N(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function Z(a){if(a===null)return function(){return null};else if(typeof a=="function")return function(c){return a(c)};else if(typeof a==
+"string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c){return c[b[0]][b[1]]}:b.length==3?function(c){return c[b[0]][b[1]][b[2]]}:function(c){for(var d=0,f=b.length;d<f;d++)c=c[b[d]];return c}}else return function(c){return c[a]}}function ya(a){if(a===null)return function(){};else if(typeof a=="function")return function(c,d){return a(c,d)};else if(typeof a=="string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c,d){c[b[0]][b[1]]=d}:b.length==3?function(c,
+d){c[b[0]][b[1]][b[2]]=d}:function(c,d){for(var f=0,e=b.length-1;f<e;f++)c=c[b[f]];c[b[b.length-1]]=d}}else return function(c,d){c[a]=d}}this.oApi={};this.fnDraw=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined"&&a===false){E(b);C(b)}else ba(b)};this.fnFilter=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);if(e.oFeatures.bFilter){if(typeof c=="undefined")c=false;if(typeof d=="undefined")d=true;if(typeof f=="undefined")f=true;if(typeof b=="undefined"||b===null){M(e,{sSearch:a,bRegex:c,
+bSmart:d},1);if(f&&typeof e.aanFeatures.f!="undefined"){b=e.aanFeatures.f;c=0;for(d=b.length;c<d;c++)i("input",b[c]).val(a)}}else{e.aoPreSearchCols[b].sSearch=a;e.aoPreSearchCols[b].bRegex=c;e.aoPreSearchCols[b].bSmart=d;M(e,e.oPreviousSearch,1)}}};this.fnSettings=function(){return A(this[o.iApiIndex])};this.fnVersionCheck=o.fnVersionCheck;this.fnSort=function(a){var b=A(this[o.iApiIndex]);b.aaSorting=a;R(b)};this.fnSortListener=function(a,b,c){ga(A(this[o.iApiIndex]),a,b,c)};this.fnAddData=function(a,
+b){if(a.length===0)return[];var c=[],d,f=A(this[o.iApiIndex]);if(typeof a[0]=="object")for(var e=0;e<a.length;e++){d=v(f,a[e]);if(d==-1)return c;c.push(d)}else{d=v(f,a);if(d==-1)return c;c.push(d)}f.aiDisplay=f.aiDisplayMaster.slice();if(typeof b=="undefined"||b)ba(f);return c};this.fnDeleteRow=function(a,b,c){var d=A(this[o.iApiIndex]);a=typeof a=="object"?U(d,a):a;var f=d.aoData.splice(a,1),e=i.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,1);ra(d.aiDisplayMaster,a);ra(d.aiDisplay,a);typeof b==
+"function"&&b.call(this,d,f);if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){E(d);C(d)}return f};this.fnClearTable=function(a){var b=A(this[o.iApiIndex]);ia(b);if(typeof a=="undefined"||a)C(b)};this.fnOpen=function(a,b,c){var d=A(this[o.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;e.colSpan=X(d);if(typeof b.jquery!="undefined"||typeof b==
+"object")e.appendChild(b);else e.innerHTML=b;b=i("tr",d.nTBody);i.inArray(a,b)!=-1&&i(f).insertAfter(a);d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=A(this[o.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnGetData=function(a,b){var c=A(this[o.iApiIndex]);if(typeof a!="undefined"){a=typeof a=="object"?U(c,a):a;if(typeof b!=
+"undefined")return H(c,a,b,"");return typeof c.aoData[a]!="undefined"?c.aoData[a]._aData:null}return aa(c)};this.fnGetNodes=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined")return typeof b.aoData[a]!="undefined"?b.aoData[a].nTr:null;return $(b)};this.fnGetPosition=function(a){var b=A(this[o.iApiIndex]),c=a.nodeName.toUpperCase();if(c=="TR")return U(b,a);else if(c=="TD"||c=="TH"){c=U(b,a.parentNode);for(var d=Q(b,c),f=0;f<b.aoColumns.length;f++)if(d[f]==a)return[c,pa(b,f),f]}return null};
+this.fnUpdate=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);b=typeof b=="object"?U(e,b):b;if(i.isArray(a)&&typeof a=="object"){e.aoData[b]._aData=a.slice();for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else if(typeof a=="object"){e.aoData[b]._aData=i.extend(true,{},a);for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else{a=a;N(e,b,c,a);if(e.aoColumns[c].fnRender!==null){a=e.aoColumns[c].fnRender({iDataRow:b,iDataColumn:c,aData:e.aoData[b]._aData,
+oSettings:e});e.aoColumns[c].bUseRendered&&N(e,b,c,a)}if(e.aoData[b].nTr!==null)Q(e,b)[c].innerHTML=a}c=i.inArray(b,e.aiDisplay);e.asDataSearch[c]=na(e,da(e,b,"filter"));if(typeof f=="undefined"||f)ca(e);if(typeof d=="undefined"||d)ba(e);return 0};this.fnSetColumnVis=function(a,b,c){var d=A(this[o.iApiIndex]),f,e;e=d.aoColumns.length;var h,j;if(d.aoColumns[a].bVisible!=b){if(b){for(f=j=0;f<a;f++)d.aoColumns[f].bVisible&&j++;j=j>=X(d);if(!j)for(f=a;f<e;f++)if(d.aoColumns[f].bVisible){h=f;break}f=0;
+for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null)j?d.aoData[f].nTr.appendChild(d.aoData[f]._anHidden[a]):d.aoData[f].nTr.insertBefore(d.aoData[f]._anHidden[a],Q(d,f)[h])}else{f=0;for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null){h=Q(d,f)[a];d.aoData[f]._anHidden[a]=h;h.parentNode.removeChild(h)}}d.aoColumns[a].bVisible=b;L(d,d.aoHeader);d.nTFoot&&L(d,d.aoFooter);f=0;for(e=d.aoOpenRows.length;f<e;f++)d.aoOpenRows[f].nTr.colSpan=X(d);if(typeof c=="undefined"||c){ca(d);C(d)}sa(d)}};this.fnPageChange=
+function(a,b){var c=A(this[o.iApiIndex]);ja(c,a);E(c);if(typeof b=="undefined"||b)C(c)};this.fnDestroy=function(){var a=A(this[o.iApiIndex]),b=a.nTableWrapper.parentNode,c=a.nTBody,d,f;a.bDestroying=true;d=0;for(f=a.aoColumns.length;d<f;d++)a.aoColumns[d].bVisible===false&&this.fnSetColumnVis(d,true);i(a.nTableWrapper).find("*").andSelf().unbind(".DT");i("tbody>tr>td."+a.oClasses.sRowEmpty,a.nTable).parent().remove();if(a.nTable!=a.nTHead.parentNode){i(">thead",a.nTable).remove();a.nTable.appendChild(a.nTHead)}if(a.nTFoot&&
+a.nTable!=a.nTFoot.parentNode){i(">tfoot",a.nTable).remove();a.nTable.appendChild(a.nTFoot)}a.nTable.parentNode.removeChild(a.nTable);i(a.nTableWrapper).remove();a.aaSorting=[];a.aaSortingFixed=[];T(a);i($(a)).removeClass(a.asStripClasses.join(" "));if(a.bJUI){i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oJUIClasses.sSortableAsc,o.oJUIClasses.sSortableDesc,o.oJUIClasses.sSortableNone].join(" "));i("th span."+o.oJUIClasses.sSortIcon,a.nTHead).remove();i("th",a.nTHead).each(function(){var e=
+i("div."+o.oJUIClasses.sSortJUIWrapper,this),h=e.contents();i(this).append(h);e.remove()})}else i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oStdClasses.sSortableAsc,o.oStdClasses.sSortableDesc,o.oStdClasses.sSortableNone].join(" "));a.nTableReinsertBefore?b.insertBefore(a.nTable,a.nTableReinsertBefore):b.appendChild(a.nTable);d=0;for(f=a.aoData.length;d<f;d++)a.aoData[d].nTr!==null&&c.appendChild(a.aoData[d].nTr);if(a.oFeatures.bAutoWidth===true)a.nTable.style.width=u(a.sDestroyWidth);
+i(">tr:even",c).addClass(a.asDestoryStrips[0]);i(">tr:odd",c).addClass(a.asDestoryStrips[1]);d=0;for(f=D.length;d<f;d++)D[d]==a&&D.splice(d,1);a=null};this.fnAdjustColumnSizing=function(a){var b=A(this[o.iApiIndex]);ca(b);if(typeof a=="undefined"||a)this.fnDraw(false);else if(b.oScroll.sX!==""||b.oScroll.sY!=="")this.oApi._fnScrollDraw(b)};for(var ua in o.oApi)if(ua)this[ua]=r(ua);this.oApi._fnExternApiFunc=r;this.oApi._fnInitalise=s;this.oApi._fnInitComplete=w;this.oApi._fnLanguageProcess=y;this.oApi._fnAddColumn=
+G;this.oApi._fnColumnOptions=x;this.oApi._fnAddData=v;this.oApi._fnCreateTr=z;this.oApi._fnGatherData=Y;this.oApi._fnBuildHead=V;this.oApi._fnDrawHead=L;this.oApi._fnDraw=C;this.oApi._fnReDraw=ba;this.oApi._fnAjaxUpdate=za;this.oApi._fnAjaxUpdateDraw=Aa;this.oApi._fnAddOptionsHtml=xa;this.oApi._fnFeatureHtmlTable=Fa;this.oApi._fnScrollDraw=Ia;this.oApi._fnAjustColumnSizing=ca;this.oApi._fnFeatureHtmlFilter=Da;this.oApi._fnFilterComplete=M;this.oApi._fnFilterCustom=Ma;this.oApi._fnFilterColumn=La;
+this.oApi._fnFilter=Ka;this.oApi._fnBuildSearchArray=ka;this.oApi._fnBuildSearchRow=na;this.oApi._fnFilterCreateSearch=la;this.oApi._fnDataToSearch=ma;this.oApi._fnSort=R;this.oApi._fnSortAttachListener=ga;this.oApi._fnSortingClasses=T;this.oApi._fnFeatureHtmlPaginate=Ha;this.oApi._fnPageChange=ja;this.oApi._fnFeatureHtmlInfo=Ga;this.oApi._fnUpdateInfo=Na;this.oApi._fnFeatureHtmlLength=Ca;this.oApi._fnFeatureHtmlProcessing=Ea;this.oApi._fnProcessingDisplay=K;this.oApi._fnVisibleToColumnIndex=Ja;this.oApi._fnColumnIndexToVisible=
+pa;this.oApi._fnNodeToDataIndex=U;this.oApi._fnVisbleColumns=X;this.oApi._fnCalculateEnd=E;this.oApi._fnConvertToWidth=Oa;this.oApi._fnCalculateColumnWidths=ea;this.oApi._fnScrollingWidthAdjust=Qa;this.oApi._fnGetWidestNode=Pa;this.oApi._fnGetMaxLenString=Ra;this.oApi._fnStringToCss=u;this.oApi._fnArrayCmp=Va;this.oApi._fnDetectType=fa;this.oApi._fnSettingsFromNode=A;this.oApi._fnGetDataMaster=aa;this.oApi._fnGetTrNodes=$;this.oApi._fnGetTdNodes=Q;this.oApi._fnEscapeRegex=oa;this.oApi._fnDeleteIndex=
+ra;this.oApi._fnReOrderIndex=Ba;this.oApi._fnColumnOrdering=ha;this.oApi._fnLog=J;this.oApi._fnClearTable=ia;this.oApi._fnSaveState=sa;this.oApi._fnLoadState=Ta;this.oApi._fnCreateCookie=Sa;this.oApi._fnReadCookie=ta;this.oApi._fnDetectHeader=W;this.oApi._fnGetUniqueThs=S;this.oApi._fnScrollBarWidth=Ua;this.oApi._fnApplyToChildren=P;this.oApi._fnMap=n;this.oApi._fnGetRowData=da;this.oApi._fnGetCellData=H;this.oApi._fnSetCellData=N;this.oApi._fnGetObjectDataFn=Z;this.oApi._fnSetObjectDataFn=ya;var va=
+this;return this.each(function(){var a=0,b,c,d,f;a=0;for(b=D.length;a<b;a++){if(D[a].nTable==this)if(typeof g=="undefined"||typeof g.bRetrieve!="undefined"&&g.bRetrieve===true)return D[a].oInstance;else if(typeof g.bDestroy!="undefined"&&g.bDestroy===true){D[a].oInstance.fnDestroy();break}else{J(D[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, please pass either no arguments to the dataTable() function, or set bRetrieve to true. Alternatively, to destory the old table and create a new one, set bDestroy to true (note that a lot of changes to the configuration can be made through the API which is usually much faster).");
+return}if(D[a].sTableId!==""&&D[a].sTableId==this.getAttribute("id")){D.splice(a,1);break}}var e=new l;D.push(e);var h=false,j=false;a=this.getAttribute("id");if(a!==null){e.sTableId=a;e.sInstance=a}else e.sInstance=o._oExternConfig.iNextUnique++;if(this.nodeName.toLowerCase()!="table")J(e,0,"Attempted to initialise DataTables on a node which is not a table: "+this.nodeName);else{e.nTable=this;e.oInstance=va.length==1?va:i(this).dataTable();e.oApi=va.oApi;e.sDestroyWidth=i(this).width();if(typeof g!=
+"undefined"&&g!==null){e.oInit=g;n(e.oFeatures,g,"bPaginate");n(e.oFeatures,g,"bLengthChange");n(e.oFeatures,g,"bFilter");n(e.oFeatures,g,"bSort");n(e.oFeatures,g,"bInfo");n(e.oFeatures,g,"bProcessing");n(e.oFeatures,g,"bAutoWidth");n(e.oFeatures,g,"bSortClasses");n(e.oFeatures,g,"bServerSide");n(e.oFeatures,g,"bDeferRender");n(e.oScroll,g,"sScrollX","sX");n(e.oScroll,g,"sScrollXInner","sXInner");n(e.oScroll,g,"sScrollY","sY");n(e.oScroll,g,"bScrollCollapse","bCollapse");n(e.oScroll,g,"bScrollInfinite",
+"bInfinite");n(e.oScroll,g,"iScrollLoadGap","iLoadGap");n(e.oScroll,g,"bScrollAutoCss","bAutoCss");n(e,g,"asStripClasses");n(e,g,"fnPreDrawCallback");n(e,g,"fnRowCallback");n(e,g,"fnHeaderCallback");n(e,g,"fnFooterCallback");n(e,g,"fnCookieCallback");n(e,g,"fnInitComplete");n(e,g,"fnServerData");n(e,g,"fnFormatNumber");n(e,g,"aaSorting");n(e,g,"aaSortingFixed");n(e,g,"aLengthMenu");n(e,g,"sPaginationType");n(e,g,"sAjaxSource");n(e,g,"sAjaxDataProp");n(e,g,"iCookieDuration");n(e,g,"sCookiePrefix");
+n(e,g,"sDom");n(e,g,"bSortCellsTop");n(e,g,"oSearch","oPreviousSearch");n(e,g,"aoSearchCols","aoPreSearchCols");n(e,g,"iDisplayLength","_iDisplayLength");n(e,g,"bJQueryUI","bJUI");n(e.oLanguage,g,"fnInfoCallback");typeof g.fnDrawCallback=="function"&&e.aoDrawCallback.push({fn:g.fnDrawCallback,sName:"user"});typeof g.fnStateSaveCallback=="function"&&e.aoStateSave.push({fn:g.fnStateSaveCallback,sName:"user"});typeof g.fnStateLoadCallback=="function"&&e.aoStateLoad.push({fn:g.fnStateLoadCallback,sName:"user"});
+if(e.oFeatures.bServerSide&&e.oFeatures.bSort&&e.oFeatures.bSortClasses)e.aoDrawCallback.push({fn:T,sName:"server_side_sort_classes"});else e.oFeatures.bDeferRender&&e.aoDrawCallback.push({fn:T,sName:"defer_sort_classes"});if(typeof g.bJQueryUI!="undefined"&&g.bJQueryUI){e.oClasses=o.oJUIClasses;if(typeof g.sDom=="undefined")e.sDom='<"H"lfr>t<"F"ip>'}if(e.oScroll.sX!==""||e.oScroll.sY!=="")e.oScroll.iBarWidth=Ua();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=
+g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Ta(e,g);e.aoDrawCallback.push({fn:sa,sName:"state_save"})}if(typeof g.iDeferLoading!="undefined"){e.bDeferLoading=true;e._iRecordsTotal=g.iDeferLoading;e._iRecordsDisplay=g.iDeferLoading}if(typeof g.aaData!="undefined")j=true;if(typeof g!="undefined"&&typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!="undefined"&&g.oLanguage.sUrl!==
+""){e.oLanguage.sUrl=g.oLanguage.sUrl;i.getJSON(e.oLanguage.sUrl,null,function(t){y(e,t,true)});h=true}else y(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"){e.asStripClasses.push(e.oClasses.sStripOdd);e.asStripClasses.push(e.oClasses.sStripEven)}c=false;d=i(">tbody>tr",this);a=0;for(b=e.asStripClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(e.asStripClasses[a])){c=true;break}if(c){e.asDestoryStrips=["",""];if(i(d[0]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[0]+=
+e.oClasses.sStripOdd+" ";if(i(d[0]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[0]+=e.oClasses.sStripEven;if(i(d[1]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[1]+=e.oClasses.sStripOdd+" ";if(i(d[1]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[1]+=e.oClasses.sStripEven;d.removeClass(e.asStripClasses.join(" "))}c=[];var k;a=this.getElementsByTagName("thead");if(a.length!==0){W(e.aoHeader,a[0]);c=S(e)}if(typeof g.aoColumns=="undefined"){k=[];a=0;for(b=c.length;a<b;a++)k.push(null)}else k=
+g.aoColumns;a=0;for(b=k.length;a<b;a++){if(typeof g.saved_aoColumns!="undefined"&&g.saved_aoColumns.length==b){if(k[a]===null)k[a]={};k[a].bVisible=g.saved_aoColumns[a].bVisible}G(e,c?c[a]:null)}if(typeof g.aoColumnDefs!="undefined")for(a=g.aoColumnDefs.length-1;a>=0;a--){var m=g.aoColumnDefs[a].aTargets;i.isArray(m)||J(e,1,"aTargets must be an array of targets, not a "+typeof m);c=0;for(d=m.length;c<d;c++)if(typeof m[c]=="number"&&m[c]>=0){for(;e.aoColumns.length<=m[c];)G(e);x(e,m[c],g.aoColumnDefs[a])}else if(typeof m[c]==
+"number"&&m[c]<0)x(e,e.aoColumns.length+m[c],g.aoColumnDefs[a]);else if(typeof m[c]=="string"){b=0;for(f=e.aoColumns.length;b<f;b++)if(m[c]=="_all"||i(e.aoColumns[b].nTh).hasClass(m[c]))x(e,b,g.aoColumnDefs[a])}}if(typeof k!="undefined"){a=0;for(b=k.length;a<b;a++)x(e,a,k[a])}a=0;for(b=e.aaSorting.length;a<b;a++){if(e.aaSorting[a][0]>=e.aoColumns.length)e.aaSorting[a][0]=0;k=e.aoColumns[e.aaSorting[a][0]];if(typeof e.aaSorting[a][2]=="undefined")e.aaSorting[a][2]=0;if(typeof g.aaSorting=="undefined"&&
+typeof e.saved_aaSorting=="undefined")e.aaSorting[a][1]=k.asSorting[0];c=0;for(d=k.asSorting.length;c<d;c++)if(e.aaSorting[a][1]==k.asSorting[c]){e.aaSorting[a][2]=c;break}}T(e);a=i(">thead",this);if(a.length===0){a=[p.createElement("thead")];this.appendChild(a[0])}e.nTHead=a[0];a=i(">tbody",this);if(a.length===0){a=[p.createElement("tbody")];this.appendChild(a[0])}e.nTBody=a[0];a=i(">tfoot",this);if(a.length>0){e.nTFoot=a[0];W(e.aoFooter,e.nTFoot)}if(j)for(a=0;a<g.aaData.length;a++)v(e,g.aaData[a]);
+else Y(e);e.aiDisplay=e.aiDisplayMaster.slice();e.bInitialised=true;h===false&&s(e)}})}})(jQuery,window,document);
diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/back_disabled.jpg b/koha-tmpl/intranet-tmpl/prog/img/datatables/back_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1e73a546e3609636f9cf4c543c2a4fe4050866c3
GIT binary patch
literal 612
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tyUn
z+02YUSHb}sD?0}l&^EXLguy7lz`(-H!phDIlVN0HVHIR%V-ON%S2Pq6HFFG{Xryc+
zmRQ($@S#&sld*HEn>dFcBLmQ_$YwDLDjGT#PW*q1fd^<YlOVGogFVCRyQwLwf|@66
ze!$4fpt!)cj7zNLKSN?_SjIEf$Z0nVqZh4{&j?Wu4PU>^;oX+iLI)z|@;wX;U8Xr>
zT8Qgxn;R!Cottl}#(8Ri${a3d=J*$R5qBRbK9bRJe*4BYwq9(uIM4mLS9%TSY?*y6
zE==owYH)vf>dq6(Uzum+IyVJqc3N&dRPD57vW(=l(=(DZ-K_<Unt1pe8#qknGCi3V
zkh;vl;B4~gY1f{Kz2M5sJrOKuSm0ZhaMrL}#<_9H6t<5or9~0qKc;W}wfIQk>!LSx
zwPk@>bN at 4B-OI9gCf>Wc_;CDAS%c at BJZ}k<t>BlbDz~@y-*&Y^_U+@};q`xNUthN}
On^Cj9W}Eu@|2F})$f79#

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/back_enabled.jpg b/koha-tmpl/intranet-tmpl/prog/img/datatables/back_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a6d764c79c7a2047b6bf65bf9d96fcafd5161e38
GIT binary patch
literal 807
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2*U&h
z1}0{pBN2d|gO!bok%5r~RhW^Pm5qg+Lx6#Sm5Gs^od+h%$i&RTD#*spplB#0EW!~u
z(MZ`u)XXulu<_tSr=TWdXR%Z_aiE1jZ7eM8Fl&IpCkWK1$Y$s$#2&a&N#sM~M5iWU
z<^Q)Bc$gW1&SMs2uxGfw`}E06etb^r9k|jMc at Dlk(IlSD-Wwx*G{%4ThHhR%HnTsw
zbu3z!=BtbC=-In5f5nt;je{+vrKZdWckk$U`c^FEYC6}Jn=<Phg&RGxWowtu+j4vL
zuDrGP=1IPrb~kp*>lG)17QB>6z3khm7PHhg<-pEGSO0F>VA}N6`w53!8pr$>MbUW|
zME<s?dezw;U%dR;`Kd)lCauvOXRNpVXgK`4pX=Sp- at CZj9x15&y*j<b<JPA<K_*#K
z<@>sFn=(%w+^5v0yp7Lmb+~3PpI4(#G~bQ$y_;t)oo+U5`bnSHZcn){CH~m7Ys2rz
z2!R at xgGrCtcPz?eOPOzKr2P26p~(mTGjR1-c<x%~cJ0>3?psA>uUGsyt|R2Ts3~!B
zN71DGSrW%W*`w8#2{O$LX)%%8*<4Ycyr;tN(Hm<XHM0xJ?{xF0EskFCh5u=&<iulr
zYNyl=#<wqXD&+4u8oF^$)m7<lY at VgXk9azsKIKz?vp4^)yx{evPw)J-Dth+P<;w$q
z`@Q9}`(-Xi+_IiGtB&jWay`d}j~$NpR at hm5{cf*szhAZWsp!3Z`)}>8|M=_HtvR>P
P+Rcr(b5Xx$|NkZcT0jT?

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/forward_disabled.jpg b/koha-tmpl/intranet-tmpl/prog/img/datatables/forward_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..28a9dc53fa232919299ac980dc9b61167c1868bd
GIT binary patch
literal 635
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tySE
z1JEp>E8&2Nm4%I+g9~UMTnNHo6kuRrVP;|B;)Y2uGBL9Vva&G<iLfgg3UfFHPBdy#
zHW3vwODt at B=oDn^oa!bn$jHFNjA9g{prWDU#Q(P#c!1(eg3N*p_6)E5E7rbHvEH7V
z8#+gHc2rxYci=nCmS=BPhUq>lzGLeh=CM*_u2I6%$1L~6;-1yGa|?*Fva<AVW}f$w
zM|jiv%AS4aZbfpP)?S?%8?6+<6*?uQG at xF)s3 at 1Q<(tn>vCW+<XI6GdMB6yB9$3U&
z#>Av>{Flt>+*?d?iZ`9)^O?_H|D3t8;Og6lD<#WHQvW(mo1ETsD>A at mr8@sqg(?1R
z%d at qrmWLWmIn1#pQuo}{brVW*C8t%EDXbOt_DabwXgGW3;wDX1;~7hWrYL+ZX=qre
z&-y^2q0zm?-FJb#(AWJTHOJ-3`S`D|JEhzC{KvY_h0kZinXP-?w!g_L at p#JQO^!z$
mYCgVwS7#SryXs@?>&L&t^Z(SozHVt~@Z#>58}s)6zX<@qORf(9

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/forward_enabled.jpg b/koha-tmpl/intranet-tmpl/prog/img/datatables/forward_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..598c075f13ab0e4bbe05a4eeea7cf777ba73cf03
GIT binary patch
literal 852
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tywO
z0~0eN(3Nn&%Fe>Z!NthH$ciG&$iU3P%Em6hz`z1zu=B#yGcqx=2(q#<2(fb*3M-3<
zDh5t8G7&R#Oe}1C=oHjs?40T*F37+LbR`oj+(bq}CT0c}Rz*W0Hg?Cv#)(EB0yioN
zi~PUEzyov)lOVGogFVA5dn3uE%Z<*rn&ugY^FIG9<<=87L*?mOy^~u`Rq(Eg+UDw^
z@^Uh}zJ$t~P2YpRT#sm2p`oEt8zJ-EBRfY;>b?DxZo!24Z)Q(O&}!Mbt}27`dKa(x
zr)AHkZg5MjKa&4$syaupXWNXgp32dQs<o<XGr#5u9@=#E+?+!}FI~Pa)LWslJ}B36
z`Lb3YheKCCm%VOu;VpX6(0MkYSk}6t at aOKz+;_*D4{7|~^5)^QORgNty2^@M51##X
zueaWLX7+9e=RH;{oZr5)jkOooU8VU}TQps%p>_rj-?|M=Q9pN^hZg^mV7=UWs>}D5
z$40(ME7Q1T4h8p}ZJ8O!G-Xk84;P~#ci!&o`A5I3kG at gLm*VlJbn%kvSqIh?3Y?HQ
zAX0NL>XIkpf=MN83*!%}9-aN5)p7^py2Am>F9gW&pFSp#V0dxX#ZPW;UoD(gaI at 8E
z(rNQz1DBIiM13!LtZ|85lHB@$wW~n0fhRz-$?R&m{@z;uI}N|35As;}zdXB<<FOu#
z{FTp-PcAia6ML~>I#+N1k=r*G-&mI78vJ_Ezs!yIV%J}l7d*c9>7Bn;xyLT84V&`$
z at 9WMTAJ6DZyR)~=FS6P2e3MDv7lHB>{C&1H^7EJ9PIf=EdUwUYtGE9%$X9(m*ZWLf
M_rC2^{;K~s0TRp{r2qf`

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a56d0e21902ce620cd57f87fa58a6d3e804135cf
GIT binary patch
literal 263
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45 at 5J;
zXU0OHl&hzUV at SoVE9Xw~GAQscA1s)^?0*rXqM}DeLv7?|BU8z at Q<ntt9<njnJ|j`Y
znD at ZlWoHa-oW7$XVs$3z>COGupVzP9Hek5&L+Gnl%BD>~0~tJB{an^LB{Ts5b0m7=

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc_disabled.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7e621ef1c68da839ce077cec6e201a55c1ba168
GIT binary patch
literal 252
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnW*L
z7srr_TUXBQ7Ge<Kak=PnB>V6G?@}f$7k6Jhw{qGm$-QDzD`qrDaZ3s$b2XF;fBBPU
nqjNDy&Nw~puHFA+-v&m8`?>-yUFVHK{$ucT^>bP0l+XkKhw^g=

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_both.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_both.png
new file mode 100644
index 0000000000000000000000000000000000000000..839ac4bb5b0b414834c950de9deafff6dd94ed2d
GIT binary patch
literal 282
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0K#2rT
z7srr_TRjsz`4|*ASOSl%eg6Ob+(JtRwX|O at S}a^IES<M^Rar)~R7{gT(8t-3AepQp
zDW<l1NyH(qlCXQ0 at AfT`xZ2rtb0gcPuhQK|E$f?fe^;k=XM|b({WbrT_5p at zx%{&^
T>QC<i+Qs1M>gTe~DWM4fR9b+X

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b295159df995329b3a84340d32761f3d1dbade
GIT binary patch
literal 260
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45 at 5J;
zXU0OHl#{26V at SoVqz8vtc$~v}dc~O{CLEF2anNavMpdMP)0v(X&o(k0opIq!LdvtJ
wj~up7 at 0`wiSoe($&y07EkGxK6U|?nlJSz0{?wJWUfu=Edy85}Sb4q9e0C9MGu>b%7

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc_disabled.png b/koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..2409653dc94cd21a281a31c0e3819323b84704b7
GIT binary patch
literal 251
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnX`r
z7srr_TS*TNvhX;E^>j)zMNBv%VR68zN24n8K+>5N&kUJbBQCy4c=qgBiu3mAQ)hD?
n)_oJhGvi(If!Apb49pB3GXz|UGFKJ=4P)?h^>bP0l+XkK*57ji

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/datatables.css b/koha-tmpl/opac-tmpl/prog/en/css/datatables.css
new file mode 100644
index 0000000..e069b93
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/css/datatables.css
@@ -0,0 +1,114 @@
+input.search_init {
+    color: #999999;
+}
+.sorting_asc {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_asc.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_desc.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_both.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_asc_disabled {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_asc_disabled.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc_disabled {
+    padding-right: 19px;
+    background: url("../../img/datatables/sort_desc_disabled.png") no-repeat scroll right center #EEEEEE;
+}
+.sorting_disabled {
+    padding-right: 19px;
+    background-color: #EEEEEE;
+}
+
+table.display {
+    width: 100%;
+}
+table.display thead th {
+    border-bottom: 1px solid black;
+    cursor: pointer;
+    font-weight: bold;
+    padding: 3px 18px 3px 10px;
+}
+.dataTables_wrapper {
+    clear: both;
+    position: relative;
+}
+.dataTables_processing {
+    background-color: white;
+    border: 1px solid #DDDDDD;
+    color: #999999;
+    font-size: 14px;
+    height: 30px;
+    left: 50%;
+    margin-left: -125px;
+    margin-top: -15px;
+    padding: 14px 0 2px;
+    position: fixed;
+    text-align: center;
+    top: 50%;
+    width: 250px;
+}
+.dataTables_info {
+    float: left;
+    width: 60%;
+}
+.dataTables_paginate {
+    float: right;
+    text-align: right;
+    width: 44px;
+}
+.paging_full_numbers {
+    height: 22px;
+    line-height: 22px;
+    width: 400px;
+}
+.paging_full_numbers span.paginate_button,
+     .paging_full_numbers span.paginate_active {
+    border: 1px solid #aaa;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    padding: 2px 5px;
+    margin: 0 3px;
+    cursor: pointer;
+    *cursor: hand;
+}
+
+.paging_full_numbers span.paginate_button {
+    background-color: #ddd;
+}
+
+.paging_full_numbers span.paginate_button:hover {
+    background-color: #ccc;
+}
+
+.paging_full_numbers span.paginate_active {
+    background-color: #99B3FF;
+}
+.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
+    float: left;
+    height: 19px;
+    margin-left: 3px;
+    width: 19px;
+}
+.paginate_disabled_previous {
+    background-image: url("../../img/datatables/back_disabled.jpg");
+}
+.paginate_enabled_previous {
+    background-image: url("../../img/datatables/back_enabled.jpg");
+}
+.paginate_disabled_next {
+    background-image: url("../../img/datatables/forward_disabled.jpg");
+}
+.paginate_enabled_next {
+    background-image: url("../../img/datatables/forward_enabled.jpg");
+}
+.spacer {
+    clear: both;
+    height: 20px;
+}
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc b/koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc
new file mode 100644
index 0000000..183f511
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc
@@ -0,0 +1,17 @@
+<script type="text/javascript">
+//<![CDATA[
+    var MSG_DT_FIRST = _("First");
+    var MSG_DT_LAST = _("Last");
+    var MSG_DT_NEXT = _("Next");
+    var MSG_DT_PREVIOUS = _("Previous");
+    var MSG_DT_EMPTY_TABLE = _("No data available in table");
+    var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
+    var MSG_DT_INFO_EMPTY = _("No entries to show");
+    var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
+    var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
+    var MSG_DT_LOADING_RECORDS = _("Loading...");
+    var MSG_DT_PROCESSING = _("Processing...");
+    var MSG_DT_SEARCH = _("Search:");
+    var MSG_DT_ZERO_RECORDS = _("No matching records found");
+//]]>
+</script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/datatables.js b/koha-tmpl/opac-tmpl/prog/en/js/datatables.js
new file mode 100644
index 0000000..38dd1d5
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/js/datatables.js
@@ -0,0 +1,281 @@
+// These default options are for translation but can be used
+// for any other datatables settings
+// MSG_DT_* variables comes from datatables-strings.inc
+// To use it, write:
+//  $("#table_id").dataTable($.extend(true, {}, dataTableDefaults, {
+//      // other settings
+//  } ) );
+var dataTablesDefaults = {
+    "oLanguage": {
+        "oPaginate": {
+            "sFirst"    : window.MSG_DT_FIRST || "First",
+            "sLast"     : window.MSG_DT_LAST || "Last",
+            "sNext"     : window.MSG_DT_NEXT || "Next",
+            "sPrevious" : window.MSG_DT_PREVIOUS || "Previous"
+        },
+        "sEmptyTable"       : window.MSG_DT_EMPTY_TABLE || "No data available in table",
+        "sInfo"             : window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries",
+        "sInfoEmpty"        : window.MSG_DT_INFO_EMPTY || "No entries to show",
+        "sInfoFiltered"     : window.MSG_DT_INFO_FILTERED || "(filtered from _MAX_ total entries)",
+        "sLengthMenu"       : window.MSG_DT_LENGTH_MENU || "Show _MENU_ entries",
+        "sLoadingRecords"   : window.MSG_DT_LOADING_RECORDS || "Loading...",
+        "sProcessing"       : window.MSG_DT_PROCESSING || "Processing...",
+        "sSearch"           : window.MSG_DT_SEARCH || "Search:",
+        "sZeroRecords"      : window.MSG_DT_ZERO_RECORDS || "No matching records found"
+    }
+};
+
+
+// Return an array of string containing the values of a particular column
+$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
+    // check that we have a column id
+    if ( typeof iColumn == "undefined" ) return new Array();
+    // by default we only wany unique data
+    if ( typeof bUnique == "undefined" ) bUnique = true;
+    // by default we do want to only look at filtered data
+    if ( typeof bFiltered == "undefined" ) bFiltered = true;
+    // by default we do not wany to include empty values
+    if ( typeof bIgnoreEmpty == "undefined" ) bIgnoreEmpty = true;
+    // list of rows which we're going to loop through
+    var aiRows;
+    // use only filtered rows
+    if (bFiltered == true) aiRows = oSettings.aiDisplay;
+    // use all rows
+    else aiRows = oSettings.aiDisplayMaster; // all row numbers
+
+    // set up data array
+    var asResultData = new Array();
+    for (var i=0,c=aiRows.length; i<c; i++) {
+        iRow = aiRows[i];
+        var aData = this.fnGetData(iRow);
+        var sValue = aData[iColumn];
+        // ignore empty values?
+        if (bIgnoreEmpty == true && sValue.length == 0) continue;
+        // ignore unique values?
+        else if (bUnique == true && jQuery.inArray(sValue, asResultData) > -1) continue;
+        // else push the value onto the result data array
+        else asResultData.push(sValue);
+    }
+    return asResultData;
+}
+
+// List of unbind keys (Ctrl, Alt, Direction keys, etc.)
+// These keys must not launch filtering
+var blacklist_keys = new Array(0, 16, 17, 18, 37, 38, 39, 40);
+
+// Set a filtering delay for global search field
+jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay ) {
+    /*
+     * Inputs:      object:oSettings - dataTables settings object - automatically given
+     *              integer:iDelay - delay in milliseconds
+     * Usage:       $('#example').dataTable().fnSetFilteringDelay(250);
+     * Author:      Zygimantas Berziunas (www.zygimantas.com) and Allan Jardine
+     * License:     GPL v2 or BSD 3 point style
+     * Contact:     zygimantas.berziunas /AT\ hotmail.com
+     */
+    var
+        _that = this,
+        iDelay = (typeof iDelay == 'undefined') ? 250 : iDelay;
+
+    this.each( function ( i ) {
+        $.fn.dataTableExt.iApiIndex = i;
+        var
+            $this = this,
+            oTimerId = null,
+            sPreviousSearch = null,
+            anControl = $( 'input', _that.fnSettings().aanFeatures.f );
+
+        anControl.unbind( 'keyup.DT' ).bind( 'keyup.DT', function(event) {
+            var $$this = $this;
+            if (blacklist_keys.indexOf(event.keyCode) != -1) {
+                return this;
+            }else if ( event.keyCode == '13' ) {
+                $.fn.dataTableExt.iApiIndex = i;
+                _that.fnFilter( $(this).val() );
+            } else {
+                if (sPreviousSearch === null || sPreviousSearch != anControl.val()) {
+                    window.clearTimeout(oTimerId);
+                    sPreviousSearch = anControl.val();
+                    oTimerId = window.setTimeout(function() {
+                        $.fn.dataTableExt.iApiIndex = i;
+                        _that.fnFilter( anControl.val() );
+                    }, iDelay);
+                }
+            }
+        });
+
+        return this;
+    } );
+    return this;
+}
+
+// Add a filtering delay on general search and on all input (with a class 'filter')
+jQuery.fn.dataTableExt.oApi.fnAddFilters = function ( oSettings, sClass, iDelay ) {
+    var table = this;
+    this.fnSetFilteringDelay(iDelay);
+    var filterTimerId = null;
+    $("input."+sClass).keyup(function(event) {
+      if (blacklist_keys.indexOf(event.keyCode) != -1) {
+        return this;
+      }else if ( event.keyCode == '13' ) {
+        table.fnFilter( $(this).val(), $(this).attr('data-column_num') );
+      } else {
+        window.clearTimeout(filterTimerId);
+        var input = this;
+        filterTimerId = window.setTimeout(function() {
+          table.fnFilter($(input).val(), $(input).attr('data-column_num'));
+        }, iDelay);
+      }
+    });
+}
+
+// Useful if you want to filter on dates with 2 inputs (start date and end date)
+// You have to include calendar.inc to use it
+function dt_add_rangedate_filter(begindate_id, enddate_id, dateCol) {
+    $.fn.dataTableExt.afnFiltering.push(
+        function( oSettings, aData, iDataIndex ) {
+
+            var beginDate = Date_from_syspref($("#"+begindate_id).val()).getTime();
+            var endDate   = Date_from_syspref($("#"+enddate_id).val()).getTime();
+
+            var data = Date_from_syspref(aData[dateCol]).getTime();
+
+            if ( !parseInt(beginDate) && ! parseInt(endDate) ) {
+                return true;
+            }
+            else if ( beginDate <= data && !parseInt(endDate) ) {
+                return true;
+            }
+            else if ( data <= endDate && !parseInt(beginDate) ) {
+                return true;
+            }
+            else if ( beginDate <= data && data <= endDate) {
+                return true;
+            }
+            return false;
+        }
+    );
+}
+
+//Sorting for dates (uk format)
+function dt_add_type_uk_date() {
+  jQuery.fn.dataTableExt.aTypes.unshift(
+    function ( sData )
+    {
+      if (sData.match(/(0[1-9]|[12][0-9]|3[01])\/(0[1-9]|1[012])\/(19|20|21)\d\d/))
+      {
+        return 'uk_date';
+      }
+      return null;
+    }
+  );
+
+  jQuery.fn.dataTableExt.oSort['uk_date-asc']  = function(a,b) {
+    var re = /(\d{2}\/\d{2}\/\d{4})/;
+    a.match(re);
+    var ukDatea = RegExp.$1.split("/");
+    b.match(re);
+    var ukDateb = RegExp.$1.split("/");
+
+    var x = (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+    var y = (ukDateb[2] + ukDateb[1] + ukDateb[0]) * 1;
+
+    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+  };
+
+  jQuery.fn.dataTableExt.oSort['uk_date-desc'] = function(a,b) {
+    var re = /(\d{2}\/\d{2}\/\d{4})/;
+    a.match(re);
+    var ukDatea = RegExp.$1.split("/");
+    b.match(re);
+    var ukDateb = RegExp.$1.split("/");
+
+    var x = (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+    var y = (ukDateb[2] + ukDateb[1] + ukDateb[0]) * 1;
+
+    return ((x < y) ? 1 : ((x > y) ?  -1 : 0));
+  };
+}
+
+// Sorting on html contains
+// <a href="foo.pl">bar</a> sort on 'bar'
+function dt_overwrite_html_sorting_localeCompare() {
+    jQuery.fn.dataTableExt.oSort['html-asc']  = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if (typeof(a.localeCompare == "function")) {
+           return a.localeCompare(b);
+        } else {
+           return (a > b) ? 1 : ((a < b) ? -1 : 0);
+        }
+    };
+
+    jQuery.fn.dataTableExt.oSort['html-desc'] = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if(typeof(b.localeCompare == "function")) {
+            return b.localeCompare(a);
+        } else {
+            return (b > a) ? 1 : ((b < a) ? -1 : 0);
+        }
+    };
+}
+
+// Sorting on string without accentued characters
+function dt_overwrite_string_sorting_localeCompare() {
+    jQuery.fn.dataTableExt.oSort['string-asc']  = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if (typeof(a.localeCompare == "function")) {
+           return a.localeCompare(b);
+        } else {
+           return (a > b) ? 1 : ((a < b) ? -1 : 0);
+        }
+    };
+
+    jQuery.fn.dataTableExt.oSort['string-desc'] = function(a,b) {
+        a = a.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        b = b.replace(/<.*?>/g, "").replace(/\s+/g, " ");
+        if(typeof(b.localeCompare == "function")) {
+            return b.localeCompare(a);
+        } else {
+            return (b > a) ? 1 : ((b < a) ? -1 : 0);
+        }
+    };
+}
+
+// Replace a node with a html and js contain.
+function replace_html( original_node, type ) {
+    switch ( $(original_node).attr('data-type') ) {
+        case "range_dates":
+            var id = $(original_node).attr("data-id");
+            var format = $(original_node).attr("data-format");
+            replace_html_date( original_node, id, format );
+            break;
+        default:
+            alert("_(This node can't be replaced)");
+    }
+}
+
+// Replace a node with a "From [date] To [date]" element
+// Used on tfoot > td
+function replace_html_date( original_node, id, format ) {
+    var node = $('<span style="white-space:nowrap">' + _("From") + '<input type="text" id="' + id + 'from" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'from").val("").change();\' >&times;</a></span><br/><span style="white-space:nowrap">' + _("To") + '<input type="text" id="' + id + 'to" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'to").val("").change();\' >&times;</a></span>');
+    $(original_node).replaceWith(node);
+    var script = document.createElement( 'script' );
+    script.type = 'text/javascript';
+    var script_content = "Calendar.setup({";
+    script_content += "    inputField: \"" + id + "from\",";
+    script_content += "    ifFormat: \"" + format + "\",";
+    script_content += "    button: \"" + id + "from\",";
+    script_content += "    onClose: function(){ $(\"#" + id + "from\").change(); this.hide();}";
+    script_content += "  });";
+    script_content += "  Calendar.setup({";
+    script_content += "    inputField: \"" + id + "to\",";
+    script_content += "    ifFormat: \"" + format + "\",";
+    script_content += "    button: \"" + id + "to\",";
+    script_content += "    onClose: function(){ $(\"#" + id + "to\").change(); this.hide();}";
+    script_content += "  });";
+    script.text = script_content;
+    $(original_node).append( script );
+}
diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js b/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
new file mode 100644
index 0000000..9035a2e
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
@@ -0,0 +1,153 @@
+/*
+ * File:        jquery.dataTables.min.js
+ * Version:     1.8.1
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Info:        www.datatables.net
+ * 
+ * Copyright 2008-2010 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ * 
+ * This source file 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 license files for details.
+ */
+(function(i,wa,p){i.fn.dataTableSettings=[];var D=i.fn.dataTableSettings;i.fn.dataTableExt={};var o=i.fn.dataTableExt;o.sVersion="1.8.1";o.sErrMode="alert";o.iApiIndex=0;o.oApi={};o.afnFiltering=[];o.aoFeatures=[];o.ofnSearch={};o.afnSortData=[];o.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
+sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
+sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};o.oJUIClasses={sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",
+sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",
+sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last ui-corner-tr ui-corner-br",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",
+sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollWrapper:"dataTables_scroll",
+sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};o.oPagination={two_button:{fnInit:function(g,l,r){var s,w,y;if(g.bJUI){s=p.createElement("a");w=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;w.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;
+s.appendChild(y)}else{s=p.createElement("div");w=p.createElement("div")}s.className=g.oClasses.sPagePrevDisabled;w.className=g.oClasses.sPageNextDisabled;s.title=g.oLanguage.oPaginate.sPrevious;w.title=g.oLanguage.oPaginate.sNext;l.appendChild(s);l.appendChild(w);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(s).bind("selectstart.DT",function(){return false});i(w).bind("selectstart.DT",function(){return false});
+if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_previous");w.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l=g.aanFeatures.p,r=0,s=l.length;r<s;r++)if(l[r].childNodes.length!==0){l[r].childNodes[0].className=g._iDisplayStart===0?g.oClasses.sPagePrevDisabled:g.oClasses.sPagePrevEnabled;l[r].childNodes[1].className=g.fnDisplayEnd()==g.fnRecordsDisplay()?g.oClasses.sPageNextDisabled:
+g.oClasses.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(g,l,r){var s=p.createElement("span"),w=p.createElement("span"),y=p.createElement("span"),G=p.createElement("span"),x=p.createElement("span");s.innerHTML=g.oLanguage.oPaginate.sFirst;w.innerHTML=g.oLanguage.oPaginate.sPrevious;G.innerHTML=g.oLanguage.oPaginate.sNext;x.innerHTML=g.oLanguage.oPaginate.sLast;var v=g.oClasses;s.className=v.sPageButton+" "+v.sPageFirst;w.className=v.sPageButton+" "+v.sPagePrevious;G.className=
+v.sPageButton+" "+v.sPageNext;x.className=v.sPageButton+" "+v.sPageLast;l.appendChild(s);l.appendChild(w);l.appendChild(y);l.appendChild(G);l.appendChild(x);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"first")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(G).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(x).bind("click.DT",function(){g.oApi._fnPageChange(g,"last")&&r(g)});i("span",l).bind("mousedown.DT",function(){return false}).bind("selectstart.DT",
+function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_first");w.setAttribute("id",g.sTableId+"_previous");G.setAttribute("id",g.sTableId+"_next");x.setAttribute("id",g.sTableId+"_last")}},fnUpdate:function(g,l){if(g.aanFeatures.p){var r=o.oPagination.iFullNumbersShowPages,s=Math.floor(r/2),w=Math.ceil(g.fnRecordsDisplay()/g._iDisplayLength),y=Math.ceil(g._iDisplayStart/g._iDisplayLength)+1,G=
+"",x,v=g.oClasses;if(w<r){s=1;x=w}else if(y<=s){s=1;x=r}else if(y>=w-s){s=w-r+1;x=w}else{s=y-Math.ceil(r/2)+1;x=s+r-1}for(r=s;r<=x;r++)G+=y!=r?'<span class="'+v.sPageButton+'">'+r+"</span>":'<span class="'+v.sPageButtonActive+'">'+r+"</span>";x=g.aanFeatures.p;var z,Y=function(L){g._iDisplayStart=(this.innerHTML*1-1)*g._iDisplayLength;l(g);L.preventDefault()},V=function(){return false};r=0;for(s=x.length;r<s;r++)if(x[r].childNodes.length!==0){z=i("span:eq(2)",x[r]);z.html(G);i("span",z).bind("click.DT",
+Y).bind("mousedown.DT",V).bind("selectstart.DT",V);z=x[r].getElementsByTagName("span");z=[z[0],z[1],z[z.length-2],z[z.length-1]];i(z).removeClass(v.sPageButton+" "+v.sPageButtonActive+" "+v.sPageButtonStaticDisabled);if(y==1){z[0].className+=" "+v.sPageButtonStaticDisabled;z[1].className+=" "+v.sPageButtonStaticDisabled}else{z[0].className+=" "+v.sPageButton;z[1].className+=" "+v.sPageButton}if(w===0||y==w||g._iDisplayLength==-1){z[2].className+=" "+v.sPageButtonStaticDisabled;z[3].className+=" "+
+v.sPageButtonStaticDisabled}else{z[2].className+=" "+v.sPageButton;z[3].className+=" "+v.sPageButton}}}}}};o.oSort={"string-asc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?-1:g>l?1:0},"string-desc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?1:g>l?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<
+l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?1:g>l?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return l-
+g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};o.aTypes=[function(g){if(typeof g=="number")return"numeric";else if(typeof g!="string")return null;var l,r=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var s=1;s<g.length;s++){l=g.charAt(s);if("0123456789.".indexOf(l)==-1)return null;if(l=="."){if(r)return null;r=true}}return"numeric"},function(g){var l=Date.parse(g);
+if(l!==null&&!isNaN(l)||typeof g=="string"&&g.length===0)return"date";return null},function(g){if(typeof g=="string"&&g.indexOf("<")!=-1&&g.indexOf(">")!=-1)return"html";return null}];o.fnVersionCheck=function(g){var l=function(x,v){for(;x.length<v;)x+="0";return x},r=o.sVersion.split(".");g=g.split(".");for(var s="",w="",y=0,G=g.length;y<G;y++){s+=l(r[y],3);w+=l(g[y],3)}return parseInt(s,10)>=parseInt(w,10)};o._oExternConfig={iNextUnique:0};i.fn.dataTable=function(g){function l(){this.fnRecordsTotal=
+function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false||this._iDisplayLength==-1?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd};this.sInstance=
+this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false,bDeferRender:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,bInfinite:false,iLoadGap:100,iBarWidth:0,bAutoCss:true};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",
+sLoadingRecords:"Loading...",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"},fnInfoCallback:null};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.aoHeader=[];this.aoFooter=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false,
+bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.sDestroyWidth=0;this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];this.fnInitComplete=this.fnPreDrawCallback=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.bInitialised=this.bDeferLoading=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button";
+this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.fnCookieCallback=null;this.aoStateSave=[];this.aoStateLoad=[];this.sAjaxSource=this.oLoadedState=null;this.sAjaxDataProp="aaData";this.bAjaxDataGet=true;this.jqXHR=null;this.fnServerData=function(a,b,c,d){d.jqXHR=i.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(f,e){e=="parsererror"&&alert("DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})};
+this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d<b;d++){if(d%3===0&&d!==0)c=","+c;c=a[b-d-1]+c}}return c};this.aLengthMenu=[10,25,50,100];this.bDrawing=this.iDraw=0;this.iDrawError=-1;this._iDisplayLength=10;this._iDisplayStart=0;this._iDisplayEnd=10;this._iRecordsDisplay=this._iRecordsTotal=0;this.bJUI=false;this.oClasses=o.oStdClasses;this.bSortCellsTop=this.bSorted=this.bFiltered=false;this.oInit=null}function r(a){return function(){var b=
+[A(this[o.iApiIndex])].concat(Array.prototype.slice.call(arguments));return o.oApi[a].apply(this,b)}}function s(a){var b,c,d=a.iInitDisplayStart;if(a.bInitialised===false)setTimeout(function(){s(a)},200);else{xa(a);V(a);L(a,a.aoHeader);a.nTFoot&&L(a,a.aoFooter);K(a,true);a.oFeatures.bAutoWidth&&ea(a);b=0;for(c=a.aoColumns.length;b<c;b++)if(a.aoColumns[b].sWidth!==null)a.aoColumns[b].nTh.style.width=u(a.aoColumns[b].sWidth);if(a.oFeatures.bSort)R(a);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);
+else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}if(a.sAjaxSource!==null&&!a.oFeatures.bServerSide)a.fnServerData.call(a.oInstance,a.sAjaxSource,[],function(f){var e=f;if(a.sAjaxDataProp!=="")e=Z(a.sAjaxDataProp)(f);for(b=0;b<e.length;b++)v(a,e[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)R(a);else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}K(a,false);w(a,f)},a);else if(!a.oFeatures.bServerSide){K(a,false);w(a)}}}function w(a,b){a._bInitComplete=true;if(typeof a.fnInitComplete=="function")typeof b!=
+"undefined"?a.fnInitComplete.call(a.oInstance,a,b):a.fnInitComplete.call(a.oInstance,a)}function y(a,b,c){n(a.oLanguage,b,"sProcessing");n(a.oLanguage,b,"sLengthMenu");n(a.oLanguage,b,"sEmptyTable");n(a.oLanguage,b,"sLoadingRecords");n(a.oLanguage,b,"sZeroRecords");n(a.oLanguage,b,"sInfo");n(a.oLanguage,b,"sInfoEmpty");n(a.oLanguage,b,"sInfoFiltered");n(a.oLanguage,b,"sInfoPostFix");n(a.oLanguage,b,"sSearch");if(typeof b.oPaginate!="undefined"){n(a.oLanguage.oPaginate,b.oPaginate,"sFirst");n(a.oLanguage.oPaginate,
+b.oPaginate,"sPrevious");n(a.oLanguage.oPaginate,b.oPaginate,"sNext");n(a.oLanguage.oPaginate,b.oPaginate,"sLast")}typeof b.sEmptyTable=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sEmptyTable");typeof b.sLoadingRecords=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sLoadingRecords");c&&s(a)}function G(a,b){var c=a.aoColumns.length;b={sType:null,_bAutoType:true,bVisible:true,bSearchable:true,bSortable:true,asSorting:["asc","desc"],
+sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,sTitle:b?b.innerHTML:"",sName:"",sWidth:null,sWidthOrig:null,sClass:null,fnRender:null,bUseRendered:true,iDataSort:c,mDataProp:c,fnGetData:null,fnSetData:null,sSortDataType:"std",sDefaultContent:null,sContentPadding:"",nTh:b?b:p.createElement("th"),nTf:null};a.aoColumns.push(b);if(typeof a.aoPreSearchCols[c]=="undefined"||a.aoPreSearchCols[c]===null)a.aoPreSearchCols[c]={sSearch:"",bRegex:false,bSmart:true};else{if(typeof a.aoPreSearchCols[c].bRegex==
+"undefined")a.aoPreSearchCols[c].bRegex=true;if(typeof a.aoPreSearchCols[c].bSmart=="undefined")a.aoPreSearchCols[c].bSmart=true}x(a,c,null)}function x(a,b,c){b=a.aoColumns[b];if(typeof c!="undefined"&&c!==null){if(typeof c.sType!="undefined"){b.sType=c.sType;b._bAutoType=false}n(b,c,"bVisible");n(b,c,"bSearchable");n(b,c,"bSortable");n(b,c,"sTitle");n(b,c,"sName");n(b,c,"sWidth");n(b,c,"sWidth","sWidthOrig");n(b,c,"sClass");n(b,c,"fnRender");n(b,c,"bUseRendered");n(b,c,"iDataSort");n(b,c,"mDataProp");
+n(b,c,"asSorting");n(b,c,"sSortDataType");n(b,c,"sDefaultContent");n(b,c,"sContentPadding")}b.fnGetData=Z(b.mDataProp);b.fnSetData=ya(b.mDataProp);if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortable;b.sSortingClassJUI=a.oClasses.sSortJUI}else if(i.inArray("asc",
+b.asSorting)!=-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function v(a,b){var c;c=typeof b.length=="number"?b.slice():i.extend(true,{},b);b=a.aoData.length;var d={nTr:null,_iId:a.iNextId++,_aData:c,_anHidden:[],_sRowStripe:""};a.aoData.push(d);for(var f,
+e=0,h=a.aoColumns.length;e<h;e++){c=a.aoColumns[e];typeof c.fnRender=="function"&&c.bUseRendered&&c.mDataProp!==null&&N(a,b,e,c.fnRender({iDataRow:b,iDataColumn:e,aData:d._aData,oSettings:a}));if(c._bAutoType&&c.sType!="string"){f=H(a,b,e,"type");if(f!==null&&f!==""){f=fa(f);if(c.sType===null)c.sType=f;else if(c.sType!=f)c.sType="string"}}}a.aiDisplayMaster.push(b);a.oFeatures.bDeferRender||z(a,b);return b}function z(a,b){var c=a.aoData[b],d;if(c.nTr===null){c.nTr=p.createElement("tr");typeof c._aData.DT_RowId!=
+"undefined"&&c.nTr.setAttribute("id",c._aData.DT_RowId);typeof c._aData.DT_RowClass!="undefined"&&i(c.nTr).addClass(c._aData.DT_RowClass);for(var f=0,e=a.aoColumns.length;f<e;f++){var h=a.aoColumns[f];d=p.createElement("td");d.innerHTML=typeof h.fnRender=="function"&&(!h.bUseRendered||h.mDataProp===null)?h.fnRender({iDataRow:b,iDataColumn:f,aData:c._aData,oSettings:a}):H(a,b,f,"display");if(h.sClass!==null)d.className=h.sClass;if(h.bVisible){c.nTr.appendChild(d);c._anHidden[f]=null}else c._anHidden[f]=
+d}}}function Y(a){var b,c,d,f,e,h,j,k,m;if(a.bDeferLoading||a.sAjaxSource===null){j=a.nTBody.childNodes;b=0;for(c=j.length;b<c;b++)if(j[b].nodeName.toUpperCase()=="TR"){k=a.aoData.length;a.aoData.push({nTr:j[b],_iId:a.iNextId++,_aData:[],_anHidden:[],_sRowStripe:""});a.aiDisplayMaster.push(k);h=j[b].childNodes;d=e=0;for(f=h.length;d<f;d++){m=h[d].nodeName.toUpperCase();if(m=="TD"||m=="TH"){N(a,k,e,i.trim(h[d].innerHTML));e++}}}}j=$(a);h=[];b=0;for(c=j.length;b<c;b++){d=0;for(f=j[b].childNodes.length;d<
+f;d++){e=j[b].childNodes[d];m=e.nodeName.toUpperCase();if(m=="TD"||m=="TH")h.push(e)}}h.length!=j.length*a.aoColumns.length&&J(a,1,"Unexpected number of TD elements. Expected "+j.length*a.aoColumns.length+" and got "+h.length+". DataTables does not support rowspan / colspan in the table body, and there must be one cell for each row/column combination.");d=0;for(f=a.aoColumns.length;d<f;d++){if(a.aoColumns[d].sTitle===null)a.aoColumns[d].sTitle=a.aoColumns[d].nTh.innerHTML;j=a.aoColumns[d]._bAutoType;
+m=typeof a.aoColumns[d].fnRender=="function";e=a.aoColumns[d].sClass!==null;k=a.aoColumns[d].bVisible;var t,q;if(j||m||e||!k){b=0;for(c=a.aoData.length;b<c;b++){t=h[b*f+d];if(j&&a.aoColumns[d].sType!="string"){q=H(a,b,d,"type");if(q!==""){q=fa(q);if(a.aoColumns[d].sType===null)a.aoColumns[d].sType=q;else if(a.aoColumns[d].sType!=q)a.aoColumns[d].sType="string"}}if(m){q=a.aoColumns[d].fnRender({iDataRow:b,iDataColumn:d,aData:a.aoData[b]._aData,oSettings:a});t.innerHTML=q;a.aoColumns[d].bUseRendered&&
+N(a,b,d,q)}if(e)t.className+=" "+a.aoColumns[d].sClass;if(k)a.aoData[b]._anHidden[d]=null;else{a.aoData[b]._anHidden[d]=t;t.parentNode.removeChild(t)}}}}}function V(a){var b,c,d;a.nTHead.getElementsByTagName("tr");if(a.nTHead.getElementsByTagName("th").length!==0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}}else{var f=p.createElement("tr");b=0;
+for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);f.appendChild(c)}i(a.nTHead).html("")[0].appendChild(f);W(a.aoHeader,a.nTHead)}if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;f=p.createElement("div");f.className=a.oClasses.sSortJUIWrapper;i(c).contents().appendTo(f);var e=p.createElement("span");e.className=a.oClasses.sSortIcon;f.appendChild(e);c.appendChild(f)}}d=function(){this.onselectstart=
+function(){return false};return false};if(a.oFeatures.bSort)for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable!==false){ga(a,a.aoColumns[b].nTh,b);i(a.aoColumns[b].nTh).bind("mousedown.DT",d)}else i(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);a.oClasses.sFooterTH!==""&&i(">tr>th",a.nTFoot).addClass(a.oClasses.sFooterTH);if(a.nTFoot!==null){c=S(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)if(typeof c[b]!="undefined")a.aoColumns[b].nTf=c[b]}}function L(a,b,c){var d,f,
+e,h=[],j=[],k=a.aoColumns.length;if(typeof c=="undefined")c=false;d=0;for(f=b.length;d<f;d++){h[d]=b[d].slice();h[d].nTr=b[d].nTr;for(e=k-1;e>=0;e--)!a.aoColumns[e].bVisible&&!c&&h[d].splice(e,1);j.push([])}d=0;for(f=h.length;d<f;d++){if(h[d].nTr){a=0;for(e=h[d].nTr.childNodes.length;a<e;a++)h[d].nTr.removeChild(h[d].nTr.childNodes[0])}e=0;for(b=h[d].length;e<b;e++){k=c=1;if(typeof j[d][e]=="undefined"){h[d].nTr.appendChild(h[d][e].cell);for(j[d][e]=1;typeof h[d+c]!="undefined"&&h[d][e].cell==h[d+
+c][e].cell;){j[d+c][e]=1;c++}for(;typeof h[d][e+k]!="undefined"&&h[d][e].cell==h[d][e+k].cell;){for(a=0;a<c;a++)j[d+a][e+k]=1;k++}h[d][e].cell.setAttribute("rowspan",c);h[d][e].cell.setAttribute("colspan",k)}}}}function C(a){var b,c,d=[],f=0,e=false;b=a.asStripClasses.length;c=a.aoOpenRows.length;if(!(a.fnPreDrawCallback!==null&&a.fnPreDrawCallback.call(a.oInstance,a)===false)){a.bDrawing=true;if(typeof a.iInitDisplayStart!="undefined"&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?
+a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;E(a)}if(a.bDeferLoading){a.bDeferLoading=false;a.iDraw++}else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!za(a))return}else a.iDraw++;if(a.aiDisplay.length!==0){var h=a._iDisplayStart,j=a._iDisplayEnd;if(a.oFeatures.bServerSide){h=0;j=a.aoData.length}for(h=h;h<j;h++){var k=a.aoData[a.aiDisplay[h]];k.nTr===null&&z(a,a.aiDisplay[h]);var m=k.nTr;if(b!==0){var t=a.asStripClasses[f%b];if(k._sRowStripe!=
+t){i(m).removeClass(k._sRowStripe).addClass(t);k._sRowStripe=t}}if(typeof a.fnRowCallback=="function"){m=a.fnRowCallback.call(a.oInstance,m,a.aoData[a.aiDisplay[h]]._aData,f,h);if(!m&&!e){J(a,0,"A node was not returned by fnRowCallback");e=true}}d.push(m);f++;if(c!==0)for(k=0;k<c;k++)m==a.aoOpenRows[k].nParent&&d.push(a.aoOpenRows[k].nTr)}}else{d[0]=p.createElement("tr");if(typeof a.asStripClasses[0]!="undefined")d[0].className=a.asStripClasses[0];e=a.oLanguage.sZeroRecords.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()));
+if(a.iDraw==1&&a.sAjaxSource!==null&&!a.oFeatures.bServerSide)e=a.oLanguage.sLoadingRecords;else if(typeof a.oLanguage.sEmptyTable!="undefined"&&a.fnRecordsTotal()===0)e=a.oLanguage.sEmptyTable;b=p.createElement("td");b.setAttribute("valign","top");b.colSpan=X(a);b.className=a.oClasses.sRowEmpty;b.innerHTML=e;d[f].appendChild(b)}typeof a.fnHeaderCallback=="function"&&a.fnHeaderCallback.call(a.oInstance,i(">tr",a.nTHead)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback==
+"function"&&a.fnFooterCallback.call(a.oInstance,i(">tr",a.nTFoot)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f=p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered){c=a.nTBody.childNodes;for(b=c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b])}b=0;for(c=d.length;b<c;b++)f.appendChild(d[b]);a.nTBody.appendChild(f);e!==null&&e.appendChild(a.nTBody)}for(b=a.aoDrawCallback.length-
+1;b>=0;b--)a.aoDrawCallback[b].fn.call(a.oInstance,a);a.bSorted=false;a.bFiltered=false;a.bDrawing=false;if(a.oFeatures.bServerSide){K(a,false);typeof a._bInitComplete=="undefined"&&w(a)}}}function ba(a){if(a.oFeatures.bSort)R(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);else{E(a);C(a)}}function za(a){if(a.bAjaxDataGet){K(a,true);var b=a.aoColumns.length,c=[],d,f;a.iDraw++;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:ha(a)});
+c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==false?a._iDisplayLength:-1});for(f=0;f<b;f++){d=a.aoColumns[f].mDataProp;c.push({name:"mDataProp_"+f,value:typeof d=="function"?"function":d})}if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++){c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch});c.push({name:"bRegex_"+
+f,value:a.aoPreSearchCols[f].bRegex});c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}}if(a.oFeatures.bSort!==false){d=a.aaSortingFixed!==null?a.aaSortingFixed.length:0;var e=a.aaSorting.length;c.push({name:"iSortingCols",value:d+e});for(f=0;f<d;f++){c.push({name:"iSortCol_"+f,value:a.aaSortingFixed[f][0]});c.push({name:"sSortDir_"+f,value:a.aaSortingFixed[f][1]})}for(f=0;f<e;f++){c.push({name:"iSortCol_"+(f+d),value:a.aaSorting[f][0]});c.push({name:"sSortDir_"+(f+d),value:a.aaSorting[f][1]})}for(f=
+0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(h){Aa(a,h)},a);return false}else return true}function Aa(a,b){if(typeof b.sEcho!="undefined")if(b.sEcho*1<a.iDraw)return;else a.iDraw=b.sEcho*1;if(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))ia(a);a._iRecordsTotal=b.iTotalRecords;a._iRecordsDisplay=b.iTotalDisplayRecords;var c=ha(a);if(c=typeof b.sColumns!="undefined"&&c!==""&&b.sColumns!=c)var d=
+Ba(a,b.sColumns);b=Z(a.sAjaxDataProp)(b);for(var f=0,e=b.length;f<e;f++)if(c){for(var h=[],j=0,k=a.aoColumns.length;j<k;j++)h.push(b[f][d[j]]);v(a,h)}else v(a,b[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;C(a);a.bAjaxDataGet=true;K(a,false)}function xa(a){var b=p.createElement("div");a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=p.createElement("div");a.nTableWrapper.className=a.oClasses.sWrapper;a.sTableId!==""&&a.nTableWrapper.setAttribute("id",a.sTableId+"_wrapper");
+a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),f,e,h,j,k,m,t,q=0;q<d.length;q++){e=0;h=d[q];if(h=="<"){j=p.createElement("div");k=d[q+1];if(k=="'"||k=='"'){m="";for(t=2;d[q+t]!=k;){m+=d[q+t];t++}if(m=="H")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(m=="F")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";if(m.indexOf(".")!=-1){k=m.split(".");j.setAttribute("id",k[0].substr(1,
+k[0].length-1));j.className=k[1]}else if(m.charAt(0)=="#")j.setAttribute("id",m.substr(1,m.length-1));else j.className=m;q+=t}c.appendChild(j);c=j}else if(h==">")c=c.parentNode;else if(h=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=Ca(a);e=1}else if(h=="f"&&a.oFeatures.bFilter){f=Da(a);e=1}else if(h=="r"&&a.oFeatures.bProcessing){f=Ea(a);e=1}else if(h=="t"){f=Fa(a);e=1}else if(h=="i"&&a.oFeatures.bInfo){f=Ga(a);e=1}else if(h=="p"&&a.oFeatures.bPaginate){f=Ha(a);e=1}else if(o.aoFeatures.length!==
+0){j=o.aoFeatures;t=0;for(k=j.length;t<k;t++)if(h==j[t].cFeature){if(f=j[t].fnInit(a))e=1;break}}if(e==1&&f!==null){if(typeof a.aanFeatures[h]!="object")a.aanFeatures[h]=[];a.aanFeatures[h].push(f);c.appendChild(f)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function Fa(a){if(a.oScroll.sX===""&&a.oScroll.sY==="")return a.nTable;var b=p.createElement("div"),c=p.createElement("div"),d=p.createElement("div"),f=p.createElement("div"),e=p.createElement("div"),h=p.createElement("div"),j=a.nTable.cloneNode(false),
+k=a.nTable.cloneNode(false),m=a.nTable.getElementsByTagName("thead")[0],t=a.nTable.getElementsByTagName("tfoot").length===0?null:a.nTable.getElementsByTagName("tfoot")[0],q=typeof g.bJQueryUI!="undefined"&&g.bJQueryUI?o.oJUIClasses:o.oStdClasses;c.appendChild(d);e.appendChild(h);f.appendChild(a.nTable);b.appendChild(c);b.appendChild(f);d.appendChild(j);j.appendChild(m);if(t!==null){b.appendChild(e);h.appendChild(k);k.appendChild(t)}b.className=q.sScrollWrapper;c.className=q.sScrollHead;d.className=
+q.sScrollHeadInner;f.className=q.sScrollBody;e.className=q.sScrollFoot;h.className=q.sScrollFootInner;if(a.oScroll.bAutoCss){c.style.overflow="hidden";c.style.position="relative";e.style.overflow="hidden";f.style.overflow="auto"}c.style.border="0";c.style.width="100%";e.style.border="0";d.style.width="150%";j.removeAttribute("id");j.style.marginLeft="0";a.nTable.style.marginLeft="0";if(t!==null){k.removeAttribute("id");k.style.marginLeft="0"}d=i(">caption",a.nTable);h=0;for(k=d.length;h<k;h++)j.appendChild(d[h]);
+if(a.oScroll.sX!==""){c.style.width=u(a.oScroll.sX);f.style.width=u(a.oScroll.sX);if(t!==null)e.style.width=u(a.oScroll.sX);i(f).scroll(function(){c.scrollLeft=this.scrollLeft;if(t!==null)e.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!=="")f.style.height=u(a.oScroll.sY);a.aoDrawCallback.push({fn:Ia,sName:"scrolling"});a.oScroll.bInfinite&&i(f).scroll(function(){if(!a.bDrawing)if(i(this).scrollTop()+i(this).height()>i(a.nTable).height()-a.oScroll.iLoadGap)if(a.fnDisplayEnd()<a.fnRecordsDisplay()){ja(a,
+"next");E(a);C(a)}});a.nScrollHead=c;a.nScrollFoot=e;return b}function Ia(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,f,e,h,j,k,m,t,q,I=[];h=a.nTable.getElementsByTagName("thead");h.length>0&&a.nTable.removeChild(h[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}h=a.nTHead.cloneNode(true);a.nTable.insertBefore(h,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);
+a.nTable.insertBefore(k,a.nTable.childNodes[1])}if(a.oScroll.sX===""){d.style.width="100%";b.parentNode.style.width="100%"}var O=S(a,h);f=0;for(e=O.length;f<e;f++){t=Ja(a,f);O[f].style.width=a.aoColumns[t].sWidth}a.nTFoot!==null&&P(function(B){B.style.width=""},k.getElementsByTagName("tr"));f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(i.browser.msie&&i.browser.version<=7)a.nTable.style.width=u(i(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!==
+"")a.nTable.style.width=u(a.oScroll.sXInner);else if(f==i(d).width()&&i(d).height()<i(a.nTable).height()){a.nTable.style.width=u(f-a.oScroll.iBarWidth);if(i(a.nTable).outerWidth()>f-a.oScroll.iBarWidth)a.nTable.style.width=u(f)}else a.nTable.style.width=u(f);f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){d.style.width=u(f+a.oScroll.iBarWidth);b.parentNode.style.width=u(f+a.oScroll.iBarWidth)}e=a.nTHead.getElementsByTagName("tr");h=h.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop=
+"0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},h,e);i(h).height(0);if(a.nTFoot!==null){j=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},j,k);i(j).height(0)}P(function(B){B.innerHTML="";B.style.width=u(I.shift())},h);a.nTFoot!==null&&P(function(B){B.innerHTML=
+"";B.style.width=u(I.shift())},j);if(i(a.nTable).outerWidth()<f)if(a.oScroll.sX==="")J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you enable x-scrolling or increase the width the table has in which to be drawn");else a.oScroll.sXInner!==""&&J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you increase the sScrollXInner property to allow it to draw in a larger area, or simply remove that parameter to allow automatic calculation");
+if(a.oScroll.sY==="")if(i.browser.msie&&i.browser.version<=7)d.style.height=u(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=u(a.oScroll.sY);j=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=u(i(a.nTable).height()+j)}j=i(a.nTable).outerWidth();c.style.width=u(j);b.style.width=u(j+a.oScroll.iBarWidth);if(a.nTFoot!==null){b=a.nScrollFoot.getElementsByTagName("div")[0];
+c=b.getElementsByTagName("table")[0];b.style.width=u(a.nTable.offsetWidth+a.oScroll.iBarWidth);c.style.width=u(a.nTable.offsetWidth)}if(a.bSorted||a.bFiltered)d.scrollTop=0}function ca(a){if(a.oFeatures.bAutoWidth===false)return false;ea(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function Da(a){var b=a.oLanguage.sSearch;b=b.indexOf("_INPUT_")!==-1?b.replace("_INPUT_",'<input type="text" />'):b===""?'<input type="text" />':b+' <input type="text" />';
+var c=p.createElement("div");c.className=a.oClasses.sFilter;c.innerHTML="<label>"+b+"</label>";a.sTableId!==""&&typeof a.aanFeatures.f=="undefined"&&c.setAttribute("id",a.sTableId+"_filter");b=i("input",c);b.val(a.oPreviousSearch.sSearch.replace('"',"&quot;"));b.bind("keyup.DT",function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f<e;f++)d[f]!=this.parentNode&&i("input",d[f]).val(this.value);this.value!=a.oPreviousSearch.sSearch&&M(a,{sSearch:this.value,bRegex:a.oPreviousSearch.bRegex,bSmart:a.oPreviousSearch.bSmart})});
+b.bind("keypress.DT",function(d){if(d.keyCode==13)return false});return c}function M(a,b,c){Ka(a,b.sSearch,c,b.bRegex,b.bSmart);for(b=0;b<a.aoPreSearchCols.length;b++)La(a,a.aoPreSearchCols[b].sSearch,b,a.aoPreSearchCols[b].bRegex,a.aoPreSearchCols[b].bSmart);o.afnFiltering.length!==0&&Ma(a);a.bFiltered=true;a._iDisplayStart=0;E(a);C(a);ka(a,0)}function Ma(a){for(var b=o.afnFiltering,c=0,d=b.length;c<d;c++)for(var f=0,e=0,h=a.aiDisplay.length;e<h;e++){var j=a.aiDisplay[e-f];if(!b[c](a,da(a,j,"filter"),
+j)){a.aiDisplay.splice(e-f,1);f++}}}function La(a,b,c,d,f){if(b!==""){var e=0;b=la(b,d,f);for(d=a.aiDisplay.length-1;d>=0;d--){f=ma(H(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d,1);e++}}}}function Ka(a,b,c,d,f){var e=la(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(o.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||a.oPreviousSearch.sSearch.length>
+b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);ka(a,1);for(c=0;c<a.aiDisplayMaster.length;c++)e.test(a.asDataSearch[c])&&a.aiDisplay.push(a.aiDisplayMaster[c])}else{var h=0;for(c=0;c<a.asDataSearch.length;c++)if(!e.test(a.asDataSearch[c])){a.aiDisplay.splice(c-h,1);h++}}a.oPreviousSearch.sSearch=b;a.oPreviousSearch.bRegex=d;a.oPreviousSearch.bSmart=f}function ka(a,b){a.asDataSearch.splice(0,a.asDataSearch.length);b=typeof b!="undefined"&&b==1?a.aiDisplayMaster:
+a.aiDisplay;for(var c=0,d=b.length;c<d;c++)a.asDataSearch[c]=na(a,da(a,b[c],"filter"))}function na(a,b){var c="";if(typeof a.__nTmpFilter=="undefined")a.__nTmpFilter=p.createElement("div");for(var d=a.__nTmpFilter,f=0,e=a.aoColumns.length;f<e;f++)if(a.aoColumns[f].bSearchable)c+=ma(b[f],a.aoColumns[f].sType)+"  ";if(c.indexOf("&")!==-1){d.innerHTML=c;c=d.textContent?d.textContent:d.innerText;c=c.replace(/\n/g," ").replace(/\r/g,"")}return c}function la(a,b,c){if(c){a=b?a.split(" "):oa(a).split(" ");
+a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,"i")}else{a=b?a:oa(a);return new RegExp(a,"i")}}function ma(a,b){if(typeof o.ofnSearch[b]=="function")return o.ofnSearch[b](a);else if(b=="html")return a.replace(/\n/g," ").replace(/<.*?>/g,"");else if(typeof a=="string")return a.replace(/\n/g," ");else if(a===null)return"";return a}function R(a,b){var c,d,f,e,h=[],j=[],k=o.oSort;d=a.aoData;var m=a.aoColumns;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||a.aaSortingFixed!==null)){h=a.aaSortingFixed!==
+null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<h.length;c++){var t=h[c][0];f=pa(a,t);e=a.aoColumns[t].sSortDataType;if(typeof o.afnSortData[e]!="undefined"){var q=o.afnSortData[e](a,t,f);f=0;for(e=d.length;f<e;f++)N(a,f,t,q[f])}}c=0;for(d=a.aiDisplayMaster.length;c<d;c++)j[a.aiDisplayMaster[c]]=c;var I=h.length;a.aiDisplayMaster.sort(function(O,B){var F,qa;for(c=0;c<I;c++){F=m[h[c][0]].iDataSort;qa=m[F].sType;F=k[(qa?qa:"string")+"-"+h[c][1]](H(a,O,F,"sort"),H(a,B,F,"sort"));
+if(F!==0)return F}return k["numeric-asc"](j[O],j[B])})}if((typeof b=="undefined"||b)&&!a.oFeatures.bDeferRender)T(a);a.bSorted=true;if(a.oFeatures.bFilter)M(a,a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;E(a);C(a)}}function ga(a,b,c,d){i(b).bind("click.DT",function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var h,j;if(f.shiftKey){for(var k=false,m=0;m<a.aaSorting.length;m++)if(a.aaSorting[m][0]==c){k=true;h=a.aaSorting[m][0];j=a.aaSorting[m][2]+
+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")a.aaSorting.splice(m,1);else{a.aaSorting[m][1]=a.aoColumns[h].asSorting[j];a.aaSorting[m][2]=j}break}k===false&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){h=a.aaSorting[0][0];j=a.aaSorting[0][2]+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")j=0;a.aaSorting[0][1]=a.aoColumns[h].asSorting[j];a.aaSorting[0][2]=j}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],
+0])}R(a)};if(a.oFeatures.bProcessing){K(a,true);setTimeout(function(){e();a.oFeatures.bServerSide||K(a,false)},0)}else e();typeof d=="function"&&d(a)}})}function T(a){var b,c,d,f,e,h=a.aoColumns.length,j=a.oClasses;for(b=0;b<h;b++)a.aoColumns[b].bSortable&&i(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);f=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){e=a.aoColumns[b].sSortingClass;
+d=-1;for(c=0;c<f.length;c++)if(f[c][0]==b){e=f[c][1]=="asc"?j.sSortAsc:j.sSortDesc;d=c;break}i(a.aoColumns[b].nTh).addClass(e);if(a.bJUI){c=i("span",a.aoColumns[b].nTh);c.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:f[d][1]=="asc"?j.sSortJUIAsc:j.sSortJUIDesc)}}else i(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);e=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=
+Q(a);if(a.oFeatures.bDeferRender)i(d).removeClass(e+"1 "+e+"2 "+e+"3");else if(d.length>=h)for(b=0;b<h;b++)if(d[b].className.indexOf(e+"1")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"1",""))}else if(d[b].className.indexOf(e+"2")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"2",""))}else if(d[b].className.indexOf(e+"3")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(" "+
+e+"3",""))}j=1;var k;for(b=0;b<f.length;b++){k=parseInt(f[b][0],10);c=0;for(a=d.length/h;c<a;c++)d[h*c+k].className+=" "+e+j;j<3&&j++}}}function Ha(a){if(a.oScroll.bInfinite)return null;var b=p.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;o.oPagination[a.sPaginationType].fnInit(a,b,function(c){E(c);C(c)});typeof a.aanFeatures.p=="undefined"&&a.aoDrawCallback.push({fn:function(c){o.oPagination[c.sPaginationType].fnUpdate(c,function(d){E(d);C(d)})},sName:"pagination"});return b}
+function ja(a,b){var c=a._iDisplayStart;if(b=="first")a._iDisplayStart=0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=
+0;else J(a,0,"Unknown paging action: "+b);return c!=a._iDisplayStart}function Ga(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Na,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b}function Na(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=a._iDisplayStart+1,c=a.fnDisplayEnd(),d=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),e=a.fnFormatNumber(b),h=a.fnFormatNumber(c),j=
+a.fnFormatNumber(d),k=a.fnFormatNumber(f);if(a.oScroll.bInfinite)e=a.fnFormatNumber(1);e=a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()===0?a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",j)+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfo.replace("_START_",e).replace("_END_",h).replace("_TOTAL_",k)+a.oLanguage.sInfoPostFix:a.oLanguage.sInfo.replace("_START_",
+e).replace("_END_",h).replace("_TOTAL_",k)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix;if(a.oLanguage.fnInfoCallback!==null)e=a.oLanguage.fnInfoCallback(a,b,c,d,f,e);a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)i(a[b]).html(e)}}function Ca(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+(a.sTableId===""?"":'name="'+a.sTableId+'_length"')+">",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]==
+"object"){c=0;for(d=a.aLengthMenu[0].length;c<d;c++)b+='<option value="'+a.aLengthMenu[0][c]+'">'+a.aLengthMenu[1][c]+"</option>"}else{c=0;for(d=a.aLengthMenu.length;c<d;c++)b+='<option value="'+a.aLengthMenu[c]+'">'+a.aLengthMenu[c]+"</option>"}b+="</select>";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+"_length");f.className=a.oClasses.sLength;f.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";i('select option[value="'+
+a._iDisplayLength+'"]',f).attr("selected",true);i("select",f).bind("change.DT",function(){var e=i(this).val(),h=a.aanFeatures.l;c=0;for(d=h.length;c<d;c++)h[c]!=this.parentNode&&i("select",h[c]).val(e);a._iDisplayLength=parseInt(e,10);E(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=0}if(a._iDisplayLength==-1)a._iDisplayStart=0;C(a)});return f}function Ea(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.r==
+"undefined"&&b.setAttribute("id",a.sTableId+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function K(a,b){if(a.oFeatures.bProcessing){a=a.aanFeatures.r;for(var c=0,d=a.length;c<d;c++)a[c].style.visibility=b?"visible":"hidden"}}function Ja(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(c==b)return d}return null}function pa(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===
+true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function U(a,b){var c,d;c=a._iDisplayStart;for(d=a._iDisplayEnd;c<d;c++)if(a.aoData[a.aiDisplay[c]].nTr==b)return a.aiDisplay[c];c=0;for(d=a.aoData.length;c<d;c++)if(a.aoData[c].nTr==b)return c;return null}function X(a){for(var b=0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===true&&b++;return b}function E(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||
+a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Oa(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=u(a);b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ea(a){var b=0,c,d=0,f=a.aoColumns.length,e,h=i("th",a.nTHead);for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d++;if(a.aoColumns[e].sWidth!==null){c=Oa(a.aoColumns[e].sWidthOrig,a.nTable.parentNode);if(c!==
+null)a.aoColumns[e].sWidth=u(c);b++}}if(f==h.length&&b===0&&d==f&&a.oScroll.sX===""&&a.oScroll.sY==="")for(e=0;e<a.aoColumns.length;e++){c=i(h[e]).width();if(c!==null)a.aoColumns[e].sWidth=u(c)}else{b=a.nTable.cloneNode(false);e=a.nTHead.cloneNode(true);d=p.createElement("tbody");c=p.createElement("tr");b.removeAttribute("id");b.appendChild(e);if(a.nTFoot!==null){b.appendChild(a.nTFoot.cloneNode(true));P(function(k){k.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(d);d.appendChild(c);
+d=i("thead th",b);if(d.length===0)d=i("tbody tr:eq(0)>td",b);h=S(a,e);for(e=d=0;e<f;e++){var j=a.aoColumns[e];if(j.bVisible&&j.sWidthOrig!==null&&j.sWidthOrig!=="")h[e-d].style.width=u(j.sWidthOrig);else if(j.bVisible)h[e-d].style.width="";else d++}for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d=Pa(a,e);if(d!==null){d=d.cloneNode(true);if(a.aoColumns[e].sContentPadding!=="")d.innerHTML+=a.aoColumns[e].sContentPadding;c.appendChild(d)}}f=a.nTable.parentNode;f.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!==
+"")b.style.width=u(a.oScroll.sXInner);else if(a.oScroll.sX!==""){b.style.width="";if(i(b).width()<f.offsetWidth)b.style.width=u(f.offsetWidth)}else if(a.oScroll.sY!=="")b.style.width=u(f.offsetWidth);b.style.visibility="hidden";Qa(a,b);f=i("tbody tr:eq(0)",b).children();if(f.length===0)f=S(a,i("thead",b)[0]);if(a.oScroll.sX!==""){for(e=d=c=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c+=a.aoColumns[e].sWidthOrig===null?i(f[d]).outerWidth():parseInt(a.aoColumns[e].sWidth.replace("px",""),
+10)+(i(f[d]).outerWidth()-i(f[d]).width());d++}b.style.width=u(c);a.nTable.style.width=u(c)}for(e=d=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c=i(f[d]).width();if(c!==null&&c>0)a.aoColumns[e].sWidth=u(c);d++}a.nTable.style.width=u(i(b).outerWidth());b.parentNode.removeChild(b)}}function Qa(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==""){i(b).width();b.style.width=u(i(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=u(i(b).outerWidth())}function Pa(a,b){var c=
+Ra(a,b);if(c<0)return null;if(a.aoData[c].nTr===null){var d=p.createElement("td");d.innerHTML=H(a,c,b,"");return d}return Q(a,c)[b]}function Ra(a,b){for(var c=-1,d=-1,f=0;f<a.aoData.length;f++){var e=H(a,f,b,"display")+"";e=e.replace(/<.*?>/g,"");if(e.length>c){c=e.length;d=f}}return d}function u(a){if(a===null)return"0px";if(typeof a=="number"){if(a<0)return"0px";return a+"px"}var b=a.charCodeAt(a.length-1);if(b<48||b>57)return a;return a+"px"}function Va(a,b){if(a.length!=b.length)return 1;for(var c=
+0;c<a.length;c++)if(a[c]!=b[c])return 2;return 0}function fa(a){for(var b=o.aTypes,c=b.length,d=0;d<c;d++){var f=b[d](a);if(f!==null)return f}return"string"}function A(a){for(var b=0;b<D.length;b++)if(D[b].nTable==a)return D[b];return null}function aa(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function $(a){for(var b=[],c=0,d=a.aoData.length;c<d;c++)a.aoData[c].nTr!==null&&b.push(a.aoData[c].nTr);return b}function Q(a,b){var c=[],d,f,e,h,j;f=0;var k=a.aoData.length;
+if(typeof b!="undefined"){f=b;k=b+1}for(f=f;f<k;f++){j=a.aoData[f];if(j.nTr!==null){b=[];e=0;for(h=j.nTr.childNodes.length;e<h;e++){d=j.nTr.childNodes[e].nodeName.toLowerCase();if(d=="td"||d=="th")b.push(j.nTr.childNodes[e])}e=d=0;for(h=a.aoColumns.length;e<h;e++)if(a.aoColumns[e].bVisible)c.push(b[e-d]);else{c.push(j._anHidden[e]);d++}}}return c}function oa(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)","g"),"\\$1")}function ra(a,b){for(var c=-1,d=
+0,f=a.length;d<f;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function Ba(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d<f;d++)for(var e=0;e<f;e++)if(a.aoColumns[d].sName==b[e]){c.push(e);break}return c}function ha(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function J(a,b,c){a=a.sTableId===""?"DataTables warning: "+c:"DataTables warning (table id = '"+a.sTableId+"'): "+c;if(b===0)if(o.sErrMode==
+"alert")alert(a);else throw a;else typeof console!="undefined"&&typeof console.log!="undefined"&&console.log(a)}function ia(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,a.aiDisplayMaster.length);a.aiDisplay.splice(0,a.aiDisplay.length);E(a)}function sa(a){if(!(!a.oFeatures.bStateSave||typeof a.bDestroying!="undefined")){var b,c,d,f="{";f+='"iCreate":'+(new Date).getTime()+",";f+='"iStart":'+(a.oScroll.bInfinite?0:a._iDisplayStart)+",";f+='"iEnd":'+(a.oScroll.bInfinite?a._iDisplayLength:
+a._iDisplayEnd)+",";f+='"iLength":'+a._iDisplayLength+",";f+='"sFilter":"'+encodeURIComponent(a.oPreviousSearch.sSearch)+'",';f+='"sFilterEsc":'+!a.oPreviousSearch.bRegex+",";f+='"aaSorting":[ ';for(b=0;b<a.aaSorting.length;b++)f+="["+a.aaSorting[b][0]+',"'+a.aaSorting[b][1]+'"],';f=f.substring(0,f.length-1);f+="],";f+='"aaSearchCols":[ ';for(b=0;b<a.aoPreSearchCols.length;b++)f+='["'+encodeURIComponent(a.aoPreSearchCols[b].sSearch)+'",'+!a.aoPreSearchCols[b].bRegex+"],";f=f.substring(0,f.length-
+1);f+="],";f+='"abVisCols":[ ';for(b=0;b<a.aoColumns.length;b++)f+=a.aoColumns[b].bVisible+",";f=f.substring(0,f.length-1);f+="]";b=0;for(c=a.aoStateSave.length;b<c;b++){d=a.aoStateSave[b].fn(a,f);if(d!=="")f=d}f+="}";Sa(a.sCookiePrefix+a.sInstance,f,a.iCookieDuration,a.sCookiePrefix,a.fnCookieCallback)}}function Ta(a,b){if(a.oFeatures.bStateSave){var c,d,f;d=ta(a.sCookiePrefix+a.sInstance);if(d!==null&&d!==""){try{c=typeof i.parseJSON=="function"?i.parseJSON(d.replace(/'/g,'"')):eval("("+d+")")}catch(e){return}d=
+0;for(f=a.aoStateLoad.length;d<f;d++)if(!a.aoStateLoad[d].fn(a,c))return;a.oLoadedState=i.extend(true,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.oPreviousSearch.sSearch=decodeURIComponent(c.sFilter);a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();if(typeof c.sFilterEsc!="undefined")a.oPreviousSearch.bRegex=!c.sFilterEsc;if(typeof c.aaSearchCols!="undefined")for(d=0;d<c.aaSearchCols.length;d++)a.aoPreSearchCols[d]=
+{sSearch:decodeURIComponent(c.aaSearchCols[d][0]),bRegex:!c.aaSearchCols[d][1]};if(typeof c.abVisCols!="undefined"){b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}}}}}function Sa(a,b,c,d,f){var e=new Date;e.setTime(e.getTime()+c*1E3);c=wa.location.pathname.split("/");a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();var h;if(f!==null){h=typeof i.parseJSON=="function"?i.parseJSON(b):eval("("+b+")");b=f(a,h,e.toGMTString(),
+c.join("/")+"/")}else b=a+"="+encodeURIComponent(b)+"; expires="+e.toGMTString()+"; path="+c.join("/")+"/";f="";e=9999999999999;if((ta(a)!==null?p.cookie.length:b.length+p.cookie.length)+10>4096){a=p.cookie.split(";");for(var j=0,k=a.length;j<k;j++)if(a[j].indexOf(d)!=-1){var m=a[j].split("=");try{h=eval("("+decodeURIComponent(m[1])+")")}catch(t){continue}if(typeof h.iCreate!="undefined"&&h.iCreate<e){f=m[0];e=h.iCreate}}if(f!=="")p.cookie=f+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+
+"/"}p.cookie=b}function ta(a){var b=wa.location.pathname.split("/");a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=p.cookie.split(";");for(var c=0;c<b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function W(a,b){b=b.getElementsByTagName("tr");var c,d,f,e,h,j,k,m,t=function(O,B,F){for(;typeof O[B][F]!="undefined";)F++;return F};a.splice(0,a.length);d=0;for(j=b.length;d<
+j;d++)a.push([]);d=0;for(j=b.length;d<j;d++){f=0;for(k=b[d].childNodes.length;f<k;f++){c=b[d].childNodes[f];if(c.nodeName.toUpperCase()=="TD"||c.nodeName.toUpperCase()=="TH"){var q=c.getAttribute("colspan")*1,I=c.getAttribute("rowspan")*1;q=!q||q===0||q===1?1:q;I=!I||I===0||I===1?1:I;m=t(a,d,0);for(h=0;h<q;h++)for(e=0;e<I;e++){a[d+e][m+h]={cell:c,unique:q==1?true:false};a[d+e].nTr=b[d]}}}}}function S(a,b,c){var d=[];if(typeof c=="undefined"){c=a.aoHeader;if(typeof b!="undefined"){c=[];W(c,b)}}b=0;
+for(var f=c.length;b<f;b++)for(var e=0,h=c[b].length;e<h;e++)if(c[b][e].unique&&(typeof d[e]=="undefined"||!a.bSortCellsTop))d[e]=c[b][e].cell;return d}function Ua(){var a=p.createElement("p"),b=a.style;b.width="100%";b.height="200px";var c=p.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.overflow="hidden";c.appendChild(a);p.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;if(b==a)a=
+c.clientWidth;p.body.removeChild(c);return b-a}function P(a,b,c){for(var d=0,f=b.length;d<f;d++)for(var e=0,h=b[d].childNodes.length;e<h;e++)if(b[d].childNodes[e].nodeType==1)typeof c!="undefined"?a(b[d].childNodes[e],c[d].childNodes[e]):a(b[d].childNodes[e])}function n(a,b,c,d){if(typeof d=="undefined")d=c;if(typeof b[c]!="undefined")a[d]=b[c]}function da(a,b,c){for(var d=[],f=0,e=a.aoColumns.length;f<e;f++)d.push(H(a,b,f,c));return d}function H(a,b,c,d){var f=a.aoColumns[c];if((c=f.fnGetData(a.aoData[b]._aData))===
+undefined){if(a.iDrawError!=a.iDraw&&f.sDefaultContent===null){J(a,0,"Requested unknown parameter '"+f.mDataProp+"' from the data source for row "+b);a.iDrawError=a.iDraw}return f.sDefaultContent}if(c===null&&f.sDefaultContent!==null)c=f.sDefaultContent;if(d=="display"&&c===null)return"";return c}function N(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function Z(a){if(a===null)return function(){return null};else if(typeof a=="function")return function(c){return a(c)};else if(typeof a==
+"string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c){return c[b[0]][b[1]]}:b.length==3?function(c){return c[b[0]][b[1]][b[2]]}:function(c){for(var d=0,f=b.length;d<f;d++)c=c[b[d]];return c}}else return function(c){return c[a]}}function ya(a){if(a===null)return function(){};else if(typeof a=="function")return function(c,d){return a(c,d)};else if(typeof a=="string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c,d){c[b[0]][b[1]]=d}:b.length==3?function(c,
+d){c[b[0]][b[1]][b[2]]=d}:function(c,d){for(var f=0,e=b.length-1;f<e;f++)c=c[b[f]];c[b[b.length-1]]=d}}else return function(c,d){c[a]=d}}this.oApi={};this.fnDraw=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined"&&a===false){E(b);C(b)}else ba(b)};this.fnFilter=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);if(e.oFeatures.bFilter){if(typeof c=="undefined")c=false;if(typeof d=="undefined")d=true;if(typeof f=="undefined")f=true;if(typeof b=="undefined"||b===null){M(e,{sSearch:a,bRegex:c,
+bSmart:d},1);if(f&&typeof e.aanFeatures.f!="undefined"){b=e.aanFeatures.f;c=0;for(d=b.length;c<d;c++)i("input",b[c]).val(a)}}else{e.aoPreSearchCols[b].sSearch=a;e.aoPreSearchCols[b].bRegex=c;e.aoPreSearchCols[b].bSmart=d;M(e,e.oPreviousSearch,1)}}};this.fnSettings=function(){return A(this[o.iApiIndex])};this.fnVersionCheck=o.fnVersionCheck;this.fnSort=function(a){var b=A(this[o.iApiIndex]);b.aaSorting=a;R(b)};this.fnSortListener=function(a,b,c){ga(A(this[o.iApiIndex]),a,b,c)};this.fnAddData=function(a,
+b){if(a.length===0)return[];var c=[],d,f=A(this[o.iApiIndex]);if(typeof a[0]=="object")for(var e=0;e<a.length;e++){d=v(f,a[e]);if(d==-1)return c;c.push(d)}else{d=v(f,a);if(d==-1)return c;c.push(d)}f.aiDisplay=f.aiDisplayMaster.slice();if(typeof b=="undefined"||b)ba(f);return c};this.fnDeleteRow=function(a,b,c){var d=A(this[o.iApiIndex]);a=typeof a=="object"?U(d,a):a;var f=d.aoData.splice(a,1),e=i.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,1);ra(d.aiDisplayMaster,a);ra(d.aiDisplay,a);typeof b==
+"function"&&b.call(this,d,f);if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){E(d);C(d)}return f};this.fnClearTable=function(a){var b=A(this[o.iApiIndex]);ia(b);if(typeof a=="undefined"||a)C(b)};this.fnOpen=function(a,b,c){var d=A(this[o.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;e.colSpan=X(d);if(typeof b.jquery!="undefined"||typeof b==
+"object")e.appendChild(b);else e.innerHTML=b;b=i("tr",d.nTBody);i.inArray(a,b)!=-1&&i(f).insertAfter(a);d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=A(this[o.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnGetData=function(a,b){var c=A(this[o.iApiIndex]);if(typeof a!="undefined"){a=typeof a=="object"?U(c,a):a;if(typeof b!=
+"undefined")return H(c,a,b,"");return typeof c.aoData[a]!="undefined"?c.aoData[a]._aData:null}return aa(c)};this.fnGetNodes=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined")return typeof b.aoData[a]!="undefined"?b.aoData[a].nTr:null;return $(b)};this.fnGetPosition=function(a){var b=A(this[o.iApiIndex]),c=a.nodeName.toUpperCase();if(c=="TR")return U(b,a);else if(c=="TD"||c=="TH"){c=U(b,a.parentNode);for(var d=Q(b,c),f=0;f<b.aoColumns.length;f++)if(d[f]==a)return[c,pa(b,f),f]}return null};
+this.fnUpdate=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);b=typeof b=="object"?U(e,b):b;if(i.isArray(a)&&typeof a=="object"){e.aoData[b]._aData=a.slice();for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else if(typeof a=="object"){e.aoData[b]._aData=i.extend(true,{},a);for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else{a=a;N(e,b,c,a);if(e.aoColumns[c].fnRender!==null){a=e.aoColumns[c].fnRender({iDataRow:b,iDataColumn:c,aData:e.aoData[b]._aData,
+oSettings:e});e.aoColumns[c].bUseRendered&&N(e,b,c,a)}if(e.aoData[b].nTr!==null)Q(e,b)[c].innerHTML=a}c=i.inArray(b,e.aiDisplay);e.asDataSearch[c]=na(e,da(e,b,"filter"));if(typeof f=="undefined"||f)ca(e);if(typeof d=="undefined"||d)ba(e);return 0};this.fnSetColumnVis=function(a,b,c){var d=A(this[o.iApiIndex]),f,e;e=d.aoColumns.length;var h,j;if(d.aoColumns[a].bVisible!=b){if(b){for(f=j=0;f<a;f++)d.aoColumns[f].bVisible&&j++;j=j>=X(d);if(!j)for(f=a;f<e;f++)if(d.aoColumns[f].bVisible){h=f;break}f=0;
+for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null)j?d.aoData[f].nTr.appendChild(d.aoData[f]._anHidden[a]):d.aoData[f].nTr.insertBefore(d.aoData[f]._anHidden[a],Q(d,f)[h])}else{f=0;for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null){h=Q(d,f)[a];d.aoData[f]._anHidden[a]=h;h.parentNode.removeChild(h)}}d.aoColumns[a].bVisible=b;L(d,d.aoHeader);d.nTFoot&&L(d,d.aoFooter);f=0;for(e=d.aoOpenRows.length;f<e;f++)d.aoOpenRows[f].nTr.colSpan=X(d);if(typeof c=="undefined"||c){ca(d);C(d)}sa(d)}};this.fnPageChange=
+function(a,b){var c=A(this[o.iApiIndex]);ja(c,a);E(c);if(typeof b=="undefined"||b)C(c)};this.fnDestroy=function(){var a=A(this[o.iApiIndex]),b=a.nTableWrapper.parentNode,c=a.nTBody,d,f;a.bDestroying=true;d=0;for(f=a.aoColumns.length;d<f;d++)a.aoColumns[d].bVisible===false&&this.fnSetColumnVis(d,true);i(a.nTableWrapper).find("*").andSelf().unbind(".DT");i("tbody>tr>td."+a.oClasses.sRowEmpty,a.nTable).parent().remove();if(a.nTable!=a.nTHead.parentNode){i(">thead",a.nTable).remove();a.nTable.appendChild(a.nTHead)}if(a.nTFoot&&
+a.nTable!=a.nTFoot.parentNode){i(">tfoot",a.nTable).remove();a.nTable.appendChild(a.nTFoot)}a.nTable.parentNode.removeChild(a.nTable);i(a.nTableWrapper).remove();a.aaSorting=[];a.aaSortingFixed=[];T(a);i($(a)).removeClass(a.asStripClasses.join(" "));if(a.bJUI){i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oJUIClasses.sSortableAsc,o.oJUIClasses.sSortableDesc,o.oJUIClasses.sSortableNone].join(" "));i("th span."+o.oJUIClasses.sSortIcon,a.nTHead).remove();i("th",a.nTHead).each(function(){var e=
+i("div."+o.oJUIClasses.sSortJUIWrapper,this),h=e.contents();i(this).append(h);e.remove()})}else i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oStdClasses.sSortableAsc,o.oStdClasses.sSortableDesc,o.oStdClasses.sSortableNone].join(" "));a.nTableReinsertBefore?b.insertBefore(a.nTable,a.nTableReinsertBefore):b.appendChild(a.nTable);d=0;for(f=a.aoData.length;d<f;d++)a.aoData[d].nTr!==null&&c.appendChild(a.aoData[d].nTr);if(a.oFeatures.bAutoWidth===true)a.nTable.style.width=u(a.sDestroyWidth);
+i(">tr:even",c).addClass(a.asDestoryStrips[0]);i(">tr:odd",c).addClass(a.asDestoryStrips[1]);d=0;for(f=D.length;d<f;d++)D[d]==a&&D.splice(d,1);a=null};this.fnAdjustColumnSizing=function(a){var b=A(this[o.iApiIndex]);ca(b);if(typeof a=="undefined"||a)this.fnDraw(false);else if(b.oScroll.sX!==""||b.oScroll.sY!=="")this.oApi._fnScrollDraw(b)};for(var ua in o.oApi)if(ua)this[ua]=r(ua);this.oApi._fnExternApiFunc=r;this.oApi._fnInitalise=s;this.oApi._fnInitComplete=w;this.oApi._fnLanguageProcess=y;this.oApi._fnAddColumn=
+G;this.oApi._fnColumnOptions=x;this.oApi._fnAddData=v;this.oApi._fnCreateTr=z;this.oApi._fnGatherData=Y;this.oApi._fnBuildHead=V;this.oApi._fnDrawHead=L;this.oApi._fnDraw=C;this.oApi._fnReDraw=ba;this.oApi._fnAjaxUpdate=za;this.oApi._fnAjaxUpdateDraw=Aa;this.oApi._fnAddOptionsHtml=xa;this.oApi._fnFeatureHtmlTable=Fa;this.oApi._fnScrollDraw=Ia;this.oApi._fnAjustColumnSizing=ca;this.oApi._fnFeatureHtmlFilter=Da;this.oApi._fnFilterComplete=M;this.oApi._fnFilterCustom=Ma;this.oApi._fnFilterColumn=La;
+this.oApi._fnFilter=Ka;this.oApi._fnBuildSearchArray=ka;this.oApi._fnBuildSearchRow=na;this.oApi._fnFilterCreateSearch=la;this.oApi._fnDataToSearch=ma;this.oApi._fnSort=R;this.oApi._fnSortAttachListener=ga;this.oApi._fnSortingClasses=T;this.oApi._fnFeatureHtmlPaginate=Ha;this.oApi._fnPageChange=ja;this.oApi._fnFeatureHtmlInfo=Ga;this.oApi._fnUpdateInfo=Na;this.oApi._fnFeatureHtmlLength=Ca;this.oApi._fnFeatureHtmlProcessing=Ea;this.oApi._fnProcessingDisplay=K;this.oApi._fnVisibleToColumnIndex=Ja;this.oApi._fnColumnIndexToVisible=
+pa;this.oApi._fnNodeToDataIndex=U;this.oApi._fnVisbleColumns=X;this.oApi._fnCalculateEnd=E;this.oApi._fnConvertToWidth=Oa;this.oApi._fnCalculateColumnWidths=ea;this.oApi._fnScrollingWidthAdjust=Qa;this.oApi._fnGetWidestNode=Pa;this.oApi._fnGetMaxLenString=Ra;this.oApi._fnStringToCss=u;this.oApi._fnArrayCmp=Va;this.oApi._fnDetectType=fa;this.oApi._fnSettingsFromNode=A;this.oApi._fnGetDataMaster=aa;this.oApi._fnGetTrNodes=$;this.oApi._fnGetTdNodes=Q;this.oApi._fnEscapeRegex=oa;this.oApi._fnDeleteIndex=
+ra;this.oApi._fnReOrderIndex=Ba;this.oApi._fnColumnOrdering=ha;this.oApi._fnLog=J;this.oApi._fnClearTable=ia;this.oApi._fnSaveState=sa;this.oApi._fnLoadState=Ta;this.oApi._fnCreateCookie=Sa;this.oApi._fnReadCookie=ta;this.oApi._fnDetectHeader=W;this.oApi._fnGetUniqueThs=S;this.oApi._fnScrollBarWidth=Ua;this.oApi._fnApplyToChildren=P;this.oApi._fnMap=n;this.oApi._fnGetRowData=da;this.oApi._fnGetCellData=H;this.oApi._fnSetCellData=N;this.oApi._fnGetObjectDataFn=Z;this.oApi._fnSetObjectDataFn=ya;var va=
+this;return this.each(function(){var a=0,b,c,d,f;a=0;for(b=D.length;a<b;a++){if(D[a].nTable==this)if(typeof g=="undefined"||typeof g.bRetrieve!="undefined"&&g.bRetrieve===true)return D[a].oInstance;else if(typeof g.bDestroy!="undefined"&&g.bDestroy===true){D[a].oInstance.fnDestroy();break}else{J(D[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, please pass either no arguments to the dataTable() function, or set bRetrieve to true. Alternatively, to destory the old table and create a new one, set bDestroy to true (note that a lot of changes to the configuration can be made through the API which is usually much faster).");
+return}if(D[a].sTableId!==""&&D[a].sTableId==this.getAttribute("id")){D.splice(a,1);break}}var e=new l;D.push(e);var h=false,j=false;a=this.getAttribute("id");if(a!==null){e.sTableId=a;e.sInstance=a}else e.sInstance=o._oExternConfig.iNextUnique++;if(this.nodeName.toLowerCase()!="table")J(e,0,"Attempted to initialise DataTables on a node which is not a table: "+this.nodeName);else{e.nTable=this;e.oInstance=va.length==1?va:i(this).dataTable();e.oApi=va.oApi;e.sDestroyWidth=i(this).width();if(typeof g!=
+"undefined"&&g!==null){e.oInit=g;n(e.oFeatures,g,"bPaginate");n(e.oFeatures,g,"bLengthChange");n(e.oFeatures,g,"bFilter");n(e.oFeatures,g,"bSort");n(e.oFeatures,g,"bInfo");n(e.oFeatures,g,"bProcessing");n(e.oFeatures,g,"bAutoWidth");n(e.oFeatures,g,"bSortClasses");n(e.oFeatures,g,"bServerSide");n(e.oFeatures,g,"bDeferRender");n(e.oScroll,g,"sScrollX","sX");n(e.oScroll,g,"sScrollXInner","sXInner");n(e.oScroll,g,"sScrollY","sY");n(e.oScroll,g,"bScrollCollapse","bCollapse");n(e.oScroll,g,"bScrollInfinite",
+"bInfinite");n(e.oScroll,g,"iScrollLoadGap","iLoadGap");n(e.oScroll,g,"bScrollAutoCss","bAutoCss");n(e,g,"asStripClasses");n(e,g,"fnPreDrawCallback");n(e,g,"fnRowCallback");n(e,g,"fnHeaderCallback");n(e,g,"fnFooterCallback");n(e,g,"fnCookieCallback");n(e,g,"fnInitComplete");n(e,g,"fnServerData");n(e,g,"fnFormatNumber");n(e,g,"aaSorting");n(e,g,"aaSortingFixed");n(e,g,"aLengthMenu");n(e,g,"sPaginationType");n(e,g,"sAjaxSource");n(e,g,"sAjaxDataProp");n(e,g,"iCookieDuration");n(e,g,"sCookiePrefix");
+n(e,g,"sDom");n(e,g,"bSortCellsTop");n(e,g,"oSearch","oPreviousSearch");n(e,g,"aoSearchCols","aoPreSearchCols");n(e,g,"iDisplayLength","_iDisplayLength");n(e,g,"bJQueryUI","bJUI");n(e.oLanguage,g,"fnInfoCallback");typeof g.fnDrawCallback=="function"&&e.aoDrawCallback.push({fn:g.fnDrawCallback,sName:"user"});typeof g.fnStateSaveCallback=="function"&&e.aoStateSave.push({fn:g.fnStateSaveCallback,sName:"user"});typeof g.fnStateLoadCallback=="function"&&e.aoStateLoad.push({fn:g.fnStateLoadCallback,sName:"user"});
+if(e.oFeatures.bServerSide&&e.oFeatures.bSort&&e.oFeatures.bSortClasses)e.aoDrawCallback.push({fn:T,sName:"server_side_sort_classes"});else e.oFeatures.bDeferRender&&e.aoDrawCallback.push({fn:T,sName:"defer_sort_classes"});if(typeof g.bJQueryUI!="undefined"&&g.bJQueryUI){e.oClasses=o.oJUIClasses;if(typeof g.sDom=="undefined")e.sDom='<"H"lfr>t<"F"ip>'}if(e.oScroll.sX!==""||e.oScroll.sY!=="")e.oScroll.iBarWidth=Ua();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=
+g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Ta(e,g);e.aoDrawCallback.push({fn:sa,sName:"state_save"})}if(typeof g.iDeferLoading!="undefined"){e.bDeferLoading=true;e._iRecordsTotal=g.iDeferLoading;e._iRecordsDisplay=g.iDeferLoading}if(typeof g.aaData!="undefined")j=true;if(typeof g!="undefined"&&typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!="undefined"&&g.oLanguage.sUrl!==
+""){e.oLanguage.sUrl=g.oLanguage.sUrl;i.getJSON(e.oLanguage.sUrl,null,function(t){y(e,t,true)});h=true}else y(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"){e.asStripClasses.push(e.oClasses.sStripOdd);e.asStripClasses.push(e.oClasses.sStripEven)}c=false;d=i(">tbody>tr",this);a=0;for(b=e.asStripClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(e.asStripClasses[a])){c=true;break}if(c){e.asDestoryStrips=["",""];if(i(d[0]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[0]+=
+e.oClasses.sStripOdd+" ";if(i(d[0]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[0]+=e.oClasses.sStripEven;if(i(d[1]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[1]+=e.oClasses.sStripOdd+" ";if(i(d[1]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[1]+=e.oClasses.sStripEven;d.removeClass(e.asStripClasses.join(" "))}c=[];var k;a=this.getElementsByTagName("thead");if(a.length!==0){W(e.aoHeader,a[0]);c=S(e)}if(typeof g.aoColumns=="undefined"){k=[];a=0;for(b=c.length;a<b;a++)k.push(null)}else k=
+g.aoColumns;a=0;for(b=k.length;a<b;a++){if(typeof g.saved_aoColumns!="undefined"&&g.saved_aoColumns.length==b){if(k[a]===null)k[a]={};k[a].bVisible=g.saved_aoColumns[a].bVisible}G(e,c?c[a]:null)}if(typeof g.aoColumnDefs!="undefined")for(a=g.aoColumnDefs.length-1;a>=0;a--){var m=g.aoColumnDefs[a].aTargets;i.isArray(m)||J(e,1,"aTargets must be an array of targets, not a "+typeof m);c=0;for(d=m.length;c<d;c++)if(typeof m[c]=="number"&&m[c]>=0){for(;e.aoColumns.length<=m[c];)G(e);x(e,m[c],g.aoColumnDefs[a])}else if(typeof m[c]==
+"number"&&m[c]<0)x(e,e.aoColumns.length+m[c],g.aoColumnDefs[a]);else if(typeof m[c]=="string"){b=0;for(f=e.aoColumns.length;b<f;b++)if(m[c]=="_all"||i(e.aoColumns[b].nTh).hasClass(m[c]))x(e,b,g.aoColumnDefs[a])}}if(typeof k!="undefined"){a=0;for(b=k.length;a<b;a++)x(e,a,k[a])}a=0;for(b=e.aaSorting.length;a<b;a++){if(e.aaSorting[a][0]>=e.aoColumns.length)e.aaSorting[a][0]=0;k=e.aoColumns[e.aaSorting[a][0]];if(typeof e.aaSorting[a][2]=="undefined")e.aaSorting[a][2]=0;if(typeof g.aaSorting=="undefined"&&
+typeof e.saved_aaSorting=="undefined")e.aaSorting[a][1]=k.asSorting[0];c=0;for(d=k.asSorting.length;c<d;c++)if(e.aaSorting[a][1]==k.asSorting[c]){e.aaSorting[a][2]=c;break}}T(e);a=i(">thead",this);if(a.length===0){a=[p.createElement("thead")];this.appendChild(a[0])}e.nTHead=a[0];a=i(">tbody",this);if(a.length===0){a=[p.createElement("tbody")];this.appendChild(a[0])}e.nTBody=a[0];a=i(">tfoot",this);if(a.length>0){e.nTFoot=a[0];W(e.aoFooter,e.nTFoot)}if(j)for(a=0;a<g.aaData.length;a++)v(e,g.aaData[a]);
+else Y(e);e.aiDisplay=e.aiDisplayMaster.slice();e.bInitialised=true;h===false&&s(e)}})}})(jQuery,window,document);
diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/back_disabled.jpg b/koha-tmpl/opac-tmpl/prog/images/datatables/back_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1e73a546e3609636f9cf4c543c2a4fe4050866c3
GIT binary patch
literal 612
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tyUn
z+02YUSHb}sD?0}l&^EXLguy7lz`(-H!phDIlVN0HVHIR%V-ON%S2Pq6HFFG{Xryc+
zmRQ($@S#&sld*HEn>dFcBLmQ_$YwDLDjGT#PW*q1fd^<YlOVGogFVCRyQwLwf|@66
ze!$4fpt!)cj7zNLKSN?_SjIEf$Z0nVqZh4{&j?Wu4PU>^;oX+iLI)z|@;wX;U8Xr>
zT8Qgxn;R!Cottl}#(8Ri${a3d=J*$R5qBRbK9bRJe*4BYwq9(uIM4mLS9%TSY?*y6
zE==owYH)vf>dq6(Uzum+IyVJqc3N&dRPD57vW(=l(=(DZ-K_<Unt1pe8#qknGCi3V
zkh;vl;B4~gY1f{Kz2M5sJrOKuSm0ZhaMrL}#<_9H6t<5or9~0qKc;W}wfIQk>!LSx
zwPk@>bN at 4B-OI9gCf>Wc_;CDAS%c at BJZ}k<t>BlbDz~@y-*&Y^_U+@};q`xNUthN}
On^Cj9W}Eu@|2F})$f79#

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/back_enabled.jpg b/koha-tmpl/opac-tmpl/prog/images/datatables/back_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a6d764c79c7a2047b6bf65bf9d96fcafd5161e38
GIT binary patch
literal 807
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2*U&h
z1}0{pBN2d|gO!bok%5r~RhW^Pm5qg+Lx6#Sm5Gs^od+h%$i&RTD#*spplB#0EW!~u
z(MZ`u)XXulu<_tSr=TWdXR%Z_aiE1jZ7eM8Fl&IpCkWK1$Y$s$#2&a&N#sM~M5iWU
z<^Q)Bc$gW1&SMs2uxGfw`}E06etb^r9k|jMc at Dlk(IlSD-Wwx*G{%4ThHhR%HnTsw
zbu3z!=BtbC=-In5f5nt;je{+vrKZdWckk$U`c^FEYC6}Jn=<Phg&RGxWowtu+j4vL
zuDrGP=1IPrb~kp*>lG)17QB>6z3khm7PHhg<-pEGSO0F>VA}N6`w53!8pr$>MbUW|
zME<s?dezw;U%dR;`Kd)lCauvOXRNpVXgK`4pX=Sp- at CZj9x15&y*j<b<JPA<K_*#K
z<@>sFn=(%w+^5v0yp7Lmb+~3PpI4(#G~bQ$y_;t)oo+U5`bnSHZcn){CH~m7Ys2rz
z2!R at xgGrCtcPz?eOPOzKr2P26p~(mTGjR1-c<x%~cJ0>3?psA>uUGsyt|R2Ts3~!B
zN71DGSrW%W*`w8#2{O$LX)%%8*<4Ycyr;tN(Hm<XHM0xJ?{xF0EskFCh5u=&<iulr
zYNyl=#<wqXD&+4u8oF^$)m7<lY at VgXk9azsKIKz?vp4^)yx{evPw)J-Dth+P<;w$q
z`@Q9}`(-Xi+_IiGtB&jWay`d}j~$NpR at hm5{cf*szhAZWsp!3Z`)}>8|M=_HtvR>P
P+Rcr(b5Xx$|NkZcT0jT?

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/forward_disabled.jpg b/koha-tmpl/opac-tmpl/prog/images/datatables/forward_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..28a9dc53fa232919299ac980dc9b61167c1868bd
GIT binary patch
literal 635
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tySE
z1JEp>E8&2Nm4%I+g9~UMTnNHo6kuRrVP;|B;)Y2uGBL9Vva&G<iLfgg3UfFHPBdy#
zHW3vwODt at B=oDn^oa!bn$jHFNjA9g{prWDU#Q(P#c!1(eg3N*p_6)E5E7rbHvEH7V
z8#+gHc2rxYci=nCmS=BPhUq>lzGLeh=CM*_u2I6%$1L~6;-1yGa|?*Fva<AVW}f$w
zM|jiv%AS4aZbfpP)?S?%8?6+<6*?uQG at xF)s3 at 1Q<(tn>vCW+<XI6GdMB6yB9$3U&
z#>Av>{Flt>+*?d?iZ`9)^O?_H|D3t8;Og6lD<#WHQvW(mo1ETsD>A at mr8@sqg(?1R
z%d at qrmWLWmIn1#pQuo}{brVW*C8t%EDXbOt_DabwXgGW3;wDX1;~7hWrYL+ZX=qre
z&-y^2q0zm?-FJb#(AWJTHOJ-3`S`D|JEhzC{KvY_h0kZinXP-?w!g_L at p#JQO^!z$
mYCgVwS7#SryXs@?>&L&t^Z(SozHVt~@Z#>58}s)6zX<@qORf(9

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/forward_enabled.jpg b/koha-tmpl/opac-tmpl/prog/images/datatables/forward_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..598c075f13ab0e4bbe05a4eeea7cf777ba73cf03
GIT binary patch
literal 852
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3 at r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tywO
z0~0eN(3Nn&%Fe>Z!NthH$ciG&$iU3P%Em6hz`z1zu=B#yGcqx=2(q#<2(fb*3M-3<
zDh5t8G7&R#Oe}1C=oHjs?40T*F37+LbR`oj+(bq}CT0c}Rz*W0Hg?Cv#)(EB0yioN
zi~PUEzyov)lOVGogFVA5dn3uE%Z<*rn&ugY^FIG9<<=87L*?mOy^~u`Rq(Eg+UDw^
z@^Uh}zJ$t~P2YpRT#sm2p`oEt8zJ-EBRfY;>b?DxZo!24Z)Q(O&}!Mbt}27`dKa(x
zr)AHkZg5MjKa&4$syaupXWNXgp32dQs<o<XGr#5u9@=#E+?+!}FI~Pa)LWslJ}B36
z`Lb3YheKCCm%VOu;VpX6(0MkYSk}6t at aOKz+;_*D4{7|~^5)^QORgNty2^@M51##X
zueaWLX7+9e=RH;{oZr5)jkOooU8VU}TQps%p>_rj-?|M=Q9pN^hZg^mV7=UWs>}D5
z$40(ME7Q1T4h8p}ZJ8O!G-Xk84;P~#ci!&o`A5I3kG at gLm*VlJbn%kvSqIh?3Y?HQ
zAX0NL>XIkpf=MN83*!%}9-aN5)p7^py2Am>F9gW&pFSp#V0dxX#ZPW;UoD(gaI at 8E
z(rNQz1DBIiM13!LtZ|85lHB@$wW~n0fhRz-$?R&m{@z;uI}N|35As;}zdXB<<FOu#
z{FTp-PcAia6ML~>I#+N1k=r*G-&mI78vJ_Ezs!yIV%J}l7d*c9>7Bn;xyLT84V&`$
z at 9WMTAJ6DZyR)~=FS6P2e3MDv7lHB>{C&1H^7EJ9PIf=EdUwUYtGE9%$X9(m*ZWLf
M_rC2^{;K~s0TRp{r2qf`

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a56d0e21902ce620cd57f87fa58a6d3e804135cf
GIT binary patch
literal 263
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45 at 5J;
zXU0OHl&hzUV at SoVE9Xw~GAQscA1s)^?0*rXqM}DeLv7?|BU8z at Q<ntt9<njnJ|j`Y
znD at ZlWoHa-oW7$XVs$3z>COGupVzP9Hek5&L+Gnl%BD>~0~tJB{an^LB{Ts5b0m7=

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc_disabled.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7e621ef1c68da839ce077cec6e201a55c1ba168
GIT binary patch
literal 252
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnW*L
z7srr_TUXBQ7Ge<Kak=PnB>V6G?@}f$7k6Jhw{qGm$-QDzD`qrDaZ3s$b2XF;fBBPU
nqjNDy&Nw~puHFA+-v&m8`?>-yUFVHK{$ucT^>bP0l+XkKhw^g=

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_both.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_both.png
new file mode 100644
index 0000000000000000000000000000000000000000..839ac4bb5b0b414834c950de9deafff6dd94ed2d
GIT binary patch
literal 282
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0K#2rT
z7srr_TRjsz`4|*ASOSl%eg6Ob+(JtRwX|O at S}a^IES<M^Rar)~R7{gT(8t-3AepQp
zDW<l1NyH(qlCXQ0 at AfT`xZ2rtb0gcPuhQK|E$f?fe^;k=XM|b({WbrT_5p at zx%{&^
T>QC<i+Qs1M>gTe~DWM4fR9b+X

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b295159df995329b3a84340d32761f3d1dbade
GIT binary patch
literal 260
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45 at 5J;
zXU0OHl#{26V at SoVqz8vtc$~v}dc~O{CLEF2anNavMpdMP)0v(X&o(k0opIq!LdvtJ
wj~up7 at 0`wiSoe($&y07EkGxK6U|?nlJSz0{?wJWUfu=Edy85}Sb4q9e0C9MGu>b%7

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc_disabled.png b/koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..2409653dc94cd21a281a31c0e3819323b84704b7
GIT binary patch
literal 251
zcmeAS at N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV- at pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnX`r
z7srr_TS*TNvhX;E^>j)zMNBv%VR68zN24n8K+>5N&kUJbBQCy4c=qgBiu3mAQ)hD?
n)_oJhGvi(If!Apb49pB3GXz|UGFKJ=4P)?h^>bP0l+XkK*57ji

literal 0
HcmV?d00001

-- 
1.7.7.3


From julian.maurice at biblibre.com  Fri Dec  2 12:40:08 2011
From: julian.maurice at biblibre.com (Julian Maurice)
Date: Fri,  2 Dec 2011 12:40:08 +0100
Subject: [Koha-patches] [PATCH 2/4] Bug 6836: followup CSS work
In-Reply-To: <1322826009-18320-1-git-send-email-julian.maurice@biblibre.com>
References: <1322826009-18320-1-git-send-email-julian.maurice@biblibre.com>
Message-ID: <1322826009-18320-2-git-send-email-julian.maurice@biblibre.com>

From: Owen Leonard <oleonard at myacpl.org>

---
 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css |  157 +++++++++++++++++++-
 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js   |  105 +++++++++++++-
 koha-tmpl/opac-tmpl/prog/en/css/datatables.css     |  157 +++++++++++++++++++-
 koha-tmpl/opac-tmpl/prog/en/js/datatables.js       |  105 +++++++++++++-
 4 files changed, 516 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
index e069b93..e7b11bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
@@ -3,15 +3,15 @@ input.search_init {
 }
 .sorting_asc {
     padding-right: 19px;
-    background: url("../../img/datatables/sort_asc.png") no-repeat scroll right center #EEEEEE;
+    background: url("../../img/asc.gif") no-repeat scroll right center #EEEEEE;
 }
 .sorting_desc {
     padding-right: 19px;
-    background: url("../../img/datatables/sort_desc.png") no-repeat scroll right center #EEEEEE;
+    background: url("../../img/desc.gif") no-repeat scroll right center #EEEEEE;
 }
 .sorting {
     padding-right: 19px;
-    background: url("../../img/datatables/sort_both.png") no-repeat scroll right center #EEEEEE;
+    background: url("../../img/ascdesc.gif") no-repeat scroll right center #EEEEEE;
 }
 .sorting_asc_disabled {
     padding-right: 19px;
@@ -26,6 +26,157 @@ input.search_init {
     background-color: #EEEEEE;
 }
 
+div.top {clear : both; }
+
+div.top.pager,
+div.bottom.pager {
+    background-color : #E5E5E5;
+    padding : 0;
+}
+
+div.bottom.pager div.dataTables_paginate.paging_full_numbers,
+div.bottom.pager div.dataTables_paginate.paging_four_button {
+    border-right-width : 0;
+}
+
+div.dataTables_filter,
+div.dataTables_length,
+div.dataTables_info,
+div.dataTables_paginate {
+    float: left;
+    padding : .3em .5em .3em .5em;
+
+}
+div.dataTables_length {
+    border-right : 1px solid #686868;
+    line-height:1.9em;
+}
+div.dataTables_info {
+    border-right : 1px solid #AAA;
+    line-height:1.9em;
+}
+div.dataTables_length,
+div.dataTables_filter {
+    border-left : 1px solid #FFF;
+}
+div.dataTables_filter {
+    line-height : 1.9em;
+}
+div.dataTables_paginate {
+    background-color : #F4F4F4;
+    font-size: 110%;
+    padding : 0;
+}
+
+.paging_full_numbers span.paginate_button,
+.paging_full_numbers span.paginate_active {
+    border-right : 1px solid #AAA;
+    border-left : 1px solid #FFF;
+    display : block;
+    float : left;
+    line-height:1.6em;
+    padding: .3em .7em;
+    cursor: pointer;
+}
+
+.paging_full_numbers span.paginate_button {
+    color : #0000CC;
+}
+.paging_full_numbers span.paginate_button.first {
+    background-image : url('../../img/first.png');
+    background-repeat: no-repeat;
+    background-position : 2px center;
+    padding-left : 2em;
+}
+.paging_full_numbers span.paginate_button.previous {
+    background-image : url('../../img/prev.png');
+    background-repeat: no-repeat;
+    background-position : 2px center;
+    padding-left : 2em;
+}
+.paging_full_numbers span.paginate_button.next {
+    background-image : url('../../img/next.png');
+    background-repeat: no-repeat;
+    background-position : right center;
+    padding-right : 2em;
+}
+.paging_full_numbers span.paginate_button.last {
+    background-image : url('../../img/last.png');
+    background-repeat: no-repeat;
+    background-position : right center;
+    border-right : 1px solid #686868;
+    padding-right : 2em;
+}
+div.bottom.pager .paging_full_numbers span.paginate_button.last {
+    border-right-width : 0;
+}
+.paging_full_numbers span.paginate_active {
+    background-color : #FFFFEA;
+    color : #000;
+    font-weight: bold;
+}
+
+.paging_full_numbers span.paginate_button:hover {
+    background-color: #FFC;
+}
+
+.paging_full_numbers span.paginate_button.paginate_button_disabled {
+    color : #666;
+}
+
+/* Two-button version */
+
+div.dataTables_paginate.paging_two_button,
+div.dataTables_paginate.paging_four_button {
+    background-color : transparent;
+    border-right : 1px solid #686868;
+    border-left : 1px solid #FFF;
+    line-height : 1.8em;
+}
+.paginate_disabled_first,
+.paginate_enabled_first,
+.paginate_disabled_previous,
+.paginate_enabled_previous,
+.paginate_disabled_next,
+.paginate_enabled_next,
+.paginate_disabled_last,
+.paginate_enabled_last {
+    float: left;
+    height: 16px;
+    margin: .5em;
+    width: 16px;
+}
+.paginate_disabled_first {
+    background-image: url("../../img/first-disabled.png");
+}
+.paginate_enabled_first {
+    background-image: url("../../img/first.png");
+    cursor: pointer;
+}
+.paginate_disabled_previous {
+    background-image: url("../../img/prev-disabled.png");
+}
+.paginate_enabled_previous {
+    background-image: url("../../img/prev.png");
+    cursor: pointer;
+}
+.paginate_disabled_next {
+    background-image: url("../../img/next-disabled.png");
+}
+.paginate_enabled_next {
+    background-image: url("../../img/next.png");
+    cursor: pointer;
+}
+.paginate_disabled_last {
+    background-image: url("../../img/last-disabled.png");
+}
+.paginate_enabled_last {
+    background-image: url("../../img/last.png");
+    cursor: pointer;
+}
+
+
+/*
 table.display {
     width: 100%;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
index 38dd1d5..e0cc888 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
@@ -22,7 +22,8 @@ var dataTablesDefaults = {
         "sProcessing"       : window.MSG_DT_PROCESSING || "Processing...",
         "sSearch"           : window.MSG_DT_SEARCH || "Search:",
         "sZeroRecords"      : window.MSG_DT_ZERO_RECORDS || "No matching records found"
-    }
+    },
+    "sDom": '<"top pager"ilpf>t<"bottom pager"ip>'
 };
 
 
@@ -279,3 +280,105 @@ function replace_html_date( original_node, id, format ) {
     script.text = script_content;
     $(original_node).append( script );
 }
+
+$.fn.dataTableExt.oPagination.four_button = {
+    /*
+     * Function: oPagination.four_button.fnInit
+     * Purpose:  Initalise dom elements required for pagination with a list of the pages
+     * Returns:  -
+     * Inputs:   object:oSettings - dataTables settings object
+     *           node:nPaging - the DIV which contains this pagination control
+     *           function:fnCallbackDraw - draw function which must be called on update
+     */
+    "fnInit": function ( oSettings, nPaging, fnCallbackDraw )
+    {
+        nFirst = document.createElement( 'span' );
+        nPrevious = document.createElement( 'span' );
+        nNext = document.createElement( 'span' );
+        nLast = document.createElement( 'span' );
+
+/*        nFirst.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sFirst ) );
+        nPrevious.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sPrevious ) );
+        nNext.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sNext ) );
+        nLast.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sLast ) );*/
+
+        nFirst.className = "paginate_button first";
+        nPrevious.className = "paginate_button previous";
+        nNext.className="paginate_button next";
+        nLast.className = "paginate_button last";
+
+        nPaging.appendChild( nFirst );
+        nPaging.appendChild( nPrevious );
+        nPaging.appendChild( nNext );
+        nPaging.appendChild( nLast );
+
+        $(nFirst).click( function () {
+            oSettings.oApi._fnPageChange( oSettings, "first" );
+            fnCallbackDraw( oSettings );
+        } );
+
+        $(nPrevious).click( function() {
+            oSettings.oApi._fnPageChange( oSettings, "previous" );
+            fnCallbackDraw( oSettings );
+        } );
+
+        $(nNext).click( function() {
+            oSettings.oApi._fnPageChange( oSettings, "next" );
+            fnCallbackDraw( oSettings );
+        } );
+
+        $(nLast).click( function() {
+            oSettings.oApi._fnPageChange( oSettings, "last" );
+            fnCallbackDraw( oSettings );
+        } );
+
+        /* Disallow text selection */
+        $(nFirst).bind( 'selectstart', function () { return false; } );
+        $(nPrevious).bind( 'selectstart', function () { return false; } );
+        $(nNext).bind( 'selectstart', function () { return false; } );
+        $(nLast).bind( 'selectstart', function () { return false; } );
+    },
+
+    /*
+     * Function: oPagination.four_button.fnUpdate
+     * Purpose:  Update the list of page buttons shows
+     * Returns:  -
+     * Inputs:   object:oSettings - dataTables settings object
+     *           function:fnCallbackDraw - draw function which must be called on update
+     */
+    "fnUpdate": function ( oSettings, fnCallbackDraw )
+    {
+        if ( !oSettings.aanFeatures.p )
+        {
+            return;
+        }
+
+        /* Loop over each instance of the pager */
+        var an = oSettings.aanFeatures.p;
+        for ( var i=0, iLen=an.length ; i<iLen ; i++ )
+        {
+            var buttons = an[i].getElementsByTagName('span');
+            if ( oSettings._iDisplayStart === 0 )
+            {
+                buttons[0].className = "paginate_disabled_first";
+                buttons[1].className = "paginate_disabled_previous";
+            }
+            else
+            {
+                buttons[0].className = "paginate_enabled_first";
+                buttons[1].className = "paginate_enabled_previous";
+            }
+
+            if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() )
+            {
+                buttons[2].className = "paginate_disabled_next";
+                buttons[3].className = "paginate_disabled_last";
+            }
+            else
+            {
+                buttons[2].className = "paginate_enabled_next";
+                buttons[3].className = "paginate_enabled_last";
+            }
+        }
+    }
+};
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/datatables.css b/koha-tmpl/opac-tmpl/prog/en/css/datatables.css
index e069b93..e7b11bd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/datatables.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/datatables.css
@@ -3,15 +3,15 @@ input.search_init {
 }
 .sorting_asc {
     padding-right: 19px;
-    background: url("../../img/datatables/sort_asc.png") no-repeat scroll right center #EEEEEE;
+    background: url("../../img/asc.gif") no-repeat scroll right center #EEEEEE;
 }
 .sorting_desc {
     padding-right: 19px;
-    background: url("../../img/datatables/sort_desc.png") no-repeat scroll right center #EEEEEE;
+    background: url("../../img/desc.gif") no-repeat scroll right center #EEEEEE;
 }
 .sorting {
     padding-right: 19px;
-    background: url("../../img/datatables/sort_both.png") no-repeat scroll right center #EEEEEE;
+    background: url("../../img/ascdesc.gif") no-repeat scroll right center #EEEEEE;
 }
 .sorting_asc_disabled {
     padding-right: 19px;
@@ -26,6 +26,157 @@ input.search_init {
     background-color: #EEEEEE;
 }
 
+div.top {clear : both; }
+
+div.top.pager,
+div.bottom.pager {
+    background-color : #E5E5E5;
+    padding : 0;
+}
+
+div.bottom.pager div.dataTables_paginate.paging_full_numbers,
+div.bottom.pager div.dataTables_paginate.paging_four_button {
+    border-right-width : 0;
+}
+
+div.dataTables_filter,
+div.dataTables_length,
+div.dataTables_info,
+div.dataTables_paginate {
+    float: left;
+    padding : .3em .5em .3em .5em;
+
+}
+div.dataTables_length {
+    border-right : 1px solid #686868;
+    line-height:1.9em;
+}
+div.dataTables_info {
+    border-right : 1px solid #AAA;
+    line-height:1.9em;
+}
+div.dataTables_length,
+div.dataTables_filter {
+    border-left : 1px solid #FFF;
+}
+div.dataTables_filter {
+    line-height : 1.9em;
+}
+div.dataTables_paginate {
+    background-color : #F4F4F4;
+    font-size: 110%;
+    padding : 0;
+}
+
+.paging_full_numbers span.paginate_button,
+.paging_full_numbers span.paginate_active {
+    border-right : 1px solid #AAA;
+    border-left : 1px solid #FFF;
+    display : block;
+    float : left;
+    line-height:1.6em;
+    padding: .3em .7em;
+    cursor: pointer;
+}
+
+.paging_full_numbers span.paginate_button {
+    color : #0000CC;
+}
+.paging_full_numbers span.paginate_button.first {
+    background-image : url('../../img/first.png');
+    background-repeat: no-repeat;
+    background-position : 2px center;
+    padding-left : 2em;
+}
+.paging_full_numbers span.paginate_button.previous {
+    background-image : url('../../img/prev.png');
+    background-repeat: no-repeat;
+    background-position : 2px center;
+    padding-left : 2em;
+}
+.paging_full_numbers span.paginate_button.next {
+    background-image : url('../../img/next.png');
+    background-repeat: no-repeat;
+    background-position : right center;
+    padding-right : 2em;
+}
+.paging_full_numbers span.paginate_button.last {
+    background-image : url('../../img/last.png');
+    background-repeat: no-repeat;
+    background-position : right center;
+    border-right : 1px solid #686868;
+    padding-right : 2em;
+}
+div.bottom.pager .paging_full_numbers span.paginate_button.last {
+    border-right-width : 0;
+}
+.paging_full_numbers span.paginate_active {
+    background-color : #FFFFEA;
+    color : #000;
+    font-weight: bold;
+}
+
+.paging_full_numbers span.paginate_button:hover {
+    background-color: #FFC;
+}
+
+.paging_full_numbers span.paginate_button.paginate_button_disabled {
+    color : #666;
+}
+
+/* Two-button version */
+
+div.dataTables_paginate.paging_two_button,
+div.dataTables_paginate.paging_four_button {
+    background-color : transparent;
+    border-right : 1px solid #686868;
+    border-left : 1px solid #FFF;
+    line-height : 1.8em;
+}
+.paginate_disabled_first,
+.paginate_enabled_first,
+.paginate_disabled_previous,
+.paginate_enabled_previous,
+.paginate_disabled_next,
+.paginate_enabled_next,
+.paginate_disabled_last,
+.paginate_enabled_last {
+    float: left;
+    height: 16px;
+    margin: .5em;
+    width: 16px;
+}
+.paginate_disabled_first {
+    background-image: url("../../img/first-disabled.png");
+}
+.paginate_enabled_first {
+    background-image: url("../../img/first.png");
+    cursor: pointer;
+}
+.paginate_disabled_previous {
+    background-image: url("../../img/prev-disabled.png");
+}
+.paginate_enabled_previous {
+    background-image: url("../../img/prev.png");
+    cursor: pointer;
+}
+.paginate_disabled_next {
+    background-image: url("../../img/next-disabled.png");
+}
+.paginate_enabled_next {
+    background-image: url("../../img/next.png");
+    cursor: pointer;
+}
+.paginate_disabled_last {
+    background-image: url("../../img/last-disabled.png");
+}
+.paginate_enabled_last {
+    background-image: url("../../img/last.png");
+    cursor: pointer;
+}
+
+
+/*
 table.display {
     width: 100%;
 }
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/datatables.js b/koha-tmpl/opac-tmpl/prog/en/js/datatables.js
index 38dd1d5..e0cc888 100644
--- a/koha-tmpl/opac-tmpl/prog/en/js/datatables.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/datatables.js
@@ -22,7 +22,8 @@ var dataTablesDefaults = {
         "sProcessing"       : window.MSG_DT_PROCESSING || "Processing...",
         "sSearch"           : window.MSG_DT_SEARCH || "Search:",
         "sZeroRecords"      : window.MSG_DT_ZERO_RECORDS || "No matching records found"
-    }
+    },
+    "sDom": '<"top pager"ilpf>t<"bottom pager"ip>'
 };
 
 
@@ -279,3 +280,105 @@ function replace_html_date( original_node, id, format ) {
     script.text = script_content;
     $(original_node).append( script );
 }
+
+$.fn.dataTableExt.oPagination.four_button = {
+    /*
+     * Function: oPagination.four_button.fnInit
+     * Purpose:  Initalise dom elements required for pagination with a list of the pages
+     * Returns:  -
+     * Inputs:   object:oSettings - dataTables settings object
+     *           node:nPaging - the DIV which contains this pagination control
+     *           function:fnCallbackDraw - draw function which must be called on update
+     */
+    "fnInit": function ( oSettings, nPaging, fnCallbackDraw )
+    {
+        nFirst = document.createElement( 'span' );
+        nPrevious = document.createElement( 'span' );
+        nNext = document.createElement( 'span' );
+        nLast = document.createElement( 'span' );
+
+/*        nFirst.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sFirst ) );
+        nPrevious.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sPrevious ) );
+        nNext.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sNext ) );
+        nLast.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sLast ) );*/
+
+        nFirst.className = "paginate_button first";
+        nPrevious.className = "paginate_button previous";
+        nNext.className="paginate_button next";
+        nLast.className = "paginate_button last";
+
+        nPaging.appendChild( nFirst );
+        nPaging.appendChild( nPrevious );
+        nPaging.appendChild( nNext );
+        nPaging.appendChild( nLast );
+
+        $(nFirst).click( function () {
+            oSettings.oApi._fnPageChange( oSettings, "first" );
+            fnCallbackDraw( oSettings );
+        } );
+
+        $(nPrevious).click( function() {
+            oSettings.oApi._fnPageChange( oSettings, "previous" );
+            fnCallbackDraw( oSettings );
+        } );
+
+        $(nNext).click( function() {
+            oSettings.oApi._fnPageChange( oSettings, "next" );
+            fnCallbackDraw( oSettings );
+        } );
+
+        $(nLast).click( function() {
+            oSettings.oApi._fnPageChange( oSettings, "last" );
+            fnCallbackDraw( oSettings );
+        } );
+
+        /* Disallow text selection */
+        $(nFirst).bind( 'selectstart', function () { return false; } );
+        $(nPrevious).bind( 'selectstart', function () { return false; } );
+        $(nNext).bind( 'selectstart', function () { return false; } );
+        $(nLast).bind( 'selectstart', function () { return false; } );
+    },
+
+    /*
+     * Function: oPagination.four_button.fnUpdate
+     * Purpose:  Update the list of page buttons shows
+     * Returns:  -
+     * Inputs:   object:oSettings - dataTables settings object
+     *           function:fnCallbackDraw - draw function which must be called on update
+     */
+    "fnUpdate": function ( oSettings, fnCallbackDraw )
+    {
+        if ( !oSettings.aanFeatures.p )
+        {
+            return;
+        }
+
+        /* Loop over each instance of the pager */
+        var an = oSettings.aanFeatures.p;
+        for ( var i=0, iLen=an.length ; i<iLen ; i++ )
+        {
+            var buttons = an[i].getElementsByTagName('span');
+            if ( oSettings._iDisplayStart === 0 )
+            {
+                buttons[0].className = "paginate_disabled_first";
+                buttons[1].className = "paginate_disabled_previous";
+            }
+            else
+            {
+                buttons[0].className = "paginate_enabled_first";
+                buttons[1].className = "paginate_enabled_previous";
+            }
+
+            if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() )
+            {
+                buttons[2].className = "paginate_disabled_next";
+                buttons[3].className = "paginate_disabled_last";
+            }
+            else
+            {
+                buttons[2].className = "paginate_enabled_next";
+                buttons[3].className = "paginate_enabled_last";
+            }
+        }
+    }
+};
-- 
1.7.7.3


From julian.maurice at biblibre.com  Fri Dec  2 12:40:09 2011
From: julian.maurice at biblibre.com (Julian Maurice)
Date: Fri,  2 Dec 2011 12:40:09 +0100
Subject: [Koha-patches] [PATCH 3/4] Bug 6836: test case readingrec.pl
In-Reply-To: <1322826009-18320-1-git-send-email-julian.maurice@biblibre.com>
References: <1322826009-18320-1-git-send-email-julian.maurice@biblibre.com>
Message-ID: <1322826009-18320-3-git-send-email-julian.maurice@biblibre.com>

---
 .../prog/en/modules/members/readingrec.tt          |   26 +++++++-------------
 1 files changed, 9 insertions(+), 17 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 7469096..b4f8ebb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -1,21 +1,16 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Circulation History for [% firstname %] [% surname %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
+<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/datatables.css" />
+<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
+<script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script>
 <script type="text/javascript" id="js">$(document).ready(function() {
-	$.tablesorter.addParser({
-		id: 'articles',
-		is: function(s) {return false;  },
-		format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
-		type: 'text'
-	});
-	$.tablesorter.defaults.widgets = ['zebra'];
-	$("#table_readingrec").tablesorter({[% IF ( dateformat_metric ) %]
-		dateFormat: 'uk',[% END %]
-		sortList: [[8,1]],
-		headers: { 1: { sorter: 'articles' }, 9: { sorter: 'shortDate'} }
-	}).tablesorterPager({container: $("#pagertable_readingrec"),positionFixed: false,size: 20});
+ $(document).ready(function() {
+    $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "sPaginationType": "four_button",
+    }));
+ });
 }); </script>
 </head>
 <body>
@@ -34,9 +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>
 
-<div id="pagertable_readingrec">
-[% INCLUDE 'table-pager.inc' perpage='20' %]
-</div>
 <table id="table_readingrec">
 <thead>
     <th>Date</th>
-- 
1.7.7.3


From julian.maurice at biblibre.com  Fri Dec  2 13:33:19 2011
From: julian.maurice at biblibre.com (Julian Maurice)
Date: Fri,  2 Dec 2011 13:33:19 +0100
Subject: [Koha-patches] [PATCH] Bug 6147 : Correcting invalid RSS
Message-ID: <1322829199-20700-1-git-send-email-julian.maurice@biblibre.com>

From: Christophe Croullebois <christophe.croullebois at biblibre.com>

---
 .../opac-tmpl/prog/en/modules/opac-opensearch.tt   |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt
index 0710344..14a5f3e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt
@@ -14,11 +14,12 @@
 [% IF ( rss2 ) %]
 <rss version="2.0"
       xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
+      xmlns:dc="http://purl.org/dc/elements/1.1/"
       xmlns:atom="http://www.w3.org/2005/Atom">
    <channel>
      <title><![CDATA[[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %]]]></title>
      <link>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2</link>
-     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2" />
+     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;sort_by=[% sort_by |html %]&amp;format=rss2"/>
      <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %] at [% LibraryName |html %]]]></description>
      <opensearch:totalResults>[% total %]</opensearch:totalResults>
      <opensearch:startIndex>[% offset %]</opensearch:startIndex>
@@ -27,20 +28,19 @@
      [% ELSE %]
        <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
      [% END %]
-     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
-     <opensearch:Query role="request" searchTerms="[% query_desc |html %] [% limit_desc |html %]" startPage="[% page %]" />
 	 [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
+     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% SEARCH_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi |html %][% SEARCH_RESULT.limit_cgi |html %]&amp;sort_by=[% SEARCH_RESULT.sort_by |html %]&amp;format=opensearchdescription"/>
+     <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |url %][% SEARCH_RESULT.limit_desc |url %]" startPage="[% SEARCH_RESULT.page %]" />
      <item>
        <title>[% SEARCH_RESULT.title |html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield |html %][% END %]</title>
-       <isbn>[% SEARCH_RESULT.isbn |html %]</isbn>
+       <dc:identifier>ISBN [% SEARCH_RESULT.isbn |html %]</dc:identifier>
        <link>[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% END %][% END %]</link>
        <description><![CDATA[
 [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<img src="http://images.amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %][% END %]
-
-[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( using_https ) %]<img src="https://secure.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% SEARCH_RESULT.normalized_upc %]&amp;oclc=[% SEARCH_RESULT.normalized_oclc %]" alt="" />
+[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %]<img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn %]/SC.GIF&amp;client=[% SEARCH_RESULT.SyndeticsClientCode %]&amp;type=xw10[% IF ( SEARCH_RESULT.normalized_upc ) %]&amp;upc=[% SEARCH_RESULT.normalized_upc %][% END %][% IF ( SEARCH_RESULT.normalized_oclc ) %]&amp;oclc=[% SEARCH_RESULT.normalized_oclc %][% END %]" alt="" />
 [% ELSE %]
 <img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% SEARCH_RESULT.normalized_upc %]&amp;oclc=[% SEARCH_RESULT.normalized_oclc %]" alt="" />
-[% END %][% END %][% END %][% END %]
+[% END %][% END %][% END %]
 
 [% IF ( BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<a href="https://[% BakerTaylorBookstoreURL |html %][% SEARCH_RESULT.normalized_isbn %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL |html %][% SEARCH_RESULT.normalized_isbn %]" /></a>[% END %][% END %]
 	   <p>[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author |html %]. [% END %]
@@ -51,7 +51,7 @@
                         [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size |html %]. [% END %]
                         [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn |html %][% END %] </p><p>
 [% IF ( RequestOnOpac ) %]
-<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold on <i>[% SEARCH_RESULT.title |html %]</i></a></p>
+<a href="[% SEARCH_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold on <i>[% SEARCH_RESULT.title %]</i></a></p>
 [% END %]
 						]]></description>
        <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]</guid>
@@ -80,12 +80,12 @@
      <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
    [% END %]
    <opensearch:Query role="request" searchTerms="[% query_desc |html %] [% limit_desc |html %]" startPage="[% page |html %]" />
-   <link rel="alternate" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]pw=[% page %]" type="text/html"/>
+   <link rel="alternate" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=[% page %]&amp;format=atom" type="application/atom+xml"/>
    <link rel="self" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&amp;format=atom" type="application/atom+xml"/>
    <link rel="first" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=1&amp;format=atom" type="application/atom+xml"/>
    <link rel="previous" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=2&amp;format=atom" type="application/atom+xml"/>
    <link rel="next" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=4&amp;format=atom" type="application/atom+xml"/>
-   <link rel="last" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]pw=42299&amp;format=atom" type="application/atom+xml"/>
+   <link rel="last" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=42299&amp;format=atom" type="application/atom+xml"/>
    <link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
 
    [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
-- 
1.7.7.3


From adrien.saurat at biblibre.com  Fri Dec  2 14:15:28 2011
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Fri,  2 Dec 2011 14:15:28 +0100
Subject: [Koha-patches] [PATCH] Bug 7307: use of the OPACBaseURL syspref for
	RSS feed
Message-ID: <1322831728-7915-1-git-send-email-adrien.saurat@biblibre.com>

The template opac-opensearch.tt is ready to use
OPACBaseURL, but it doesn't get the value.
This patch corrects this in opac-search.pl.
---
 opac/opac-search.pl |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 42eb0ec..cd7d6d5 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -714,11 +714,19 @@ my $session = get_session($cgi->cookie("CGISESSID"));
 my @addpubshelves;
 my $pubshelves = $session->param('pubshelves');
 my $barshelves = $session->param('barshelves');
+my $OPACRssURL;
 foreach my $shelf (@$pubshelves) {
 	next if ( ($shelf->{'owner'} != ($borrowernumber ? $borrowernumber : -1)) && ($shelf->{'category'} < 3) );
 	push (@addpubshelves, $shelf);
 }
 
+if ( C4::Context->preference('OPACBaseURL') ne '' ) {
+	$OPACRssURL = C4::Context->preference('OPACBaseURL');
+	$OPACRssURL=~s/https:/http:/;
+    if ( $OPACRssURL !~ m/^http:\/\// ) { $OPACRssURL = "http://" . $OPACRssURL }
+	$template->param( OPACBaseURL     => $OPACRssURL );
+}
+
 if (@addpubshelves) {
 	$template->param( addpubshelves     => scalar (@addpubshelves));
 	$template->param( addpubshelvesloop => \@addpubshelves);
-- 
1.7.4.1


From christophe.croullebois at biblibre.com  Fri Dec  2 16:14:55 2011
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Fri,  2 Dec 2011 16:14:55 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 6663: Features for holidays.pl
Message-ID: <1322838895-23185-1-git-send-email-christophe.croullebois@biblibre.com>

Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I add also Holidays repeated yearly on a range.
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    2 +
 .../prog/en/modules/tools/holidays.tt              |   28 +++++++-
 tools/newHolidays.pl                               |   83 ++++++++++++++++----
 3 files changed, 96 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 7b38062..493a757 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -554,6 +554,8 @@ div.yui-b fieldset.brief li.radio {
 	padding : .7em 0;
 }
 div.yui-b fieldset.brief li.radio label,
+div.yui-b fieldset.brief li.dateinsert label,
+div.yui-b fieldset.brief li.dateinsert span.label,
 div.yui-b fieldset.brief li.radio span.label {
 	display : inline;
 }
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 ac867fe..a958788 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -209,7 +209,7 @@
 				<input type="hidden" id="newBranchName" name="newBranchName" />
 			</li>
 			<li>
-				<strong>Date:</strong>
+				<strong>From Date:</strong>
 				<span id="newDaynameOutput"></span>, 
 
 				[% IF ( dateformat_us ) %]<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>/<span id="newYearOutput"></span>[% ELSIF ( dateformat_metric ) %]<span id="newDayOutput"></span>/<span id="newMonthOutput"></span>/<span id="newYearOutput"></span>[% ELSE %]<span id="newYearOutput"></span>/<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>[% END %]
@@ -220,6 +220,22 @@
 				<input type="hidden" id="newMonth" name="newMonth" />
 				<input type="hidden" id="newYear" name="newYear" />
 			</li>
+			<li class="dateinsert">
+			<b>To Date : </b>
+			[% IF ( dateformat_us ) %]
+			<label for="newMonth1">Month </label> <input type="text" size="2" id="newMonth1" name="newMonth1"/>
+			<label for="newDay1">Day </label> <input type="text" size="2" id="newDay1" name="newDay1" />
+			<label for="newYear1">Year </label> <input type="text" size="4" id="newYear1" name="newYear1"/>
+			[% ELSIF ( dateformat_metric ) %]
+			<label for="newDay1">Day </label> <input type="text" size="2" id="newDay1" name="newDay1" />
+			<label for="newMonth1">Month </label> <input type="text" size="2" id="newMonth1" name="newMonth1"/>
+			<label for="newYear1">Year </label> <input type="text" size="4" id="newYear1" name="newYear1"/>
+			[% ELSE %]
+			<label for="newYear1">Year </label> <input type="text" size="4" id="newYear1" name="newYear1"/>
+			<label for="newMonth1">Month </label> <input type="text" size="2" id="newMonth1" name="newMonth1"/>
+			<label for="newDay1">Day </label> <input type="text" size="2" id="newDay1" name="newDay1" />
+			[% END %]
+			</li>
 			<li><label for="title">Title: </label><input type="text" name="newTitle" id="title" size="35" /></li>
 			<li><label for="newDescription">Description:</label>
 				<textarea rows="2" cols="40" id="newDescription" name="newDescription"></textarea>
@@ -239,6 +255,16 @@
 							<a href="#" class="helptext">[?]</a>
 							<div class="hint">This will take this day and month as a reference to make it a holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1st will make August 1st a holiday every year.</div>
 							</li>
+            <li class="radio"><input type="radio" name="newOperation" id="newOperationField" value="holidayrange" />
+                            <label for="newOperationField">Holidays on a range</label>.
+                            <a href="#" class="helptext">[?]</a>
+                            <div class="hint">Make a single holiday on a range. For example, selecting August 1st, 2012  and August 10st, 2012 will make all days between 1st and 10st holiday, but will not affect August 1st-10st in other years.</div>
+                            </li>
+            <li class="radio"><input type="radio" name="newOperation" id="newOperationFieldyear" value="holidayrangerepeat" />
+                            <label for="newOperationFieldyear">Holidays repeated yearly on a range</label>.
+                            <a href="#" class="helptext">[?]</a>
+                            <div class="hint">Make a single holiday on a range repeated yearly. For example, selecting August 1st, 2012  and August 10st, 2012 will make all days between 1st and 10st holiday, and will affect August 1st-10st in other years.</div>
+                            </li>
 				<li class="radio">
 				<input type="checkbox" name="allBranches" id="allBranches" />
 				<label for="allBranches">Copy to all libraries</label>.
diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl
index 34469d8..f050b85 100755
--- a/tools/newHolidays.pl
+++ b/tools/newHolidays.pl
@@ -10,24 +10,28 @@ use C4::Output;
 
 
 use C4::Calendar;
+use DateTime;
 
-my $input = new CGI;
-my $dbh = C4::Context->dbh();
+my $input               = new CGI;
+my $dbh                 = C4::Context->dbh();
 
-my $branchcode = $input->param('newBranchName');
-my $originalbranchcode = $branchcode;
-my $weekday = $input->param('newWeekday');
-my $day = $input->param('newDay');
-my $month = $input->param('newMonth');
-my $year = $input->param('newYear');
-my $title = $input->param('newTitle');
-my $description = $input->param('newDescription');
-my $newoperation = $input->param('newOperation');
-my $allbranches = $input->param('allBranches');
+my $branchcode          = $input->param('newBranchName');
+my $originalbranchcode  = $branchcode;
+my $weekday             = $input->param('newWeekday');
+my $day                 = $input->param('newDay');
+my $month               = $input->param('newMonth');
+my $year                = $input->param('newYear');
+my $day1                = $input->param('newDay1');
+my $month1              = $input->param('newMonth1');
+my $year1               = $input->param('newYear1');
+my $title               = $input->param('newTitle');
+my $description         = $input->param('newDescription');
+my $newoperation        = $input->param('newOperation');
+my $allbranches         = $input->param('allBranches');
 
-my $calendardate = sprintf("%04d-%02d-%02d", $year, $month, $day);
-my $isodate = C4::Dates->new($calendardate, 'iso');
-$calendardate = $isodate->output('syspref');
+my $calendardate        = sprintf("%04d-%02d-%02d", $year, $month, $day);
+my $isodate             = C4::Dates->new($calendardate, 'iso');
+$calendardate           = $isodate->output('syspref');
 
 $title || ($title = '');
 if ($description) {
@@ -80,5 +84,52 @@ sub add_holiday {
 						             description => $description);
 		}
 
-	}
+	} elsif ( $newoperation eq 'holidayrange' ) {
+        #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){
+            unless ( $calendar->isHoliday( $date->{local_c}->{day}, $date->{local_c}->{month}, $date->{local_c}->{year} ) ) {
+            $calendar->insert_single_holiday(
+                day         => $date->{local_c}->{day},
+                month       => $date->{local_c}->{month},
+                year        => $date->{local_c}->{year},
+                title       => $title,
+                description => $description
+                );
+            }
+        }
+    } elsif ( $newoperation eq 'holidayrangerepeat' ) {
+        #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){
+            unless ( $calendar->isHoliday( $date->{local_c}->{day}, $date->{local_c}->{month}, $date->{local_c}->{year} ) ) {
+            $calendar->insert_day_month_holiday(
+                day         => $date->{local_c}->{day},
+                month       => $date->{local_c}->{month},
+                title       => $title,
+                description => $description
+                );
+            }
+        }
+    }
 }
-- 
1.7.0.4


From jonathan.druart at biblibre.com  Fri Dec  2 16:19:20 2011
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Fri,  2 Dec 2011 16:19:20 +0100
Subject: [Koha-patches] [PATCH] Bug 7154: Modification in borrower attributes
Message-ID: <1322839160-24622-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

this patch add 2 fields in borrower_attribute_types :
    category_type
    class
---
 C4/Members/AttributeTypes.pm                       |   55 ++++++++++++-
 C4/Members/Attributes.pm                           |    4 +-
 admin/patron-attr-types.pl                         |    9 ++
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 ++
 .../prog/en/modules/admin/patron-attr-types.tt     |   62 +++++++++++----
 .../prog/en/modules/members/memberentrygen.tt      |   84 ++++++++++++++------
 .../prog/en/modules/members/moremember.tt          |   43 +++++++----
 members/memberentry.pl                             |    5 +
 members/moremember.pl                              |   19 ++++-
 10 files changed, 223 insertions(+), 66 deletions(-)

diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm
index e36557b..6a6b16d 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,8 @@ sub new {
     $self->{'staff_searchable'} = 0;
     $self->{'display_checkout'} = 0;
     $self->{'authorised_value_category'} = '';
+    $self->{'category_type'} = '';
+    $self->{'class'} = '';
 
     bless $self, $class;
     return $self;
@@ -155,6 +157,8 @@ sub fetch {
     $self->{'staff_searchable'}          = $row->{'staff_searchable'};
     $self->{'display_checkout'}          = $row->{'display_checkout'};
     $self->{'authorised_value_category'} = $row->{'authorised_value_category'};
+    $self->{'category_type'}             = $row->{'category_type'};
+    $self->{'class'}                     = $row->{'class'};
 
     bless $self, $class;
     return $self;
@@ -185,14 +189,16 @@ sub store {
                                          password_allowed = ?,
                                          staff_searchable = ?,
                                          authorised_value_category = ?,
-                                         display_checkout = ?
+                                         display_checkout = ?,
+                                         category_type = ?,
+                                         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_type, class, code)
                                         VALUES (?, ?, ?, ?, ?,
-                                                ?, ?, ?, ?)");
+                                                ?, ?, ?, ?, ?, ?)");
     }
     $sth->bind_param(1, $self->{'description'});
     $sth->bind_param(2, $self->{'repeatable'});
@@ -202,7 +208,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_type'});
+    $sth->bind_param(10, $self->{'class'});
+    $sth->bind_param(11, $self->{'code'});
     $sth->execute;
 
 }
@@ -341,6 +349,43 @@ sub authorised_value_category {
     @_ ? $self->{'authorised_value_category'} = shift : $self->{'authorised_value_category'};
 }
 
+=head2 category_type
+
+=over 4
+
+my $category_type = $attr_type->category_type();
+$attr_type->category_type($category_type);
+
+=back
+
+Accessor.
+
+=cut
+
+sub category_type {
+    my $self = shift;
+    @_ ? $self->{'category_type'} = shift : $self->{'category_type'};
+}
+
+=head2 class
+
+=over 4
+
+my $category_type = $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..377159b 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -110,6 +110,9 @@ sub error_add_attribute_type_form {
         $template->param(display_checkout_checked => 'checked="checked"');
     }
 
+    $template->param( category_type => $input->param('category_type') );
+    $template->param( class => $input->param('class') );
+
     $template->param(
         attribute_type_form => 1,
         confirm_op => 'add_attribute_type_confirmed',
@@ -152,6 +155,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_type($input->param('category_type'));
+    $attr_type->class($input->param('class'));
 
     if ($op eq 'edit') {
         $template->param(edited_attribute_type => $attr_type->code());
@@ -209,6 +214,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);
@@ -232,6 +238,9 @@ sub edit_attribute_type_form {
     }
     authorised_value_category_list($template, $attr_type->authorised_value_category());
 
+    $template->param ( category_type => $attr_type->category_type );
+    $template->param ( class => $attr_type->class );
+
     $template->param(
         attribute_type_form => 1,
         edit_attribute_type => 1,
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 452173d..f4db550 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -286,6 +286,7 @@ 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
   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 9ae0060..6728330 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4571,6 +4571,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN category_type VARCHAR(1)  NOT NULL DEFAULT '' AFTER `display_checkout`");
+    $dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN class VARCHAR(255)  NOT NULL DEFAULT '' AFTER `category_type`");
+    print "Upgrade to $DBversion done (New fields category_type and class in borrower_attribute_types table)\n";
+    SetVersion($DBversion);
+}
 
 =head1 FUNCTIONS
 
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..4d32646 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,24 @@ 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_type">Category type: </label>
+            <select name="category_type" id="category_type">
+                <option value=""></option>
+                [% IF category_type == 'A' %]<option value="A" selected="selected">Adult</option>[% ELSE %]<option value="A">Adult</option>[% END %]
+                [% IF category_type == 'C' %]<option value="C" selected="selected">Child</option>[% ELSE %]<option value="C">Child</option>[% END %]
+                [% IF category_type == 'S' %]<option value="S" selected="selected">Staff</option>[% ELSE %]<option value="S">Staff</option>[% END %]
+                [% IF category_type == 'I' %]<option value="I" selected="selected">Organization</option>[% ELSE %]<option value="I">Organization</option>[% END %]
+                [% IF category_type == 'P' %]<option value="P" selected="selected">Professional</option>[% ELSE %]<option value="P">Professional</option>[% END %]
+                [% IF category_type == 'X' %]<option value="X" selected="selected">Statistical</option>[% ELSE %]<option value="X">Statistical</option>[% 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>
+            <input type="text" id="class" name="class"  size="20" value="[% class | html %]"/>
+            <span>Group attributes types with a block title</span>
+        </li>
     </ol>
   </fieldset>
   <fieldset class="action">
@@ -248,23 +266,33 @@ 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>
-  [% END %]
-</table>[% ELSE %]<p>There are no saved patron attribute types.</p>[% END %]
+[% IF ( available_attribute_types ) %]
+  <table id="patron_attributes_types">
+    <thead>
+      <tr>
+        <th>Class</th>
+        <th>Code</th>
+        <th>Description</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH available_attribute_type IN available_attribute_types %]
+        <tr>
+          <td>[% available_attribute_type.class |html %]</td>
+          <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>
+      [% END %]
+    </tbody>
+  </table>
+[% 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 b9371b6..9c31271 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 category_type %]
+            update_category_code( "[% category_type %]" );
+        [% ELSE %]
+            if ( $("#categorycode").length > 0 ){
+                var category_type = $("#categorycode").find("option:selected").attr("data-typename");
+                update_category_code( category_type );
+            }
+        [% END %]
+
     });
 
     function clear_entry(node) {
@@ -51,6 +61,23 @@
         $("select#patron_attr_" + newId, clone).attr('value','');
         original.parentNode.insertBefore(clone, original.nextSibling);
     }
+
+    function update_category_code(category_type) {
+        var mytable = $("#attributes_table>tbody");
+
+        mytable.find("tr").each(function(){
+            $(this).hide()
+        });
+
+        mytable.find("tr[data-category_type="+category_type+"]").each(function(){
+            $(this).show();
+        });
+        mytable.find("tr[data-category_type='']").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 ");
@@ -890,25 +917,25 @@
     </li>
     <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>
@@ -1180,14 +1207,20 @@
   <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>
+    <table id="attributes_table">
+        <thead>
+            <tr>
+                <th>Class</th>
+                <th>Type</th>
+                <th colspan="2">Value</th>
+            </tr>
+        </thead>
+        <tbody>
         [% FOREACH patron_attribute IN patron_attributes %]
-        <tr>
-            <td>[% patron_attribute.code %] ([% patron_attribute.description %])
+        <tr data-category_type="[% patron_attribute.category_type %]">
+            <td>[% patron_attribute.class %]</td>
+            <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 %]" />
@@ -1228,6 +1261,7 @@
             </td>
         </tr>
         [% END %]
+        </tbody>
     </table>
   </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 454032c..439689f 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 d169dbd..0997888 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -407,6 +407,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' );
@@ -760,11 +763,13 @@ sub patron_attributes_form {
     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_type     => $attr_type->category_type(),
             password          => '',
         };
         if (exists $attr_hash{$attr_type->code()}) {
diff --git a/members/moremember.pl b/members/moremember.pl
index 6e5407c..e48538e 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,25 @@ 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 );
+    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 Dec  2 16:33:13 2011
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Fri,  2 Dec 2011 16:33:13 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_5347=3A_Adds_columns_cla?=
	=?utf-8?q?ims=5Fcount_and_claimed=5Fdate_in_aqorders?=
Message-ID: <1322839993-25575-1-git-send-email-jonathan.druart@biblibre.com>

This patch adds 2 columns in the aqorders table :
- claims_count : number of claims for an orders
- claimed_date : date of the lastest claim

In the lateorders.pl table, you can not select orders from different
supplier because there is just one letter sent after clicking the "Claim
order" button. So, it's logic that you want to select only orders from
this supplier.

Modification in C4/Letters.pm:
refactoring code for claimacquisition and claimissues letter type.
Now, fields for theses letters check the table name. It's not possible
to chooce aqorders.title, this field doesn't exist !
Furthermore, you can add a <item> tag around your item fields, like
this :

-- Begin example
<<LibrarianFirstname>>
<<LibrarianSurname>>

<<aqbooksellers.contact>>
<<aqbooksellers.address1>>
<<aqbooksellers.phone>>
<<aqbasket.basketno>>
<<aqbooksellers.phone>>
<item>Library : <<items.homebranch>>
In your possesssion : <<biblio.author>>. <<biblio.title>>.
<<biblioitems.publishercode>>, <<biblioitems.publicationyear>>.
Callnumber : <<items.itemcallnumber>>. doc type : <<items.itype>>
Barcode : <<items.barcode>>
Date for the return : <<items.onloan>>.</item>

<<LibrarianSurname>>
-- End example
---
 C4/Acquisition.pm                                  |   30 +++
 C4/Letters.pm                                      |  198 ++++++++------------
 acqui/lateorders.pl                                |   18 ++-
 .../data/mysql/en/mandatory/sample_notices.sql     |    2 +-
 .../mysql/fr-FR/1-Obligatoire/sample_notices.sql   |    2 +-
 installer/data/mysql/kohastructure.sql             |    2 +
 .../data/mysql/pl-PL/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/ru-RU/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/ru-RU/optional/sample_notices.sql   |    2 +-
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/uk-UA/optional/sample_notices.sql   |    2 +-
 installer/data/mysql/updatedatabase.pl             |    6 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |   10 +-
 .../prog/en/modules/acqui/lateorders.tt            |   39 ++++-
 14 files changed, 185 insertions(+), 132 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 7127f24..e1d18f5 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -61,6 +61,8 @@ BEGIN {
         &GetContracts &GetContract
 
         &GetItemnumbersFromOrder
+
+        &AddClaim
     );
 }
 
@@ -1416,9 +1418,12 @@ sub GetLateOrders {
         DATE(aqbasket.closedate)  AS orderdate,
         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,
         borrowers.branchcode      AS branch,
         aqbooksellers.name        AS supplier,
+        aqbooksellers.id          AS supplierid,
         biblio.author, biblio.title,
         biblioitems.publishercode AS publisher,
         biblioitems.publicationyear,
@@ -1742,6 +1747,31 @@ sub GetContract {
     return $result;
 }
 
+=head3 AddClaim
+
+=over 4
+
+&AddClaim($ordernumber);
+
+Add a claim for an order
+
+=back
+
+=cut
+sub AddClaim {
+    my ($ordernumber) = @_;
+    my $dbh          = C4::Context->dbh;
+    my $query        = "
+        UPDATE aqorders SET
+            claims_count = claims_count + 1,
+            claimed_date = CURDATE()
+        WHERE ordernumber = ?
+        ";
+    my $sth = $dbh->prepare($query);
+    $sth->execute($ordernumber);
+
+}
+
 1;
 __END__
 
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 6846a00..edd93a1 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -243,6 +243,7 @@ sub findrelatedto ($$) {
 sub SendAlerts {
     my ( $type, $externalid, $letter ) = @_;
     my $dbh = C4::Context->dbh;
+    my $strsth;
     if ( $type eq 'issue' ) {
 
         # 		warn "sending issues...";
@@ -290,99 +291,56 @@ sub SendAlerts {
                     );
                 sendmail(%mail) or carp $Mail::Sendmail::error;
 
-# warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
             }
         }
     }
     elsif ( $type eq 'claimacquisition' ) {
 
-        # 		warn "sending issues...";
-        my $letter = getletter( 'claimacquisition', $letter );
+        $letter = getletter( 'claimacquisition', $letter );
 
         # prepare the letter...
         # search the biblionumber
-        my $strsth =
-"select aqorders.*,aqbasket.*,biblio.*,biblioitems.* from aqorders LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno LEFT JOIN biblio on aqorders.biblionumber=biblio.biblionumber LEFT JOIN biblioitems on aqorders.biblioitemnumber=biblioitems.biblioitemnumber where aqorders.ordernumber IN ("
-          . join( ",", @$externalid ) . ")";
-        my $sthorders = $dbh->prepare($strsth);
-        $sthorders->execute;
-        my $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{booksellerid} );
-        my $sthbookseller =
-          $dbh->prepare("select * from aqbooksellers where id=?");
-        $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
-        my $databookseller = $sthbookseller->fetchrow_hashref;
-
-        # 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;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
-                }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
-            }
-        }
-        $letter->{content} =~ s/<<[^>]*>>//g;
-        my $innerletter = $letter;
-
-        # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} )
-        {
-            my %mail = (
-                To => $databookseller->{bookselleremail}
-                  . (
-                    $databookseller->{contemail}
-                    ? "," . $databookseller->{contemail}
-                    : ""
-                  ),
-                From           => $userenv->{emailaddress},
-                Subject        => "" . $innerletter->{title},
-                Message        => "" . $innerletter->{content},
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-        }
-        if ( C4::Context->preference("LetterLog") ) {
-            logaction(
-                "ACQUISITION",
-                "Send Acquisition claim letter",
-                "",
-                "order list : "
-                  . join( ",", @$externalid )
-                  . "\n$innerletter->{title}\n$innerletter->{content}"
-            );
+        $strsth = qq{
+            SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*,aqbooksellers.*
+            FROM aqorders
+            LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
+            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
+            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' ) {
 
-        # 		warn "sending issues...";
-        my $letter = getletter( 'claimissues', $letter );
+        $letter = getletter( 'claimissues', $letter );
 
         # prepare the letter...
         # search the biblionumber
-        my $strsth =
-"select serial.*,subscription.*, biblio.* from serial LEFT JOIN subscription on serial.subscriptionid=subscription.subscriptionid LEFT JOIN biblio on serial.biblionumber=biblio.biblionumber where serial.serialid IN ("
+        $strsth = 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 $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{aqbooksellerid} );
-        my $sthbookseller =
-          $dbh->prepare("select * from aqbooksellers where id=?");
-        $sthbookseller->execute( $dataorders->[0]->{aqbooksellerid} );
-        my $databookseller = $sthbookseller->fetchrow_hashref;
+        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;
+        }
 
         # parsing branch info
         my $userenv = C4::Context->userenv;
@@ -391,59 +349,65 @@ sub SendAlerts {
         # parsing librarian name
         $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
         $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
-        $letter->{content} =~
-          s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
+        $letter->{content} =~ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
+
+        # Get Fields remplacement
+        my $item_format = $1 if ( $letter->{content} =~ m/(<item>.*<\/item>)/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 ( $item_format ) {
+            # For each order
+            foreach my $infos ( @orders_infos ) {
+                my $order_content = $item_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;
                 }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
+                $order_content =~ s/<\/{0,1}?item>//g;
+                $letter->{content} =~ s/<item>.*<\/item>/$order_content\n$item_format/xms;
             }
+            $letter->{content} =~ s/<item>.*<\/item>//xms;
         }
-        $letter->{content} =~ s/<<[^>]*>>//g;
+
         my $innerletter = $letter;
 
         # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} ) {
-            my $mail_to = $databookseller->{bookselleremail};
-            if ($databookseller->{contemail}) {
-                if (!$mail_to) {
-                    $mail_to = $databookseller->{contemail};
-                } else {
-                    $mail_to .= q|,|;
-                    $mail_to .= $databookseller->{contemail};
-                }
-            }
-            my $mail_subj = $innerletter->{title};
-            my $mail_msg  = $innerletter->{content};
-            $mail_msg  ||= q{};
-            $mail_subj ||= q{};
-
+        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 => $mail_to,
-                From    => $userenv->{emailaddress},
-                Subject => $mail_subj,
-                Message => $mail_msg,
+                To             => $to,
+                From           => $userenv->{emailaddress},
+                Subject        => "" . $innerletter->{title},
+                Message        => "" . $innerletter->{content},
                 'Content-Type' => 'text/plain; charset="utf8"',
             );
             sendmail(%mail) or carp $Mail::Sendmail::error;
-            logaction(
-                "ACQUISITION",
-                "CLAIM ISSUE",
-                undef,
-                "To="
-                  . $databookseller->{contemail}
-                  . " Title="
-                  . $innerletter->{title}
-                  . " Content="
-                  . $innerletter->{content}
-            ) if C4::Context->preference("LetterLog");
+            warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
+            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 {
+            die "This bookseller have no email\n";
         }
-    }    
-   # send an "account details" notice to a newly created user 
+
+        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}";
+    }
+
+    # 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;
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 810f665..fe27de4 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -76,6 +76,19 @@ unless ($delay =~ /^\d{1,3}$/) {
 	$delay = 30;	#default value for delay
 }
 
+if ($op and $op eq "send_alert"){
+    my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
+    eval {
+        SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
+        AddClaim ( $_ ) for @ordernums;
+    };
+    if ( $@ ) {
+        $template->param(error_claim => $@);
+    } else {
+        $template->param(info_claim => "Emails have been sent");
+    }
+}
+
 my %supplierlist = GetBooksellersWithLateOrders($delay);
 my (@sloopy);	# supplier loop
 foreach (keys %supplierlist){
@@ -100,11 +113,6 @@ foreach (keys %$letters){
 }
 $template->param(letters=>\@letters) if (@letters);
 
-if ($op and $op eq "send_alert"){
-	my @ordernums = $input->param("claim_for");									# FIXME: Fallback values?
-	SendAlerts('claimacquisition',\@ordernums,$input->param("letter_code"));	# FIXME: Fallback value?
-}
-
 $template->param(ERROR_LOOP => \@errors) if (@errors);
 $template->param(
 	lateorders => \@lateorders,
diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
index 689fa0f..0c9e860 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
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 977e59d..09dc641 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
@@ -2,7 +2,7 @@ INSERT IGNORE INTO `letter`
 (module, code, name, title, content)
 VALUES
 ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'),
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'),
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 452173d..c79c4b9 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2631,6 +2631,8 @@ CREATE TABLE `aqorders` (
   `sort1_authcat` varchar(10) default NULL,
   `sort2_authcat` varchar(10) default NULL,
   `uncertainprice` tinyint(1),
+  `claims_count` int(11) default 0,
+  `claimed_date` date default NULL,
   PRIMARY KEY  (`ordernumber`),
   KEY `basketno` (`basketno`),
   KEY `biblionumber` (`biblionumber`),
diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
index 6be2eb8..287730a 100644
--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
@@ -2,7 +2,7 @@ INSERT INTO `letter` (module, code, name, title, content)
 VALUES 
 ('circulation','ODUE','Overdue Notice',
 'Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
index 689fa0f..0c9e860 100644
--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/ru-RU/optional/sample_notices.sql b/installer/data/mysql/ru-RU/optional/sample_notices.sql
index 4f2001e..d6537e1 100644
--- a/installer/data/mysql/ru-RU/optional/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/optional/sample_notices.sql
@@ -5,7 +5,7 @@ INSERT INTO `letter`
 VALUES
 ('circulation','ODUE','??????????? ? ?????????','??????? ???????????','???????? <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n?? ????? ???????? ???????, ? ??? ???? ????????????? ??????????. ???? ?????????? ?? ??????? ?????? ?? ?????????, ??, ??????????, ????????? ??? ???????? ?? ??? ????? ??????.\r\n\r\n<<branches.branchname>><<branches.branchaddress1>><<branches.branchaddress2>><<branches.branchaddress3>><<branches.branchphone>><<branches.branchfax>><<branches.branchemail>>???? ?? ???????????????? ?????? ? ??????????, ?? ?????? ???????????? ??? ? ????? ??????? ????????????? ?????? ??? ??????????? ??????. ???? ????????? ????? ????????? ????? ??? ?? 30 ????, ?? ?? ??????? ???????????? ??? ???????????? ????? ???? ?? ??????? ?????????. ????????? ????????? ? ????????? ????? ???????? ????????????:\r\n\r\n<<items.content>>'),
 
-('claimacquisition','ACQCLAIM','?????????? ????????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????? <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ??????) ???????? ?? ????.'),
+('claimacquisition','ACQCLAIM','?????????? ????????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????? <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ??????) ???????? ?? ????.'),
 
 ('serial','RLIST','?????? ??????????','?????????? ??????? ??? ?????????','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n????????? ?????? ??? ????????:\r\n\r\n<<items.content>>\r\n\r\n??????? ??????? ??? ? ????? ??????? ??? ??? ?????.'),
 
diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
index 358205b..dc5a54d 100644
--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/uk-UA/optional/sample_notices.sql b/installer/data/mysql/uk-UA/optional/sample_notices.sql
index 6df324b..0e1e1f4 100644
--- a/installer/data/mysql/uk-UA/optional/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/optional/sample_notices.sql
@@ -5,7 +5,7 @@ INSERT INTO `letter`
 VALUES
 ('circulation','ODUE','???????????? ??? ????????????','??????? ???????????','???????? <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n?? ????? ???????? ???????, ? ??? ? ??????????? ??????????. ???? ?????????? ?? ?????? ?????? ?? ??????????, ???, ???? ?????, ????????? ??? ??????? ?? ?? ????? ??????.\r\n\r\n<<branches.branchname>><<branches.branchaddress1>><<branches.branchaddress2>><<branches.branchaddress3>><<branches.branchphone>><<branches.branchfax>><<branches.branchemail>>???? ?? ????????????? ?????? ? ??????????, ?? ?????? ??????????????? ???? ? ????? ??????? ????????????? ?????? ??? ??????????? ??????. ???? ????????? ??? ???????????? ????? ??? ?? 30 ????, ?? ?? ??????? ??????????????? ??? ????????? ?????? ???? ?? ????????? ?????????. ????????? ????????? ? ????? ??? ? ????????????:\r\n\r\n<<items.content>>'),
 
-('claimacquisition','ACQCLAIM','?????? ?????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????????? <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ?????????) (<<aqorders.listprice>> ??????) ???????? ?? ????.'),
+('claimacquisition','ACQCLAIM','?????? ?????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????????? <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ?????????) (<<aqorders.listprice>> ??????) ???????? ?? ????.'),
 
 ('serial','RLIST','?????? ???????????','????????? ??????? ??? ????????','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n????????? ?????? ??? ?????????:\r\n\r\n<<items.content>>\r\n\r\n???????? ??????? ???? ? ????-???? ??????? ??? ??? ???.'),
 
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9ae0060..f46d33b 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4571,6 +4571,12 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE `aqorders` ADD COLUMN `claims_count` INT(11)  DEFAULT 0, ADD COLUMN `claimed_date` DATE  DEFAULT NULL AFTER `claims_count`");
+    print "Upgrade to $DBversion done (Add claims_count and claimed_date fields in aqorders table)\n";
+    SetVersion($DBversion);
+}
 
 =head1 FUNCTIONS
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 7b38062..7557f58 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2080,4 +2080,12 @@ div.pager input.pagedisplay {
 	background-color : transparent;
 	font-weight: bold;
 	text-align : center;
-}
\ No newline at end of file
+}
+
+div.info {
+   border : 2px dashed #990000;
+   background-color : #99FFCC;
+   padding : .5em;
+   margin : 1em;
+}
+
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 1e64e1f..545d9c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -1,6 +1,20 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function() {
+    $("input:checkbox[name=claim_for]").click(function(){
+        var supplierid = $(this).attr('supplierid');
+        if ( $("input:checkbox[name=claim_for]:checked").length > 0) {
+            $("input:checkbox[name=claim_for][supplierid!="+supplierid+"]").attr('disabled', true);
+        } else {
+            $("input:checkbox[name=claim_for]").attr('disabled', false);
+        }
+    });
+});
+//]]>
+</script>
 </head>
 <body>
 [% INCLUDE 'header.inc' %]
@@ -17,6 +31,12 @@
 <h1>[% IF ( Supplier ) %][% Supplier %] : [% END %]Late orders</h1>
 <div id="acqui_lateorders">
 
+[% IF error_claim %]
+    <div class="error">[% error_claim %]</div>
+[% END %]
+[% IF info_claim %]
+    <div class="info">[% info_claim %]</div>
+[% END %]
 [% IF ( lateorders ) %]
 <form action="lateorders.pl" name="claim" method="post">
   <input type="hidden" name="op" value="send_alert" />
@@ -35,12 +55,20 @@
             <th>Information</th>
             <th>Total cost</th>
             <th>Basket</th>
-            <th>&nbsp;</th>
+            <th>claims count</th>
+            <th>claimed date</th>
+            <!-- TMPL_IF name="Supplier" -->
+            [% IF Supplier %]
+                <th><input type="checkbox" id="checkAll"></th>
+            [% ELSE %]
+                <th></th>
+            [% END %]
         </tr>
     [% FOREACH lateorder IN lateorders %]
         [% UNLESS ( loop.odd ) %]<tr class="highlight">
         [% ELSE %]<tr>[% END %]
             <td>
+                ([% lateorder.supplierid %])
                 [% lateorder.orderdate %]
                 ([% lateorder.latesince %] days)
             </td>
@@ -69,8 +97,13 @@
                  </p>
                  <p title="branch">[% lateorder.branch %]</p>
             </td>
+            <td>[% lateorder.claims_count %]</td>
+            <td>[% lateorder.claimed_date %]</td>
             <td>
-                <input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]" />
+                [% UNLESS lateorder.budget_lock %]
+                    <input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]"  supplierid="[% lateorder.supplierid %]"/>
+                [% END %]
+             </td>
             </td>
         </tr>
         [% END %]
@@ -79,6 +112,8 @@
             <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>
-- 
1.7.7.3


From magnus at enger.priv.no  Fri Dec  2 17:37:03 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Fri,  2 Dec 2011 16:37:03 +0000
Subject: [Koha-patches] =?utf-8?q?=5BPATCH_3/3=5D_Bug_7309_-_Add_NORMARCsl?=
	=?utf-8?q?im2intranetDetail=2Exsl_for_detail_view_in_intranet?=
Message-ID: <1322843823-19570-1-git-send-email-magnus@enger.priv.no>

Adds two files, to enable XSLT for the detail view in the intranet:
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl

To test:
- Set sysprefs: marcflavour = NORMARC and XSLTDetailsDisplay = "using XSLT stylesheet"
- Make sure OPACBaseURL is set correctly
- Check that detail display looks ok
- Check that automatic links for author, subjects etc work
- Check that the "Open in new window" link works as expected
- Empty the OPACBaseURL syspref and check that "Open in new window" does not display
---
 .../prog/en/xslt/NORMARCslim2intranetDetail.xsl    |  535 ++++++++++++++++++++
 .../prog/en/xslt/NORMARCslimUtils.xsl              |  205 ++++++++
 2 files changed, 740 insertions(+), 0 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
new file mode 100644
index 0000000..163ed29
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
@@ -0,0 +1,535 @@
+<?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-community.org/items"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="marc items">
+    <xsl:import href="NORMARCslimUtils.xsl"/>
+    <xsl:output method = "xml" indent="yes" omit-xml-declaration = "yes" />
+    <xsl:template match="/">
+            <xsl:apply-templates/>
+    </xsl:template>
+
+    <xsl:template match="marc:record">
+
+        <!-- Sysprefs -->
+        <xsl:variable name="OPACBaseURL" select="marc:sysprefs/marc:syspref[@name='OPACBaseURL']"/>
+
+        <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="controlField008" select="marc:controlfield[@tag=008]"/>
+        <xsl:variable name="field019b" select="marc:datafield[@tag=019]/marc:subfield[@code='b']"/>
+        <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
+        <xsl:variable name="materialTypeCode">
+            <xsl:choose>
+                <xsl:when test="$field019b='b' or $field019b='k' or $field019b='l' or $leader6='b'">Mon</xsl:when>
+                <xsl:when test="$field019b='e' or contains($field019b,'ec') or contains($field019b,'ed') or contains($field019b,'ee') or contains($field019b,'ef') or $leader6='g'">FV</xsl:when>
+                <xsl:when test="$field019b='c' or $field019b='d' or contains($field019b,'da') or contains($field019b,'db') or contains($field019b,'dc') or contains($field019b,'dd') or contains($field019b,'dg') or contains($field019b,'dh') or contains($field019b,'di') or contains($field019b,'dj') or contains($field019b,'dk') or $leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'">Mus</xsl:when>
+                <xsl:when test="$field019b='a' or contains($field019b,'ab') or contains($field019b,'aj') or $leader6='e' or $leader6='f'">Kar</xsl:when>
+                <xsl:when test="$field019b='f' or $field019b='i' or contains($field019b,'ib') or contains($field019b,'ic') or contains($field019b,'fd') or contains($field019b,'ff') or contains($field019b,'fi') or $leader6='k'">gra</xsl:when>
+                <xsl:when test="$field019b='g' or contains($field019b,'gb') or contains($field019b,'gd') or contains($field019b,'ge') or $leader6='m'">Fil</xsl:when>
+                <xsl:when test="$leader6='o'">kom</xsl:when>
+                <xsl:when test="$field019b='h' or $leader6='r'">trd</xsl:when>
+                <xsl:when test="$field019b='j' or $leader6='a'">
+                    <xsl:choose>
+                        <xsl:when test="$leader7='a' or $leader7='c' or $leader7='m' or $leader7='p'">Mon</xsl:when>
+                        <xsl:when test="$field019b='j' or $leader7='b' or $leader7='s'">Per</xsl:when>
+                    </xsl:choose>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="materialTypeLabel">
+                        <xsl:choose>
+                <xsl:when test="$field019b='b' or $field019b='k' or $field019b='l' or $leader6='b'">Bok</xsl:when>
+                <xsl:when test="$field019b='e' or contains($field019b,'ec') or contains($field019b,'ed') or contains($field019b,'ee') or contains($field019b,'ef') or $leader6='g'">Film og video</xsl:when>
+                <xsl:when test="$field019b='c' or $field019b='d' or contains($field019b,'da') or contains($field019b,'db') or contains($field019b,'dc') or contains($field019b,'dd') or contains($field019b,'dg') or contains($field019b,'dh') or contains($field019b,'di') or contains($field019b,'dj') or contains($field019b,'dk') or $leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'">Musikalier</xsl:when>
+                <xsl:when test="$field019b='a' or contains($field019b,'ab') or contains($field019b,'aj') or $leader6='e' or $leader6='f'">Kart</xsl:when>
+                <xsl:when test="$field019b='f' or $field019b='i' or contains($field019b,'ib') or contains($field019b,'ic') or contains($field019b,'fd') or contains($field019b,'ff') or contains($field019b,'fi') or $leader6='k'">Grafisk materiale</xsl:when>
+                <xsl:when test="$field019b='g' or contains($field019b,'gb') or contains($field019b,'gd') or contains($field019b,'ge') or $leader6='m'">Fil</xsl:when>
+                <xsl:when test="$leader6='o'">Kombidokument</xsl:when>
+                <xsl:when test="$field019b='h' or $leader6='r'">Tredimensjonal gjenstand</xsl:when>
+                <xsl:when test="$field019b='j' or $leader6='a'">
+                    <xsl:choose>
+                        <xsl:when test="$leader7='a' or $leader7='c' or $leader7='m' or $leader7='p'">Bok</xsl:when>
+                        <xsl:when test="$field019b='j' or $leader7='b' or $leader7='s'">Periodikum</xsl:when>
+                    </xsl:choose>
+                </xsl:when>
+            </xsl:choose>
+
+        </xsl:variable>
+
+        <!-- Tittel og ansvarsopplysninger -->
+        <xsl:if test="marc:datafield[@tag=245]">
+        <h1>
+            <xsl:for-each select="marc:datafield[@tag=245]">
+                    <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">np</xsl:with-param>
+                    </xsl:call-template>
+            </xsl:for-each>
+        </h1>
+        </xsl:if>
+
+        <!-- Author Statement -->
+		<!-- 245$9 is Koha authority number --> 
+        <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]">
+        <h5 class="author">av
+        <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
+        <a>
+        <xsl:choose>
+            <xsl:when test="marc:subfield[@code=9]">
+                <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>
+
+        <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
+        <a>
+        <xsl:choose>
+            <xsl:when test="marc:subfield[@code=9]">
+                <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=111 or @tag=711]">
+        <a>
+        <xsl:choose>
+            <xsl:when test="marc:subfield[@code=9]">
+                <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>
+        </h5>
+        </xsl:when>
+        </xsl:choose>
+
+
+        <xsl:if test="$materialTypeCode!=''">
+        <span class="results_summary"><span class="label">Materialtype: </span>
+        <xsl:element name="img"><xsl:attribute name="src">/opac-tmpl/prog/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element>
+        <xsl:value-of select="$materialTypeLabel"/>
+        </span>
+        </xsl:if>
+
+        <!--Series -->
+        <xsl:if test="marc:datafield[@tag=440 or @tag=490]">
+	        <span class="results_summary"><span class="label">Series: </span>
+	        <xsl:for-each select="marc:datafield[@tag=440]">
+	             <a href="/cgi-bin/koha/catalogue/search.pl?q=se:{marc:subfield[@code='a']}">
+	            <xsl:call-template name="chopPunctuation">
+	                            <xsl:with-param name="chopString">
+	                                <xsl:call-template name="subfieldSelect">
+	                                    <xsl:with-param name="codes">av</xsl:with-param>
+	                                </xsl:call-template>
+	                            </xsl:with-param>
+	                        </xsl:call-template>
+				</a>
+	                    <xsl:text> </xsl:text><xsl:call-template name="part"/>
+	            <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=490][@ind1=0]">
+	             <a href="/cgi-bin/koha/catalogue/search.pl?q=se:{marc:subfield[@code='a']}">
+	                        <xsl:call-template name="chopPunctuation">
+	                            <xsl:with-param name="chopString">
+	                                <xsl:call-template name="subfieldSelect">
+	                                    <xsl:with-param name="codes">av</xsl:with-param>
+	                                </xsl:call-template>
+	                            </xsl:with-param>
+	                        </xsl:call-template>
+	            </a>
+	                    <xsl:call-template name="part"/>
+	        <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>
+
+        <!-- Publisher Statement -->
+        
+        <xsl:if test="marc:datafield[@tag=260]">
+        <span class="results_summary"><span class="label">Utgiver: </span>
+            <xsl:for-each select="marc:datafield[@tag=260]">
+                <xsl:call-template name="chopPunctuation">
+                  <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">bcg</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>
+
+        <!-- Edition Statement -->
+        
+        <xsl:if test="marc:datafield[@tag=250]">
+        <span class="results_summary"><span class="label">Utgave: </span>
+            <xsl:for-each select="marc:datafield[@tag=250]">
+                <xsl:call-template name="chopPunctuation">
+                  <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">ab</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>
+
+        <!-- Description -->
+        
+        <xsl:if test="marc:datafield[@tag=300]">
+        <span class="results_summary"><span class="label">Beskrivelse: </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>
+
+       <abbr class="unapi-id" title="koha:biblionumber:{marc:datafield[@tag=999]/marc:subfield[@code='c']}" ><!-- unAPI --></abbr>
+
+       <xsl:if test="marc:datafield[@tag=020]">
+        <span class="results_summary"><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"><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>
+
+        <!-- Other Title  Statement -->
+
+        <xsl:if test="marc:datafield[@tag=246]">
+        <span class="results_summary"><span class="label">Parallelltittel: </span>
+            <xsl:for-each select="marc:datafield[@tag=246]">
+                <xsl:call-template name="chopPunctuation">
+                  <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abhfgnp</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>
+
+        <!-- Uniform Title  Statement -->
+
+        <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
+        <span class="results_summary"><span class="label">Standardtittel: </span>
+        <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
+            <xsl:variable name="str">
+                <xsl:for-each select="marc:subfield">
+                    <xsl:if test="(contains('adfklmor', at code) and (not(../marc:subfield[@code='n' or @code='p']) or (following-sibling::marc:subfield[@code='n' or @code='p'])))">
+                        <xsl:value-of select="text()"/>
+                        <xsl:text> </xsl:text>
+                     </xsl:if>
+                </xsl:for-each>
+            </xsl:variable>
+            <xsl:call-template name="chopPunctuation">
+                <xsl:with-param name="chopString">
+                    <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
+                        
+                </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[substring(@tag, 1, 1) = '6']">
+            <span class="results_summary"><span class="label">Emner: </span>
+            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
+            <a>
+            <xsl:choose>
+            <xsl:when test="marc:subfield[@code=9]">
+                <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=su:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
+            </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="chopPunctuation">
+                <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abcdvxyz</xsl:with-param>
+                        <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
+                        <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:with-param>
+            </xsl:call-template></a>
+            <xsl:choose>
+            <xsl:when test="position()=last()"></xsl:when>
+            <xsl:otherwise> | </xsl:otherwise>
+            </xsl:choose>
+
+            </xsl:for-each>
+            </span>
+        </xsl:if>
+
+        <xsl:if test="marc:datafield[@tag=856]">
+        <span class="results_summary"><span class="label">Nettbasert ressurs: </span>
+        <xsl:for-each select="marc:datafield[@tag=856]">
+            <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+        <xsl:choose>
+            <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'])">
+        Klikk her for tilgang
+        </xsl:when>
+        </xsl:choose>
+        </a>
+            <xsl:choose>
+            <xsl:when test="position()=last()"></xsl:when>
+            <xsl:otherwise> | </xsl:otherwise>
+            </xsl:choose>  
+        </xsl:for-each>
+        </span>
+        </xsl:if>
+        
+        <!-- NORMARC does not define indicators for 505
+        <xsl:if test="marc:datafield[@tag=505]">
+        <xsl:for-each select="marc:datafield[@tag=505]">
+        <span class="results_summary"><span class="label">
+        <xsl:choose>
+        <xsl:when test="@ind1=0">
+            Contents:
+        </xsl:when>
+        <xsl:when test="@ind1=1">
+            Incomplete contents:
+        </xsl:when>
+        <xsl:when test="@ind1=1">
+            Partial contents:
+        </xsl:when>
+        </xsl:choose>  
+        </span>
+        <xsl:choose>
+        <xsl:when test="@ind2=0">
+            <xsl:for-each select="marc:subfield[@code='t']">
+                <xsl:value-of select="marc:subfield[@code=t]"/> <xsl:value-of select="marc:subfield[@code=r]"/>
+            </xsl:for-each> 
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="subfieldSelect">
+                <xsl:with-param name="codes">au</xsl:with-param>
+            </xsl:call-template>
+        </xsl:otherwise>
+        </xsl:choose>
+        </span>
+        </xsl:for-each>
+        </xsl:if>
+        -->
+        <xsl:if test="marc:datafield[@tag=505]">
+	        <xsl:call-template name="subfieldSelect">
+                <xsl:with-param name="codes">a</xsl:with-param>
+            </xsl:call-template>
+		</xsl:if>
+		
+        <!-- 780 -->
+        <xsl:if test="marc:datafield[@tag=780]">
+        <xsl:for-each select="marc:datafield[@tag=780]">
+        <span class="results_summary"><span class="label">
+        <xsl:choose>
+	        <xsl:when test="@ind2=0">
+	            Fortsettelse av:
+	        </xsl:when>
+	        <xsl:when test="@ind2=1">
+	            Delvis fortsettelse av:
+	        </xsl:when>
+	        <xsl:when test="@ind2=2">
+	            Avl?ser:
+	        </xsl:when>
+	        <xsl:when test="@ind2=3">
+	            Avl?ser delvis:
+	        </xsl:when>
+	        <xsl:when test="@ind2=4">
+	            Sammensl?ing av: ... ; og ...
+	        </xsl:when>
+	        <xsl:when test="@ind2=5">
+	            Har tatt opp:
+	        </xsl:when>
+	        <xsl:when test="@ind2=6">
+	            Har delvis tatt opp:
+	        </xsl:when>
+	        <xsl:when test="@ind2=7">
+	            Utskilt fra:
+	        </xsl:when>
+        </xsl:choose>
+        </span>
+                <xsl:variable name="f780">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">a_t</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:variable>
+             <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:value-of select="translate($f780, '()', '')"/></xsl:attribute>
+                <xsl:value-of select="translate($f780, '()', '')"/>
+            </a>
+        </span>
+ 
+        <xsl:choose>
+        <xsl:when test="@ind1=0">
+            <span class="results_summary"><xsl:value-of select="marc:subfield[@code='n']"/></span>
+        </xsl:when>
+        </xsl:choose>
+
+        </xsl:for-each>
+        </xsl:if>
+
+        <!-- 785 -->
+        <xsl:if test="marc:datafield[@tag=785]">
+        <xsl:for-each select="marc:datafield[@tag=785]">
+        <span class="results_summary"><span class="label">
+        <xsl:choose>
+	        <xsl:when test="@ind2=0">
+	            Fortsettelse i:
+	        </xsl:when>
+	        <xsl:when test="@ind2=1">
+	            Fortsettes delvis i:
+	        </xsl:when>
+	        <xsl:when test="@ind2=2">
+	            Avl?st av:
+	        </xsl:when>
+	        <xsl:when test="@ind2=3">
+	            Delvis avl?st av:
+	        </xsl:when>
+	        <xsl:when test="@ind2=4">
+	            G?tt inn i:
+	        </xsl:when>
+	        <xsl:when test="@ind2=5">
+	            Delvis g?tt inn i:
+	        </xsl:when>
+	        <xsl:when test="@ind2=6">
+	            Fortsettes av: ...; og ...
+	        </xsl:when>
+	        <xsl:when test="@ind2=7">
+	             	Sl?tt sammen med: .., til: ...
+	        </xsl:when>
+        </xsl:choose>
+        </span>
+                   <xsl:variable name="f785">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">a_t</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:variable>
+
+                <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:value-of select="translate($f785, '()', '')"/></xsl:attribute>
+                <xsl:value-of select="translate($f785, '()', '')"/>
+            </a>
+
+        </span>
+        </xsl:for-each>
+        </xsl:if>
+
+        <!-- This will only work if the OPACBaseURL syspref is set. -->
+        <xsl:if test="string-length($OPACBaseURL) > 0">
+        <p>OPAC View: <a>
+                      <xsl:attribute name="href">http://<xsl:value-of select="$OPACBaseURL"/>/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
+                      <xsl:attribute name="target">_blank</xsl:attribute>
+                      Open in new window
+                      </a></p>
+         </xsl:if>
+
+    </xsl:template>
+
+    <xsl:template name="part">
+        <xsl:variable name="partNumber">
+            <xsl:call-template name="specialSubfieldSelect">
+                <xsl:with-param name="axis">n</xsl:with-param>
+                <xsl:with-param name="anyCodes">n</xsl:with-param>
+                <xsl:with-param name="afterCodes">fghkdlmor</xsl:with-param>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="partName">
+            <xsl:call-template name="specialSubfieldSelect">
+                <xsl:with-param name="axis">p</xsl:with-param>
+                <xsl:with-param name="anyCodes">p</xsl:with-param>
+                <xsl:with-param name="afterCodes">fghkdlmor</xsl:with-param>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:if test="string-length(normalize-space($partNumber))">
+                <xsl:call-template name="chopPunctuation">
+                    <xsl:with-param name="chopString" select="$partNumber"/>
+                </xsl:call-template>
+        </xsl:if>
+        <xsl:if test="string-length(normalize-space($partName))">
+                <xsl:call-template name="chopPunctuation">
+                    <xsl:with-param name="chopString" select="$partName"/>
+                </xsl:call-template>
+        </xsl:if>
+    </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:stylesheet>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
new file mode 100644
index 0000000..7c2bf21
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
@@ -0,0 +1,205 @@
+<?xml version='1.0'?>
+<xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:template name="datafield">
+		<xsl:param name="tag"/>
+		<xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>
+		<xsl:param name="ind2"><xsl:text> </xsl:text></xsl:param>
+		<xsl:param name="subfields"/>
+		<xsl:element name="datafield">
+			<xsl:attribute name="tag">
+				<xsl:value-of select="$tag"/>
+			</xsl:attribute>
+			<xsl:attribute name="ind1">
+				<xsl:value-of select="$ind1"/>
+			</xsl:attribute>
+			<xsl:attribute name="ind2">
+				<xsl:value-of select="$ind2"/>
+			</xsl:attribute>
+			<xsl:copy-of select="$subfields"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template name="subfieldSelect">
+		<xsl:param name="codes"/>
+		<xsl:param name="delimeter"><xsl:text> </xsl:text></xsl:param>
+		<xsl:param name="subdivCodes"/>
+		<xsl:param name="subdivDelimiter"/>
+		<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:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>
+	</xsl:template>
+
+	<xsl:template name="buildSpaces">
+		<xsl:param name="spaces"/>
+		<xsl:param name="char"><xsl:text> </xsl:text></xsl:param>
+		<xsl:if test="$spaces>0">
+			<xsl:value-of select="$char"/>
+			<xsl:call-template name="buildSpaces">
+				<xsl:with-param name="spaces" select="$spaces - 1"/>
+				<xsl:with-param name="char" select="$char"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="chopPunctuation">
+		<xsl:param name="chopString"/>
+		<xsl:variable name="length" select="string-length($chopString)"/>
+		<xsl:choose>
+			<xsl:when test="$length=0"/>
+			<xsl:when test="contains('.:,;/ ', substring($chopString,$length,1))">
+				<xsl:call-template name="chopPunctuation">
+					<xsl:with-param name="chopString" select="substring($chopString,1,$length - 1)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:when test="not($chopString)"/>
+			<xsl:otherwise><xsl:value-of select="$chopString"/></xsl:otherwise>
+		</xsl:choose>
+<xsl:text> </xsl:text>
+	</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>
+
+    <!-- Function m880Select:  Display Alternate Graphic Representation (MARC 880) for selected latin "base"tags
+        - should be called immediately before the corresonding latin tags are processed 
+        - tags in right-to-left languages are displayed floating right
+        * Parameter:
+           + basetags: display these tags if found in linkage section ( subfield 6) of tag 880
+           + codes: display these subfields codes
+        * Options: 
+            - class: wrap output in <span class="$class">...</span>
+            - label: prefix each(!) tag with label $label
+            - bibno: link to biblionumber $bibno
+            - index: build a search link using index $index with subfield $a as key; if subfield $9 is present use index 'an' with key $9 instead.
+         * Limitations:
+            - displays every field on a separate line (to switch between rtl and ltr)
+         * Pitfalls:
+           (!) output might be empty
+    -->
+    <xsl:template name="m880Select">
+         <xsl:param name="basetags"/> <!-- e.g.  100,700,110,710 -->
+        <xsl:param name="codes"/> <!-- e.g. abc  -->
+        <xsl:param name="class"/> <!-- e.g. results_summary -->
+        <xsl:param name="label"/> <!-- e.g.  Edition -->
+        <xsl:param name="bibno"/>
+        <xsl:param name="index"/> <!-- e.g.  au -->
+
+        <xsl:for-each select="marc:datafield[@tag=880]">
+            <xsl:variable name="code6" select="marc:subfield[@code=6]"/>
+            <xsl:if test="contains(string($basetags), substring($code6,1,3))">
+                <span>
+                    <xsl:if test="boolean($class)">
+                        <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute>
+                    </xsl:if>
+                    <xsl:choose>
+                        <!-- display right-to-left tags floating right of their left-to-right counterparts -->
+                        <xsl:when test="substring($code6,10,2) ='/r'">
+                            <xsl:attribute name="style">display:block; text-align:right; float:right; width:50%; padding-left:20px</xsl:attribute>
+                            <xsl:attribute name="dir">rtl</xsl:attribute>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:attribute name="style">display:block; </xsl:attribute>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                    <xsl:if test="boolean($label)">
+                        <span class="label">
+                            <xsl:value-of select="$label"/>
+                        </span>
+                    </xsl:if>
+                    <xsl:variable name="str">
+                        <xsl:for-each select="marc:subfield">
+                            <xsl:if test="contains($codes, @code)">
+                                <xsl:value-of select="text()"/>
+                                <xsl:text> </xsl:text>
+                            </xsl:if>
+                        </xsl:for-each>
+                    </xsl:variable>
+                    <xsl:choose>
+                        <xsl:when test="boolean($bibno)">
+                            <a>
+                                <xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of  select="$bibno"/></xsl:attribute>
+                                <xsl:value-of select="$str"/>
+                            </a>
+                        </xsl:when>
+                       <xsl:when test="boolean($index) and boolean(marc:subfield[@code=9])">
+                            <a>
+                                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of  select="marc:subfield[@code=9]"/></xsl:attribute>
+                                  <xsl:value-of select="$str"/>
+                            </a>
+                        </xsl:when>
+                        <xsl:when test="boolean($index)">
+                            <a>
+                                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of  select="$index"/>:<xsl:value-of  select="marc:subfield[@code='a']"/></xsl:attribute>
+                                <xsl:value-of select="$str"/>
+                            </a>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$str"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </span>
+            </xsl:if>
+        </xsl:for-each>
+
+    </xsl:template>
+
+</xsl:stylesheet>
+
+<!-- Stylus Studio meta-information - (c)1998-2002 eXcelon Corp.
+<metaInformation>
+<scenarios/><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
+</metaInformation>
+-->
-- 
1.7.2.5


From stephane.delaune at biblibre.com  Fri Dec  2 18:16:15 2011
From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=)
Date: Fri,  2 Dec 2011 18:16:15 +0100
Subject: [Koha-patches] [PATCH] Bug 7286: fix rebuild_zebra.pl to add
	rebuild_zebra_sliced.zsh
Message-ID: <1322846175-24187-1-git-send-email-stephane.delaune@biblibre.com>


Signed-off-by: St?phane Delaune <stephane.delaune at biblibre.com>
---
 misc/migration_tools/rebuild_zebra.pl         |   54 ++++++++++-
 misc/migration_tools/rebuild_zebra_sliced.zsh |  127 +++++++++++++++++++++++++
 2 files changed, 176 insertions(+), 5 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 fa87f22..8264121 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 $min;
+my $where;
+my $ofset;
 my $verbose_logging;
 my $zebraidx_log_opt = " -v none,fatal,warn ";
 my $result = GetOptions(
@@ -51,6 +55,10 @@ my $result = GetOptions(
 	'x'				=> \$as_xml,
     'y'             => \$do_not_clear_zebraqueue,
     'z'             => \$process_zebraqueue,
+    'l:i'           => \$item_limit,
+    'where:s'       => \$where,
+    'min:i'         => \$min,
+    'ofset:i'       => \$ofset,
     'v'             => \$verbose_logging,
 );
 
@@ -78,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";
@@ -294,13 +308,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 $min } if ($min && !$ofset);
+    $strsth.=qq{ LIMIT $min,$ofset } if ($min && $ofset);
+    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 $min } if ($min && !$ofset);
+    $strsth.=qq{ LIMIT $min,$ofset } if ($ofset);
+    my $sth = $dbh->prepare($strsth);
     $sth->execute();
     return $sth;
 }
@@ -406,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);
         }
@@ -431,10 +454,14 @@ sub get_corrected_marc_record {
 
     if (defined $marc) {
         fix_leader($marc);
-        if ($record_type eq 'authority') {
-            fix_authority_id($marc, $record_number);
+        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") {
+        if ( C4::Context->preference("marcflavour") eq "UNIMARC" ) {
             fix_unimarc_100($marc);
         }
     }
@@ -498,6 +525,18 @@ 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
@@ -635,9 +674,14 @@ 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.
 
+    -min   1234                 minimum biblionumber 
+    -ofset 1243                 count biblios to process
     -munge-config           Deprecated option to try
                             to fix Zebra config files.
     --help or -h            show this message.
diff --git a/misc/migration_tools/rebuild_zebra_sliced.zsh b/misc/migration_tools/rebuild_zebra_sliced.zsh
new file mode 100755
index 0000000..1e9554d
--- /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 -ofset 1 -min 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 -ofset $INCREMENT -min $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 oleonard at myacpl.org  Fri Dec  2 20:14:45 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  2 Dec 2011 14:14:45 -0500
Subject: [Koha-patches] [PATCH] Bug 6865 - Replace image-based gradient
	backgrounds with CSS3 gradients
Message-ID: <1322853286-12896-1-git-send-email-oleonard@myacpl.org>

Replaces image-based gradients in:

OPAC search bar
OPAC submit buttons
OPAC lists menu background
OPAC alert and message boxes
OPAC user menu tabs
Staff client alert and message boxes
Staff client side menu tabs

Removes obsoleted background image files.

Cross-browser background-gradients created using:
http://www.colorzilla.com/gradient-editor/
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |   68 ++++++++++---
 koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif      |  Bin 2255 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/bg-tab.png        |  Bin 115 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/button-bg.gif     |  Bin 582 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif     |  Bin 1922 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/fade-butt.png     |  Bin 785 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/message-bg.gif    |  Bin 966 -> 0 bytes
 .../prog/img/side-tab-gradient-hover.gif           |  Bin 92 -> 0 bytes
 .../intranet-tmpl/prog/img/side-tab-gradient.gif   |  Bin 92 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |  105 +++++++++++++++-----
 koha-tmpl/opac-tmpl/prog/images/alert-bg.gif       |  Bin 2255 -> 0 bytes
 .../prog/images/listmenu-container-bg.gif          |  Bin 347 -> 0 bytes
 .../opac-tmpl/prog/images/menu-background.gif      |  Bin 3048 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/message-bg.gif     |  Bin 966 -> 0 bytes
 .../prog/images/side-tab-gradient-hover.gif        |  Bin 92 -> 0 bytes
 .../opac-tmpl/prog/images/side-tab-gradient.gif    |  Bin 92 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/images/submit-bg.gif      |  Bin 2899 -> 0 bytes
 17 files changed, 134 insertions(+), 39 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/bg-tab.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/button-bg.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/fade-butt.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/message-bg.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient-hover.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/alert-bg.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/listmenu-container-bg.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/menu-background.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/message-bg.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/side-tab-gradient-hover.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/side-tab-gradient.gif
 delete mode 100644 koha-tmpl/opac-tmpl/prog/images/submit-bg.gif

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 7b38062..bad6835 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1113,12 +1113,14 @@ div.first fieldset {
 }
 
 .dialog {
-  border: 1px solid #bcbcbc;
+	-moz-border-radius : 2px;
+	border-radius : 2px;
 	padding : .5em;
 	margin : 1em auto;
-  width: 65%;
-  }
-  
+	text-align : center;
+	width: 65%;
+}
+
 .dialog table {
 	margin : .5em auto;
 }
@@ -1192,20 +1194,27 @@ td input.approve {
  	background-color : #ffc;
  }
 
+div.dialog {
+	border: 1px solid #bcbcbc;
+}
+
 div.alert {
-  background : #FFC url(../../img/alert-bg.gif) repeat-x left 0;
-  text-align : center;
+	background: #fef8d3; /* Old browsers */
+	background: -moz-linear-gradient(top, #fef8d3 0%, #ffec91 9%, #ffed87 89%, #f9dc00 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fef8d3), color-stop(9%,#ffec91), color-stop(89%,#ffed87), color-stop(100%,#f9dc00)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fef8d3', endColorstr='#f9dc00',GradientType=0 ); /* IE6-9 */
+	background: linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* W3C */
+	  text-align : center;
+	border: 1px solid #E0C726;
 }
 
 div.alert strong {
 	color : #900;
 }
 
-div.dialog {
-  background : #FFC url(../../img/dialog-bg.gif) repeat-x left 0;
-  text-align : center;
-}
-
 a.document {
 	background-position : left middle;
 	background-repeat : no-repeat;
@@ -1225,7 +1234,14 @@ a.xml {
 }
 
 div.message {
-	background : white url("../../img/message-bg.gif") repeat-x left 0;
+	background: #ffffff; /* Old browsers */
+	background: -moz-linear-gradient(top, #ffffff 0%, #f4f6fa 2%, #eaeef5 23%, #e8edf6 94%, #cddbf2 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(2%,#f4f6fa), color-stop(23%,#eaeef5), color-stop(94%,#e8edf6), color-stop(100%,#cddbf2)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cddbf2',GradientType=0 ); /* IE6-9 */
+	background: linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* W3C */
   	border : 1px solid #bcbcbc;
   	text-align: center;
 	width : 55%;
@@ -1307,7 +1323,14 @@ div#menu {
 div#menu li a {
 	text-decoration: none;
 	display: block;
-	background : #EEE url(../../img/side-tab-gradient.gif) repeat-y top right;
+	background: #eeeeee; /* Old browsers */
+	background: -moz-linear-gradient(left, #eeeeee 0%, #eeeeee 96%, #e6e6e6 97%, #cccccc 99%, #c1c1c1 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#eeeeee), color-stop(96%,#eeeeee), color-stop(97%,#e6e6e6), color-stop(99%,#cccccc), color-stop(100%,#c1c1c1)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#c1c1c1',GradientType=1 ); /* IE6-9 */
+	background: linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* W3C */
 	border: 1px solid #000;
 	font-size: 111%;
 	margin: .5em 0;
@@ -1316,7 +1339,14 @@ div#menu li a {
 }
 
 div#menu li a:hover {
-	background : #E8F0F6 url(../../img/side-tab-gradient-hover.gif) repeat-y top right;
+	background: #e8f0f6; /* Old browsers */
+	background: -moz-linear-gradient(left, #e8f0f6 0%, #e8f0f6 96%, #c1c1c1 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e8f0f6), color-stop(96%,#e8f0f6), color-stop(100%,#c1c1c1)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e8f0f6', endColorstr='#c1c1c1',GradientType=1 ); /* IE6-9 */
+	background: linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* W3C */
 }
 
 div#menu li.active a:hover {
@@ -1605,8 +1635,16 @@ input[type=submit], input[type=reset], input[type=button], input.submit, button.
 	border: 1px outset #999999;
 	border-top-color: #666;
 	border-left-color: #666;
+	-moz-border-radius : 2px;
 	padding: 0.25em;
-	background : #E8E8E8 url(../../img/button-bg.gif) top left repeat-x;
+	background: #ffffff; /* Old browsers */
+	background: -moz-linear-gradient(top, #ffffff 0%, #f7f7f7 35%, #e0e0e0 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(35%,#f7f7f7), color-stop(100%,#e0e0e0)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9 */
+	background: linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* W3C */
 	color: #333333;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif
deleted file mode 100644
index 44625a2ec273b20a2708ba2c8f3489b92113a480..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2255
zcmcJM>sOP99e|^CKp}W+=YYd(OD}_nh^})$(RLo&LI{C6yNQQ-$!seeK;(3-c&ObF
zkWfev1qlrxfdB~*NVo>WRc^Th0ul@$cM=GJklPz_`Mq2BKkWJNe0;t<;SpgWAN}K9
zOu at c&3<fNPu=f~@>0l<qUNM;SV6O<QWw2KQwkp`8fu#uSwP0g_g9COpn8<+Sf%O-F
zW^gnCw1Bk~pcNeT;NXI-66`hLXasvTI2ypt0^1X?(!o{%&<1uUSj)jt2fzamfaAYz
z2jByA0NMxWD4;SF-37D<&_O_l0G$G~7i>&GU!o`q=p>+0K*s at n0q88iQ$VKy6$9E0
z=meljKt+Jc0UZNV2B6OX9RcV9TRA`{pu>PF0G$JL0PJ;u3Q=?(ERO)m2g^f1s9-4o
z<N+WQFz15#XE5i0={}gU!ITN6EHGw(@gC;?z`J_~{#On7)xSQ$IHTzy8JSu4v&r{Q
z=H^kT`46aHJ}NAFTugiX1--Pa{7FUm$5qVgnp#%Pr}Yh-#wKoKa7$}jdk4QgTF}+q
z)7#hcmw~~d;Su5R8HrRTA03mQnwXq=F|By<k#cr!{?)?#x#gABwRP3n=}pa+c6&z~
zrZ*T(X2cX|wb>njI&xi(;CYN^nZLP)yDZ{W4wBt}z?b2htA_J_cQ1ZU)XWq<c<bk!
zBM~jt;=(`FurG^SYNWK|g`%>E)>?V#pG(zq;#SsJ#m8|jZxPzq&zYZpi at PFetD9s+
zRpQGD?e#Aj{{Aq2Ueey6;9mJE=dH*N&db(s6WLd!9gVa6o9Ne~@<@KueAf?|>Uk-j
zyU_R3W0$vyoxG*N`+vn<m320+2n*hie6q!CS(BFhDRD$r-KrX6e46LfQ`NRH$^Nn-
zOkUNlQSiQ&W;a%KXlFbBsd**u;_tlCpXv5aba&_Oim33|wbAaUdbe?AWJPq3z@(XJ
zO<Wl5=`y=64(7e{MQ`_>K|R at UZLGJ)`nqmKTJc3+uft|BXcor$`rx-1C){HC0gw2_
zdoI2u0~y#L^<w6sFx*ns;Txo-`(8KLOW8+mtCz?=*|_B#p9`erpK-P9<=lV{^>W_H
z5!?#p<aeYMYREc!CI5_Bz4G9!)6vy}v!SHbhj`z*RrC=tXk)eTeAv;oqVs8_wa1rk
z)U6d?zP+(VBV`|5FCkqgt^X2VTenV6>eyH>O&K|=Dodf0RONTp>r_wfnm1Gx=}wZk
z!&x2)>dGA7H1%tgpiMQiAk2TGy69rUMor0$gbnAi+nXCKMz;SZySg}GvyNSx;Qtz@
zV{@~CH{!41v`r^y8avk$G)~>-O%1o->DU%;$Rly9S>&6T<SYx)Y_*Pu9n-c=T};%r
z&)i5n{`%Z)jh4TdeQdjPwK#G6>9UfsE!gVNY<FpWeRjHy(}_Dhmi306Ub|Vd(`Qfc
z(e)qjOwv7b@#E+Qu)$lpL2R(k?$F_wq+N8_D~_`}awK(YS9m1PM=$z-mZTTsSRB11
zfWM`e24wmeWTzBK26>2zV;DVyY#GMRoOstb{+Z`Z<MYpH4C4ebSZka-AAa04^|u&z
z)4oe_ji%|#salhQL_Thw`G$7W{POx&46`zcuQku62#+Ik-z#n+^WT#h$g8`E7FkGl
z4zw(0c_v$yvLYFlWlHe2Wu+iIaBsCJCV6kI=zYfCdRglBo{B*Zw5qFV$<_ at vD_XFh
z!{4 at Qc)~#2R+}Q(rtMTEpWfGvY}<DFoln?xL!P(nyCOfXT`vnhaThZle!^j#in--5
z&BSpX=DE}z2eL>$0jOm)?pFVvn#Bd{7Jmn9I^hY_ZdBa*x7}@(i-H~5K~W5rfpNz7
z at Apng$KV<JJw^Rap}KpAD2xMs_-C%Mx(qKF!zozw>>#1Q)dySY5{@5uldj9c5i4C|
zL<1fI-Tjl4N^Bf{(0g>;HAGf<FjX}8wpB+yi>*3D#t*&cy_<t4R=r6R4fzJX;dY)<
zb(n=8_K)4oy(Fvh;ERR>({}SnSf-Z{Kk{MzAKl`KOmBr~BuKDJO`$N4sPMv2<!=5R
z8S`yKB>ZH%*)<(o?c*FFI_Iq~$RSq0=P4G2h3X#`P^v%hix3l{^{yqdYTsb7I66&_
z7Ba9kxbO(c1-ib7O|0>c5lb#MU2x-3Y69XSq_IkUai^>%FjXwQYSq*Fv9%}35wh#v
zhLToF`iC^J>_({JmvKt%DOQ9$A=W^j3P=y)i{;5_hSEhWD?}JE`W at X+rY5pN6|avT
z?=+O_D6BK8h_N)K;fY1Y`UDY={mW{oz__!|Iuph-Mhe|rqS)s=CF9wl#>zuf_Gf;C
z=ee=QDla)ZELie9Kh4PWc^vN<Mwoa+H&)}K>IgBCiDH4V<|MU_7)O|-D~+`w^1A3$
z<-|UVk#*L+{ydp5Rpo7B<D=>?&?Hl}p{Ba?RR06DgctR(rus{$y#69z@}eot)Iid1
zdX5mLTj(ZEd{jfMLNeVUFg2!78!oE|3W3tpbVuHB6_F^OrY&*P-8m%Z$e96eGcPBK
zbKO%qGZJcUE}(M0 at r!&Zi8Z&B{FLMsBz-xWW^QG;H^zrYDktdXHg;5FLX1>7Eikw9
zsEtW+k+aGH4{WErF*#K_`^swO_q#WxkR#`oy^&5)RMU4f>D+oK@^qZq^nK}%S(~wl
zU`F0_yZKo5b{f*P=+3<(jC`f1Bi-sKZkj^+$}B*7bX4wLRpf$IiS%09cf8Ef1+XH0
zn1j4 at XX4`i-&^`!qInsfvPGxUmS>0Zc>!5|#3k3SECXJnJWP;m>EMr+L7#)oIpM_R
ZH%l!;xaj8G7}>H%mu2{ag9k9D{{x||N9O<l

diff --git a/koha-tmpl/intranet-tmpl/prog/img/bg-tab.png b/koha-tmpl/intranet-tmpl/prog/img/bg-tab.png
deleted file mode 100644
index 18554b04d1762ec1db8ed5f110e6ed035bef2736..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 115
zcmeAS at N?(olHy`uVBq!ia0vp^T0kt$!2~2fxq8(DDJxGG#}JRs<jAsjmWK~8PGj6s
zedSl+YxlMCTkEb=Sw;VU|Np;W&fod_nX~`ypP2La{lx?F8?XJB4S3DSs-;l2TCvv?
PXbOX;tDnm{r-UW|HbW}w

diff --git a/koha-tmpl/intranet-tmpl/prog/img/button-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/button-bg.gif
deleted file mode 100644
index a63f4875e40f6520615a10411b35519b09a42880..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 582
zcmZ?wbhEHb)L;l?xXQrr?%lh`k00N^fB)C7U;qC7`}60|$B!R>{P^+n=g*ffU%r3;
z{?45{ckkYP^5n^zH*daw|NiXRvrnHs-M)SM)vH%uzI^%m_3MKN51v1N{_x?$yLa#1
zx^?@(gNM(bzxe(8H&F7))2H|D-T(CY^TUUaUcY&B`}Uo0- at g6*`}fwZTmS$6zj^Z}
z1I0k`CkxmN9S{lf69e0ShbaXfI#T@}N{J_Ptma?Hxa_hvYW<BhWvAa(t!&*;;iEVE
z{Nr;8XY+R7|4<?Axc>J0AA9cAz4-mVp|PpCp1-ZVqqD2Kr(IQa!o*3Fr%atTQBGvm
z>^XDi&0jEEQE<u9Wy at ErT(y*K?Yi|FHg4Lyo@?9o9XogJ-m`;Y|AB*t4j(ysP?_)K
zsnci9o;!bvQ~2_gtJkjIxOqi}^X|R-4<0^xd{18d`HPpYUcY(!f>Ge(r_W!$e*6AO
ziTC%PzyJO-Fn_u&uwcQ#W)5Mkn2Z31wsrw!uQ?tYm0SeGjI!>W*tqz3zmzeDgy*Iu
zCnswJPl`FPVCm`U2Fa)9yqt8TX|_f2t2-w*tNSJM3N>-bdTm*8aj}!XM(n9AD=#k(
zSnM^|D>Sofb;RbZyQj9UzP>);aF?w2wlz05XIx$tdwSd2+uI8spPK8vecj#N6`x<-
oJ-vPX{rwHh+;ToUHatAsA*>yDX2-_I$0sOz&-2-tE5Kk40Ck{39RL6T

diff --git a/koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif
deleted file mode 100644
index b70cf23925f9b4234c9d4f83102d1b396333265f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1922
zcmWlX`BxHn0>IhorLUn~ccwRDGqX|CD4CU8ZPL^$tr;bTuBlDha%$SvD>Zkfr%tEk
zS)o}P;*BDLsb#51o**bnXch`6D$0G|a;aZ-`~2|v2R@&uW0A=Hzix)?|C15|0fK*m
z$)5rLXJ8}&Lk-YZ0L at dNE(EH_U at jR<#Q at QTrOE#+O<n=Q=;etED--8e_~%ymXTij2
zFqa6#SL~8nkKh`RqykmGYdRAs9yrB09zg<--v`r|mnScQg&Sb%7oa0JW*#pI;()ac
z$nF9I(IW2!qVqtR2Nu%29w}I4nN*`dUj+nbfVS8zN^^@cjG8IOOp!;J3g&-zP2Kef
zQw%ye(3Jw&O)wj`Jn at TB%?Bo`S-~`F1a?WaRYn7jVc;BdiXS>=3cYTTK|2fVz0T>Z
z75*9fJQ+-1TAV8f+7cj1af<V73sj)U29_3}%mFq!kfsA6)}$V{N?XlJwpqzBskjz-
z7cezgWo=+47KpDdPs9NEJ%e`MppzQ4V%OA7;NpYH(~EO>$Luq=@HZg44d(x=*Q;Dp
zx80%}9$}Jgp;@m}0AoGS;(>__q<?_f1i(M7*K0Pr*FZiI@=2eXKzzKJJ04_Z=j7()
zpdUTP6%;-xNP1RW@*H3KJgU5+vZ}hKDzc7LPi~-)cfM$9Zh85t1 at oq@y at S@-alWg&
zr?;=aH*kQ(9vtEfMswfsM#tWdMttN?ObUdPSEj`?vvZQ!TT+=^p;RgU(CYLCqsg$^
zYO^mooG!O#39$makk#wfpom0fmhTtA7l&JGkHY-EMOUI;OWCVndlF}cUz0db;71E#
z$KKSB6eEsXu_JHD?@B{sv}MQI8b&LS$>^z(Hp=^&@H<=>x}ExggeusG<+eBSDW^#2
zD)eIJWD~Y6ahBWBBz)yN at aUVLXw6e?@%$H~3|fo0Gu12Wi;3ubIoq9Kn;RVHd?o46
zT<z^RLT_DQ<$tkhjzNDd;}m^+*b)Brjp7|)&!t1Gw{5ET#H05PMRc`m_|!8sg{-a)
zov`)a{l<uHnn6teU7}=lcbX)OEU(~558WagF5VQ!?0IWbjgt=lC8D=$Q73A<#9{V!
zJ5BSfd!<MFdfYZOzlOu;>s at l1W&Jfr`ukRvTsFx`Mt{H83t5Yp&s_5*ih18RkUIYW
z8Z6>u`9&fYvNxdBtQ=S at bs_ibMAT3oJQpF&--?fyK1ASarH?{rYU$%0=ioBjUO~L9
z0I8(P3OCu+vM1qdw{0ytwIM<N6cyOG)%$GAUX8r?ROGhrO4glCP&~)RHY)HJ(=>`z
zmvgr%30Lt6%Ch)|#)0xAnnqcX+Vys@@`fNmRh2QVVN~CCXjC<sYlGFq>{XZ5wfTWB
z)OEOhS~aOCk{b^#IhUv*6Jl>BKq}L;8VWHtSWB(PCu$q(XtmlG%`~mHspSM**W4~h
z)V0u+FLW<^99rEg#@g-rR=Vd`{p;btCjA at UKApa8JaW6Ced63TLx(7KJA*cprZaTT
z=WaLB<@jqU^b_?>#x6Zgx3l|m_I6W`U2ttz?_cFjroLr|&eRX_2{AL)ct2w at eS@0K
z1JE$NndNsFZeeeTPO^9hVR6ltq1YRG3kRMTvU~V&Ns at I0L22I2g}3Xi??O2tdwA<7
zl5C?$RkLmEpi{qRb-2$C`}hz3$@UMZpqPP=m at tE#f9k+2bK-1t^5P`+!X2jIV!B~b
zc==W`M|8C`*)bJg(ZZTe>NGgSsoi&2GdG0E&e;s{dd}Q!r@<-7T#Dh$XZxqP7V^J3
z#FFB|j4oNxffFowNpy-^LAcO2q^wLgx>dwmCphZ*(iD$|T2al?Hg_65y4LQOOntjB
zWywGn&#{d?PUDh^u{6dsv;D6xTZX?nIcVjDnU-zi2cEF)6VcaK7DX3M4mf7gO)Jj%
zTQzL2OI~^%xYZTcSss0-2`rhry+g}(;dSqdOKchf%TCk(7laZaJ}3qPX3q4*5LfvV
z!nYvJ_x*6hH9 at e5&#>kPFdlJj7=am-Va|d>Yki|&1HlAyHUd+-E}AfKfNstS#nnRN
zV62 at Yb1srs`{#55>+ddeUO2SQFAv7v0<+|!Fm<1o64;?g%fnN+x(yWA;0CPa5tdi?
zWhdds%^8-*m!TvW2Nt=DV8O*>NE?NOp<Q%KK`M^)wF(v$DzX%2 at JN4i5;*=Y%acrK
zJ=`Y%wG(D7%E#1i at h?Nck=Cb0xcaR at 0VA8S)@KA>ePCGG$i at t-q?iaLBccM({~%aP
zs2Fl^bQ$+My7hT0jvNvf at Y7zA6;J1pccz!U+v~EHGN28ic>%m{U^c=qreSw!8Rj6;
zRyK}n*h>i*-H)}Ei+BzDI?F~6XV at y{p%f(N*w}C7wn{aI^1X0mEUn8{WyVnss*b(C
zIc=+U at hFF!Bk%8eY&DSe)Nmj4_=AmhqVI9)5r6J@?)UauzXIwHLFf;U{$;O&jZ!1S
zxE~5{+DY*Bji at N}$7kjCdc^TYbTs!PzROMyEoj8Vq50+0_6Fo=<B4=GzuIG`+=oC8
F{13kOucH6}

diff --git a/koha-tmpl/intranet-tmpl/prog/img/fade-butt.png b/koha-tmpl/intranet-tmpl/prog/img/fade-butt.png
deleted file mode 100644
index 42f08b79942d32f9d7e693b6952c2d935e352774..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 785
zcmb`F-%C?r7{}lJa2&>jxy)rl9Mwn%LP*puyzuCjPMwJ95JKF>j+PKsXg_GsnhtD8
zh=^TCB+KZ+w1O at i>_T)@BanhF!iyL+Vms&T{MtEZJ7;Iq>;Dih&-?H^?}zX6eBpgE
zG}u$CKdlD<)Vh0}!!XywXhAgaPSf^0Oxh{bg97mO^W~b at aosrU8k@a3GdX+De+L6-
za3+9R-8cPH*f8b~KDeF6Iv|7(4UD)7Bq<02RVXNmg6H!LO&2+?R4U1`OcDggapiKE
zFY+wIunf!d#VW*b2<D}-Bnkq{G9|G at k|fXbG)<REB1zyJ$4ce0B+GoUNDzb|h<F|+
zah#$kx=@g1NvXnFIRXm7hg^=PXo$m85=DwC&@?4W5`hy0o+ojl$Z|!FRVo!(lHn4P
zB-0ed(3B{OL>^}-T9V2H+?-(*rOF(SfEtt}NrEU;s|w4ql}aU_%l$QMw*#Qsc019L
z`$qxet-2wzufeA~GdF29GQ(3k#HwpP=Tp5>sTUs~bbFp^79H8|jwMGn{Nu=E4WHV@
z<`Pj1OGKNZ!frxXz at l>r$fB|FiN4r)-$3m7_{6|c6Ou{+s8EME>s@=BuaUFM*eAr;
zY2XyDLos!9uJm+8Ui3todx6%dF|QjeX0yfetkJS=SZ+O-Jgk9eC?1L*hC<0?DEZSH
ziYJrFcpRuw8!vzFO<!+G+i!fax2E;#l^xj3d<^cTHm5g!9i}$p`$0``t6c?!=N<FA
z4vluP+Z_gh%t&VS(x^9+U0w68c`tbXWV08K?KYf8QO`rP4L#v$JAvA4o;K75abuv)
zWD5BG- at fVs*8X|dH4AhfdJn>2-wvIO)u`0SmbDZ3PihhCn+Q-Xj2f-scY3wf=tci0
Zqyhce4|i>ku8hL(3f!(i=T4U|@(=9Ekd*)c

diff --git a/koha-tmpl/intranet-tmpl/prog/img/message-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/message-bg.gif
deleted file mode 100644
index 553546f9b52df90ae0db48554d586f49c0663a03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 966
zcmcJL=}(#m0LEEth&{HLv at xb}J<`P>nyyP1<Bks|ZJ0%Cn{+d#>9uq*2+d;F#+a^I
zsC0^=)mBSwMGjHqP(eVTf`YRuf{Ke(+acu=cn|L51;oPY{)asuo)5ndzvOv-xPUAD
z=I4{Bu20rcs6aUG55?g?EEq|6gNQGPL}JM(vJ;9X!qKERfPnrO96-W*FbVr(p-93P
zLUvNSnM@`eP3-Qb<H=MyoeqXS^0+ at 7kHvQ)ND}hLKwk{-A%HK2`ag3rx$i%H at m}w3
zLZLId*81||qn&fK-xlwD%UW)`habHv{;9RW=)14IPHU_ at -Dh%j++Y4xZS_$eREf=j
zgys)ZAeA9MY@#%N*4#pEZKJh!JnqbY^0d3>8NCPn;$<JBpUGl#2DpPmykWjT$oh12
zOe`6f%H$IYrAoG6t(ltE>Sq3$eLXk7pr1QpTv}c+t*&IRy;<MbeEaSn^Oohk)n<2C
za$If?079_W=g$g;!jWhUi6 at dD|NM~7pt26+Q#tGzO7>yw`D`|4wk78jo>4wNFh|Qf
zOWe|ra~C>KoV)s_OggyOjk&@+q>~OApP#vHU|f*#mitQYLR*WnVN- at xMyk!j%lUtE
z%R6v22DxBu_%avYkDnl~i)v&<i(x{vDZVw^_IZV3<elu=e*Sf%V$`gxcN+RDlw%fk
zV+67omEtBXIqTrDN|nSuOFdk4W2y8j%0kzv3TEXisms`VmNZt(mU&F<bF^a at C*|N8
z|BC3w^5g`(DLJlZUQ{c5X4PHzy at jI;Sap<x$E!4|kW=4XbaO at XD&kq?R<Nq3CS&kh
z8OgdbrH%(|Lto}yn${#Ez?$f$X?iLZ51N1Py`-J~kV-^gt4XWPWKd{~jl3_HV0)Nd
zz_&FWDgkVi92~~}=twoe{%2k--`<?x066U}N1IMKs9(?tj#dnh?`SJl01n!jd5p9D
z>kWdlqtwlJKK>p7oSkLp!tJi}xpmu5$_oVBPb*8n?e5FCLRZg^)pf3CHMIg4{aOR)
zdVZ_9(B1nBz0UoDz!SJ%-cf+=zWVt>598iOou|LiE$}cOAfSguMq>f?qg*1up&Al1
z1MMXc!0p0e!NHztA~@7rD+GCr1_&HxH)A3GAe{&a_&gyb98o}!NHULwN8}qscvR&U
k!ebf)g2g&?kyr9Mm*gGS7l^#lr4raHTg8z`IjHac1(BF02mk;8

diff --git a/koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient-hover.gif b/koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient-hover.gif
deleted file mode 100644
index 9fcdc96598c37f44e362daa191df3afb2a8d3c7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92
zcmZ?wbhEHb<YM4wSj50^@ZiBmFWz3gdFRB*Q at 0;HId}2$ix1xz7#I|PvH(d21|1Lq
uQp>=sn33fe#H{mdLCo8uGj-QXv&DIdPkX$4;+0iZi=+>)h>7N8um%A7aU}8p

diff --git a/koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient.gif b/koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient.gif
deleted file mode 100644
index af3addbcdaef7bbd180682f490dedb1fa96e0da2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92
zcmZ?wbhEHb<YM4wSj50^@ZiDMuU}uidiB|}XLs-3J#*&FyLayx7#I|PvH(d21|1Lq
uQp>=sn2}|u!m9IZLCo8uGj-QXv&DIdPkX$4;+0iZi=+>)h>7N8um%7F^(68D

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 11c434f..a783bd0 100755
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -220,9 +220,21 @@ h6 {
 	font-size : 100%;
 }
 
-input[type=submit], input[type=button], input[type=reset] {
-	background : #b8d0e6 url(../../images/submit-bg.gif) repeat-x 0 0;
-	background-color : #b8d0e6;
+input[type=submit],
+input[type=button],
+input[type=reset],
+fieldset.brief input[type=submit],
+fieldset.brief input[type=button],
+fieldset.brief input[type=reset]
+{
+	background: #f4f9fc; /* Old browsers */
+	background: -moz-linear-gradient(top, #f4f9fc 0%, #dfeefa 4%, #bfd5ea 93%, #a1c4e2 97%, #b8d0e6 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f9fc), color-stop(4%,#dfeefa), color-stop(93%,#bfd5ea), color-stop(97%,#a1c4e2), color-stop(100%,#b8d0e6)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #f4f9fc 0%,#dfeefa 4%,#bfd5ea 93%,#a1c4e2 97%,#b8d0e6 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #f4f9fc 0%,#dfeefa 4%,#bfd5ea 93%,#a1c4e2 97%,#b8d0e6 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #f4f9fc 0%,#dfeefa 4%,#bfd5ea 93%,#a1c4e2 97%,#b8d0e6 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f9fc', endColorstr='#b8d0e6',GradientType=0 ); /* IE6-9 */
+	background: linear-gradient(top, #f4f9fc 0%,#dfeefa 4%,#bfd5ea 93%,#a1c4e2 97%,#b8d0e6 100%); /* W3C */
 	border-top: 1px solid #cccccc;
 	border-left: 1px solid #cccccc;
 	border-right: 1px solid #eeeeee;
@@ -233,7 +245,7 @@ input[type=submit], input[type=button], input[type=reset] {
 	padding : 4px;
 }
 
-input[type=submit]:active, input[type=button], input[type=reset] {
+input[type=submit]:active, input[type=button]:active, input[type=reset]:active {
 	border: 1px inset #666666;
 }
 
@@ -760,10 +772,14 @@ body#advsearch #listsmenulink {
 }
 
 #opac-main-search {
-	background-image : url( ../../images/menu-background.gif);
-	background-repeat : repeat-x;
-	background-color : #739ACF;
-	background-position : -10px top;
+	background: #8fb4e8; /* Old browsers */
+	background: -moz-linear-gradient(top, #8fb4e8 0%, #8cb1e5 19%, #80a8dc 48%, #7da5d8 52%, #7198cf 83%, #618ac0 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#8fb4e8), color-stop(19%,#8cb1e5), color-stop(48%,#80a8dc), color-stop(52%,#7da5d8), color-stop(83%,#7198cf), color-stop(100%,#618ac0)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #8fb4e8 0%,#8cb1e5 19%,#80a8dc 48%,#7da5d8 52%,#7198cf 83%,#618ac0 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #8fb4e8 0%,#8cb1e5 19%,#80a8dc 48%,#7da5d8 52%,#7198cf 83%,#618ac0 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(top, #8fb4e8 0%,#8cb1e5 19%,#80a8dc 48%,#7da5d8 52%,#7198cf 83%,#618ac0 100%); /* IE10+ */
+	background: linear-gradient(top, #8fb4e8 0%,#8cb1e5 19%,#80a8dc 48%,#7da5d8 52%,#7198cf 83%,#618ac0 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#8fb4e8', endColorstr='#618ac0',GradientType=0 ); /* IE6-9 */
 	border-top : 1px solid #335599;
 	border-bottom : 1px solid #335599;
 	margin-left : -10px;
@@ -1340,8 +1356,15 @@ padding-left : .4em;
   }
  
 div.alert {
-  background : #FFC url(../../images/alert-bg.gif) repeat-x left 0;
-  text-align : center;
+	background: #fef8d3; /* Old browsers */
+	background: -moz-linear-gradient(top, #fef8d3 0%, #ffec91 9%, #ffed87 89%, #f9dc00 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fef8d3), color-stop(9%,#ffec91), color-stop(89%,#ffed87), color-stop(100%,#f9dc00)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fef8d3', endColorstr='#f9dc00',GradientType=0 ); /* IE6-9 */
+	background: linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* W3C */
+	text-align : center;
 }
 
 div.alert strong {
@@ -1349,8 +1372,15 @@ div.alert strong {
 }
 
 div.message {
-	background : white url("../../images/message-bg.gif") repeat-x left 0;
-   border : 1px solid #bcbcbc;
+	background: #ffffff; /* Old browsers */
+	background: -moz-linear-gradient(top, #ffffff 0%, #f4f6fa 2%, #eaeef5 23%, #e8edf6 94%, #cddbf2 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(2%,#f4f6fa), color-stop(23%,#eaeef5), color-stop(94%,#e8edf6), color-stop(100%,#cddbf2)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cddbf2',GradientType=0 ); /* IE6-9 */
+	background: linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* W3C */
+	border : 1px solid #bcbcbc;
 	width : 55%;
 }
 
@@ -1388,11 +1418,15 @@ div.message {
 }
 
 #opac-main-search #listsmenu .bd {
-	background-color : #f3f3f3;
+	background: #eef4fe; /* Old browsers */
+	background: -moz-linear-gradient(left, #eef4fe 0%, #eef4fe 88%, #f6f9fe 98%, #ffffff 99%, #a5c2f6 99%, #e6eefe 100%, #cbdefe 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#eef4fe), color-stop(88%,#eef4fe), color-stop(98%,#f6f9fe), color-stop(99%,#ffffff), color-stop(99%,#a5c2f6), color-stop(100%,#e6eefe), color-stop(100%,#cbdefe)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(left, #eef4fe 0%,#eef4fe 88%,#f6f9fe 98%,#ffffff 99%,#a5c2f6 99%,#e6eefe 100%,#cbdefe 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(left, #eef4fe 0%,#eef4fe 88%,#f6f9fe 98%,#ffffff 99%,#a5c2f6 99%,#e6eefe 100%,#cbdefe 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(left, #eef4fe 0%,#eef4fe 88%,#f6f9fe 98%,#ffffff 99%,#a5c2f6 99%,#e6eefe 100%,#cbdefe 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eef4fe', endColorstr='#cbdefe',GradientType=1 ); /* IE6-9 */
+	background: linear-gradient(left, #eef4fe 0%,#eef4fe 88%,#f6f9fe 98%,#ffffff 99%,#a5c2f6 99%,#e6eefe 100%,#cbdefe 100%); /* W3C */
 	border : 1px solid #739acf;
-	background-image : url("../../images/listmenu-container-bg.gif");
-	background-position : top right;
-	background-repeat : repeat-y;
 	padding : .3em 1em 0 0;
 }
 
@@ -1474,12 +1508,21 @@ div#changelanguage li.yuimenuitem a.yuimenuitemlabel {
 }
 
 #opac-main-search input.submit {
-	background : #b8d0e6 url(../../images/submit-bg.gif) repeat-x 0 0;
-	background-color : #b8d0e6;
-	border-top: 1px solid #cccccc;
-	border-left: 1px solid #cccccc;
-	border-right: 1px solid #eeeeee;
-	border-bottom: 1px solid #eeeeee;
+	background: #e6f3fe; /* Old browsers */
+	background: -moz-linear-gradient(top, #e6f3fe 0%, #dfeefa 8%, #bfd5ea 49%, #b8d0e6 52%, #b8d0e6 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e6f3fe), color-stop(8%,#dfeefa), color-stop(49%,#bfd5ea), color-stop(52%,#b8d0e6), color-stop(100%,#b8d0e6)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #e6f3fe 0%,#dfeefa 8%,#bfd5ea 49%,#b8d0e6 52%,#b8d0e6 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #e6f3fe 0%,#dfeefa 8%,#bfd5ea 49%,#b8d0e6 52%,#b8d0e6 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #e6f3fe 0%,#dfeefa 8%,#bfd5ea 49%,#b8d0e6 52%,#b8d0e6 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e6f3fe', endColorstr='#b8d0e6',GradientType=0 ); /* IE6-9 */
+	background: linear-gradient(top, #e6f3fe 0%,#dfeefa 8%,#bfd5ea 49%,#b8d0e6 52%,#b8d0e6 100%); /* W3C */
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: 1px 1px 1px 1px , , .3);
+	-moz-box-shadow: 1px 1px 1px 1px , , .3);
+	box-shadow: 1px 1px 1px 1px , , .3);
+
 	color : #333;
 	font-weight : normal;
 	font-size : 80%;
@@ -1495,9 +1538,16 @@ div#menu {
 }
 
 div#menu li a {
+	background: #eeeeee; /* Old browsers */
+	background: -moz-linear-gradient(left, #eeeeee 0%, #eeeeee 96%, #e6e6e6 97%, #cccccc 99%, #c1c1c1 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#eeeeee), color-stop(96%,#eeeeee), color-stop(97%,#e6e6e6), color-stop(99%,#cccccc), color-stop(100%,#c1c1c1)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* IE10+ */
+	background: linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#c1c1c1',GradientType=1 ); /* IE6-9 */
 	text-decoration : none;
 	display : block;
-	background : #EEE url(../../images/side-tab-gradient.gif) repeat-y top right;
 	border : 1px solid #979797;
 	font-size : 111%;
 	margin : .5em 0;
@@ -1506,7 +1556,14 @@ div#menu li a {
 }
 
 div#menu li a:hover {
-	background : #E8F0F6 url(../../images/side-tab-gradient-hover.gif) repeat-y top right;
+	background: #eaeef5; /* Old browsers */
+	background: -moz-linear-gradient(left, #eaeef5 0%, #dee6f4 96%, #c4d5ef 98%, #a2bee8 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#eaeef5), color-stop(96%,#dee6f4), color-stop(98%,#c4d5ef), color-stop(100%,#a2bee8)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(left, #eaeef5 0%,#dee6f4 96%,#c4d5ef 98%,#a2bee8 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(left, #eaeef5 0%,#dee6f4 96%,#c4d5ef 98%,#a2bee8 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(left, #eaeef5 0%,#dee6f4 96%,#c4d5ef 98%,#a2bee8 100%); /* IE10+ */
+	background: linear-gradient(left, #eaeef5 0%,#dee6f4 96%,#c4d5ef 98%,#a2bee8 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eaeef5', endColorstr='#a2bee8',GradientType=1 ); /* IE6-9 */
 }
 
 div#menu li.active a:hover {
diff --git a/koha-tmpl/opac-tmpl/prog/images/alert-bg.gif b/koha-tmpl/opac-tmpl/prog/images/alert-bg.gif
deleted file mode 100644
index 44625a2ec273b20a2708ba2c8f3489b92113a480..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2255
zcmcJM>sOP99e|^CKp}W+=YYd(OD}_nh^})$(RLo&LI{C6yNQQ-$!seeK;(3-c&ObF
zkWfev1qlrxfdB~*NVo>WRc^Th0ul@$cM=GJklPz_`Mq2BKkWJNe0;t<;SpgWAN}K9
zOu at c&3<fNPu=f~@>0l<qUNM;SV6O<QWw2KQwkp`8fu#uSwP0g_g9COpn8<+Sf%O-F
zW^gnCw1Bk~pcNeT;NXI-66`hLXasvTI2ypt0^1X?(!o{%&<1uUSj)jt2fzamfaAYz
z2jByA0NMxWD4;SF-37D<&_O_l0G$G~7i>&GU!o`q=p>+0K*s at n0q88iQ$VKy6$9E0
z=meljKt+Jc0UZNV2B6OX9RcV9TRA`{pu>PF0G$JL0PJ;u3Q=?(ERO)m2g^f1s9-4o
z<N+WQFz15#XE5i0={}gU!ITN6EHGw(@gC;?z`J_~{#On7)xSQ$IHTzy8JSu4v&r{Q
z=H^kT`46aHJ}NAFTugiX1--Pa{7FUm$5qVgnp#%Pr}Yh-#wKoKa7$}jdk4QgTF}+q
z)7#hcmw~~d;Su5R8HrRTA03mQnwXq=F|By<k#cr!{?)?#x#gABwRP3n=}pa+c6&z~
zrZ*T(X2cX|wb>njI&xi(;CYN^nZLP)yDZ{W4wBt}z?b2htA_J_cQ1ZU)XWq<c<bk!
zBM~jt;=(`FurG^SYNWK|g`%>E)>?V#pG(zq;#SsJ#m8|jZxPzq&zYZpi at PFetD9s+
zRpQGD?e#Aj{{Aq2Ueey6;9mJE=dH*N&db(s6WLd!9gVa6o9Ne~@<@KueAf?|>Uk-j
zyU_R3W0$vyoxG*N`+vn<m320+2n*hie6q!CS(BFhDRD$r-KrX6e46LfQ`NRH$^Nn-
zOkUNlQSiQ&W;a%KXlFbBsd**u;_tlCpXv5aba&_Oim33|wbAaUdbe?AWJPq3z@(XJ
zO<Wl5=`y=64(7e{MQ`_>K|R at UZLGJ)`nqmKTJc3+uft|BXcor$`rx-1C){HC0gw2_
zdoI2u0~y#L^<w6sFx*ns;Txo-`(8KLOW8+mtCz?=*|_B#p9`erpK-P9<=lV{^>W_H
z5!?#p<aeYMYREc!CI5_Bz4G9!)6vy}v!SHbhj`z*RrC=tXk)eTeAv;oqVs8_wa1rk
z)U6d?zP+(VBV`|5FCkqgt^X2VTenV6>eyH>O&K|=Dodf0RONTp>r_wfnm1Gx=}wZk
z!&x2)>dGA7H1%tgpiMQiAk2TGy69rUMor0$gbnAi+nXCKMz;SZySg}GvyNSx;Qtz@
zV{@~CH{!41v`r^y8avk$G)~>-O%1o->DU%;$Rly9S>&6T<SYx)Y_*Pu9n-c=T};%r
z&)i5n{`%Z)jh4TdeQdjPwK#G6>9UfsE!gVNY<FpWeRjHy(}_Dhmi306Ub|Vd(`Qfc
z(e)qjOwv7b@#E+Qu)$lpL2R(k?$F_wq+N8_D~_`}awK(YS9m1PM=$z-mZTTsSRB11
zfWM`e24wmeWTzBK26>2zV;DVyY#GMRoOstb{+Z`Z<MYpH4C4ebSZka-AAa04^|u&z
z)4oe_ji%|#salhQL_Thw`G$7W{POx&46`zcuQku62#+Ik-z#n+^WT#h$g8`E7FkGl
z4zw(0c_v$yvLYFlWlHe2Wu+iIaBsCJCV6kI=zYfCdRglBo{B*Zw5qFV$<_ at vD_XFh
z!{4 at Qc)~#2R+}Q(rtMTEpWfGvY}<DFoln?xL!P(nyCOfXT`vnhaThZle!^j#in--5
z&BSpX=DE}z2eL>$0jOm)?pFVvn#Bd{7Jmn9I^hY_ZdBa*x7}@(i-H~5K~W5rfpNz7
z at Apng$KV<JJw^Rap}KpAD2xMs_-C%Mx(qKF!zozw>>#1Q)dySY5{@5uldj9c5i4C|
zL<1fI-Tjl4N^Bf{(0g>;HAGf<FjX}8wpB+yi>*3D#t*&cy_<t4R=r6R4fzJX;dY)<
zb(n=8_K)4oy(Fvh;ERR>({}SnSf-Z{Kk{MzAKl`KOmBr~BuKDJO`$N4sPMv2<!=5R
z8S`yKB>ZH%*)<(o?c*FFI_Iq~$RSq0=P4G2h3X#`P^v%hix3l{^{yqdYTsb7I66&_
z7Ba9kxbO(c1-ib7O|0>c5lb#MU2x-3Y69XSq_IkUai^>%FjXwQYSq*Fv9%}35wh#v
zhLToF`iC^J>_({JmvKt%DOQ9$A=W^j3P=y)i{;5_hSEhWD?}JE`W at X+rY5pN6|avT
z?=+O_D6BK8h_N)K;fY1Y`UDY={mW{oz__!|Iuph-Mhe|rqS)s=CF9wl#>zuf_Gf;C
z=ee=QDla)ZELie9Kh4PWc^vN<Mwoa+H&)}K>IgBCiDH4V<|MU_7)O|-D~+`w^1A3$
z<-|UVk#*L+{ydp5Rpo7B<D=>?&?Hl}p{Ba?RR06DgctR(rus{$y#69z@}eot)Iid1
zdX5mLTj(ZEd{jfMLNeVUFg2!78!oE|3W3tpbVuHB6_F^OrY&*P-8m%Z$e96eGcPBK
zbKO%qGZJcUE}(M0 at r!&Zi8Z&B{FLMsBz-xWW^QG;H^zrYDktdXHg;5FLX1>7Eikw9
zsEtW+k+aGH4{WErF*#K_`^swO_q#WxkR#`oy^&5)RMU4f>D+oK@^qZq^nK}%S(~wl
zU`F0_yZKo5b{f*P=+3<(jC`f1Bi-sKZkj^+$}B*7bX4wLRpf$IiS%09cf8Ef1+XH0
zn1j4 at XX4`i-&^`!qInsfvPGxUmS>0Zc>!5|#3k3SECXJnJWP;m>EMr+L7#)oIpM_R
ZH%l!;xaj8G7}>H%mu2{ag9k9D{{x||N9O<l

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

literal 347
zcmZ?wbhEHb{Kde<aD;*3-IsqKzx{jv_1}lD|GxbA_xbz3Z$JNi`u^|hkAGi({(JxB
z-|2h*e*XUd`_KOm-~KH<^zHMHfB*mg|MczO- at pIA|N8&z-9HArK=CIFSY8K2g6w2q
zy`iAcmy$UzW7WEx*ZT@|&aYj>VPW at Xx9}hPlZg=;VhSxPjEx>DJORwD7iYN0O=ZnJ
z{kCfVgAb>tUH-^sm*C)GqBPYfJ;ZBk($+_N>dwDEe<C$KBP-jP-Ob(0+t)uZI5a%6
zZt|3=(_$Men=&18+Vi>!djtB*CQV<la at C5NX*P2l+dA?+7Zop^Sh0Hdp1m{78`C$m
z=DKd_F6t}Yx$o?`^O|d!X1C1Sys&5c>GBJA at 9n#ECF|OPf}5u%+`0ey&D4j7u5Nm|
d_4$(9%isR|mH2-B$D^HRR5wr8^X6c%1^~1?xI+K{

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

literal 3048
zcmV<E3m5c9Nk%w1VIBaM0QUd at UWdMZq}hR}+={T{gR0(qqS$qu(qoFkf27)Ci@|)N
z*NwF2SAe*SvgKrq#9)ZOU531ctlxK@)L)3ciLm2<r`(6G;a-NldZ5)=g1LpP;8cFK
zVT!?HjKYPh;8%dRa+%MLv*&D+%5Id)T7<iSsM~Ou&5W_-RDHICs at -{@)_9)NWsb#e
zmdj?3#$1HEex})7hP{ro=a04MjkD&6uHuZc<%zH3c%RgOr`v+5-By3Mi?QW at rrK40
zwt1k{cb?OIq}YV2-i52*im>E{tl)>O;d-IgbDPk6qSt4S#f-A%i?QT=q}hh8;BlDF
zh_B*wo6w4}<ZzeGcAe6MtKW&Q;&hzRXpqK at v*&V}&t{Iqb)3;yfw^3Tyo|HvhOOa_
zwCHx7(|e-UT7$ZCn$VB5=yaRWgQ?wZmCJ6H%vyrFbDGbNwda7Q+gpRXf2P}Smdt~x
z-h!yyU4^|^fw+95*N?R4hpypyq19=T$cV1tdZN~4jl+PZ+FXRZYm>=giNS1?$ytH9
zS%SJ%eYJ6!&TEp%XpqNYiNIHXw|1V>jk4xoh`?lw!i1~dY?R7^sNIaS<#(Udb)C{!
zfVhFD+-;T0gsR_ak;r(U)N7K+ex=!puj7KL+<c_iZ<oz-n$T5$wuP(Shppm(r`mX+
z)pnlJkG1EAt>9*k#fh-wim~Nnjl+($=vsogX_CizpwwH0yJ?Zfi?HN~uj5^XylRrj
zd7sr*f3{$Wzg2#>d!g2iv*n1b;d-LiYm>@*q1SVp(T%d at iLT;mlgMU`#CV_8d7so)
zezsPAw^x6-cAU~wezu3K;c1e{S%JEawB~i2(PoduT7tV;gS%UUx?+jISb(`%fw)|S
zy=#-mex}-Jk;izR)NPc?ZIsJ)ozY~B!)1)ba+=P1pw at Aj&u^H`YLdr)r`n3I<b0&p
zYLUlPf46g+&vBa0cb?LWvgC-a<711$YLdxnlgW#+=5(CUjI-x|r`u?e#%YkoX^_Wh
zk;ZqO(^P%6A^8LV00000EC2ui03HCA000R80A~msNU)&6g95`0G-Jlq3{(PLnF+&i
zhQt|W1VU7(v5hN=ciNa~(`H7SJ2En&3Ude5NEs|eW}Fe`qzssM!rX*8V`onpZDiaT
zN>ZfIoi`WAP^uH=&8A47LXCPeONbCzZiZMYgGLCYGPZ^dyI?C;uL~Ar&64$Mh-hll
zvdyBFt6aD=^6J&gmd1j-e*t^Vn}tSUy^Ox#`@(qd7aCud=zYv6?_(N_Dog6ML=p{2
znTL7q75Ot}8a5b9PHnlDjU}%;4~x8H$*|P0YcF9``?U=ll3>$lz{5s^-wj~@UcRKk
zap%A7H8|n>_X*<EjbFEMf`|8b+OMDgxbB^}cjMl95NE=JiTm{LnGiRh-aC6%Or+pv
zf}a+x{8BLSpA<w07$7TB1ehNYQVhT#5d#pIA1y>cm|%noCYWG_5k6QU5fltSL4!oB
zA|i(-mU!X-5q3xc1?t>z0|i8MB4a13+&I7uBHB3Pix76wNr)84_~ML6%4lSfNLpcq
zkxI(wWGzrUS;Lf8Kmi3YTV`414O!N5B@|*pQ9}(?nyDq4R-8%9nOUA$r95VyX{Vid
zoVf=cd)BaLpJ(RjCz>_zxyPACkiw at Ccr=O!DWv$qC!dN+ny90ANZP0ojDmqjDx5MJ
zsu5s-;Y6rl7;$PUpQ>s^5vIcbS_G+1IAN-(s-EghDy2FBYbwr|>Wr^N)LO)`#cEK5
z2DUPLtP{)<E9<cyC>wzW*lKX?ves6+Ew)8O5J9!dYCFUb<D#2xwH|nI?z`fmTgAB=
z41w(<RS0oz6{8GM#lJ(~3oyU_J~B$b{XTN85SR#&FD94}Pz5Gc;M*`J_zL0hzXUwO
zu)`h`AcV*oi%bB?Bb%&o$tSmbG8!$*p at SS~pdm-gDG-oC3UbiQGXZk^d~ymp6s-dq
zMb|tt(nu%Ww9Q8MeDoYeM?!TZkr-|C9CJkC$=6xy;0e~A%u%)g0?dJS+H1G%w%cl}
zopuRy3s6D at c3UEVC3^G!y|*Pf?2Wc1cMD!Z4uI!SK at N;FUIE~VJFa--jWg~?4sO8V
zMk)EYkwYnd_^~<WrEKno=We6}$K|Kz00$gB__2BqJ-`lo?6S*VJMFY*PW$bg(9Q`r
zoCII|@w^AmI}FHkBmD8uM=yQx2uxpm0MR#5d=uDn&x!WO2harf+Ls^1_~)lTKKkjm
z&wdj@#DBgW^ao+bC!gGJzy0;cZwLRMSO@<4XNLmNkA4a`paK`jK>8Wb4oQF@{UQj#
z2r3{67)&4rF<3zhCP4uT7{eGaD8gWj;TI<y10P111QhZi7)el}2*<z+6Y}B+IK&|@
z_`nAo at -T-$?4b|;bGXAJ<lzVyIHD2DVMG-e at rXajLmr%%LkwV`97>d89)7^ZF8;t2
zUgY8yx5&j<gprGyh=nF_fCDw+z!auPBQ8vV3|!y<8DPYPCUAiaO&sF~$2bNX**FP8
z4$_c=EF>GfaY#kt00@(qgf}Fxf)z{x2ok`-BqSgKAYd|*kgQ}UBdJMGieV9+M5QS`
z=}CWh5+0{GWhz&RN->;*3SywbEvdjuG5GS7yu at WLeYuEO?s5^7pad7Fkj!vUf|ubi
zfB~4vjAR-hnasE*C78iXYjS}L1_0+bDG^R-av_=D1gA2u5KeMlL78XZf;6IV1!<h&
z3irIi73g{YhJM~dpZeqiK>K;mC`3URNI-%?qkx1nEcBrLM1n9L8U=@*A)!bpLqf~I
z(K4_>p&I3AMv>r-jc!z<CS`*bJgU-AXh91qg{e!~5DGScAQYhh0Zm~FQ#ROC3m^!p
zP(c7x5SYUpMGY!BfcjFPk^=<q0D&Q<`UFE%^$A$bs#Ukj)vS8;380vQ2~04BDS(2k
zVm*gh%evOEqSdT#ZGjrp5QjLlAP#fIt6u9$*S_ZUu6$L)B`yJuG#EAw-?+qK(*O>|
z4py-vaO`47 at C`u-0uq7%gdl(+0!WD9vLXmAXfZ1SU~m=^m=%Nw08xxX0OGZ`IK(07
z@!CWGY@;54h;1>pafnT9qPM**#wGx<2|dgr6MBG!9+0btTV&$7=$M5bl51Q&JfpeK
z$OJ54F$;F+0}F@%FBZl-UPOeq8{_Q<dC|*{@FHR#?p1<(mEeN;+V{TlorZn&Yu_zw
zfdyMoMSzWA3;_GL5B^Q?e^mkC0tXnteQ1R^#xagQM7R|Zws0RPY+(%d!2uc`hll&n
zfq6K>#PcZei5<}aM>s+p9cXckQ#|7mqxb*`-~f(yoPc at gSjY32M*<G8V;t)^$3*rq
z2Li!?CNDV=iMYm+196Q+1R at bjo-zlljAbY{;sK5LvMzM-WiXHV0S`Dcn!(%%U8LFn
z&20t%045-3I!}Pka-OrD at 4RO`&w0)l2=oO2Fla(wAO?aaw4x0y=Rp at 501%*q7w7<i
z7}$ain2rIaDQ$~N(?J`y(1xaC5a~|GzzbgZ1FBW6YA?v*53feGELQD>7r;8zxOTNH
z-XM!!zk%1i_B9E9z3X7_8rZ*n0~yvp25VG<4A5pa8LGkTHAs8e&87yn*FX(xui+Jh
z2=^-nkpXf;;}sb|Hz6{x2578d-5DUnAmAPDL3E)GgQ!CnvY~H#+dBhY064z8K=6WR
zgWLkIL>CxPhdNY(0hOo&1F*qx1~9x56o+`jBkpjCD}n(Z*ugSB{sBdNU>P6906EB0
zj&h5K+~g)N`3`2Di<#T}=8Cwv&TDS-Tqt4}yHJKGMBxJ;?4an%*o6<0;RB@)o#{Tv
z1<{q^gLWi?=sqY!(Y4-;qWhp3T+h1Jz3u}P6k_Z}- at pd`adx)*;2&x)gxXQ?kGIzy
z?q|>YKiIzazWe>}fDgRj2T%CI8~*T!PrTw6&-lhW{_&8HyyPcO`N~`V@|e%O<~Psz
q&U^mzpbx$1M^F0FoBs5uPrd3_&-&K8{`Ihrz3gXC``Z5_AOJfS7U$gn

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

literal 966
zcmcJL=}(#m0LEEth&{HLv at xb}J<`P>nyyP1<Bks|ZJ0%Cn{+d#>9uq*2+d;F#+a^I
zsC0^=)mBSwMGjHqP(eVTf`YRuf{Ke(+acu=cn|L51;oPY{)asuo)5ndzvOv-xPUAD
z=I4{Bu20rcs6aUG55?g?EEq|6gNQGPL}JM(vJ;9X!qKERfPnrO96-W*FbVr(p-93P
zLUvNSnM@`eP3-Qb<H=MyoeqXS^0+ at 7kHvQ)ND}hLKwk{-A%HK2`ag3rx$i%H at m}w3
zLZLId*81||qn&fK-xlwD%UW)`habHv{;9RW=)14IPHU_ at -Dh%j++Y4xZS_$eREf=j
zgys)ZAeA9MY@#%N*4#pEZKJh!JnqbY^0d3>8NCPn;$<JBpUGl#2DpPmykWjT$oh12
zOe`6f%H$IYrAoG6t(ltE>Sq3$eLXk7pr1QpTv}c+t*&IRy;<MbeEaSn^Oohk)n<2C
za$If?079_W=g$g;!jWhUi6 at dD|NM~7pt26+Q#tGzO7>yw`D`|4wk78jo>4wNFh|Qf
zOWe|ra~C>KoV)s_OggyOjk&@+q>~OApP#vHU|f*#mitQYLR*WnVN- at xMyk!j%lUtE
z%R6v22DxBu_%avYkDnl~i)v&<i(x{vDZVw^_IZV3<elu=e*Sf%V$`gxcN+RDlw%fk
zV+67omEtBXIqTrDN|nSuOFdk4W2y8j%0kzv3TEXisms`VmNZt(mU&F<bF^a at C*|N8
z|BC3w^5g`(DLJlZUQ{c5X4PHzy at jI;Sap<x$E!4|kW=4XbaO at XD&kq?R<Nq3CS&kh
z8OgdbrH%(|Lto}yn${#Ez?$f$X?iLZ51N1Py`-J~kV-^gt4XWPWKd{~jl3_HV0)Nd
zz_&FWDgkVi92~~}=twoe{%2k--`<?x066U}N1IMKs9(?tj#dnh?`SJl01n!jd5p9D
z>kWdlqtwlJKK>p7oSkLp!tJi}xpmu5$_oVBPb*8n?e5FCLRZg^)pf3CHMIg4{aOR)
zdVZ_9(B1nBz0UoDz!SJ%-cf+=zWVt>598iOou|LiE$}cOAfSguMq>f?qg*1up&Al1
z1MMXc!0p0e!NHztA~@7rD+GCr1_&HxH)A3GAe{&a_&gyb98o}!NHULwN8}qscvR&U
k!ebf)g2g&?kyr9Mm*gGS7l^#lr4raHTg8z`IjHac1(BF02mk;8

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

literal 92
zcmZ?wbhEHb<YM4wSj50^@ZiBmFWz3gdFRB*Q at 0;HId}2$ix1xz7#I|PvH(d21|1Lq
uQp>=sn33fe#H{mdLCo8uGj-QXv&DIdPkX$4;+0iZi=+>)h>7N8um%A7aU}8p

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

literal 92
zcmZ?wbhEHb<YM4wSj50^@ZiDMuU}uidiB|}XLs-3J#*&FyLayx7#I|PvH(d21|1Lq
uQp>=sn2}|u!m9IZLCo8uGj-QXv&DIdPkX$4;+0iZi=+>)h>7N8um%7F^(68D

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

literal 2899
zcmd^8=~vQ;0{wvtqLk3MYldk`jTuc->C*@-m&qk9Gsi7To0^sxCreAm4w7cOTQ#<;
zS!3&vS&Cbbxnzo<0wRK_D7$PX2&k`l|Hiu??x%asUCy~-KZW`S9Lxk_0384{(x<1j
ziyb2h=JeN=LGifKNM*}fha?j!6I(pTk?5v03+==5-Z9nKjDgG$b&bw^<|&2h1)hAK
z%$Ob!&USHUJ}{+RnSM|>+cY4ejjQPsTCQw<O0!61OKIa8wrH+-K=gqn?cph#2gU6i
z`PhtcOktQ*nZAsvddJlCN$t?|*R~<aq<VoS(D3AjaixhP(YFuFxKce$pyny&Kl7Cz
zm=d98L7+5Fs!j9>P1At5V?@pt>o`&!Phn^t5clwvWcqY7Lo}sbq%fsZ+65|0Cj2Iz
z)J&*N?Ht($mZXUx8kOlAza^iV9g*n96h_8`rh9aTBh|MIh{<#jV?sMPHQPEQ?&i+4
z4T%|(8iCT(#Z?RnwWG3mu5|v(n7WNA;mZwdk#0h at Fsb?GA|0I4GN-=s<@0>Sd at ED(
znWt)EOm}b;eF8OOQrk!u4NPe%Ea{}iG$7P|;j2ca`VNk~PoU`<RWvcg6t;}7Ft9|r
zUcQPYniD7t%;`Di)La`={Bc;`H?A3x=!Kfa&Jjf?N5K-$HPJ;BrlgZ2 at 8zpUq`DF5
zw??8?ruZ{oHK|(Y8&^}<QkGcP%n*O%$c5U49=>W^Wu&kq&4Z#Q`gF^nXlQz_o2!^m
zF984F at R&FM-vGY<^1q(|td;;XE4Oe`CG~>Uck7b7NmcDdaL--$!%M4+JZ}W~CX@)f
zJFmN!Wh7_BrgeF`I2HuoshJ8bb=i>Pbw~3!>fXxo<Qj>GcU0M?-^*$w8*BQjY+`bT
z=1bT91dU;1Z>fU2u0D at BfSszkP-O1D|J^RS$F1l4-bUOOSN80XCT@#pxsg{TdS0+5
zk)6eSoc1~HRqBD-l at Vv8!)?EE4EAo!W87ycReqr*L<rbC3SLVd^|F|<Tf1d%Xk|}k
zdGGBoPr>+noz(l~_Tn3P<gZhGYk&AB>y`K0-{=kb?D*Du8XMX@|L<3w%n1WITRe0e
z#_`B7(ZJ&)?Byvr6=GhMa!Gt6uW4Q(Xb4<7pOTx84h#+1u;H=soO<k$Qtxhw$=3A;
zAO!@}{R}JX<;a9WGoQ+sO2WSTNCDL5A-1XzW-YF~0L{7-Y+n>vF-|}v4p*A3S>cZ?
zv`TFBAj16oCoZp8-8f!=#-Q-9jge>^Y^!N_vKV7M?&%T~jr_Fi0_xn3lAtz3&CO7Q
zKJ6CPh3r+bl>%Dh7FvxEmSQzd?PVA~{V_b45?fOi`;_y`-9w$|?vmdlRiPD_rpq|U
zVLSokymCn8V;OszPJMJ`b>fbyLX1mD_0>agan(iZU7^lbw~Q23$Kqpl)Do>nsDGDc
zVLL0IERv5^Z+2Q5!Bxk8N(_Bk+;i;Lr`K56(AtKFBOr%36ubbu$?gU4W)lkk@@?Oq
z{E)Xe6xX+o?ZUNkxbA<|x2_}g)T_EKmk0}c#_imba9l6_#M|3vuZA>p_8j+h7{ka;
zkP`&5_4S?JfVl at 2D5X$6b`sGaEnQa-sgMnB>Q5d)_pw$8*K2P&o&E-?Ke_LAd*cB;
z3*OmbyZ=vhk4H`Ho6hfjN;;{2FMLUTQ24b!tju79T{i1sf{U)(bZ)c2WxMtD17>bf
zKQbaAdG!N(!&2TcE+=mTR_}3*+B_Kb{q^wSgJvh|hxYDAci1_n$ABF7#?jw%Pc`sD
zx%R?WS-jltCEiwk#(sJy|7<!XgrD7Y at +>#4_W^G7+^RMR at 4|;yb55s<H-?Po^z-~3
zvj^8_TU0b(Z{VIS!B{#bktiUWND{qW_IeYwV5Kh!ZvlCmNx{jJMrWGsw~1-gnSXTj
zc88>d(p-5w`VW&VQvNW|X&YfYcdk{3FVaxclugRWUK-e`uDstU6KCSXv~KmU7vxF3
z?#(hhfduk#B>==_OI(WOBIVM5D0nlV9t4}s#ySBi0?ZD-WYTSS@`V#^;wl%{B|yxH
z0>TP&kf%X}1xfoYy>ALY_7ylAscpWOIc_DOr*220^U)O^=KJUb%a?eIAmKr?B|V*h
zyjxWi9*2YPBN5%fh|3uH!8KR(pS;}}u)?DRXJT!KyS2I~{LgCJJ60j9wy2ACd8OIT
zlR8ii)mNg at S0f&D?{uF)g0sCq%P(QU0Xqri2)!pl<sTljh$!|#r6V1o-58gFlIty#
ztG;vY4s|Fqzl+Rw*M%40CIHAyFCt1a+#RxfPx&MBboW)xpa7um77_Nu;x!&*gT=z&
zwNKV(Li1Bc25j1D4*PZBzog`N*uQT9qw^#d$-w|T73IAt^PI)8|9l6ougCuQhWsVf
zFaZA4vIbfIbMJ4gAO89rbj1J2=P#+&f(KwdHBbWV2GKJgek~B$3hylSpEu+`I^QkA
ztVQ(aEE1NRhK}HjKlg`O%|3vp)CPG}#av{SgPaZ%ppk^w8#y;Eoh;TayN?IET)X+$
z<xFt6Gk%Xt<&RHb$Y;>F=dq=~)IUaFmqY|g&3zh&p2C2TsEyKskel_jeoS#hz}=y1
z-u6!{_1L&42GABK<a0~XbI?sB^Vx4-&G4=3;#=2UdY!rtnq)8A_sTl{S at o^whnVXU
znIo)!QkgF^6y}Md99FYtA3Uq|c>MN^e7B%{y8tYBg&%1ckt_gvX85MNCJhH&Lqh&K
zd?MW=kmwV%1ybBfIO3Yi at wo;-cZbUluX(|-Nr<m6R-ACRzWTG*QnEw+<wAMdwiikC
zP>1^R&9Bn-210ur<^YI3*fBYSu<7(T;Fm#lE(uH#{@_SH5MzGY{*M%4BD;xp2Ip2{
z95wUR+4Nrb%euoYjJ(8dW^6Odd~rNg>D^#+K>s>#5}m5|-uhwg-OL$g1Yw0;BV`Ag
zl#hrc`1)1=a6jsWw^+g+Y$J6|rK)f%>>wm8;iC(Nbg?K#0Ey6lToIp907Vz<t<+Q8
zwq#s7(0ge4aY3gG`Xjuu5`;KPfoyfiN1QgLt%7j6Fz|faizVsHVAQVFm+CArRUj1B
z**YK46c^zORvkyeaqi&qT;Ft*6SX@!z79cXnf5m7mwIC{+Oo`K;re?4UGWz;m4v7O
z>mUIrv7-IaTC8~caS%Pv?{xJ$!I9v-Sep=4<|Bwg6o4}Hm!HQX+yRTQGy{m}JzE8N
za5QR(V`ql~+j+0Q9OszB%v-+sDRiY|hmpgwOV|u#^~qMN3~Y+!+{!-{$ANGVkPT$L
z$yUhHAVv<&^1a;^k~}c-9=oDs3u!I<<k6(SVcz-oja^YQr|ua?#nBB-?7o?-W+P8^
zqoG9<rOe?P`FdJIo32lJ-e?>HY#S+%Xcf`bB(U1u_|cK3x)^90hZi?~@`+YoNit11
z^*45IrKxY^nkJF9<nFL&P1!w at 5QW}N?%7Y%+-^2ap^M4AN20ZNxu$9VeljharhRBM
XiLka!^rGn5YS#sExMMaJ00RFD^C5?V

-- 
1.7.3


From oleonard at myacpl.org  Fri Dec  2 21:16:03 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  2 Dec 2011 15:16:03 -0500
Subject: [Koha-patches] [PATCH] Bug 7202 - z39.50 search on bib edit not
	working
Message-ID: <1322856963-13305-1-git-send-email-oleonard@myacpl.org>

The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.
---
 .../prog/en/modules/cataloguing/z3950_search.tt    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 20150ac..6eb4b50 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
@@ -146,7 +146,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         [% IF ( breeding_loo.breedingid ) %]
 
 	    <tr id="row[% breeding_loo.breedingid %]">
-	        <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview Card</a> <a href="#" onclick="Import([% breeding_loo.breedingid %],0); return false">Import</a><a href="#" onclick="closemenu();return false;" title="Close this menu"> X </a></div> </td>
+	        <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview Card</a> <a href="#" onclick="Import([% breeding_loo.breedingid %],[% breeding_loo.biblionumber %]); return false">Import</a><a href="#" onclick="closemenu();return false;" title="Close this menu"> X </a></div> </td>
             <td>[% breeding_loo.title |html %]</td>
             <td>[% breeding_loo.author %]</td>
             <td>[% breeding_loo.date %]</td>
-- 
1.7.3


From Katrin.Fischer.83 at web.de  Sat Dec  3 09:56:37 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sat,  3 Dec 2011 09:56:37 +0100
Subject: [Koha-patches] [PATCH] Bug 7313: Untranslatable strings in 'Search
	to hold' feature
Message-ID: <1322902597-11737-1-git-send-email-Katrin.Fischer.83@web.de>

Changed the javascript to include markup for translation _(...) in result
list and detail page tool bars.

Also changed the text shown for each result to match the text in the toolbar
to make things more consistent.

To test:
- Apply patch
- Run "perl translate update <your language code>"
- Open .po file for staff and check for "Place hold on" and "Forget"
- Translate those
- Run "perl translate install <your language code>"
- Activate "Search for hold" feature in patron account
- Do a search and check tool bar on top of result list
- Check link text shown in result list
- Check detail page
---
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    6 +++---
 .../prog/en/modules/catalogue/results.tt           |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 6c7ffae..5ae91ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -158,8 +158,8 @@ function confirm_items_deletion() {
 			location.href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]";
 		}
 		var HoldForButtonMenu = [
-			{ text: "Place hold", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]" },
-			{ text: "Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&findborrower=[% holdfor_cardnumber %]" }
+			{ text: _("Place hold"), url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]" },
+			{ text: _("Place hold for")+ " [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&findborrower=[% holdfor_cardnumber %]" }
 		];
 
 		//	Instantiate a Split Button using the array of YAHOO.widget.MenuItem 
@@ -169,7 +169,7 @@ function confirm_items_deletion() {
 		var HoldForButton = new YAHOO.widget.Button({
 				id: "holdfor",
 				type: "split",
-				label: "Place hold",
+				label: _("Place hold"),
 				name: "holdfor",
 				menu: HoldForButtonMenu,
 				container: this,
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 2bed51c..9ea3fae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -194,13 +194,13 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
             placeHold();
         }
         var HoldForButtonMenu = [
-            { text: "Place hold", onclick: { fn: holdFor }},
-            { text: "Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: holdForPatron }},
-            { text: "Forget [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: forgetPatron }}];
+            { text: _("Place hold"), onclick: { fn: holdFor }},
+            { text: _("Place hold for") + " [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: holdForPatron }},
+            { text: _("Forget") + " [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: forgetPatron }}];
 
         var HoldForButton = new YAHOO.widget.Button({
                 type: "split",
-                label: "Place hold",
+                label: _("Place hold"),
                 name: "holdfor",
                 menu: HoldForButtonMenu,
                 container: "placeholdc",
@@ -513,7 +513,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                   <span class="noholdstext">No holds allowed</span>
                               [% ELSE %]
                                   <a id="reserve_[% SEARCH_RESULT.biblionumber %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Holds</a>
-                                  [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]&amp;findborrower=[% holdfor_cardnumber %]">Hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a></span>[% END %]
+                                  [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]&amp;findborrower=[% holdfor_cardnumber %]">Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a></span>[% END %]
                               [% END %]
                           [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                           | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Edit record</a>
-- 
1.7.5.4


From christophe.croullebois at biblibre.com  Sun Dec  4 22:03:46 2011
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Sun,  4 Dec 2011 22:03:46 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 6663: Features for holidays.pl with
	datepicker
Message-ID: <1323032626-15500-1-git-send-email-christophe.croullebois@biblibre.com>

Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I have added also Holidays repeated yearly on a range.
On suggestions I have added a datepicker for "To Date".
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    2 +
 .../prog/en/modules/tools/holidays.tt              |   27 +++++-
 tools/holidays.pl                                  |    1 +
 tools/newHolidays.pl                               |   98 ++++++++++++++++---
 4 files changed, 111 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 7b38062..493a757 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -554,6 +554,8 @@ div.yui-b fieldset.brief li.radio {
 	padding : .7em 0;
 }
 div.yui-b fieldset.brief li.radio label,
+div.yui-b fieldset.brief li.dateinsert label,
+div.yui-b fieldset.brief li.dateinsert span.label,
 div.yui-b fieldset.brief li.radio span.label {
 	display : inline;
 }
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 ac867fe..83fcc7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -103,6 +103,7 @@
 		$("a.helptext").click(function(){
 			$(this).parent().find(".hint").toggle(); return false;
 		});
+		$("#dateofrange").each(function () { this.value = "" });
 	});
 //]]>
 </script>
@@ -209,7 +210,7 @@
 				<input type="hidden" id="newBranchName" name="newBranchName" />
 			</li>
 			<li>
-				<strong>Date:</strong>
+				<strong>From Date:</strong>
 				<span id="newDaynameOutput"></span>, 
 
 				[% IF ( dateformat_us ) %]<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>/<span id="newYearOutput"></span>[% ELSIF ( dateformat_metric ) %]<span id="newDayOutput"></span>/<span id="newMonthOutput"></span>/<span id="newYearOutput"></span>[% ELSE %]<span id="newYearOutput"></span>/<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>[% END %]
@@ -220,6 +221,20 @@
 				<input type="hidden" id="newMonth" name="newMonth" />
 				<input type="hidden" id="newYear" name="newYear" />
 			</li>
+			<li class="dateinsert">
+				<b>To Date : </b>
+				<input type="text" id="dateofrange" name="dateofrange" size="20" value="[% dateofrange %]" />
+				<img src="[% themelang %]/lib/calendar/cal.gif" id="dateofrange_button" alt="Show Calendar" />
+				<script language="JavaScript" type="text/javascript">
+				Calendar.setup(
+					{
+					inputField : "dateofrange",
+					ifFormat : "[% DHTMLcalendar_dateformat %]",
+					button : "dateofrange_button"
+					}
+				);
+				</script>
+			</li>
 			<li><label for="title">Title: </label><input type="text" name="newTitle" id="title" size="35" /></li>
 			<li><label for="newDescription">Description:</label>
 				<textarea rows="2" cols="40" id="newDescription" name="newDescription"></textarea>
@@ -239,6 +254,16 @@
 							<a href="#" class="helptext">[?]</a>
 							<div class="hint">This will take this day and month as a reference to make it a holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1st will make August 1st a holiday every year.</div>
 							</li>
+            <li class="radio"><input type="radio" name="newOperation" id="newOperationField" value="holidayrange" />
+                            <label for="newOperationField">Holidays on a range</label>.
+                            <a href="#" class="helptext">[?]</a>
+                            <div class="hint">Make a single holiday on a range. For example, selecting August 1st, 2012  and August 10st, 2012 will make all days between 1st and 10st holiday, but will not affect August 1st-10st in other years.</div>
+                            </li>
+            <li class="radio"><input type="radio" name="newOperation" id="newOperationFieldyear" value="holidayrangerepeat" />
+                            <label for="newOperationFieldyear">Holidays repeated yearly on a range</label>.
+                            <a href="#" class="helptext">[?]</a>
+                            <div class="hint">Make a single holiday on a range repeated yearly. For example, selecting August 1st, 2012  and August 10st, 2012 will make all days between 1st and 10st holiday, and will affect August 1st-10st in other years.</div>
+                            </li>
 				<li class="radio">
 				<input type="checkbox" name="allBranches" id="allBranches" />
 				<label for="allBranches">Copy to all libraries</label>.
diff --git a/tools/holidays.pl b/tools/holidays.pl
index 90ef56a..b3912eb 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -147,6 +147,7 @@ $template->param(WEEK_DAYS_LOOP => \@week_days,
         keydate => $keydate,
         branchcodes => $branchcodes,
         branch => $branch,
+        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         branchname => $branchname
   );
 
diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl
index 34469d8..c36d328 100755
--- a/tools/newHolidays.pl
+++ b/tools/newHolidays.pl
@@ -10,25 +10,44 @@ use C4::Output;
 
 
 use C4::Calendar;
+use DateTime;
 
-my $input = new CGI;
-my $dbh = C4::Context->dbh();
+my $input               = new CGI;
+my $dbh                 = C4::Context->dbh();
 
-my $branchcode = $input->param('newBranchName');
-my $originalbranchcode = $branchcode;
-my $weekday = $input->param('newWeekday');
-my $day = $input->param('newDay');
-my $month = $input->param('newMonth');
-my $year = $input->param('newYear');
-my $title = $input->param('newTitle');
-my $description = $input->param('newDescription');
-my $newoperation = $input->param('newOperation');
-my $allbranches = $input->param('allBranches');
+my $branchcode          = $input->param('newBranchName');
+my $originalbranchcode  = $branchcode;
+my $weekday             = $input->param('newWeekday');
+my $day                 = $input->param('newDay');
+my $month               = $input->param('newMonth');
+my $year                = $input->param('newYear');
+my $day1;
+my $month1;
+my $year1;
+my $dateofrange         = $input->param('dateofrange');
+my $title               = $input->param('newTitle');
+my $description         = $input->param('newDescription');
+my $newoperation        = $input->param('newOperation');
+my $allbranches         = $input->param('allBranches');
 
-my $calendardate = sprintf("%04d-%02d-%02d", $year, $month, $day);
-my $isodate = C4::Dates->new($calendardate, 'iso');
-$calendardate = $isodate->output('syspref');
+my $calendardate        = sprintf("%04d-%02d-%02d", $year, $month, $day);
+my $isodate             = C4::Dates->new($calendardate, 'iso');
+$calendardate           = $isodate->output('syspref');
 
+my @dateend = split(/[\/-]/, $dateofrange);
+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];
+}
 $title || ($title = '');
 if ($description) {
 	$description =~ s/\r/\\r/g;
@@ -80,5 +99,52 @@ sub add_holiday {
 						             description => $description);
 		}
 
-	}
+	} elsif ( $newoperation eq 'holidayrange' ) {
+        #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){
+            unless ( $calendar->isHoliday( $date->{local_c}->{day}, $date->{local_c}->{month}, $date->{local_c}->{year} ) ) {
+            $calendar->insert_single_holiday(
+                day         => $date->{local_c}->{day},
+                month       => $date->{local_c}->{month},
+                year        => $date->{local_c}->{year},
+                title       => $title,
+                description => $description
+                );
+            }
+        }
+    } elsif ( $newoperation eq 'holidayrangerepeat' ) {
+        #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){
+            unless ( $calendar->isHoliday( $date->{local_c}->{day}, $date->{local_c}->{month}, $date->{local_c}->{year} ) ) {
+            $calendar->insert_day_month_holiday(
+                day         => $date->{local_c}->{day},
+                month       => $date->{local_c}->{month},
+                title       => $title,
+                description => $description
+                );
+            }
+        }
+    }
 }
-- 
1.7.5.4


From M.de.Rooy at rijksmuseum.nl  Mon Dec  5 08:45:58 2011
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 5 Dec 2011 07:45:58 +0000
Subject: [Koha-patches] [PATCH] Bug 6786: Follow up fixing index names with
	hyphens
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3137CE93@S-MAIL-1B.rijksmuseum.intra>

Adds hyphen to regex looking for index names in buildQuery.
Test by searching on Control-number=...
---
 C4/Search.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 98db887..fdb3479 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1075,7 +1075,7 @@ sub buildQuery {
     my $cclq       = 0;
     my $cclindexes = getIndexes();
     if ( $query !~ /\s*ccl=/ ) {
-        while ( !$cclq && $query =~ /(?:^|\W)(\w+)(,\w+)*[:=]/g ) {
+        while ( !$cclq && $query =~ /(?:^|\W)([\w-]+)(,[\w-]+)*[:=]/g ) {
             my $dx = lc($1);
             $cclq = grep { lc($_) eq $dx } @$cclindexes;
         }
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Mon Dec  5 09:23:21 2011
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 5 Dec 2011 08:23:21 +0000
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 2616: Remove unnecessary
 'use HTML::Template' calls
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3137CF4C@S-MAIL-1B.rijksmuseum.intra>

From: Ian Walls <ian.walls at bywatersolutions.com>

Removes deprecated calls to HTML::Template or HTML::Template::Pro from:
C4/Output.pm
catalogue/export.pl
reports/issues_by_borrower_category.plugin
reports/itemtypes.plugin

Only remaining calls are in misc/cronjobs/rss/rss.pl, misc/cronjobs/smsoverdues.pl,
and t/test_template.pl.  These scripts still legitimately depend on H:T:P

Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
---
 C4/Output.pm                               |    1 -
 catalogue/export.pl                        |    1 -
 reports/issues_by_borrower_category.plugin |    1 -
 reports/itemtypes.plugin                   |    1 -
 4 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/C4/Output.pm b/C4/Output.pm
index 41a0a28..6ab16d9 100644
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -33,7 +33,6 @@ use C4::Dates qw(format_date);
 use C4::Budgets qw(GetCurrency);
 use C4::Templates;
 
-#use HTML::Template::Pro;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 BEGIN {
diff --git a/catalogue/export.pl b/catalogue/export.pl
index 3efdb21..2b55d9f 100755
--- a/catalogue/export.pl
+++ b/catalogue/export.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-use HTML::Template::Pro;
 use strict;
 #use warnings; FIXME - Bug 2505
 
diff --git a/reports/issues_by_borrower_category.plugin b/reports/issues_by_borrower_category.plugin
index 5b43023..825a492 100755
--- a/reports/issues_by_borrower_category.plugin
+++ b/reports/issues_by_borrower_category.plugin
@@ -22,7 +22,6 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template::Pro;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
index d541429..f543f2d 100755
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -22,7 +22,6 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template::Pro;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
-- 
1.6.0.6


From jonathan.druart at biblibre.com  Mon Dec  5 09:49:49 2011
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Mon,  5 Dec 2011 09:49:49 +0100
Subject: [Koha-patches] [PATCH] Bug 7154: Modification in borrower attributes
Message-ID: <1323074989-6763-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

this patch add 2 fields in borrower_attribute_types :
    category_type
    class
---
 C4/Members/AttributeTypes.pm                       |   55 ++++++++++++-
 C4/Members/Attributes.pm                           |    4 +-
 admin/patron-attr-types.pl                         |    9 ++
 installer/data/mysql/kohastructure.sql             |    2 +
 installer/data/mysql/updatedatabase.pl             |    7 ++
 .../prog/en/modules/admin/patron-attr-types.tt     |   62 +++++++++++----
 .../prog/en/modules/members/memberentrygen.tt      |   84 ++++++++++++++------
 .../prog/en/modules/members/moremember.tt          |   43 +++++++----
 members/memberentry.pl                             |    5 +
 members/moremember.pl                              |   19 ++++-
 10 files changed, 224 insertions(+), 66 deletions(-)

diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm
index e36557b..6a6b16d 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,8 @@ sub new {
     $self->{'staff_searchable'} = 0;
     $self->{'display_checkout'} = 0;
     $self->{'authorised_value_category'} = '';
+    $self->{'category_type'} = '';
+    $self->{'class'} = '';
 
     bless $self, $class;
     return $self;
@@ -155,6 +157,8 @@ sub fetch {
     $self->{'staff_searchable'}          = $row->{'staff_searchable'};
     $self->{'display_checkout'}          = $row->{'display_checkout'};
     $self->{'authorised_value_category'} = $row->{'authorised_value_category'};
+    $self->{'category_type'}             = $row->{'category_type'};
+    $self->{'class'}                     = $row->{'class'};
 
     bless $self, $class;
     return $self;
@@ -185,14 +189,16 @@ sub store {
                                          password_allowed = ?,
                                          staff_searchable = ?,
                                          authorised_value_category = ?,
-                                         display_checkout = ?
+                                         display_checkout = ?,
+                                         category_type = ?,
+                                         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_type, class, code)
                                         VALUES (?, ?, ?, ?, ?,
-                                                ?, ?, ?, ?)");
+                                                ?, ?, ?, ?, ?, ?)");
     }
     $sth->bind_param(1, $self->{'description'});
     $sth->bind_param(2, $self->{'repeatable'});
@@ -202,7 +208,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_type'});
+    $sth->bind_param(10, $self->{'class'});
+    $sth->bind_param(11, $self->{'code'});
     $sth->execute;
 
 }
@@ -341,6 +349,43 @@ sub authorised_value_category {
     @_ ? $self->{'authorised_value_category'} = shift : $self->{'authorised_value_category'};
 }
 
+=head2 category_type
+
+=over 4
+
+my $category_type = $attr_type->category_type();
+$attr_type->category_type($category_type);
+
+=back
+
+Accessor.
+
+=cut
+
+sub category_type {
+    my $self = shift;
+    @_ ? $self->{'category_type'} = shift : $self->{'category_type'};
+}
+
+=head2 class
+
+=over 4
+
+my $category_type = $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..377159b 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -110,6 +110,9 @@ sub error_add_attribute_type_form {
         $template->param(display_checkout_checked => 'checked="checked"');
     }
 
+    $template->param( category_type => $input->param('category_type') );
+    $template->param( class => $input->param('class') );
+
     $template->param(
         attribute_type_form => 1,
         confirm_op => 'add_attribute_type_confirmed',
@@ -152,6 +155,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_type($input->param('category_type'));
+    $attr_type->class($input->param('class'));
 
     if ($op eq 'edit') {
         $template->param(edited_attribute_type => $attr_type->code());
@@ -209,6 +214,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);
@@ -232,6 +238,9 @@ sub edit_attribute_type_form {
     }
     authorised_value_category_list($template, $attr_type->authorised_value_category());
 
+    $template->param ( category_type => $attr_type->category_type );
+    $template->param ( class => $attr_type->class );
+
     $template->param(
         attribute_type_form => 1,
         edit_attribute_type => 1,
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 452173d..f35a8b4 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 9ae0060..6728330 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4571,6 +4571,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN category_type VARCHAR(1)  NOT NULL DEFAULT '' AFTER `display_checkout`");
+    $dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN class VARCHAR(255)  NOT NULL DEFAULT '' AFTER `category_type`");
+    print "Upgrade to $DBversion done (New fields category_type and class in borrower_attribute_types table)\n";
+    SetVersion($DBversion);
+}
 
 =head1 FUNCTIONS
 
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..4d32646 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,24 @@ 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_type">Category type: </label>
+            <select name="category_type" id="category_type">
+                <option value=""></option>
+                [% IF category_type == 'A' %]<option value="A" selected="selected">Adult</option>[% ELSE %]<option value="A">Adult</option>[% END %]
+                [% IF category_type == 'C' %]<option value="C" selected="selected">Child</option>[% ELSE %]<option value="C">Child</option>[% END %]
+                [% IF category_type == 'S' %]<option value="S" selected="selected">Staff</option>[% ELSE %]<option value="S">Staff</option>[% END %]
+                [% IF category_type == 'I' %]<option value="I" selected="selected">Organization</option>[% ELSE %]<option value="I">Organization</option>[% END %]
+                [% IF category_type == 'P' %]<option value="P" selected="selected">Professional</option>[% ELSE %]<option value="P">Professional</option>[% END %]
+                [% IF category_type == 'X' %]<option value="X" selected="selected">Statistical</option>[% ELSE %]<option value="X">Statistical</option>[% 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>
+            <input type="text" id="class" name="class"  size="20" value="[% class | html %]"/>
+            <span>Group attributes types with a block title</span>
+        </li>
     </ol>
   </fieldset>
   <fieldset class="action">
@@ -248,23 +266,33 @@ 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>
-  [% END %]
-</table>[% ELSE %]<p>There are no saved patron attribute types.</p>[% END %]
+[% IF ( available_attribute_types ) %]
+  <table id="patron_attributes_types">
+    <thead>
+      <tr>
+        <th>Class</th>
+        <th>Code</th>
+        <th>Description</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH available_attribute_type IN available_attribute_types %]
+        <tr>
+          <td>[% available_attribute_type.class |html %]</td>
+          <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>
+      [% END %]
+    </tbody>
+  </table>
+[% 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 b9371b6..9c31271 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 category_type %]
+            update_category_code( "[% category_type %]" );
+        [% ELSE %]
+            if ( $("#categorycode").length > 0 ){
+                var category_type = $("#categorycode").find("option:selected").attr("data-typename");
+                update_category_code( category_type );
+            }
+        [% END %]
+
     });
 
     function clear_entry(node) {
@@ -51,6 +61,23 @@
         $("select#patron_attr_" + newId, clone).attr('value','');
         original.parentNode.insertBefore(clone, original.nextSibling);
     }
+
+    function update_category_code(category_type) {
+        var mytable = $("#attributes_table>tbody");
+
+        mytable.find("tr").each(function(){
+            $(this).hide()
+        });
+
+        mytable.find("tr[data-category_type="+category_type+"]").each(function(){
+            $(this).show();
+        });
+        mytable.find("tr[data-category_type='']").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 ");
@@ -890,25 +917,25 @@
     </li>
     <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>
@@ -1180,14 +1207,20 @@
   <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>
+    <table id="attributes_table">
+        <thead>
+            <tr>
+                <th>Class</th>
+                <th>Type</th>
+                <th colspan="2">Value</th>
+            </tr>
+        </thead>
+        <tbody>
         [% FOREACH patron_attribute IN patron_attributes %]
-        <tr>
-            <td>[% patron_attribute.code %] ([% patron_attribute.description %])
+        <tr data-category_type="[% patron_attribute.category_type %]">
+            <td>[% patron_attribute.class %]</td>
+            <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 %]" />
@@ -1228,6 +1261,7 @@
             </td>
         </tr>
         [% END %]
+        </tbody>
     </table>
   </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 454032c..439689f 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 d169dbd..0997888 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -407,6 +407,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' );
@@ -760,11 +763,13 @@ sub patron_attributes_form {
     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_type     => $attr_type->category_type(),
             password          => '',
         };
         if (exists $attr_hash{$attr_type->code()}) {
diff --git a/members/moremember.pl b/members/moremember.pl
index 6e5407c..e48538e 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,25 @@ 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 );
+    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 adrien.saurat at biblibre.com  Mon Dec  5 10:40:14 2011
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Mon,  5 Dec 2011 10:40:14 +0100
Subject: [Koha-patches] [PATCH] Bug 7013: required format for authorized
	values
Message-ID: <1323078014-4084-1-git-send-email-adrien.saurat@biblibre.com>

When an authorized values contains special characters
as spaces, some problems arise in other pages.
This patch sets up a new check for any new
authorized value. The value can only contain
letters, numbers, dash "-" and underscore "_".
---
 admin/authorised_values.pl                         |   97 +++++++++++---------
 .../prog/en/modules/admin/authorised_values.tt     |    7 +-
 2 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index d7872d6..26e792e 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -102,59 +102,68 @@ if ($op eq 'add_form') {
     my $imageurl     = $input->param( 'imageurl' ) || '';
 	$imageurl = '' if $imageurl =~ /removeImage/;
     my $duplicate_entry = 0;
+    my $bad_chars = 0;
 
-    if ( $id ) { # Update
-        my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id='$id' ");
-        $sth->execute();
-        my ($category, $authorised_value) = $sth->fetchrow_array();
-        if ( $authorised_value ne $new_authorised_value ) {
+    if ( $new_authorised_value =~ /^[a-zA-Z0-9\-_]+$/ ) {
+        if ( $id ) { # Update
+            my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id='$id' ");
+            $sth->execute();
+            my ($category, $authorised_value) = $sth->fetchrow_array();
+            if ( $authorised_value ne $new_authorised_value ) {
+                my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
+                    "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' and id<>$id");
+                $sth->execute();
+                ($duplicate_entry) = $sth->fetchrow_array();
+                warn "**** duplicate_entry = $duplicate_entry";
+            }
+            unless ( $duplicate_entry ) {
+                my $sth=$dbh->prepare( 'UPDATE authorised_values
+                                          SET category         = ?,
+                                              authorised_value = ?,
+                                              lib              = ?,
+                                              lib_opac         = ?,
+                                              imageurl         = ?
+                                          WHERE id=?' );
+                my $lib = $input->param('lib');
+                my $lib_opac = $input->param('lib_opac');
+                undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
+                undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string
+                $sth->execute($new_category, $new_authorised_value, $lib, $lib_opac, $imageurl, $id);          
+                print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."&offset=$offset\"></html>";
+                exit;
+            }
+        }
+        else { # Insert
             my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
-                "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' and id<>$id");
+                "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' ");
             $sth->execute();
             ($duplicate_entry) = $sth->fetchrow_array();
-            warn "**** duplicate_entry = $duplicate_entry";
+            unless ( $duplicate_entry ) {
+                my $sth=$dbh->prepare( 'INSERT INTO authorised_values
+                                        ( id, category, authorised_value, lib, lib_opac, imageurl )
+                                        values (?, ?, ?, ?, ?, ?)' );
+                my $lib = $input->param('lib');
+                my $lib_opac = $input->param('lib_opac');
+                undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
+                undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string
+                $sth->execute($id, $new_category, $new_authorised_value, $lib, $lib_opac, $imageurl );
+                print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."&offset=$offset\"></html>";
+                exit;
+            }
         }
-        unless ( $duplicate_entry ) {
-            my $sth=$dbh->prepare( 'UPDATE authorised_values
-                                      SET category         = ?,
-                                          authorised_value = ?,
-                                          lib              = ?,
-                                          lib_opac         = ?,
-                                          imageurl         = ?
-                                      WHERE id=?' );
-            my $lib = $input->param('lib');
-            my $lib_opac = $input->param('lib_opac');
-            undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
-            undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string
-            $sth->execute($new_category, $new_authorised_value, $lib, $lib_opac, $imageurl, $id);          
-            print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."&offset=$offset\"></html>";
-            exit;
+        if ( $duplicate_entry ) {       
+            $template->param(duplicate_category => $new_category,
+                             duplicate_value =>  $new_authorised_value,
+                             else => 1);
+            default_form();
         }
     }
-    else { # Insert
-        my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
-            "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' ");
-        $sth->execute();
-        ($duplicate_entry) = $sth->fetchrow_array();
-        unless ( $duplicate_entry ) {
-            my $sth=$dbh->prepare( 'INSERT INTO authorised_values
-                                    ( id, category, authorised_value, lib, lib_opac, imageurl )
-                                    values (?, ?, ?, ?, ?, ?)' );
-    	    my $lib = $input->param('lib');
-    	    my $lib_opac = $input->param('lib_opac');
-    	    undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
-    	    undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string
-    	    $sth->execute($id, $new_category, $new_authorised_value, $lib, $lib_opac, $imageurl );
-    	    print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."&offset=$offset\"></html>";
-    	    exit;
-        }
-    }
-    if ( $duplicate_entry ) {       
-        $template->param(duplicate_category => $new_category,
-                         duplicate_value =>  $new_authorised_value,
+    else {
+        $template->param(rejected_category => $new_category,
+                         rejected_value =>  $new_authorised_value,
                          else => 1);
         default_form();
-     }           
+    }
 	
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index 7e71789..1d9cfea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -67,8 +67,7 @@
         <li>
             <label for="authorised_value">Authorized value</label>
      [% IF ( action_modify ) %]<input type="hidden" id="id" name="id" value="[% id %]" />[% END %]
-            <input type="text" id="authorised_value" name="authorised_value" value="[% authorised_value %]" maxlength="80" />
-        </li>
+            <input type="text" id="authorised_value" name="authorised_value" value="[% authorised_value %]" maxlength="80" /> <span class="hint">Allowed characters : letters, numbers, dash and underscore</span></li>
         <li>
             <label for="lib">Description</label>
             <input type="text" name="lib" id="lib" value="[% lib %]" maxlength="80" />
@@ -182,6 +181,10 @@
 <div class="dialog alert">Could not add value &quot;[% duplicate_value %]&quot; for category &quot;[% duplicate_category %]&quot; &mdash; value already present.
 </div>
 [% END %]
+[% IF ( rejected_category ) %]
+<div class="dialog alert">Could not add value &quot;[% rejected_value %]&quot; for category &quot;[% rejected_category %]&quot; &mdash; the value can only contain the following characters: letters, numbers, - and _
+</div>
+[% END %]
 <form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label>[% tab_list %] <input type="submit" value="Submit" /></form>
 [% IF ( category == 'Bsort1' ) %]
     <p>An authorized value attached to patrons, that can be used for stats purposes</p>
-- 
1.7.4.1


From jonathan.druart at biblibre.com  Mon Dec  5 11:36:59 2011
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Mon,  5 Dec 2011 11:36:59 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_5347=3A_Adds_columns_cla?=
	=?utf-8?q?ims=5Fcount_and_claimed=5Fdate_in_aqorders?=
Message-ID: <1323081419-11845-1-git-send-email-jonathan.druart@biblibre.com>

This patch adds 2 columns in the aqorders table :
- claims_count : number of claims for an orders
- claimed_date : date of the lastest claim

In the lateorders.pl table, you can not select orders from different
supplier because there is just one letter sent after clicking the "Claim
order" button. So, it's logic that you want to select only orders from
this supplier.

Modification in C4/Letters.pm:
refactoring code for claimacquisition and claimissues letter type.
Now, fields for theses letters check the table name. It's not possible
to chooce aqorders.title, this field doesn't exist !
Furthermore, you can add a <item> tag around your item fields, like
this :

-- Begin example
<<aqbooksellers.name>>
<<aqbooksellers.address1>>
<<aqbooksellers.address2>>
<<aqbooksellers.address3>>
<<aqbooksellers.address4>>
<<aqbooksellers.phone>>

<item>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>)
(<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not
been
received.</item>
-- End example
---
 C4/Acquisition.pm                                  |   30 +++
 C4/Letters.pm                                      |  198 ++++++++------------
 acqui/lateorders.pl                                |   18 ++-
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/en/mandatory/sample_notices.sql     |    2 +-
 .../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             |    2 +
 .../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 +-
 .../data/mysql/ru-RU/optional/sample_notices.sql   |    2 +-
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/uk-UA/optional/sample_notices.sql   |    2 +-
 installer/data/mysql/updatedatabase.pl             |    6 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |   10 +-
 .../prog/en/modules/acqui/lateorders.tt            |   39 ++++-
 18 files changed, 189 insertions(+), 136 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 7127f24..e1d18f5 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -61,6 +61,8 @@ BEGIN {
         &GetContracts &GetContract
 
         &GetItemnumbersFromOrder
+
+        &AddClaim
     );
 }
 
@@ -1416,9 +1418,12 @@ sub GetLateOrders {
         DATE(aqbasket.closedate)  AS orderdate,
         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,
         borrowers.branchcode      AS branch,
         aqbooksellers.name        AS supplier,
+        aqbooksellers.id          AS supplierid,
         biblio.author, biblio.title,
         biblioitems.publishercode AS publisher,
         biblioitems.publicationyear,
@@ -1742,6 +1747,31 @@ sub GetContract {
     return $result;
 }
 
+=head3 AddClaim
+
+=over 4
+
+&AddClaim($ordernumber);
+
+Add a claim for an order
+
+=back
+
+=cut
+sub AddClaim {
+    my ($ordernumber) = @_;
+    my $dbh          = C4::Context->dbh;
+    my $query        = "
+        UPDATE aqorders SET
+            claims_count = claims_count + 1,
+            claimed_date = CURDATE()
+        WHERE ordernumber = ?
+        ";
+    my $sth = $dbh->prepare($query);
+    $sth->execute($ordernumber);
+
+}
+
 1;
 __END__
 
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 6846a00..edd93a1 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -243,6 +243,7 @@ sub findrelatedto ($$) {
 sub SendAlerts {
     my ( $type, $externalid, $letter ) = @_;
     my $dbh = C4::Context->dbh;
+    my $strsth;
     if ( $type eq 'issue' ) {
 
         # 		warn "sending issues...";
@@ -290,99 +291,56 @@ sub SendAlerts {
                     );
                 sendmail(%mail) or carp $Mail::Sendmail::error;
 
-# warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
             }
         }
     }
     elsif ( $type eq 'claimacquisition' ) {
 
-        # 		warn "sending issues...";
-        my $letter = getletter( 'claimacquisition', $letter );
+        $letter = getletter( 'claimacquisition', $letter );
 
         # prepare the letter...
         # search the biblionumber
-        my $strsth =
-"select aqorders.*,aqbasket.*,biblio.*,biblioitems.* from aqorders LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno LEFT JOIN biblio on aqorders.biblionumber=biblio.biblionumber LEFT JOIN biblioitems on aqorders.biblioitemnumber=biblioitems.biblioitemnumber where aqorders.ordernumber IN ("
-          . join( ",", @$externalid ) . ")";
-        my $sthorders = $dbh->prepare($strsth);
-        $sthorders->execute;
-        my $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{booksellerid} );
-        my $sthbookseller =
-          $dbh->prepare("select * from aqbooksellers where id=?");
-        $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
-        my $databookseller = $sthbookseller->fetchrow_hashref;
-
-        # 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;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
-                }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
-            }
-        }
-        $letter->{content} =~ s/<<[^>]*>>//g;
-        my $innerletter = $letter;
-
-        # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} )
-        {
-            my %mail = (
-                To => $databookseller->{bookselleremail}
-                  . (
-                    $databookseller->{contemail}
-                    ? "," . $databookseller->{contemail}
-                    : ""
-                  ),
-                From           => $userenv->{emailaddress},
-                Subject        => "" . $innerletter->{title},
-                Message        => "" . $innerletter->{content},
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-        }
-        if ( C4::Context->preference("LetterLog") ) {
-            logaction(
-                "ACQUISITION",
-                "Send Acquisition claim letter",
-                "",
-                "order list : "
-                  . join( ",", @$externalid )
-                  . "\n$innerletter->{title}\n$innerletter->{content}"
-            );
+        $strsth = qq{
+            SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*,aqbooksellers.*
+            FROM aqorders
+            LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
+            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
+            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' ) {
 
-        # 		warn "sending issues...";
-        my $letter = getletter( 'claimissues', $letter );
+        $letter = getletter( 'claimissues', $letter );
 
         # prepare the letter...
         # search the biblionumber
-        my $strsth =
-"select serial.*,subscription.*, biblio.* from serial LEFT JOIN subscription on serial.subscriptionid=subscription.subscriptionid LEFT JOIN biblio on serial.biblionumber=biblio.biblionumber where serial.serialid IN ("
+        $strsth = 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 $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{aqbooksellerid} );
-        my $sthbookseller =
-          $dbh->prepare("select * from aqbooksellers where id=?");
-        $sthbookseller->execute( $dataorders->[0]->{aqbooksellerid} );
-        my $databookseller = $sthbookseller->fetchrow_hashref;
+        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;
+        }
 
         # parsing branch info
         my $userenv = C4::Context->userenv;
@@ -391,59 +349,65 @@ sub SendAlerts {
         # parsing librarian name
         $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
         $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
-        $letter->{content} =~
-          s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
+        $letter->{content} =~ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
+
+        # Get Fields remplacement
+        my $item_format = $1 if ( $letter->{content} =~ m/(<item>.*<\/item>)/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 ( $item_format ) {
+            # For each order
+            foreach my $infos ( @orders_infos ) {
+                my $order_content = $item_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;
                 }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
+                $order_content =~ s/<\/{0,1}?item>//g;
+                $letter->{content} =~ s/<item>.*<\/item>/$order_content\n$item_format/xms;
             }
+            $letter->{content} =~ s/<item>.*<\/item>//xms;
         }
-        $letter->{content} =~ s/<<[^>]*>>//g;
+
         my $innerletter = $letter;
 
         # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} ) {
-            my $mail_to = $databookseller->{bookselleremail};
-            if ($databookseller->{contemail}) {
-                if (!$mail_to) {
-                    $mail_to = $databookseller->{contemail};
-                } else {
-                    $mail_to .= q|,|;
-                    $mail_to .= $databookseller->{contemail};
-                }
-            }
-            my $mail_subj = $innerletter->{title};
-            my $mail_msg  = $innerletter->{content};
-            $mail_msg  ||= q{};
-            $mail_subj ||= q{};
-
+        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 => $mail_to,
-                From    => $userenv->{emailaddress},
-                Subject => $mail_subj,
-                Message => $mail_msg,
+                To             => $to,
+                From           => $userenv->{emailaddress},
+                Subject        => "" . $innerletter->{title},
+                Message        => "" . $innerletter->{content},
                 'Content-Type' => 'text/plain; charset="utf8"',
             );
             sendmail(%mail) or carp $Mail::Sendmail::error;
-            logaction(
-                "ACQUISITION",
-                "CLAIM ISSUE",
-                undef,
-                "To="
-                  . $databookseller->{contemail}
-                  . " Title="
-                  . $innerletter->{title}
-                  . " Content="
-                  . $innerletter->{content}
-            ) if C4::Context->preference("LetterLog");
+            warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
+            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 {
+            die "This bookseller have no email\n";
         }
-    }    
-   # send an "account details" notice to a newly created user 
+
+        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}";
+    }
+
+    # 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;
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 810f665..fe27de4 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -76,6 +76,19 @@ unless ($delay =~ /^\d{1,3}$/) {
 	$delay = 30;	#default value for delay
 }
 
+if ($op and $op eq "send_alert"){
+    my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
+    eval {
+        SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
+        AddClaim ( $_ ) for @ordernums;
+    };
+    if ( $@ ) {
+        $template->param(error_claim => $@);
+    } else {
+        $template->param(info_claim => "Emails have been sent");
+    }
+}
+
 my %supplierlist = GetBooksellersWithLateOrders($delay);
 my (@sloopy);	# supplier loop
 foreach (keys %supplierlist){
@@ -100,11 +113,6 @@ foreach (keys %$letters){
 }
 $template->param(letters=>\@letters) if (@letters);
 
-if ($op and $op eq "send_alert"){
-	my @ordernums = $input->param("claim_for");									# FIXME: Fallback values?
-	SendAlerts('claimacquisition',\@ordernums,$input->param("letter_code"));	# FIXME: Fallback value?
-}
-
 $template->param(ERROR_LOOP => \@errors) if (@errors);
 $template->param(
 	lateorders => \@lateorders,
diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
index 166c36d..bd195fb 100644
--- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql
+++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Mahnung','Mahnung','Liebe/r <<borrowers.firstname>> <<borrowers.surname>>,\n\nNach unseren Unterlagen haben Sie Medien entliehen, die nun ?berf?llig geworden sind. Unsere Bibliothek erhebt keine Mahngeb?hren, bitte geben Sie die entliehenen Medien schnellstm?glich zur?ck.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nTelefon: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nSie k?nnen die ?berf?lligen Medien soweit m?glich auch direkt ?ber Ihr Benutzerkonto online verl?ngern. Wenn ein Medium l?nger als 30 Tage ?berf?llig ist, wird Ihr Benutzeraccount gesperrt und Sie k?nnen keine Medien mehr entleihen.\n\nDie folgenden Medien sind zur Zeit ?berf?llig:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Geb?hr: <fine>EUR</fine></item>\n\nVielen Dank f?r die schnelle Erledigung.\n\n<<branches.branchname>> Ihr Bibliotheksteam\n'),
-('claimacquisition','ACQCLAIM','Reklamation (Erwerbung)','Titel nicht eingetroffen','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> bestellt) (je $<<aqorders.listprice>> ?) sind nicht eingetroffen.'),
+('claimacquisition','ACQCLAIM','Reklamation (Erwerbung)','Titel nicht eingetroffen','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> bestellt) (je $<<aqorders.listprice>> ?) sind nicht eingetroffen.'),
 ('serial','RLIST','Umlaufliste','Zeitschrift ist jetzt verf?gbar','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nDas folgende Heft ist jetzt verf?gbar:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nBitte holen Sie es sobald m?glich ab.'),
 ('members','ACCTDETAILS','Kontoinformationen - Standard','Ihr neues Benutzerkonto','Liebe/r <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nDie Daten Ihres neuen Benutzerkontos sind:\r\n\r\nBenutzer:  <<borrowers.userid>>\r\nPasswort: <<borrowers.password>>\r\n\r\nWenn Sie Probleme in Hinsicht auf Ihr Benutzerkonto haben, wenden Sie sich bitte an die Bibliothek.\r\n\r\nVielen Dank,\r\nIhr Bibliotheksteam'), 
 ('circulation','DUE','F?lligkeitsbenachrichtigung','F?lligkeitsbenachrichtigung','Liebe/r <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nDie folgenden Medien sind ab heute f?llig:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
index 689fa0f..0c9e860 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
index 689fa0f..0c9e860 100644
--- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql
+++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
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 977e59d..09dc641 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
@@ -2,7 +2,7 @@ INSERT IGNORE INTO `letter`
 (module, code, name, title, content)
 VALUES
 ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'),
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'),
diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql
index 689fa0f..0c9e860 100644
--- a/installer/data/mysql/it-IT/necessari/notices.sql
+++ b/installer/data/mysql/it-IT/necessari/notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 452173d..c79c4b9 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2631,6 +2631,8 @@ CREATE TABLE `aqorders` (
   `sort1_authcat` varchar(10) default NULL,
   `sort2_authcat` varchar(10) default NULL,
   `uncertainprice` tinyint(1),
+  `claims_count` int(11) default 0,
+  `claimed_date` date default NULL,
   PRIMARY KEY  (`ordernumber`),
   KEY `basketno` (`basketno`),
   KEY `biblionumber` (`biblionumber`),
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 cdb5529..7263eb0 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
@@ -21,7 +21,7 @@
 
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Purring','Purring p? dokument','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har l?n som skulle v?rt levert. Biblioteket krever ikke inn gebyrer, men vennligst lever eller forny l?net/l?nene ved biblioteket.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nTelefon: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nE-post: <<branches.branchemail>>\n\nDersom du har et passord og l?net/l?nene kan fornyes kan du gj?re dette p? nettet. Dersom du overskrider l?netiden med mer enn 30 dager vil l?nekortet bli sperret.\n\nF?lgende l?n har g?tt over tiden:\n\n<item>"<<biblio.title>>" av <<biblio.author>>, <<items.itemcallnumber>>, Strekkode: <<items.barcode>> Gebyr: <fine>GBP</fine></item>\n\nP? forh?nd takk.\n\n<<branches.branchname>>\n'),
-('claimacquisition','ACQCLAIM','Periodikapurring','Eksemplar ikke mottatt','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nBestillingsnummer <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) har ikke blitt mottatt.'),
+('claimacquisition','ACQCLAIM','Periodikapurring','Eksemplar ikke mottatt','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nBestillingsnummer <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) har ikke blitt mottatt.'),
 ('serial','RLIST','Sirkulasjon','Et dokument er n? tilgjengelig','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nDette dokumentet er tilgjengelig:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nVennligst kom og hent det n?r det passer.'),
 ('members','ACCTDETAILS','Mal for kontodetaljer - STANDARD','Dine nye kontodetaljer i Koha.','Hei <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nDine nye detaljer er:\r\n\r\nBruker:  <<borrowers.userid>>\r\nPassord: <<borrowers.password>>\r\n\r\nDersom det oppst?r problemer, vennligst kontakt biblioteket.\r\n\r\nVennlig hilsen,\r\nBiblioteket\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Innleveringsp?minnelse','Innleveringsp?minnelse','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nDette dokumentet m? n? leveres:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
index 6be2eb8..287730a 100644
--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
@@ -2,7 +2,7 @@ INSERT INTO `letter` (module, code, name, title, content)
 VALUES 
 ('circulation','ODUE','Overdue Notice',
 'Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
index 689fa0f..0c9e860 100644
--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/ru-RU/optional/sample_notices.sql b/installer/data/mysql/ru-RU/optional/sample_notices.sql
index 4f2001e..d6537e1 100644
--- a/installer/data/mysql/ru-RU/optional/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/optional/sample_notices.sql
@@ -5,7 +5,7 @@ INSERT INTO `letter`
 VALUES
 ('circulation','ODUE','??????????? ? ?????????','??????? ???????????','???????? <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n?? ????? ???????? ???????, ? ??? ???? ????????????? ??????????. ???? ?????????? ?? ??????? ?????? ?? ?????????, ??, ??????????, ????????? ??? ???????? ?? ??? ????? ??????.\r\n\r\n<<branches.branchname>><<branches.branchaddress1>><<branches.branchaddress2>><<branches.branchaddress3>><<branches.branchphone>><<branches.branchfax>><<branches.branchemail>>???? ?? ???????????????? ?????? ? ??????????, ?? ?????? ???????????? ??? ? ????? ??????? ????????????? ?????? ??? ??????????? ??????. ???? ????????? ????? ????????? ????? ??? ?? 30 ????, ?? ?? ??????? ???????????? ??? ???????????? ????? ???? ?? ??????? ?????????. ????????? ????????? ? ????????? ????? ???????? ????????????:\r\n\r\n<<items.content>>'),
 
-('claimacquisition','ACQCLAIM','?????????? ????????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????? <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ??????) ???????? ?? ????.'),
+('claimacquisition','ACQCLAIM','?????????? ????????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????? <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ??????) ???????? ?? ????.'),
 
 ('serial','RLIST','?????? ??????????','?????????? ??????? ??? ?????????','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n????????? ?????? ??? ????????:\r\n\r\n<<items.content>>\r\n\r\n??????? ??????? ??? ? ????? ??????? ??? ??? ?????.'),
 
diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
index 358205b..dc5a54d 100644
--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/uk-UA/optional/sample_notices.sql b/installer/data/mysql/uk-UA/optional/sample_notices.sql
index 6df324b..0e1e1f4 100644
--- a/installer/data/mysql/uk-UA/optional/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/optional/sample_notices.sql
@@ -5,7 +5,7 @@ INSERT INTO `letter`
 VALUES
 ('circulation','ODUE','???????????? ??? ????????????','??????? ???????????','???????? <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n?? ????? ???????? ???????, ? ??? ? ??????????? ??????????. ???? ?????????? ?? ?????? ?????? ?? ??????????, ???, ???? ?????, ????????? ??? ??????? ?? ?? ????? ??????.\r\n\r\n<<branches.branchname>><<branches.branchaddress1>><<branches.branchaddress2>><<branches.branchaddress3>><<branches.branchphone>><<branches.branchfax>><<branches.branchemail>>???? ?? ????????????? ?????? ? ??????????, ?? ?????? ??????????????? ???? ? ????? ??????? ????????????? ?????? ??? ??????????? ??????. ???? ????????? ??? ???????????? ????? ??? ?? 30 ????, ?? ?? ??????? ??????????????? ??? ????????? ?????? ???? ?? ????????? ?????????. ????????? ????????? ? ????? ??? ? ????????????:\r\n\r\n<<items.content>>'),
 
-('claimacquisition','ACQCLAIM','?????? ?????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????????? <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ?????????) (<<aqorders.listprice>> ??????) ???????? ?? ????.'),
+('claimacquisition','ACQCLAIM','?????? ?????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????????? <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ?????????) (<<aqorders.listprice>> ??????) ???????? ?? ????.'),
 
 ('serial','RLIST','?????? ???????????','????????? ??????? ??? ????????','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n????????? ?????? ??? ?????????:\r\n\r\n<<items.content>>\r\n\r\n???????? ??????? ???? ? ????-???? ??????? ??? ??? ???.'),
 
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9ae0060..f46d33b 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4571,6 +4571,12 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE `aqorders` ADD COLUMN `claims_count` INT(11)  DEFAULT 0, ADD COLUMN `claimed_date` DATE  DEFAULT NULL AFTER `claims_count`");
+    print "Upgrade to $DBversion done (Add claims_count and claimed_date fields in aqorders table)\n";
+    SetVersion($DBversion);
+}
 
 =head1 FUNCTIONS
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 7b38062..7557f58 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2080,4 +2080,12 @@ div.pager input.pagedisplay {
 	background-color : transparent;
 	font-weight: bold;
 	text-align : center;
-}
\ No newline at end of file
+}
+
+div.info {
+   border : 2px dashed #990000;
+   background-color : #99FFCC;
+   padding : .5em;
+   margin : 1em;
+}
+
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 1e64e1f..545d9c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -1,6 +1,20 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function() {
+    $("input:checkbox[name=claim_for]").click(function(){
+        var supplierid = $(this).attr('supplierid');
+        if ( $("input:checkbox[name=claim_for]:checked").length > 0) {
+            $("input:checkbox[name=claim_for][supplierid!="+supplierid+"]").attr('disabled', true);
+        } else {
+            $("input:checkbox[name=claim_for]").attr('disabled', false);
+        }
+    });
+});
+//]]>
+</script>
 </head>
 <body>
 [% INCLUDE 'header.inc' %]
@@ -17,6 +31,12 @@
 <h1>[% IF ( Supplier ) %][% Supplier %] : [% END %]Late orders</h1>
 <div id="acqui_lateorders">
 
+[% IF error_claim %]
+    <div class="error">[% error_claim %]</div>
+[% END %]
+[% IF info_claim %]
+    <div class="info">[% info_claim %]</div>
+[% END %]
 [% IF ( lateorders ) %]
 <form action="lateorders.pl" name="claim" method="post">
   <input type="hidden" name="op" value="send_alert" />
@@ -35,12 +55,20 @@
             <th>Information</th>
             <th>Total cost</th>
             <th>Basket</th>
-            <th>&nbsp;</th>
+            <th>claims count</th>
+            <th>claimed date</th>
+            <!-- TMPL_IF name="Supplier" -->
+            [% IF Supplier %]
+                <th><input type="checkbox" id="checkAll"></th>
+            [% ELSE %]
+                <th></th>
+            [% END %]
         </tr>
     [% FOREACH lateorder IN lateorders %]
         [% UNLESS ( loop.odd ) %]<tr class="highlight">
         [% ELSE %]<tr>[% END %]
             <td>
+                ([% lateorder.supplierid %])
                 [% lateorder.orderdate %]
                 ([% lateorder.latesince %] days)
             </td>
@@ -69,8 +97,13 @@
                  </p>
                  <p title="branch">[% lateorder.branch %]</p>
             </td>
+            <td>[% lateorder.claims_count %]</td>
+            <td>[% lateorder.claimed_date %]</td>
             <td>
-                <input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]" />
+                [% UNLESS lateorder.budget_lock %]
+                    <input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]"  supplierid="[% lateorder.supplierid %]"/>
+                [% END %]
+             </td>
             </td>
         </tr>
         [% END %]
@@ -79,6 +112,8 @@
             <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>
-- 
1.7.7.3


From oleonard at myacpl.org  Mon Dec  5 15:47:08 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon,  5 Dec 2011 09:47:08 -0500
Subject: [Koha-patches] [PATCH] Bug 7319 - Improving title and breadcrumbs
	on acquisitions Z39.50 search pages
Message-ID: <1323096428-24102-1-git-send-email-oleonard@myacpl.org>

Changing title and breadcrumbs so that they correctly reflect
the curent stage of the process.

To test: Add to an order from an external source. When filling
out the Z39.50 search form the title and breadcrumbs should read
"Order from external sources." After searching they should read
"Order from external sources -> Search results"
---
 .../prog/en/modules/acqui/z3950_search.tt          |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 bbcb973..66dbc6e 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
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Acquisitions &rsaquo; Z39.50 Search Results</title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source &rsaquo; Search results[% END %]</title>
 [% INCLUDE 'greybox.inc' %]
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
@@ -63,11 +63,11 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 [% 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/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Order from Z39.50 search</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; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; [% IF ( opsearch ) %]Order from external source[% ELSE %]<a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Order from external source</a> &rsaquo; Search results[% END %]</div>
 <div id="doc3" class="yui-t7">
       <div id="bd">
 	  [% IF ( opsearch ) %]
-<h2>Z39.50 Search Points</h2>
+<h2>Order from external source</h2>
     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
     <input type="hidden" name="op" id="op" value="do_search" />
 	<div class="yui-g">
@@ -126,7 +126,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 
 
 [% ELSE %]
-    <h2>Results</h2>
+    <h2>Search results</h2>
     [% IF ( breeding_loop ) %]
     <table id="resultst">
 <thead>    <tr>
-- 
1.7.3


From oleonard at myacpl.org  Tue Dec  6 15:59:20 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Dec 2011 09:59:20 -0500
Subject: [Koha-patches] [PATCH] Bug 7226 - can't add tags on list
Message-ID: <1323183560-28390-1-git-send-email-oleonard@myacpl.org>

Incorrect check for TagsInputOnList was preventing the
right JavaScript from being triggered, and markup was
nested inside the wrong logic for the confirmation
message to be displayed consistently.
---
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |   26 ++++++++++----------
 1 files changed, 13 insertions(+), 13 deletions(-)

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 528b8a7..8fff936 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -92,7 +92,6 @@ $(function() {
           $("#addtags").html("<a id=\"tagsel_tag\" href=\"#\">"+_("Tag")+"<\/a> |");
 
         $(".tagbutton").click(KOHA.Tags.add_tag_button);
-      [% IF ( TagsInputOnList ) %]
       [% IF ( loggedinusername ) %]
             $("#tagsel_tag").click(function(){
                 tagSelected();
@@ -112,7 +111,6 @@ $(function() {
                 return false;
             });
         [% END %]
-        [% END %]
         [% END %][% END %][% END %]
   [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
 });
@@ -278,14 +276,16 @@ $(function() {
           [% END %][% ELSE %]This record has no items.[% END %]</span>
             [% END %]
         [% IF ( TagsEnabled ) %]
-                [% IF ( TagsShowOnList ) %]
-                [% IF ( itemsloo.TagLoop ) %]
-          <div class="results_summary">
-                        <span class="label">Tags:</span>
-                        <ul style="display: inline; list-style: none;">[% FOREACH TagLoo IN itemsloo.TagLoop %]<li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&amp;q=[% TagLoo.term |url %]">[% TagLoo.term %]</a> <span class="weight">([% TagLoo.weight_total %])</span></li>
-                            [% END %]
-                        </ul>
-                [% END %]
+          [% IF ( TagsShowOnList ) %]
+            [% IF ( itemsloo.TagLoop.size ) %]
+              <div class="results_summary">
+              <span class="label">Tags:</span>
+              <ul style="display: inline; list-style: none;">[% FOREACH TagLoo IN itemsloo.TagLoop %]<li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&amp;q=[% TagLoo.term |url %]">[% TagLoo.term %]</a> <span class="weight">([% TagLoo.weight_total %])</span></li>
+                  [% END %]
+              </ul>
+              </div>
+            [% END %]
+          [% END %]
                 [% IF ( TagsInputOnList ) %]
           [% IF ( loggedinusername ) %]
                     <form name="tagform[% itemsloo.biblionumber %]" method="post" action="/cgi-bin/koha/opac-tags.pl">
@@ -299,10 +299,10 @@ $(function() {
                     [% ELSIF ( loop.first ) %]<span class="tagstatus" id="login4tags">Log in to add tags.</span>
                   [% END %]
                 [% END %]
-                  [% IF ( itemsloo.TagLoop ) %]
-          </div>[% END %]
+            [% IF ( loggedinusername ) %]
+              <span id="newtag[% itemsloo.biblionumber %]_status" class="tagstatus" style="display:none;">Tag status here.</span>
+            [% END %]
         [% END %]
-                [% END %]
 
 <span class="results_summary actions"><span class="label">Actions:</span>
       [% IF ( RequestOnOpac ) %]
-- 
1.7.3


From oleonard at myacpl.org  Tue Dec  6 17:02:04 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Dec 2011 11:02:04 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 7261 System Preference to
	select the first day of week
Message-ID: <1323187324-29076-1-git-send-email-oleonard@myacpl.org>

From: Juan Romay Sieira <juan.sieira at xercode.es>

Choose Sunday or Monday as the first day of the week
in the calendar (OPAC and Intranet).

Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 C4/Auth.pm                                         |    2 ++
 installer/data/mysql/sysprefs.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl             |    6 ++++++
 .../intranet-tmpl/prog/en/includes/calendar.inc    |    2 +-
 .../prog/en/lib/calendar/calendar-setup.js         |    5 ++++-
 .../prog/en/modules/admin/preferences/admin.pref   |    8 ++++++++
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    6 ++++--
 7 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index e360e10..347d037 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -369,6 +369,7 @@ sub get_template_and_user {
             AmazonSimilarItems          => C4::Context->preference("AmazonSimilarItems"),
             AutoLocation                => C4::Context->preference("AutoLocation"),
             "BiblioDefaultView".C4::Context->preference("IntranetBiblioDefaultView") => 1,
+            CalendarFirstDayOfWeek      => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday")?0:1,
             CircAutocompl               => C4::Context->preference("CircAutocompl"),
             FRBRizeEditions             => C4::Context->preference("FRBRizeEditions"),
             IndependantBranches         => C4::Context->preference("IndependantBranches"),
@@ -426,6 +427,7 @@ sub get_template_and_user {
             AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
             AuthorisedValueImages     => C4::Context->preference("AuthorisedValueImages"),
             BranchesLoop              => GetBranchesLoop($opac_name),
+            CalendarFirstDayOfWeek    => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Monday")?1:0,
             LibraryName               => "" . C4::Context->preference("LibraryName"),
             LibraryNameTitle          => "" . $LibraryNameTitle,
             LoginBranchname           => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index ae2c1cb..8ada5f5 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -328,4 +328,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
 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('CalendarFirstDayOfWeek','Sunday','Select the first day of week to use in the calendar.','Sunday|Monday','Choice');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9ae0060..4e21b12 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4571,6 +4571,12 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CalendarFirstDayOfWeek','Sunday','Select the first day of week to use in the calendar.','Sunday|Monday','Choice');");
+    print "Upgrade to $DBversion done (Add syspref CalendarFirstDayOfWeek used to select the first day of week to use in the calendar. )\n";
+    SetVersion($DBversion);
+}
 
 =head1 FUNCTIONS
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index 43ba022..d70716c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -7,7 +7,7 @@ Calendar._DN = new Array(_("Sunday"),_("Monday"),_("Tuesday"),_("Wednesday"),_("
 Calendar._SDN = new Array(_("Sun"),_("Mon"),_("Tue"),_("Wed"),_("Thu"),_("Fri"),_("Sat"),_("Sun"));
 // First day of the week. "0" means display Sunday first, "1" means display
 // Monday first, etc.
-Calendar._FD = 1;
+Calendar._FD = [% CalendarFirstDayOfWeek %];
 // full month names
 Calendar._MN = new Array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
 // short month names
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js b/koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js
index 8b7fcdf..1d876b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js
@@ -69,7 +69,10 @@ Calendar.setup = function (params) {
 	param_default("singleClick",    true);
 	param_default("disableFunc",    'dateStatusHandler');
 	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
-	param_default("firstDay",       0); // defaults to "Sunday" first
+	if (Calendar._FD)
+		param_default("firstDay",       Calendar._FD);
+	else
+		param_default("firstDay",       0); // defaults to "Sunday" first
 	param_default("align",          "Br");
 	param_default("range",          [1900, 2999]);
 	param_default("weekNumbers",    true);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index f026c7e..e4f5502 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -40,6 +40,14 @@ Administration:
                   yes: Allow
                   no: "Don't allow"
             - staff and patrons to create and view saved lists of books.
+        -
+            - Use 
+            - pref: CalendarFirstDayOfWeek
+              default: Sunday
+              choices:
+                  Sunday: Sunday
+                  Monday: Monday
+            - as the first day of week in the calendar.
     Login options:
         -
             - pref: insecure
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index ca49152..826effc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -338,7 +338,8 @@
                 ifFormat : "[% DHTMLcalendar_dateformat %]",
                 button : "CalendarReserveDate[% bibitemloo.biblionumber %]",
                 disableFunc : validate[% bibitemloo.biblionumber %],
-                dateStatusFunc : validate[% bibitemloo.biblionumber %]
+                dateStatusFunc : validate[% bibitemloo.biblionumber %],
+                firstDay : [% CalendarFirstDayOfWeek %]
               }
               );
               //]]>
@@ -370,7 +371,8 @@
           ifFormat : "[% DHTMLcalendar_dateformat %]",
           button : "CalendarExpirationDate_[% bibitemloo.biblionumber %]",
           disableFunc : validate1,
-          dateStatusFunc : validate1
+          dateStatusFunc : validate1,
+          firstDay : [% CalendarFirstDayOfWeek %]
         }
       );
       //]]>
-- 
1.7.3


From oleonard at myacpl.org  Tue Dec  6 17:10:43 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Dec 2011 11:10:43 -0500
Subject: [Koha-patches] [PATCH] Bug 2307 - Calendar widget cannot be
	translated
Message-ID: <1323187843-29150-1-git-send-email-oleonard@myacpl.org>

Implementing the same fix in the OPAC which we now
use in the staff client.
---
 koha-tmpl/opac-tmpl/prog/en/includes/calendar.inc |   62 ++++++++++++++++++++-
 1 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/prog/en/includes/calendar.inc
index 140abeb..43ba022 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/calendar.inc
@@ -1,6 +1,66 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/calendar/calendar-system.css"/>
 <script type="text/javascript" src="[% themelang %]/lib/calendar/calendar.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-en.js"></script>
+<script type="text/javascript">
+// full day names
+Calendar._DN = new Array(_("Sunday"),_("Monday"),_("Tuesday"),_("Wednesday"),_("Thursday"),_("Friday"),_("Saturday"),_("Sunday"));
+// short day names
+Calendar._SDN = new Array(_("Sun"),_("Mon"),_("Tue"),_("Wed"),_("Thu"),_("Fri"),_("Sat"),_("Sun"));
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+// full month names
+Calendar._MN = new Array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
+// short month names
+Calendar._SMN = new Array(_("Jan"),_("Feb"),_("Mar"),_("Apr"),_("May"),_("Jun"),_("Jul"),_("Aug"),_("Sep"),_("Oct"),_("Nov"),_("Dec"));
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = _("About the calendar");
+
+Calendar._TT["ABOUT"] =
+_("Dhtml Date/Time Selector")+"\n" +
+"(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
+_("For latest version visit: http://dynarch.com/mishoo/calendar.epl")+"\n" +
+_("Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details.") +
+"\n\n" +
+_("Date selection:")+"\n" +
+_("- Use the \xab, \xbb buttons to select year")+"\n" +
+_("- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month")+"\n" +
+_("- Hold mouse button on any of the above buttons for faster selection.");
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+_("Time selection:")+"\n" +
+_("- Click on any of the time parts to increase it")+"\n" +
+_("- or Shift-click to decrease it")+"\n" +
+_("- or click and drag for faster selection.");
+
+Calendar._TT["PREV_YEAR"] = _("Prev. year (hold for menu)");
+Calendar._TT["PREV_MONTH"] = _("Prev. month (hold for menu)");
+Calendar._TT["GO_TODAY"] = _("Go to Today");
+Calendar._TT["NEXT_MONTH"] = _("Next month (hold for menu)");
+Calendar._TT["NEXT_YEAR"] = _("Next year (hold for menu)");
+Calendar._TT["SEL_DATE"] = _("Select date");
+Calendar._TT["DRAG_TO_MOVE"] = _("Drag to move");
+Calendar._TT["PART_TODAY"] = _(" (today)");
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = _("Display %s first");
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = _("Close");
+Calendar._TT["TODAY"] = _("Today");
+Calendar._TT["TIME_PART"] = _("(Shift-)Click or drag to change value");
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = _("wk");
+Calendar._TT["TIME"] = _("Time:");
+</script>
 <script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-setup.js"></script>
 <script type="text/javascript">
 //<![CDATA[
-- 
1.7.3


From oleonard at myacpl.org  Tue Dec  6 17:44:35 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Dec 2011 11:44:35 -0500
Subject: [Koha-patches] [PATCH] Bug 7323 - Javascript error when editing list
Message-ID: <1323189875-514-1-git-send-email-oleonard@myacpl.org>

Correcting check for empty shlef name to prevent
javascript error.

Also correcting unescaped ampersand.
---
 .../prog/en/modules/virtualshelves/shelves.tt      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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 d7a34a1..d4f8ec3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -95,7 +95,7 @@ function placeHold () {
 		var _alertString="";
 		var alertString2;
 
-	    if(f.addshelf.value.length ==0){
+	    if($("#shelfname").val() == ""){
 			_alertString += _("- You must enter a List Name") + "\n";
 		}
 
@@ -349,7 +349,7 @@ function placeHold () {
         		<tr><th>List Name</th><th>Contents</th><th>Sort by</th><th>Type</th><th>Options</th></tr>
                 [% FOREACH shelveslooppri IN shelveslooppriv %]
                     [% IF ( shelveslooppri.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
-        <td><a href="shelves.pl?[% IF ( shelveslooppri.showprivateshelves ) %]display=privateshelves&amp;[% END %]viewshelf=[% shelveslooppri.shelf %]&shelfoff=[% shelfoff %]">[% shelveslooppri.shelfname |html %]</a></td>
+        <td><a href="shelves.pl?[% IF ( shelveslooppri.showprivateshelves ) %]display=privateshelves&amp;[% END %]viewshelf=[% shelveslooppri.shelf %]&amp;shelfoff=[% shelfoff %]">[% shelveslooppri.shelfname |html %]</a></td>
         <td>[% shelveslooppri.count %] item(s)</td>
         <td>[% IF ( shelveslooppri.authorsort ) %]Author[% ELSIF ( shelveslooppri.yearsort ) %]Year[% ELSE %]Title[% END %]</td>
         <td>[% IF ( shelveslooppri.viewcategory1 ) %]Private[% END %]
-- 
1.7.3


From oleonard at myacpl.org  Tue Dec  6 18:59:10 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Dec 2011 12:59:10 -0500
Subject: [Koha-patches] [PATCH] Bug 6291 - Cart printing truncated in Firefox
Message-ID: <1323194350-929-1-git-send-email-oleonard@myacpl.org>

Alternate fix suggested by http://www.sidesofmarch.com/index.php/archive/2007/04/25/firefox-truncates-long-tables-when-printing/

Seems absurd that changing the top heading from an <h1> to an <h2>
would fix the problem, but it does in my tests in Firefox 3.6 and 8
on Windows 7
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
index 5fc5503..62be158 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
@@ -118,7 +118,7 @@ function tagAdded() {
 
 <div id="doc" class="yui-t7">
 <div id="userbasket" class="container">
-<h1>Your Cart</h1>
+<h2>Your Cart</h2>
 
 [% UNLESS ( print_basket ) %]
 <div id="toolbar">
-- 
1.7.3


From Katrin.Fischer.83 at web.de  Tue Dec  6 20:23:27 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Tue,  6 Dec 2011 20:23:27 +0100
Subject: [Koha-patches] [PATCH] Bug 6716: Follow up: Documentation for
	aqbooksellers table / accountnumber
Message-ID: <1323199407-4867-1-git-send-email-Katrin.Fischer.83@web.de>

Accountnumber is now used and can be managed in the
staff interface.
---
 installer/data/mysql/kohastructure.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 6e187ae..ed26072 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2469,7 +2469,7 @@ CREATE TABLE `aqbooksellers` ( -- information about the vendors listed in acquis
   `address3` mediumtext, -- third line of vendor physical address
   `address4` mediumtext, -- fourth line of vendor physical address
   `phone` varchar(30) default NULL, -- vendor phone number
-  `accountnumber` mediumtext, -- unused in Koha
+  `accountnumber` mediumtext, -- vendor accountnumber
   `othersupplier` mediumtext,  -- unused in Koha
   `currency` varchar(3) NOT NULL default '', -- unused in Koha
   `booksellerfax` mediumtext, -- vendor fax number
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Dec  6 21:10:45 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Dec 2011 15:10:45 -0500
Subject: [Koha-patches] [PATCH] Bug 3806 - Holidays table doesn't order by
	date correcly
Message-ID: <1323202245-1903-1-git-send-email-oleonard@myacpl.org>

Adding dateformat filter to JavaScript tablesorter
configurations.
---
 .../prog/en/modules/tools/holidays.tt              |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

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 ac867fe..fe2cdff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -88,16 +88,20 @@
 		$("#branch").change(function(){
 			changeBranch();
 		});
-		$("#holidayexceptions").tablesorter({
+		$("#holidayexceptions").tablesorter({[% IF ( dateformat_metric ) %]
+		  dateFormat: 'uk',[% END %]
 		  sortList: [[0,0]], widgets: ['zebra']
 		});
-		$("#holidayweeklyrepeatable").tablesorter({
+		$("#holidayweeklyrepeatable").tablesorter({[% IF ( dateformat_metric ) %]
+		  dateFormat: 'uk',[% END %]
 		  sortList: [[0,0]], widgets: ['zebra']
 		});
-		$("#holidaysyearlyrepeatable").tablesorter({
+		$("#holidaysyearlyrepeatable").tablesorter({[% IF ( dateformat_metric ) %]
+		  dateFormat: 'uk',[% END %]
 		  sortList: [[0,0]], widgets: ['zebra']
 		});
-		$("#holidaysunique").tablesorter({
+		$("#holidaysunique").tablesorter({[% IF ( dateformat_metric ) %]
+		  dateFormat: 'uk',[% END %]
 		  sortList: [[0,0]], widgets: ['zebra']
 		});
 		$("a.helptext").click(function(){
-- 
1.7.3


From oleonard at myacpl.org  Tue Dec  6 22:04:41 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Dec 2011 16:04:41 -0500
Subject: [Koha-patches] [PATCH] Bug 7325 - Editing a list generates errors
	in the log
Message-ID: <1323205481-2192-1-git-send-email-oleonard@myacpl.org>

Checking for variables before trying to use them in
building the pagination menu
---
 C4/VirtualShelves/Page.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 18535a5..523527e 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -367,9 +367,9 @@ sub shelfpage ($$$$$) {
         $qhash{$_} = $query->param($_) if $query->param($_);
     }
     ( scalar keys %qhash ) and $url .= '?' . join '&', map { "$_=$qhash{$_}" } keys %qhash;
-    if ( $shelfnumber ) {
+    if ( $shelfnumber && $totitems ) {
         $template->param(  pagination_bar => pagination_bar( $url, ( int( $totitems / $shelflimit ) ) + ( ( $totitems % $shelflimit ) > 0 ? 1 : 0 ), $itemoff, "itemoff" )  );
-    } else {
+    } elsif ( $totshelves ) {
         $template->param(
              pagination_bar => pagination_bar( $url, ( int( $totshelves / $shelveslimit ) ) + ( ( $totshelves % $shelveslimit ) > 0 ? 1 : 0 ), $shelfoff, "shelfoff" )  );
     }
-- 
1.7.3


From christophe.croullebois at biblibre.com  Wed Dec  7 12:06:15 2011
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Wed,  7 Dec 2011 12:06:15 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7329: Items onloan are deleted when
	undoing import into catalog
Message-ID: <1323255975-23375-1-git-send-email-christophe.croullebois@biblibre.com>

this patch checks the "on loan" and "reserved" status before deleting item, and
do noting in this case, so the record can't be deleted due to existing item.
---
 C4/ImportBatch.pm |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm
index b6db406..1bc4fa6 100644
--- a/C4/ImportBatch.pm
+++ b/C4/ImportBatch.pm
@@ -644,13 +644,18 @@ sub BatchRevertItems {
     $sth->bind_param(1, $import_record_id);
     $sth->execute();
     while (my $row = $sth->fetchrow_hashref()) {
-        DelItem($dbh, $biblionumber, $row->{'itemnumber'});
-        my $updsth = $dbh->prepare("UPDATE import_items SET status = ? WHERE import_items_id = ?");
-        $updsth->bind_param(1, 'reverted');
-        $updsth->bind_param(2, $row->{'import_items_id'});
-        $updsth->execute();
-        $updsth->finish();
-        $num_items_deleted++;
+        my $error = DelItemCheck($dbh, $biblionumber, $row->{'itemnumber'});
+        if ($error == 1){
+            my $updsth = $dbh->prepare("UPDATE import_items SET status = ? WHERE import_items_id = ?");
+            $updsth->bind_param(1, 'reverted');
+            $updsth->bind_param(2, $row->{'import_items_id'});
+            $updsth->execute();
+            $updsth->finish();
+            $num_items_deleted++;
+        }
+        else {
+            next;
+        }
     }
     $sth->finish();
     return $num_items_deleted;
-- 
1.7.0.4


From M.de.Rooy at rijksmuseum.nl  Wed Dec  7 14:26:26 2011
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Wed, 7 Dec 2011 13:26:26 +0000
Subject: [Koha-patches] [PATCH] 6803 Replacing remote XSL include
In-Reply-To: <1323264220-29216-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1323264220-29216-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3137EF37@S-MAIL-1B.rijksmuseum.intra>

Replacing remote include by local one.
This resolves possible connectivity issues (see Bugzilla comments).
Should theoretically be safer and faster too.

December 7, 2011: Rebased and included nbsp entity definition (bug 7141).
---
 .../prog/en/xslt/MARC21slim2MODS3-1.xsl            |    2 +-
 .../prog/en/xslt/MARC21slimUtils-MODS31.xsl        |  190 ++++++++++++++++++++
 2 files changed, 191 insertions(+), 1 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl
index a4ac1b2..d796f66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
 <xsl:stylesheet version="1.0" xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="xlink marc">
-       <xsl:include href="http://www.loc.gov/marcxml/xslt/MARC21slimUtils.xsl"/>
+       <xsl:include href="MARC21slimUtils-MODS31.xsl"/>
        <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
        <!--

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl
new file mode 100644
index 0000000..5a8d6cc
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl
@@ -0,0 +1,190 @@
+<?xml version='1.0'?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim"
+       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+       <!-- 08/08/08: tmee added corrected chopPunctuation templates for 260c -->
+       <!-- 08/19/04: ntra added "marc:" prefix to datafield element -->
+       <!-- 12/14/07: ntra added url encoding template -->
+       <!-- url encoding -->
+
+       <xsl:variable name="ascii">
+               <xsl:text> !"#$%&amp;'()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~</xsl:text>
+       </xsl:variable>
+
+       <xsl:variable name="latin1">
+               <xsl:text> ???????????????????????????????????????????????????????????????????????????????????????????????</xsl:text>
+       </xsl:variable>
+       <!-- Characters that usually don't need to be escaped -->
+       <xsl:variable name="safe">
+               <xsl:text>!'()*-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~</xsl:text>
+       </xsl:variable>
+
+       <xsl:variable name="hex">0123456789ABCDEF</xsl:variable>
+
+
+       <xsl:template name="datafield">
+               <xsl:param name="tag"/>
+               <xsl:param name="ind1">
+                       <xsl:text> </xsl:text>
+               </xsl:param>
+               <xsl:param name="ind2">
+                       <xsl:text> </xsl:text>
+               </xsl:param>
+               <xsl:param name="subfields"/>
+               <xsl:element name="marc:datafield">
+                       <xsl:attribute name="tag">
+                               <xsl:value-of select="$tag"/>
+                       </xsl:attribute>
+                       <xsl:attribute name="ind1">
+                               <xsl:value-of select="$ind1"/>
+                       </xsl:attribute>
+                       <xsl:attribute name="ind2">
+                               <xsl:value-of select="$ind2"/>
+                       </xsl:attribute>
+                       <xsl:copy-of select="$subfields"/>
+               </xsl:element>
+       </xsl:template>
+
+       <xsl:template name="subfieldSelect">
+               <xsl:param name="codes">abcdefghijklmnopqrstuvwxyz</xsl:param>
+               <xsl:param name="delimeter">
+                       <xsl:text> </xsl:text>
+               </xsl:param>
+               <xsl:variable name="str">
+                       <xsl:for-each select="marc:subfield">
+                               <xsl:if test="contains($codes, @code)">
+                                       <xsl:value-of select="text()"/>
+                                       <xsl:value-of select="$delimeter"/>
+                               </xsl:if>
+                       </xsl:for-each>
+               </xsl:variable>
+               <xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>
+       </xsl:template>
+
+       <xsl:template name="buildSpaces">
+               <xsl:param name="spaces"/>
+               <xsl:param name="char">
+                       <xsl:text> </xsl:text>
+               </xsl:param>
+               <xsl:if test="$spaces>0">
+                       <xsl:value-of select="$char"/>
+                       <xsl:call-template name="buildSpaces">
+                               <xsl:with-param name="spaces" select="$spaces - 1"/>
+                               <xsl:with-param name="char" select="$char"/>
+                       </xsl:call-template>
+               </xsl:if>
+       </xsl:template>
+
+       <xsl:template name="chopPunctuation">
+               <xsl:param name="chopString"/>
+               <xsl:param name="punctuation">
+                       <xsl:text>.:,;/ </xsl:text>
+               </xsl:param>
+               <xsl:variable name="length" select="string-length($chopString)"/>
+               <xsl:choose>
+                       <xsl:when test="$length=0"/>
+                       <xsl:when test="contains($punctuation, substring($chopString,$length,1))">
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString" select="substring($chopString,1,$length - 1)"/>
+                                       <xsl:with-param name="punctuation" select="$punctuation"/>
+                               </xsl:call-template>
+                       </xsl:when>
+                       <xsl:when test="not($chopString)"/>
+                       <xsl:otherwise>
+                               <xsl:value-of select="$chopString"/>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+
+       <xsl:template name="chopPunctuationFront">
+               <xsl:param name="chopString"/>
+               <xsl:variable name="length" select="string-length($chopString)"/>
+               <xsl:choose>
+                       <xsl:when test="$length=0"/>
+                       <xsl:when test="contains('.:,;/[ ', substring($chopString,1,1))">
+                               <xsl:call-template name="chopPunctuationFront">
+                                       <xsl:with-param name="chopString" select="substring($chopString,2,$length - 1)"
+                                       />
+                               </xsl:call-template>
+                       </xsl:when>
+                       <xsl:when test="not($chopString)"/>
+                       <xsl:otherwise>
+                               <xsl:value-of select="$chopString"/>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+
+       <xsl:template name="chopPunctuationBack">
+               <xsl:param name="chopString"/>
+               <xsl:param name="punctuation">
+                       <xsl:text>.:,;/] </xsl:text>
+               </xsl:param>
+               <xsl:variable name="length" select="string-length($chopString)"/>
+               <xsl:choose>
+                       <xsl:when test="$length=0"/>
+                       <xsl:when test="contains($punctuation, substring($chopString,$length,1))">
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString" select="substring($chopString,1,$length - 1)"/>
+                                       <xsl:with-param name="punctuation" select="$punctuation"/>
+                               </xsl:call-template>
+                       </xsl:when>
+                       <xsl:when test="not($chopString)"/>
+                       <xsl:otherwise>
+                               <xsl:value-of select="$chopString"/>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+
+       <!-- nate added 12/14/2007 for lccn.loc.gov: url encode ampersand, etc. -->
+       <xsl:template name="url-encode">
+
+               <xsl:param name="str"/>
+
+               <xsl:if test="$str">
+                       <xsl:variable name="first-char" select="substring($str,1,1)"/>
+                       <xsl:choose>
+                               <xsl:when test="contains($safe,$first-char)">
+                                       <xsl:value-of select="$first-char"/>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       <xsl:variable name="codepoint">
+                                               <xsl:choose>
+                                                       <xsl:when test="contains($ascii,$first-char)">
+                                                               <xsl:value-of
+                                                                       select="string-length(substring-before($ascii,$first-char)) + 32"
+                                                               />
+                                                       </xsl:when>
+                                                       <xsl:when test="contains($latin1,$first-char)">
+                                                               <xsl:value-of
+                                                                       select="string-length(substring-before($latin1,$first-char)) + 160"/>
+                                                               <!-- was 160 -->
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:message terminate="no">Warning: string contains a character
+                                                                       that is out of range! Substituting "?".</xsl:message>
+                                                               <xsl:text>63</xsl:text>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </xsl:variable>
+                                       <xsl:variable name="hex-digit1"
+                                               select="substring($hex,floor($codepoint div 16) + 1,1)"/>
+                                       <xsl:variable name="hex-digit2" select="substring($hex,$codepoint mod 16 + 1,1)"/>
+                                       <!-- <xsl:value-of select="concat('%',$hex-digit2)"/> -->
+                                       <xsl:value-of select="concat('%',$hex-digit1,$hex-digit2)"/>
+                               </xsl:otherwise>
+                       </xsl:choose>
+                       <xsl:if test="string-length($str) &gt; 1">
+                               <xsl:call-template name="url-encode">
+                                       <xsl:with-param name="str" select="substring($str,2)"/>
+                               </xsl:call-template>
+                       </xsl:if>
+               </xsl:if>
+       </xsl:template>
+</xsl:stylesheet>
+<!-- Stylus Studio meta-information - (c)1998-2002 eXcelon Corp.
+<metaInformation>
+<scenarios/><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
+</metaInformation>
+-->
+
--
1.6.0.6

From oleonard at myacpl.org  Wed Dec  7 16:55:32 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  7 Dec 2011 10:55:32 -0500
Subject: [Koha-patches] [PATCH] Bug 7330 - System preferences editor
	generates errors in the log with each search
Message-ID: <1323273332-7262-1-git-send-email-oleonard@myacpl.org>

Adding a check for an empty value in a couple of places
which seem to always get one.

As far as I can tell these places in the script are looping
over ALL the data in the pref files, and sometimes an empty
value comes through. I wonder if this is because of a minor
syntax error in the pref file?

My correction is a stab in the dark since I haven't determined
where the empty value is actually coming from. This change
quiets the errors in the log and doesn't seem to affect
preference search results.
---
 admin/preferences.pl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/admin/preferences.pl b/admin/preferences.pl
index 055f69d..0dcec19 100755
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -216,6 +216,7 @@ sub SearchPrefs {
 
                 foreach my $piece ( @$line ) {
                     if ( ref( $piece ) eq 'HASH' ) {
+                        if ( !$piece->{'pref'} ){ next; }
                         if ( $piece->{'pref'} =~ /^$searchfield$/i ) {
                             my ( undef, $LINES ) = TransformPrefsToHTML( $data, $searchfield );
 
@@ -249,7 +250,7 @@ sub SearchPrefs {
 
 sub matches {
     my ( $text, $terms ) = @_;
-    return !grep( { $text !~ /$_/i } @$terms );
+    if ( $text ) { return !grep( { $text !~ /$_/i } @$terms ); }
 }
 
 my $dbh = C4::Context->dbh;
-- 
1.7.3


From oleonard at myacpl.org  Wed Dec  7 18:20:19 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  7 Dec 2011 12:20:19 -0500
Subject: [Koha-patches] [PATCH] Bug 5543 - Date ISO format wrong separator
Message-ID: <1323278419-7748-1-git-send-email-oleonard@myacpl.org>

This patch converts the changes in Fridolyn SOMERS patch
to T:T and adds an update to the database to correct
the description there.
---
 installer/data/mysql/sysprefs.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl             |    8 ++++++++
 .../intranet-tmpl/prog/en/includes/date-format.inc |    2 +-
 .../en/modules/admin/preferences/i18n_l10n.pref    |    2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index ae2c1cb..32860b7 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -139,7 +139,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ThingISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the ThingISBN web service in the Editions tab on the detail pages.','','YesNo');
 
 -- I18N/L10N
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('dateformat','us','Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy/mm/dd)','metric|us|iso','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('dateformat','us','Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd)','metric|us|iso','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaclanguages','en','Set the default language in the OPAC.',NULL,'Languages');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaclanguagesdisplay',0,'If ON, enables display of Change Language feature on OPAC','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersTitles','Mr|Mrs|Miss|Ms','Define appropriate Titles for patrons',NULL,'free');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index b5f96ef..7c22361 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4578,6 +4578,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.02.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("UPDATE  `systempreferences` SET  `explanation` = 'Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd)' WHERE `systempreferences`.`variable` =  'dateformat'");
+    print "Correcting the description of ISO format in the dateformat system preference.";
+    SetVersion($DBversion);
+}
+
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
index 5ef0d79..8aafb04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
@@ -1 +1 @@
-[% IF ( dateformat_us ) %](MM/DD/YYYY)[% ELSIF ( dateformat_metric ) %](DD/MM/YYYY)[% ELSE %](YYYY/MM/DD)[% END %]
\ No newline at end of file
+[% IF ( dateformat_us ) %](MM/DD/YYYY)[% ELSIF ( dateformat_metric ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
index 591e6ca..9d409ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
@@ -6,7 +6,7 @@ I18N/L10N:
           choices:
               us: mm/dd/yyyy
               metric: dd/mm/yyyy
-              iso: yyyy/mm/dd
+              iso: yyyy-mm-dd
         - .
     -
         - "Enable the following languages on the staff interface:"
-- 
1.7.3


From srdjan at catalyst.net.nz  Wed Dec  7 22:22:43 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu,  8 Dec 2011 10:22:43 +1300
Subject: [Koha-patches] [PATCH] bug_5473: Update items when receiving
	shipments
In-Reply-To: <bug 5473>
References: <bug 5473>
Message-ID: <1323292963-30529-1-git-send-email-srdjan@catalyst.net.nz>

---
 acqui/finishreceive.pl |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 71b13d6..27a77c5 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -72,10 +72,14 @@ if ( any { $order->{$_} ne $tplorder{$_} } qw(quantity quantityreceived notes rr
     ModOrder($order);
 }
 
+my $items_created;
+
 #need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
 if ($quantityrec > $origquantityrec ) {
     # now, add items if applicable
     if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
+        $items_created = 1;
+
         my @tags         = $input->param('tag');
         my @subfields    = $input->param('subfield');
         my @field_values = $input->param('field_value');
@@ -106,6 +110,7 @@ if ($quantityrec > $origquantityrec ) {
                                     $itemhash{$item}->{'indicator'},'ITEM');
             my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
             my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
+            update_item( $itemnumber, $record );
         }
     }
     
@@ -114,4 +119,23 @@ if ($quantityrec > $origquantityrec ) {
     	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
 	}
 }
-    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
+
+unless ( $items_created ) {
+    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");
+
+################################ End of script ################################
+
+sub update_item {
+    my ( $itemnumber, $record ) = @_;
+
+    ModItem( {
+        booksellerid         => $supplierid,
+        dateaccessioned      => $datereceived,
+        price                => $unitprice,
+        replacementprice     => $replacement,
+        replacementpricedate => $datereceived,
+    }, $biblionumber, $itemnumber, $record );
+}
-- 
1.6.5


From srdjan at catalyst.net.nz  Wed Dec  7 23:21:22 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu,  8 Dec 2011 11:21:22 +1300
Subject: [Koha-patches] [PATCH] bug_6504: Reintroduced shipping costs when
	receiving orders
In-Reply-To: <bug 6504>
References: <bug 6504>
Message-ID: <1323296482-9919-1-git-send-email-srdjan@catalyst.net.nz>

Calculate freight per item
Replaced GetBudgetSpent() and GetBudgetOrdered with a subquery()
---
 C4/Acquisition.pm                                  |    4 +-
 C4/Budgets.pm                                      |   69 ++++++-------------
 acqui/acqui-home.pl                                |    2 -
 acqui/addorder.pl                                  |    3 +
 acqui/basket.pl                                    |   41 ++++++++----
 acqui/neworderempty.pl                             |    1 +
 acqui/parcel.pl                                    |   49 ++++++--------
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    6 ++
 .../prog/en/modules/acqui/neworderempty.tt         |    6 ++
 .../prog/en/modules/acqui/orderreceive.tt          |    5 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   21 +++----
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    5 +-
 12 files changed, 104 insertions(+), 108 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 7127f24..37c250b 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -712,7 +712,8 @@ sub GetPendingOrders {
     my $strsth = "
         SELECT    ".($grouped?"count(*),":"")."aqbasket.basketno,
                     surname,firstname,aqorders.*,biblio.*,biblioitems.isbn,
-                    aqbasket.closedate, aqbasket.creationdate, aqbasket.basketname
+                    aqbasket.closedate, aqbasket.creationdate, aqbasket.basketname,
+                    (SELECT count(*) FROM aqorders_items WHERE aqorders_items.ordernumber=aqorders.ordernumber) AS items
         FROM      aqorders
         LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
         LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
@@ -1266,6 +1267,7 @@ sub GetParcel {
                 aqorders.listprice,
                 aqorders.rrp,
                 aqorders.ecost,
+                aqorders.freight,
                 biblio.title
         FROM aqorders
         LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 7c867e0..86dd2e6 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -39,8 +39,6 @@ BEGIN {
 	    &AddBudget
         &ModBudget
         &DelBudget
-        &GetBudgetSpent
-        &GetBudgetOrdered
         &GetPeriodsCount
         &GetChildBudgetsSpent
 
@@ -300,38 +298,6 @@ sub ModBudgetPlan {
 }
 
 # -------------------------------------------------------------------
-sub GetBudgetSpent {
-	my ($budget_id) = @_;
-	my $dbh = C4::Context->dbh;
-	my $sth = $dbh->prepare(qq|
-        SELECT SUM( COALESCE(unitprice, ecost) * quantity ) AS sum FROM aqorders
-            WHERE budget_id = ? AND
-            quantityreceived > 0 AND
-            datecancellationprinted IS NULL
-    |);
-
-	$sth->execute($budget_id);
-	my $sum =  $sth->fetchrow_array;
-	return $sum;
-}
-
-# -------------------------------------------------------------------
-sub GetBudgetOrdered {
-	my ($budget_id) = @_;
-	my $dbh = C4::Context->dbh;
-	my $sth = $dbh->prepare(qq|
-        SELECT SUM(ecost *  quantity) AS sum FROM aqorders
-            WHERE budget_id = ? AND
-            quantityreceived = 0 AND
-            datecancellationprinted IS NULL
-    |);
-
-	$sth->execute($budget_id);
-	my $sum =  $sth->fetchrow_array;
-	return $sum;
-}
-
-# -------------------------------------------------------------------
 sub GetBudgetAuthCats  {
     my ($budget_period_id) = shift;
     # now, populate the auth_cats_loop used in the budget planning button
@@ -431,14 +397,27 @@ sub ModBudgetPeriod {
 }
 
 # -------------------------------------------------------------------
+my $AQORDERS_CUMULATIVE_SUBQUERY = <<EOQ;
+SELECT SUM( COALESCE(unitprice, ecost) * COALESCE(quantityreceived, 0)
+          + CASE WHEN quantityreceived > 0 THEN COALESCE(freight, 0)
+                 ELSE 0
+            END ) AS budget_spent,
+       SUM( CASE WHEN quantityreceived > 0 THEN 0
+                 ELSE ecost * quantity + COALESCE(freight, 0)
+            END ) AS budget_ordered,
+       budget_id
+FROM aqorders GROUP BY budget_id
+EOQ
 sub GetBudgetHierarchy {
     my ( $budget_period_id, $branchcode, $owner ) = @_;
     my @bind_params;
     my $dbh   = C4::Context->dbh;
     my $query = qq|
-                    SELECT aqbudgets.*, aqbudgetperiods.budget_period_active
+                    SELECT aqbudgets.*, aqbudgetperiods.budget_period_active, aqord.budget_spent, aqord.budget_ordered
                     FROM aqbudgets 
-                    JOIN aqbudgetperiods USING (budget_period_id)|;
+                    JOIN aqbudgetperiods USING (budget_period_id)
+                    LEFT OUTER JOIN ( $AQORDERS_CUMULATIVE_SUBQUERY ) aqord USING (budget_id)
+                |;
                         
 	my @where_strings;
     # show only period X if requested
@@ -548,18 +527,12 @@ sub GetBudgetHierarchy {
         $moo =~ s/\ /\&nbsp\;/g;
         $r->{'budget_name_indent'} = $moo;
 
-        $r->{'budget_spent'}       = GetBudgetSpent( $r->{'budget_id'} );
-
         $r->{'budget_amount_total'} =  $r->{'budget_amount'};
 
-        # foreach sub-levels
-        my $unalloc_count ;
-
 		foreach my $sub (@subs_arr) {
 			my $sub_budget = GetBudget($sub);
 
-			$r->{budget_spent_sublevel} +=    GetBudgetSpent( $sub_budget->{'budget_id'} );
-			$unalloc_count +=   $sub_budget->{'budget_amount'};
+			$r->{budget_spent_sublevel} += $sub_budget->{'budget_spent'};
 		}
 	}
 	return \@sort;
@@ -603,6 +576,7 @@ sub GetBudget {
     my $query = "
         SELECT *
         FROM   aqbudgets
+        LEFT OUTER JOIN ( $AQORDERS_CUMULATIVE_SUBQUERY ) aqord USING (budget_id)
         WHERE  budget_id=?
         ";
     my $sth = $dbh->prepare($query);
@@ -626,14 +600,15 @@ sub GetChildBudgetsSpent {
     my $query = "
         SELECT *
         FROM   aqbudgets
-        WHERE  budget_parent_id=?
+        LEFT OUTER JOIN ( $AQORDERS_CUMULATIVE_SUBQUERY ) aqord USING (budget_id)
+        WHERE  budget_id=? OR budget_parent_id=?
         ";
     my $sth = $dbh->prepare($query);
-    $sth->execute( $budget_id );
+    $sth->execute( $budget_id, $budget_id, );
     my $result = $sth->fetchall_arrayref({});
-    my $total_spent = GetBudgetSpent($budget_id);
+    my $total_spent = 0;
     if ($result){
-        $total_spent += GetChildBudgetsSpent($_->{"budget_id"}) foreach @$result;    
+        $total_spent += $_->{"budget_spent"} foreach @$result;    
     }
     return $total_spent;
 }
diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index 69482a8..96a747e 100755
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -110,8 +110,6 @@ foreach my $budget ( @{$budget_arr} ) {
         $budget->{budget_amount} = 0;
     }
 
-    $budget->{'budget_ordered'} = GetBudgetOrdered( $budget->{'budget_id'} );
-    $budget->{'budget_spent'}   = GetBudgetSpent( $budget->{'budget_id'} );
     if ( !defined $budget->{budget_spent} ) {
         $budget->{budget_spent} = 0;
     }
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 121d20d..8e85067 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -103,6 +103,8 @@ budget_id used to pay this order.
 
 =item C<cost>
 
+=item C<freight>
+
 =item C<sub>
 
 =item C<invoice>
@@ -174,6 +176,7 @@ $orderinfo->{'uncertainprice'} ||= 0;
 #my $gst           = $input->param('GST');
 #my $budget        = $input->param('budget');
 #my $cost          = $input->param('cost');
+#my $freight       = $input->param('freight');
 #my $sub           = $input->param('sub');
 #my $purchaseorder = $input->param('purchaseordernumber');
 #my $invoice       = $input->param('invoice');
diff --git a/acqui/basket.pl b/acqui/basket.pl
index b836280..d34c744 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -234,12 +234,15 @@ if ( $op eq 'delete_confirm' ) {
 	my $total_rrp_gste; # RRP Total, GST excluded
 	my $gist_rrp;
 	my $total_rrp_est;
+	my $total_freight;
+	my $total_freight_gsti; # Freight Total, GST included
+	my $total_freight_gste; # Freight Total, GST excluded
+	my $gist_freight;
 	
     my $qty_total;
     my @books_loop;
 
     for my $order ( @results ) {
-        my $rrp = $order->{'listprice'} || 0;
 		my $qty = $order->{'quantity'} || 0;
         if (!defined $order->{quantityreceived}) {
             $order->{quantityreceived} = 0;
@@ -251,10 +254,10 @@ if ( $op eq 'delete_confirm' ) {
         }
 
         my $budget = GetBudget(  $order->{'budget_id'} );
-        $rrp = ConvertCurrency( $order->{'currency'}, $rrp );
 
         $total_rrp += $qty * $order->{'rrp'};
-        my $line_total = $qty * $order->{'ecost'};
+        $total_freight += $order->{'freight'} || 0;
+        my $line_total = $qty * $order->{'ecost'} + $order->{'freight'} || 0;
         $total_rrp_est += $qty * $order->{'ecost'};
 		# FIXME: what about the "actual cost" field?
         $qty_total += $qty;
@@ -285,11 +288,12 @@ if ( $op eq 'delete_confirm' ) {
         $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};
-        $line{order_received}       = ( $qty == $order->{'quantityreceived'} );
+        $line{order_received}       = ( $qty == $order->{quantityreceived} );
         $line{basketno}             = $basketno;
         $line{budget_name}          = $budget->{budget_name};
-        $line{rrp}                  = sprintf( "%.2f", $line{'rrp'} );
-        $line{ecost}                = sprintf( "%.2f", $line{'ecost'} );
+        $line{rrp}                  = sprintf( "%.2f", $line{rrp} );
+        $line{ecost}                = sprintf( "%.2f", $line{ecost} );
+        $line{freight}              = sprintf( "%.2f", $line{freight} );
         $line{line_total}           = sprintf( "%.2f", $line_total );
         if ($line{uncertainprice}) {
             $template->param( uncertainprices => 1 );
@@ -314,19 +318,26 @@ my $total_est_gste;
            $total_rrp_gsti = $total_rrp;                           # we know $total_rrp_gsti
            $total_rrp_gste = $total_rrp_gsti / ( $gist + 1 );      # and can reverse compute other values
            $gist_rrp       = $total_rrp_gsti - $total_rrp_gste;    #
-           $total_est_gste = $total_rrp_gste - ( $total_rrp_gste * $discount );
-           $total_est_gsti = $total_rrp_est;
+           $total_freight_gsti = $total_freight;
+           $total_freight_gste = $total_freight_gsti / ( $gist + 1 );
+           $gist_freight       = $total_freight_gsti - $total_freight_gste;    #
+           $total_est_gste = $total_rrp_gste - ( $total_rrp_gste * $discount ) + $total_freight_gste;
+           $total_est_gsti = $total_rrp_est + $total_freight_gsti;
         } else {                                                    # if prices does not include GST
            $total_rrp_gste = $total_rrp;                           # then we use the common way to compute other values
            $gist_rrp       = $total_rrp_gste * $gist;              #
            $total_rrp_gsti = $total_rrp_gste + $gist_rrp;          #
-           $total_est_gste = $total_rrp_est;
-           $total_est_gsti = $total_rrp_gsti - ( $total_rrp_gsti * $discount );
+           $total_freight_gste = $total_freight;
+           $gist_freight       = $total_freight_gste * $gist;
+           $total_freight_gsti = $total_freight_gste + $gist_freight;
+           $total_est_gste = $total_rrp_est + $total_freight_gste;
+           $total_est_gsti = $total_rrp_gsti - ( $total_rrp_gsti * $discount ) + $total_freight_gsti;
        }
-       $gist_est = $gist_rrp - ( $gist_rrp * $discount );
+       $gist_est = $gist_rrp - ( $gist_rrp * $discount ) + $gist_freight;
     } else {
     $total_rrp_gsti = $total_rrp;
-    $total_est_gsti = $total_rrp_est;
+    $total_freight_gsti = $total_freight;
+    $total_est_gsti = $total_rrp_est + $total_freight_gsti;
 }
 
     my $contract = &GetContract($basket->{contractnumber});
@@ -361,13 +372,15 @@ my $total_est_gste;
         books_loop           => \@books_loop,
         gist_rate            => sprintf( "%.2f", $gist * 100 ) . '%',
         total_rrp_gste       => sprintf( "%.2f", $total_rrp_gste ),
+        total_freight_gste   => sprintf( "%.2f", $total_freight_gste ),
         total_est_gste       => sprintf( "%.2f", $total_est_gste ),
         gist_est             => sprintf( "%.2f", $gist_est ),
         gist_rrp             => sprintf( "%.2f", $gist_rrp ),        
+        gist_freight         => sprintf( "%.2f", $gist_freight ),        
         total_rrp_gsti       => sprintf( "%.2f", $total_rrp_gsti ),
+        total_freight_gsti   => sprintf( "%.2f", $total_freight_gsti ),
         total_est_gsti       => sprintf( "%.2f", $total_est_gsti ),
-#        currency             => $bookseller->{'listprice'},
-	currency		=> $cur->{'currency'},
+	    currency		=> $cur->{'currency'},
         qty_total            => $qty_total,
         GST                  => $gist,
         basketgroups         => $basketgroups,
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 459dfe8..f3cd048 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -384,6 +384,7 @@ $template->param(
     quantityrec      => $data->{'quantity'},
     rrp              => $data->{'rrp'},
     listprice        => sprintf("%.2f", $data->{'listprice'}||$data->{'price'}||$listprice),
+    freight          => sprintf("%.2f", $data->{'freight'}||0),
     total            => sprintf("%.2f", ($data->{'ecost'}||0)*($data->{'quantity'}||0) ),
     ecost            => $data->{'ecost'},
     unitprice        => sprintf("%.2f", $data->{'unitprice'}),
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index c256c60..a00cfeb 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -166,39 +166,38 @@ 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]->{'freight'};
     $parcelitems[$i]->{'unitprice'} += 0;
     my %line;
     %line          = %{ $parcelitems[$i] };
     $line{invoice} = $invoice;
     $line{gst}     = $gst;
+    $line{freight} = sprintf($cfstr, $line{freight});
     $line{total} = sprintf($cfstr, $total);
     $line{supplierid} = $supplierid;
     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'};
+    $totalfreight  += $parcelitems[$i]->{'freight'};
     $totalquantity += $parcelitems[$i]->{'quantityreceived'};
     $tototal       += $total;
 }
 
 my $pendingorders = GetPendingOrders($supplierid);
-my $countpendings = scalar @$pendingorders;
+my $countpendingitems = 0;
+if ($pendingorders) {
+    $countpendingitems += $_->{quantity} || 1 foreach @$pendingorders;
+}
+my $freight_per_item = $freight && $countpendingitems ? $freight/$countpendingitems : 0;
 
 # 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]};
+for (my $i = $startfrom; $i < $startfrom + $resultsperpage; $i++) {
+    last unless $pendingorders->[$i];
+    my %line = %{$pendingorders->[$i]};
    
     $line{quantity}+=0;
     $line{quantityreceived}+=0;
@@ -210,11 +209,12 @@ for (my $i = 0 ; $i < $countpendings ; $i++) {
     $line{ecost} = sprintf("%.2f",$line{ecost});
     $line{ordertotal} = sprintf("%.2f",$line{ecost}*$line{quantity});
     $line{unitprice} = sprintf("%.2f",$line{unitprice});
+    $line{freight} = sprintf("%.2f",$freight_per_item * $line{quantity});
     $line{invoice} = $invoice;
     $line{gst} = $gst;
     $line{total} = $total;
     $line{supplierid} = $supplierid;
-    $ordergrandtotal += $line{ecost} * $line{quantity};
+    $ordergrandtotal += $line{ecost} * $line{quantity} + $line{freight} || 0;
     
     my $biblionumber = $line{'biblionumber'};
     my $countbiblio = CountBiblioInOrders($biblionumber);
@@ -244,22 +244,20 @@ for (my $i = 0 ; $i < $countpendings ; $i++) {
     $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);
+    push @loop_orders, \%line;
 }
-$freight = $totalfreight unless $freight;
 
-my $count = $countpendings;
+my $countpendings = $pendingorders ? scalar (@$pendingorders) : 0;
 
-if ($count>$resultsperpage){
+if ($countpendings>$resultsperpage){
     my $displaynext=0;
     my $displayprev=$startfrom;
-    if(($count - ($startfrom+$resultsperpage)) > 0 ) {
+    if(($countpendings - ($startfrom+$resultsperpage)) > 0 ) {
         $displaynext = 1;
     }
 
     my @numbers = ();
-    for (my $i=1; $i<$count/$resultsperpage+1; $i++) {
+    for (my $i=1; $i<$countpendings/$resultsperpage+1; $i++) {
             my $highlight=0;
             ($startfrom/$resultsperpage==($i-1)) && ($highlight=1);
             push @numbers, { number => $i,
@@ -269,22 +267,19 @@ if ($count>$resultsperpage){
 
     my $from = $startfrom*$resultsperpage+1;
     my $to;
-    if($count < (($startfrom+1)*$resultsperpage)){
-        $to = $count;
+    if($countpendings < (($startfrom+1)*$resultsperpage)){
+        $to = $countpendings;
     } else {
         $to = (($startfrom+1)*$resultsperpage);
     }
     $template->param(numbers=>\@numbers,
                      displaynext=>$displaynext,
                      displayprev=>$displayprev,
-                     nextstartfrom=>(($startfrom+$resultsperpage<$count)?$startfrom+$resultsperpage:$count),
+                     nextstartfrom=>(($startfrom+$resultsperpage<$countpendings)?$startfrom+$resultsperpage:$countpendings),
                      prevstartfrom=>(($startfrom-$resultsperpage>0)?$startfrom-$resultsperpage:0)
                     );
 }
 
-#$totalfreight=$freight;
-$tototal = $tototal + $freight;
-
 $template->param(
     invoice               => $invoice,
     datereceived          => $datereceived->output('iso'),
@@ -300,7 +295,7 @@ $template->param(
     countpending          => $countpendings,
     loop_orders           => \@loop_orders,
     totalprice            => sprintf($cfstr, $totalprice),
-    totalfreight          => $totalfreight,
+    totalfreight          => sprintf($cfstr, $totalfreight),
     totalquantity         => $totalquantity,
     tototal               => sprintf($cfstr, $tototal),
     ordergrandtotal       => sprintf($cfstr, $ordergrandtotal),
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 c0b62f2..d0bd241 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -203,6 +203,7 @@
                         <th>RRP</th>
                         <th>Est.</th>
                         <th>Qty.</th>
+                        <th>Shipping</th>
                         <th>Total</th>
                         <th>Fund</th>
                         [% IF ( active ) %]
@@ -220,6 +221,7 @@
                     <th>[% total_rrp_gste %]</th>
                     <th>&nbsp;</th>
                     <th>[% qty_total %]</th>
+                    <th>[% total_freight_gste %]</th>
                     <th>[% total_est_gste %]</th>
                         [% IF ( active ) %]
                             [% IF ( closedate ) %]
@@ -234,6 +236,7 @@
                     <th>[% gist_rrp %]</th>
                     <th>&nbsp;</th>
                     <th>&nbsp;</th>
+                    <th>[% gist_freight %]</th>
                     <th>[% gist_est %]</th>
                 </tr>
                 <tr>
@@ -241,6 +244,7 @@
                     <th>[% total_rrp_gsti %]</th>
                     <th>&nbsp;</th>
                     <th>[% qty_total %]</th>
+                    <th>[% total_freight_gsti %]</th>
                     <th>[% total_est_gsti %]</th>
                 </tr>
                 [% ELSE %]
@@ -249,6 +253,7 @@
                     <th>[% total_rrp_gsti %]</th>
                     <th>&nbsp;</th>
                     <th>[% qty_total %]</th>
+                    <th>[% total_freight_gsti %]</th>
                     <th>[% total_est_gsti %]</th>
                 </tr>
                 [% END %]
@@ -269,6 +274,7 @@
                         <td class="number">[% books_loo.rrp %]</td>
                         <td class="number">[% books_loo.ecost %]</td>
                         <td class="number">[% books_loo.quantity %]</td>
+                        <td class="number">[% books_loo.freight %]</td>
                         <td class="number">[% books_loo.line_total %]</td>
                         <td>[% books_loo.budget_name %]</td>
                         [% IF ( active ) %]
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 d58582e..7bbeb3c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -464,6 +464,12 @@ $(document).ready(function()
                 <input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice %]" />
                 [% END %]
             </li>
+            [% IF ( quantityrec ) %]
+            <li>
+                <label for="freight">Freight: </label>
+                <input type="text" id="freight" size="20" name="freight" value="[% freight %]" [% IF close %] readonly="readonly" [% END %]/>
+            </li>
+            [% END %]
             <li>
                 <label for="notes">Notes: </label>
                 <textarea id="notes" cols="30" rows="3" name="notes" >[% notes %]</textarea>
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 ac39141..60018b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -82,7 +82,6 @@
     <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">
@@ -126,7 +125,9 @@
          <input type="text" size="20" name="cost" id="cost" value="[% unitprice %]" />
         [% ELSE %]
             <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
-        [% END %]</li></ol>
+        [% END %]</li>
+        <li><label for="freight">Shipping Cost: </label><input type="text" size="20" name="freight" id="freight" value="[% freight %]" /></li>
+        </ol>
         <label for="note">Notes: </label><textarea name="note" width="40" rows="8" >[% notes %]</textarea>
         <input type="hidden" name="invoice" value="[% invoice %]" />
     </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 eb5492e..c787c90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -213,6 +213,7 @@
     	    <th>View Record</th>
             <th>Quantity</th>
             <th>Unit cost</th>
+            <th>Shipping</th>
             <th>Order cost</th>
             <th>&nbsp;</th>
             <th>&nbsp;</th>
@@ -222,6 +223,7 @@
             <tr><td colspan="4" class="total">TOTAL</td>
                 <td> [% totalPquantity %] </td>
 				<td>&nbsp;</td>
+				<td>&nbsp;</td>
                 <td>[% ordergrandtotal %]</td>
 				<td>&nbsp;</td>
 				<td>&nbsp;</td>
@@ -245,6 +247,7 @@
                 <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.freight %]</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>
@@ -310,6 +313,7 @@
 		<th>Quantity</th>  
 		<th>Est cost</th>
 		<th>Actual cost</th>
+		<th>Shipping</th>
 		<th>TOTAL</th>
 	    </tr>
 	</thead>
@@ -318,18 +322,10 @@
 		<td colspan="4" class="total">SUBTOTAL</td>
 		<td colspan="2">&nbsp;</td>
 		<td>[% totalprice %]</td>
+		<td>[% totalfreight %]</td>
 		<td>[% tototal %]</td>
 	    </tr>
-	      
-	      [% IF ( totalfreight ) %]
-		    <tr>
-			<td colspan="6">&nbsp;
-		</td>
-			    <td>Shipping</td>
-		<td>[% totalfreight %]</td>
-	    	</tr> 
-	    [% END %]
-	      [% IF ( gst ) %]
+      [% IF ( gst ) %]
 		    <tr>
 			<td colspan="6">
 		<p class="message">
@@ -340,11 +336,11 @@
 			    <td><b>Tax rate</b></td>
 		<td>[% gst %]</td>
 	    	</tr> 
-	    [% END %]
+	  [% END %]
 	    <tr>
 	    <td colspan="4" class="total">TOTAL</td>
 		<td>[% totalquantity %]</td>
-		<td colspan="2">&nbsp;</td>
+		<td colspan="3">&nbsp;</td>
 		<td>[% grandtot %]</td>
 	    </tr>
     </tfoot>
@@ -366,6 +362,7 @@
                 <td>[% loop_receive.quantityreceived %]</td>
                 <td>[% loop_receive.ecost %]</td>
                 <td>[% loop_receive.unitprice %]</td>
+                <td>[% loop_receive.freight %]</td>
                 <td>[% loop_receive.total %]</td>
             </tr>
 	    [% END %]
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..4478f34 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -96,11 +96,10 @@
             <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>
+            <label for="freight">Shipping cost:</label>
             <input type="text" size="20" id="freight" name="freight" />
-        </li> -->
+        </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" />
-- 
1.6.5


From srdjan at catalyst.net.nz  Thu Dec  8 04:52:17 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu,  8 Dec 2011 16:52:17 +1300
Subject: [Koha-patches] [PATCH] bug_4530: Rework issuing rules
In-Reply-To: <bug 4530>
References: <bug 4530>
Message-ID: <1323316337-30511-1-git-send-email-srdjan@catalyst.net.nz>

Use only one set of functions
Database efficient rules fetch - only one query
---
 C4/Circulation.pm                          |  326 +++++++++-------------------
 C4/Members.pm                              |    1 -
 C4/Overdues.pm                             |   42 +----
 C4/Reserves.pm                             |   15 +--
 t/db_dependent/lib/KohaTest/Circulation.pm |    4 +-
 t/db_dependent/lib/KohaTest/Overdues.pm    |    1 -
 6 files changed, 109 insertions(+), 280 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 3d63224..fa601f0 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -74,7 +74,6 @@ BEGIN {
 		&GetItemIssue
 		&GetItemIssues
 		&GetIssuingCharges
-		&GetIssuingRule
         &GetBranchBorrowerCircRule
         &GetBranchItemRule
 		&GetBiblioIssues
@@ -356,12 +355,12 @@ sub TooMany {
  
     # given branch, patron category, and item type, determine
     # applicable issuing rule
-    my $issuing_rule = GetIssuingRule($cat_borrower, $type, $branch);
+    my $issuing_rule = GetIssuingRuleRecord($cat_borrower, $type, $branch, 'maxissueqty');
 
     # if a rule is found and has a loan limit set, count
     # how many loans the patron already has that meet that
     # rule
-    if (defined($issuing_rule) and defined($issuing_rule->{'maxissueqty'})) {
+    if ( $issuing_rule ) {
         my @bind_params;
         my $count_query = "SELECT COUNT(*) FROM issues
                            JOIN items USING (itemnumber) ";
@@ -1119,56 +1118,8 @@ Get loan length for an itemtype, a borrower type and a branch
 
 sub GetLoanLength {
     my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-"select issuelength from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"
-      );
-# warn "in get loan lenght $borrowertype $itemtype $branchcode ";
-# try to find issuelength & return the 1st available.
-# check with borrowertype, itemtype and branchcode, then without one of those parameters
-    $sth->execute( $borrowertype, $itemtype, $branchcode );
-    my $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", "*", $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", "*", "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
     # if no rule is set => 21 days (hardcoded)
-    return 21;
+    return GetIssuingRuleValue( $borrowertype, $itemtype, $branchcode, 'issuelength' ) || 21;
 }
 
 
@@ -1182,108 +1133,100 @@ Get the Hard Due Date and it's comparison for an itemtype, a borrower type and a
 
 sub GetHardDueDate {
     my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-"select hardduedate, hardduedatecompare from issuingrules where categorycode=? and itemtype=? and branchcode=?"
-      );
-    $sth->execute( $borrowertype, $itemtype, $branchcode );
-    my $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, $branchcode );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( "*", "*", $branchcode );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", "*" );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, "*" );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( "*", "*", "*" );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    # if no rule is set => return undefined
-    return (undef, undef);
+    my $issuing_rule = GetIssuingRuleRecord($borrowertype, $itemtype, $branchcode, 'hardduedate')
+      or return;
+    return (C4::Dates->new($issuing_rule->{hardduedate}, 'iso'),$issuing_rule->{hardduedatecompare});
+}
+   
+
+=head2 GetIssuingRuleValue
+
+  my $irule = &GetIssuingRuleValue($borrowertype,$itemtype,$branchcode, $rule_name)
+
+Get the most specific non-null value issuing rule for an itemtype, a borrower type and a branch
+
+=cut
+
+sub GetIssuingRuleValue {
+    my ( $borrowertype, $itemtype, $branchcode, $rule ) = @_;
+    my $irule = GetIssuingRuleRecord( $borrowertype, $itemtype, $branchcode, $rule )
+      or return;
+    return $irule->{$rule};
 }
 
-=head2 GetIssuingRule
+=head2 GetIssuingRuleRecord
 
-  my $irule = &GetIssuingRule($borrowertype,$itemtype,branchcode)
+  my $irule = &GetIssuingRuleRecord($borrowertype,$itemtype,$branchcode, $rule_name)
 
-FIXME - This is a copy-paste of GetLoanLength
-as a stop-gap.  Do not wish to change API for GetLoanLength 
-this close to release, however, Overdues::GetIssuingRules is broken.
+Get the most specific non-null value issuing rule for an itemtype, a borrower type and a branch
+If $rule_name is specified, only records with $rule_name not null are taken in account
 
-Get the issuing rule for an itemtype, a borrower type and a branch
-Returns a hashref from the issuingrules table.
+Order of preference is $branchcode, $borrowertype, $itemtype
 
 =cut
 
-sub GetIssuingRule {
-    my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =  $dbh->prepare( "select * from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"  );
-    my $irule;
+sub GetIssuingRuleRecord {
+    my ( $borrowertype, $itemtype, $branchcode, $rule ) = @_;
+
+    my $irules = GetIssuingRules($borrowertype,$itemtype,$branchcode)
+      or return;
+
+    return unless @$irules;
 
-	$sth->execute( $borrowertype, $itemtype, $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    return $irules->[0] unless $rule;
 
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    die qq{Invalid rule (field) "$rule"} unless exists $irules->[0]->{$rule};
 
-    $sth->execute( "*", $itemtype, $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    foreach (@$irules) {
+        return $_ if $_->{$rule}; # XXX defined $_->{$rule}
+    }
+
+    return;
+}
 
-    $sth->execute( "*", "*", $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+=head2 GetIssuingRules
 
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+  my $irules = &GetIssuingRules($borrowertype,$itemtype,$branchcode)
 
-    $sth->execute( $borrowertype, "*", "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+Get issuing all rule records for an itemtype, a borrower type and a branch
+in order of preference
 
-    $sth->execute( "*", $itemtype, "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+Order of preference is $branchcode, $borrowertype, $itemtype
 
-    $sth->execute( "*", "*", "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+=cut
+
+sub GetIssuingRules {
+    my ( $borrowertype, $itemtype, $branchcode ) = @_;
+
+    my (@where, @params);
+
+    if ( $borrowertype ) {
+        push @where, "categorycode=? OR categorycode='*'";
+        push @params, $borrowertype;
+    } else {
+        push @where, "categorycode='*'";
+    }
 
-    # if no rule matches,
-    return undef;
+    if ( $itemtype ) {
+        push @where, "itemtype=? OR itemtype='*'";
+        push @params, $itemtype;
+    } else {
+        push @where, "itemtype='*'";
+    }
+
+    if ( $branchcode ) {
+        push @where, "branchcode=? OR branchcode='*'";
+        push @params, $branchcode;
+    } else {
+        push @where, "branchcode='*'";
+    }
+
+    my $qry = "select * from issuingrules where "
+            .join( ' AND ', map "($_)", @where )
+            ." order by branchcode desc, categorycode desc, itemtype desc";
+
+    my $dbh = C4::Context->dbh;
+    return  $dbh->selectall_arrayref($qry, { Slice => {} }, @params);
 }
 
 =head2 GetBranchBorrowerCircRule
@@ -1783,18 +1726,16 @@ sub _FixFineDaysOnReturn {
     }
 
     my $branchcode = _GetCircControlBranch( $item, $borrower );
+
+    my $finedays = GetIssuingRuleValue( $borrower->{categorycode}, $item->{itype}, $branchcode, 'finedays' )
+      or return;
+    my $grace = GetIssuingRuleValue( $borrower->{categorycode}, $item->{itype}, $branchcode, 'firstremind' );
+
     my $calendar = C4::Calendar->new( branchcode => $branchcode );
     my $today = C4::Dates->new();
-
-    my $deltadays = $calendar->daysBetween( $datedue, C4::Dates->new() );
+    my $deltadays = $calendar->daysBetween( $datedue, $today );
 
     my $circcontrol = C4::Context::preference('CircControl');
-    my $issuingrule = GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branchcode );
-    my $finedays    = $issuingrule->{finedays};
-
-    # exit if no finedays defined
-    return unless $finedays;
-    my $grace = $issuingrule->{firstremind};
 
     if ( $deltadays - $grace > 0 ) {
         my @newdate = Add_Delta_Days( Today(), $deltadays * $finedays );
@@ -2224,47 +2165,37 @@ sub CanBookBeRenewed {
     
     my $sthcount = $dbh->prepare("
                    SELECT 
-                    borrowers.categorycode, biblioitems.itemtype, issues.renewals, renewalsallowed, $controlbranch
-                   FROM  issuingrules, 
-                   issues 
+                    borrowers.categorycode, biblioitems.itemtype, issues.renewals, $controlbranch
+                   FROM issues 
                    LEFT JOIN items USING (itemnumber) 
                    LEFT JOIN borrowers USING (borrowernumber) 
                    LEFT JOIN biblioitems USING (biblioitemnumber)
                    
                    WHERE
-                    (issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')
-                   AND
-                    (issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
-                   AND
-                    (issuingrules.branchcode = $controlbranch OR issuingrules.branchcode = '*') 
-                   AND 
                     borrowernumber = ? 
                    AND
                     itemnumber = ?
-                   ORDER BY
-                    issuingrules.categorycode desc,
-                    issuingrules.itemtype desc,
-                    issuingrules.branchcode desc
                    LIMIT 1;
                   ");
 
     $sthcount->execute( $borrowernumber, $itemnumber );
     if ( my $data1 = $sthcount->fetchrow_hashref ) {
-        
-        if ( ( $data1->{renewalsallowed} && $data1->{renewalsallowed} > $data1->{renewals} ) || $override_limit ) {
-            $renewokay = 1;
-        }
-        else {
-			$error="too_many";
-		}
-		
         my ( $resfound, $resrec ) = C4::Reserves::CheckReserves($itemnumber);
         if ($resfound) {
             $renewokay = 0;
 			$error="on_reserve"
         }
+        elsif ( $override_limit ) {
+            $renewokay = 1;
+        }
+        elsif ( my $renewalsallowed = GetIssuingRuleValue($data1->{categorycode}, $itype, $data1->{$controlbranch}, 'renewalsallowed') ) {
+            if ( $renewalsallowed > $data1->{renewals} || $override_limit ) {
+                $renewokay = 1;
+            }
+        }
+	    $error="too_many" unless $renewokay;
+	}
 
-    }
     return ($renewokay,$error);
 }
 
@@ -2371,8 +2302,6 @@ sub GetRenewCount {
     my ( $bornum, $itemno ) = @_;
     my $dbh           = C4::Context->dbh;
     my $renewcount    = 0;
-    my $renewsallowed = 0;
-    my $renewsleft    = 0;
 
     my $borrower = C4::Members::GetMember( borrowernumber => $bornum);
     my $item     = GetItem($itemno); 
@@ -2393,10 +2322,8 @@ sub GetRenewCount {
     # $item and $borrower should be calculated
     my $branchcode = _GetCircControlBranch($item, $borrower);
     
-    my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{itype}, $branchcode);
-    
-    $renewsallowed = $issuingrule->{'renewalsallowed'};
-    $renewsleft    = $renewsallowed - $renewcount;
+    my $renewsallowed = GetIssuingRuleValue($borrower->{categorycode}, $item->{itype}, $branchcode, 'renewalsallowed') || 0;
+    my $renewsleft    = $renewsallowed - $renewcount;
     if($renewsleft < 0){ $renewsleft = 0; }
     return ( $renewcount, $renewsallowed, $renewsleft );
 }
@@ -2441,19 +2368,11 @@ sub GetIssuingCharges {
         $item_type = $item_data->{itemtype};
         $charge    = $item_data->{rentalcharge};
         my $branch = C4::Branch::mybranch();
-        my $discount_query = q|SELECT rentaldiscount,
-            issuingrules.itemtype, issuingrules.branchcode
+        my $borr_query = q|SELECT borrowers.categorycode
             FROM borrowers
-            LEFT JOIN issuingrules ON borrowers.categorycode = issuingrules.categorycode
-            WHERE borrowers.borrowernumber = ?
-            AND (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
-            AND (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')|;
-        my $discount_sth = $dbh->prepare($discount_query);
-        $discount_sth->execute( $borrowernumber, $item_type, $branch );
-        my $discount_rules = $discount_sth->fetchall_arrayref({});
-        if (@{$discount_rules}) {
-            # We may have multiple rules so get the most specific
-            my $discount = _get_discount_from_rule($discount_rules, $branch, $item_type);
+            WHERE borrowers.borrowernumber = ?|;
+        my $borr_cat = $dbh->selectrow_array($borr_query, undef, $borrowernumber);
+        if ( my $discount = GetIssuingRuleValue($borr_cat, $item_type, $branch, 'rentaldiscount') ) {
             $charge = ( $charge * ( 100 - $discount ) ) / 100;
         }
     }
@@ -2462,43 +2381,6 @@ sub GetIssuingCharges {
     return ( $charge, $item_type );
 }
 
-# Select most appropriate discount rule from those returned
-sub _get_discount_from_rule {
-    my ($rules_ref, $branch, $itemtype) = @_;
-    my $discount;
-
-    if (@{$rules_ref} == 1) { # only 1 applicable rule use it
-        $discount = $rules_ref->[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # could have up to 4 does one match $branch and $itemtype
-    my @d = grep { $_->{branchcode} eq $branch && $_->{itemtype} eq $itemtype } @{$rules_ref};
-    if (@d) {
-        $discount = $d[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # do we have item type + all branches
-    @d = grep { $_->{branchcode} eq q{*} && $_->{itemtype} eq $itemtype } @{$rules_ref};
-    if (@d) {
-        $discount = $d[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # do we all item types + this branch
-    @d = grep { $_->{branchcode} eq $branch && $_->{itemtype} eq q{*} } @{$rules_ref};
-    if (@d) {
-        $discount = $d[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # so all and all (surely we wont get here)
-    @d = grep { $_->{branchcode} eq q{*} && $_->{itemtype} eq q{*} } @{$rules_ref};
-    if (@d) {
-        $discount = $d[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # none of the above
-    return 0;
-}
-
 =head2 AddIssuingCharge
 
   &AddIssuingCharge( $itemno, $borrowernumber, $charge )
diff --git a/C4/Members.pm b/C4/Members.pm
index 8bd7b47..f5f6dbf 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -626,7 +626,6 @@ sub IsMemberBlocked {
     my $dbh            = C4::Context->dbh;
 
     my $blockeddate = CheckBorrowerDebarred($borrowernumber);
-
     return ( 1, $blockeddate ) if $blockeddate;
 
     # if he have late issues
diff --git a/C4/Overdues.pm b/C4/Overdues.pm
index 4897b41..1334d05 100644
--- a/C4/Overdues.pm
+++ b/C4/Overdues.pm
@@ -72,9 +72,6 @@ BEGIN {
 	push @EXPORT, qw(
         &GetIssuesIteminfo
 	);
-    #
-	# &GetIssuingRules - delete.
-	# use C4::Circulation::GetIssuingRule instead.
 	
 	# subs to move to Members.pm
 	push @EXPORT, qw(
@@ -272,9 +269,6 @@ sub CalcFine {
     my $dbh = C4::Context->dbh;
     my $amount = 0;
 	my $daystocharge;
-	# get issuingrules (fines part will be used)
-    $debug and warn sprintf("CalcFine calling GetIssuingRule(%s, %s, %s)", $bortype, $item->{'itemtype'}, $branchcode);
-    my $data = C4::Circulation::GetIssuingRule($bortype, $item->{'itemtype'}, $branchcode);
 	if($difference) {
 		# if $difference is supplied, the difference has already been calculated, but we still need to adjust for the calendar.
     	# use copy-pasted functions from calendar module.  (deprecated -- these functions will be removed from C4::Overdues ).
@@ -292,6 +286,7 @@ sub CalcFine {
 		}
 	}
 	# correct for grace period.
+    my $data = C4::Circulation::GetIssuingRuleRecord($bortype, $item->{'itemtype'}, $branchcode);
 	my $days_minus_grace = $daystocharge - $data->{'firstremind'};
     if ($data->{'chargeperiod'} > 0 && $days_minus_grace > 0 ) { 
         $amount = int($daystocharge / $data->{'chargeperiod'}) * $data->{'fine'};
@@ -652,41 +647,6 @@ sub GetFine {
     return ( $data->{'sum(amountoutstanding)'} );
 }
 
-
-=head2 GetIssuingRules
-
-FIXME - This sub should be deprecated and removed.
-It ignores branch and defaults.
-
-    $data = &GetIssuingRules($itemtype,$categorycode);
-
-Looks up for all issuingrules an item info 
-
-C<$itemnumber> is a reference-to-hash whose keys are all of the fields
-from the borrowers and categories tables of the Koha database. Thus,
-
-C<$categorycode> contains  information about borrowers category 
-
-C<$data> contains all information about both the borrower and
-category he or she belongs to.
-=cut 
-
-sub GetIssuingRules {
-	warn "GetIssuingRules is deprecated: use GetIssuingRule from C4::Circulation instead.";
-   my ($itemtype,$categorycode)=@_;
-   my $dbh   = C4::Context->dbh();    
-   my $query=qq|SELECT *
-        FROM issuingrules
-        WHERE issuingrules.itemtype=?
-            AND issuingrules.categorycode=?
-        |;
-    my $sth = $dbh->prepare($query);
-    #  print $query;
-    $sth->execute($itemtype,$categorycode);
-    return $sth->fetchrow_hashref;
-}
-
-
 sub ReplacementCost2 {
     my ( $itemnum, $borrowernumber ) = @_;
     my $dbh   = C4::Context->dbh();
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 4af8a85..267f968 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -417,18 +417,6 @@ sub CanItemBeReserved{
     my $item     = GetItem($itemnumber);
     my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);     
     
-    # we retrieve user rights on this itemtype and branchcode
-    my $sth = $dbh->prepare("SELECT categorycode, itemtype, branchcode, reservesallowed 
-                             FROM issuingrules 
-                             WHERE (categorycode in (?,'*') ) 
-                             AND (itemtype IN (?,'*')) 
-                             AND (branchcode IN (?,'*')) 
-                             ORDER BY 
-                               categorycode DESC, 
-                               itemtype     DESC, 
-                               branchcode   DESC;"
-                           );
-                           
     my $querycount ="SELECT 
                             count(*) as count
                             FROM reserves
@@ -453,8 +441,7 @@ sub CanItemBeReserved{
     }
     
     # we retrieve rights 
-    $sth->execute($categorycode, $itemtype, $branchcode);
-    if(my $rights = $sth->fetchrow_hashref()){
+    if(my $rights = C4::Circulation::GetIssuingRuleRecord($categorycode, $itemtype, $branchcode, 'reservesallowed')){
         $itemtype        = $rights->{itemtype};
         $allowedreserves = $rights->{reservesallowed}; 
     }else{
diff --git a/t/db_dependent/lib/KohaTest/Circulation.pm b/t/db_dependent/lib/KohaTest/Circulation.pm
index b3a1ff8..106c1ba 100644
--- a/t/db_dependent/lib/KohaTest/Circulation.pm
+++ b/t/db_dependent/lib/KohaTest/Circulation.pm
@@ -20,7 +20,9 @@ sub methods : Test( 1 ) {
                       CanBookBeIssued 
                       AddIssue 
                       GetLoanLength 
-                      GetIssuingRule 
+                      GetIssuingRules
+                      GetIssuingRuleRecord
+                      GetIssuingRuleValue
                       GetBranchBorrowerCircRule
                       AddReturn 
                       MarkIssueReturned 
diff --git a/t/db_dependent/lib/KohaTest/Overdues.pm b/t/db_dependent/lib/KohaTest/Overdues.pm
index 13eb1f2..07d9d41 100644
--- a/t/db_dependent/lib/KohaTest/Overdues.pm
+++ b/t/db_dependent/lib/KohaTest/Overdues.pm
@@ -23,7 +23,6 @@ sub methods : Test( 1 ) {
                        BorType 
                        ReplacementCost 
                        GetFine 
-                       GetIssuingRules 
                        ReplacementCost2 
                        GetNextIdNotify 
                        NumberNotifyId
-- 
1.6.5


From Katrin.Fischer.83 at web.de  Thu Dec  8 07:21:56 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Thu,  8 Dec 2011 07:21:56 +0100
Subject: [Koha-patches] [PATCH] Bug 7334: Improve 'no address stored' and
	similar messages in patron account
Message-ID: <1323325316-6034-1-git-send-email-Katrin.Fischer.83@web.de>

- 'no address stored' is now only displayed when first and second line
of the address are empty
- added id's to all 3 possible messages so people can change or hide them

To test:
1) Check 'no address stored' shows only up when address fields are both empty
2) Check address is still correctly displayed

Note: make sure you check the 'checkouts' and other tabs, because there
are 2 different include files used here.
---
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |   20 ++++++++++--------
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |   21 +++++++++++--------
 2 files changed, 23 insertions(+), 18 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 6556562..da3d018 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -12,19 +12,21 @@
 <li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
 [% END %]
 [% END %]
-    <li>[% IF ( address ) %]
-            [% address %]
+    [% IF ( address or address2 ) %]
+        [% IF ( address ) %]
+            <li>[% address %]</li>
+        [% END %]
+        [% IF ( address2 ) %]
+            <li>[% address2 %]</li>
+        [% END %]
     [% ELSE %]
-            <span class="empty">No address stored.</span>
-    [% END %]</li>
-    [% IF ( address2 ) %]
-        <li>[% address2 %]</li>
-    [% END %]<li> 
+            <li><span class="empty" id="noadressstored">No address stored.</span></li>
+    [% END %]
     [% IF ( city ) %]
             [% city %][% IF ( state ) %], [% state %][% END %]
 	    [% zipcode %][% IF ( country ) %], [% country %][% END %]
     [% ELSE %]
-        <span class="empty">No city stored.</span>
+        <span class="empty" id="nocitystored">No city stored.</span>
     [% END %]</li>
     <li>[% IF ( phone ) %]
         [% phone %]
@@ -35,7 +37,7 @@
             [% IF ( phonepro ) %]
                 [% phonepro %]
             [% ELSE %]
-                <span class="empty">No phone stored.</span>    
+                <span class="empty" id="nophonestored">No phone stored.</span>    
             [% END %]
         [% END %]
     [% END %]</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
index fe04b63..451cd98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -14,19 +14,22 @@ in the global namespace %]
 <li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
 [% END %]
 [% END %]
-    <li>[% IF borrower.address %]
-            [% borrower.address %]
+    [% IF ( borrower.address or borrower.address2 ) %]
+        [% IF ( borrower.address ) %]
+            <li>[% borrower.address %]</li>
+        [% END %]
+        [% IF ( borrower.address2 ) %]
+            <li>[% borrower.address2 %]</li>
+        [% END %]
     [% ELSE %]
-            <span class="empty">No address stored.</span>
-    [% END %]</li>
-    [% IF borrower.address2 %]
-        <li>[% borrower.address2 %]</li>
-    [% END %]<li>
+            <li><span class="empty" id="noaddressstored">No address stored.</span></li>
+    [% END %]
+    <li>
     [% IF borrower.city %]
             [% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %]
 	    [% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %]
     [% ELSE %]
-        <span class="empty">No city stored.</span>
+        <span class="empty" id="nocitystored">No city stored.</span>
     [% END %]</li>
     <li>[% IF borrower.phone %]
         [% borrower.phone %]
@@ -37,7 +40,7 @@ in the global namespace %]
             [% IF borrower.phonepro %]
                 [% borrower.phonepro %]
             [% ELSE %]
-                <span class="empty">No phone stored.</span>
+                <span class="empty" id="nophonestored">No phone stored.</span>
             [% END %]
         [% END %]
     [% END %]</li>
-- 
1.7.5.4


From jcamins at cpbibliography.com  Thu Dec  8 15:22:37 2011
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Thu,  8 Dec 2011 09:22:37 -0500
Subject: [Koha-patches] [PATCH] Bug 7332: Translated title (MARC21 242) not
	shown
Message-ID: <1323354157-2125-1-git-send-email-jcamins@cpbibliography.com>

The cataloger-supplied translated title stored in MARC21 field 242 was not being
displayed when XSLT was enabled.

Test plan:
1) Enable XSLT for OPAC Details and Results, and Intranet Details.
2) Create or add a record with a 242 field
3) See that the translated title is not displayed in OPAC Details or Results, or
Intranet Details
4) Apply patch
5) See that the translated title is now displayed in OPAC Details and Results,
and Intranet Details
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   15 +++++++++++++++
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   16 ++++++++++++++++
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |   11 +++++++++++
 3 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 6c640b2..5655437 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -403,6 +403,21 @@
         </span>
        </xsl:if>
 
+        <xsl:if test="marc:datafield[@tag=242]">
+        <span class="results_summary translated_title"><span class="label">Title translated: </span>
+            <xsl:for-each select="marc:datafield[@tag=242]">
+                <xsl:call-template name="chopPunctuation">
+                  <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abchnp</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>
+
         <!-- Uniform Title  Statement: Alternate Graphic Representation (MARC 880) -->
         <xsl:if test="$display880">
             <xsl:call-template name="m880Select">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 2d88880..9773831 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -462,6 +462,22 @@
         </span>
        </xsl:if>
 
+
+        <xsl:if test="marc:datafield[@tag=242]">
+        <span class="results_summary translated_title"><span class="label">Title translated: </span>
+            <xsl:for-each select="marc:datafield[@tag=242]">
+                <xsl:call-template name="chopPunctuation">
+                  <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abchnp</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>
+
         <!-- Uniform Title  Statement: Alternate Graphic Representation (MARC 880) -->
         <xsl:if test="$display880">
             <xsl:call-template name="m880Select">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 9c6c307..d742a29 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -904,6 +904,17 @@
             </xsl:for-each>
 	</span>
     </xsl:if>
+    <xsl:if test="marc:datafield[@tag=242]">
+	<span class="results_summary">
+    <span class="label">Title translated: </span>
+            <xsl:for-each select="marc:datafield[@tag=242]">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abh</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>
-- 
1.7.2.5


From oleonard at myacpl.org  Thu Dec  8 16:24:34 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  8 Dec 2011 10:24:34 -0500
Subject: [Koha-patches] [PATCH] Bug 7337 - "Debarred Until" display in the
	opac tells patrons they are debarred until the year 9999
Message-ID: <1323357874-16738-1-git-send-email-oleonard@myacpl.org>

This patch copies the debarred handling method from circulation.pl for
use on opac-user.pl so that debarred dates and comments can be handled
properly.

I have slightly reworded the message in the OPAC and on circulation.pl
to make the display of the debarred comment a little clearer.
---
 .../prog/en/modules/circ/circulation.tt            |    4 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    4 ++--
 opac/opac-user.pl                                  |   12 ++++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 5627109..e3200ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -565,12 +565,12 @@ No patron matched <span class="ex">[% message %]</span>
 
             [% IF ( userdebarred ) %]
                <li class="blocker">
-               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %]([% debarredcomment %])[% END %]
+               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
                <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
 	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
 	                <input type="hidden" name="destination" value="circ" />
 	                <input type="hidden" name="cardnumber" value="[% cardnumber %]" />
-	                <input type="submit" value="Lift Debarment" />
+	                <input type="submit" value="Lift restriction" />
                </form>
 			</li>[% END %]
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 0971f46..b16936c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -92,8 +92,8 @@ $.tablesorter.addParser({
         [% IF ( BORROWER_INF.flagged ) %]
 		<div class="dialog alert">
         <ul>
-            [% IF ( BORROWER_INF.debarred ) %]
-                <li><strong>Please note:</strong> Your account has been frozen until [% BORROWER_INF.debarred %] - [% BORROWER_INF.debarredcomment %]. Usually the reason for freezing an account is old overdues or damage fees.If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
+            [% IF ( BORROWER_INF.userdebarred ) %]
+                <li><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until [% BORROWER_INF.userdebarreddate %][% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment "[% BORROWER_INF.debarredcomment %]"[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
             [% END %]
             [% IF ( BORROWER_INF.gonenoaddress ) %]
                 <li><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 9806c9f..3b9aa45 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -30,6 +30,7 @@ use C4::Members;
 use C4::Members::AttributeTypes;
 use C4::Members::Attributes qw/GetBorrowerAttributeValue/;
 use C4::Output;
+use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Biblio;
 use C4::Items;
 use C4::Dates qw/format_date/;
@@ -78,7 +79,15 @@ for (qw(dateenrolled dateexpiry dateofbirth)) {
 }
 $borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
 
-if ( $borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
+my $debar = CheckBorrowerDebarred($borrowernumber);
+if ($debar) {
+    $borr->{'userdebarred'} = 1;
+    if ( $debar ne "9999-12-31" ) {
+        $borr->{'userdebarreddate'} = C4::Dates::format_date($debar);
+    }
+}
+
+if ( $borr->{'userdebarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
     $borr->{'flagged'} = 1;
 }
 
@@ -104,7 +113,6 @@ if ( $borr->{'amountoutstanding'} < 0 ) {
 }
 
 $borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
-$borr->{'debarred'} = C4::Dates->new($borr->{'debarred'},'iso')->output;
 
 my @bordat;
 $bordat[0] = $borr;
-- 
1.7.3


From oleonard at myacpl.org  Thu Dec  8 17:11:21 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  8 Dec 2011 11:11:21 -0500
Subject: [Koha-patches] [PATCH] Bug 7336 - memberentry.pl generates an error
	in the log
Message-ID: <1323360681-20274-1-git-send-email-oleonard@myacpl.org>

Adding check for the existence of a variable in
order to quiet errors in the log.
---
 members/memberentry.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/members/memberentry.pl b/members/memberentry.pl
index d169dbd..c047873 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -649,7 +649,7 @@ if (C4::Context->preference('uppercasesurnames')) {
 }
 
 $data{debarred} = C4::Overdues::CheckBorrowerDebarred($borrowernumber);
-$data{datedebarred} = $data{debarred} if ( $data{debarred} ne "9999-12-31" );
+$data{datedebarred} = $data{debarred} if ( $data{debarred} && $data{debarred} ne "9999-12-31" );
 foreach (qw(dateenrolled dateexpiry dateofbirth datedebarred)) {
 	$data{$_} = format_date($data{$_});	# back to syspref for display
 	$template->param( $_ => $data{$_});
-- 
1.7.3


From oleonard at myacpl.org  Thu Dec  8 18:35:58 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  8 Dec 2011 12:35:58 -0500
Subject: [Koha-patches] [PATCH] Bug 7337 - "Debarred Until" display in the
	opac tells patrons they are debarred until the year 9999
Message-ID: <1323365758-20810-1-git-send-email-oleonard@myacpl.org>

This patch copies the debarred handling method from circulation.pl for
use on opac-user.pl so that debarred dates and comments can be handled
properly.

I have slightly reworded the message in the OPAC and on circulation.pl
to make the display of the debarred comment a little clearer.

Revision adds missing handling of debarred status with regard to
renewal operations. Renew links and buttons were not being hidden
from debarred users.
---
 .../prog/en/modules/circ/circulation.tt            |    4 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |   16 ++++++----------
 opac/opac-user.pl                                  |   16 ++++++++++++++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 5627109..e3200ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -565,12 +565,12 @@ No patron matched <span class="ex">[% message %]</span>
 
             [% IF ( userdebarred ) %]
                <li class="blocker">
-               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %]([% debarredcomment %])[% END %]
+               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
                <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
 	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
 	                <input type="hidden" name="destination" value="circ" />
 	                <input type="hidden" name="cardnumber" value="[% cardnumber %]" />
-	                <input type="submit" value="Lift Debarment" />
+	                <input type="submit" value="Lift restriction" />
                </form>
 			</li>[% END %]
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 0971f46..b78fc03 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -27,7 +27,7 @@ $.tablesorter.addParser({
             }); 
 			$("#overduest").tablesorter();
 [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
-        [% IF ( OpacRenewalAllowed ) %][% IF ( canrenew ) %]$("#renewselected").submit(function(){
+        [% IF ( OpacRenewalAllowed && canrenew && !userdebarred ) %]$("#renewselected").submit(function(){
             valid = false;
             $("input[type=checkbox]").each(function(){
                 if($(this).is(':checked')){
@@ -45,7 +45,7 @@ $.tablesorter.addParser({
         $("#renewall_link").live('click',function(){
             $("#renewall").submit();
         });
-        $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");[% END %][% END %]
+        $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");[% END %]
             });
 //]]>
 </script>
@@ -92,8 +92,8 @@ $.tablesorter.addParser({
         [% IF ( BORROWER_INF.flagged ) %]
 		<div class="dialog alert">
         <ul>
-            [% IF ( BORROWER_INF.debarred ) %]
-                <li><strong>Please note:</strong> Your account has been frozen until [% BORROWER_INF.debarred %] - [% BORROWER_INF.debarredcomment %]. Usually the reason for freezing an account is old overdues or damage fees.If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
+            [% IF ( userdebarred ) %]
+                <li><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until [% BORROWER_INF.userdebarreddate %][% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment "[% BORROWER_INF.debarredcomment %]"[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
             [% END %]
             [% IF ( BORROWER_INF.gonenoaddress ) %]
                 <li><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
@@ -260,14 +260,11 @@ $.tablesorter.addParser({
             </tr>
         [% END %]</tbody>
         </table>
-	   [% IF ( canrenew ) %]
-		[% IF ( OpacRenewalAllowed ) %]
+	   [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
 		<input type="submit" value="Renew Selected" />
 		[% END %]
-        [% END %]
 		</form>
-		[% IF ( OpacRenewalAllowed ) %]
-        [% IF ( canrenew ) %]
+        [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
 		<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
 			<input type="hidden" name="from" value="opac_user" />
 			<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
@@ -277,7 +274,6 @@ $.tablesorter.addParser({
 			[% UNLESS patron_flagged %]<input type="submit" value="Renew All" />[% END %]
 		</form>
 		[% END %]
-        [% END %]
     [% ELSE %]
         <table>
             <tr><td>You have nothing checked out</td></tr>
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 9806c9f..b94a05f 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -30,6 +30,7 @@ use C4::Members;
 use C4::Members::AttributeTypes;
 use C4::Members::Attributes qw/GetBorrowerAttributeValue/;
 use C4::Output;
+use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Biblio;
 use C4::Items;
 use C4::Dates qw/format_date/;
@@ -78,7 +79,18 @@ for (qw(dateenrolled dateexpiry dateofbirth)) {
 }
 $borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
 
-if ( $borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
+my $debar = CheckBorrowerDebarred($borrowernumber);
+my $userdebarred;
+
+if ($debar) {
+    $userdebarred = 1;
+    $template->param( 'userdebarred' => $userdebarred );
+    if ( $debar ne "9999-12-31" ) {
+        $borr->{'userdebarreddate'} = C4::Dates::format_date($debar);
+    }
+}
+
+if ( $userdebarred || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
     $borr->{'flagged'} = 1;
 }
 
@@ -104,7 +116,6 @@ if ( $borr->{'amountoutstanding'} < 0 ) {
 }
 
 $borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
-$borr->{'debarred'} = C4::Dates->new($borr->{'debarred'},'iso')->output;
 
 my @bordat;
 $bordat[0] = $borr;
@@ -127,6 +138,7 @@ $template->param(   BORROWER_INFO     => \@bordat,
                     OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
                     surname           => $borr->{surname},
                     showname          => $borr->{showname},
+
                 );
 
 #get issued items ....
-- 
1.7.3


From srdjan at catalyst.net.nz  Fri Dec  9 05:13:12 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Fri,  9 Dec 2011 17:13:12 +1300
Subject: [Koha-patches] [PATCH] bug_6488: Take in account opachiddenitems
	when searching in opac
In-Reply-To: <bug 6488>
References: <bug 6488>
Message-ID: <1323403992-7177-1-git-send-email-srdjan@catalyst.net.nz>

Changed searchResults() interface
Added trailing \n when parsing OpacHiddenItems to make YAML happy
XSLTParse4Display() and buildKohaItemsNamespace() take hidden
items as input param
Removed numbering from the search results, looks wrong with
hidden items
---
 C4/Items.pm                                        |   52 +++++++------
 C4/Search.pm                                       |   83 +++++++++++---------
 C4/XSLT.pm                                         |   11 ++-
 catalogue/search.pl                                |    2 +-
 cataloguing/addbooks.pl                            |    2 +-
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    1 -
 opac/opac-search.pl                                |    4 +-
 7 files changed, 86 insertions(+), 69 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 0756832..a8801ca 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1630,41 +1630,45 @@ sub GetHiddenItemnumbers {
     my @resultitems;
 
     my $yaml = C4::Context->preference('OpacHiddenItems');
+    $yaml = "$yaml\n"; # YAML is anal on ending \n. Surplus does not hurt
     my $hidingrules;
     eval {
-    	$hidingrules = YAML::Load($yaml);
+        $hidingrules = YAML::Load($yaml);
     };
     if ($@) {
-    	warn "Unable to parse OpacHiddenItems syspref : $@";
-    	return ();
-    } else {
+        warn "Unable to parse OpacHiddenItems syspref : $@";
+        return ();
+    }
     my $dbh = C4::Context->dbh;
 
-	# For each item
-	foreach my $item (@items) {
+    # For each item
+    foreach my $item (@items) {
 
-	    # We check each rule
-	    foreach my $field (keys %$hidingrules) {
-		my $query = "SELECT $field from items where itemnumber = ?";
-		my $sth = $dbh->prepare($query);	
-		$sth->execute($item->{'itemnumber'});
-		my ($result) = $sth->fetchrow;
+        # We check each rule
+        foreach my $field (keys %$hidingrules) {
+            my $val;
+            if (exists $item->{$field}) {
+                $val = $item->{$field};
+            }
+            else {
+                my $query = "SELECT $field from items where itemnumber = ?";
+                $val = $dbh->selectrow_array($query, undef, $item->{'itemnumber'});
+            }
+            $val = '' unless defined $val;
 
-		# If the results matches the values in the yaml file
-		if (any { $result eq $_ } @{$hidingrules->{$field}}) {
+            # If the results matches the values in the yaml file
+            if (any { $val eq $_ } @{$hidingrules->{$field}}) {
 
-		    # We add the itemnumber to the list
-		    push @resultitems, $item->{'itemnumber'};	    
+                # We add the itemnumber to the list
+                push @resultitems, $item->{'itemnumber'};	    
 
-		    # If at least one rule matched for an item, no need to test the others
-		    last;
-		}
-	    }
-	}
-	return @resultitems;
+                # If at least one rule matched for an item, no need to test the others
+                last;
+            }
+        }
     }
-
- }
+    return @resultitems;
+}
 
 =head3 get_item_authorised_values
 
diff --git a/C4/Search.pm b/C4/Search.pm
index fdb3479..a9d47ac 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -31,6 +31,7 @@ use C4::Branch;
 use C4::Reserves;    # CheckReserves
 use C4::Debug;
 use C4::Items;
+use C4::Charset;
 use YAML;
 use URI::Escape;
 
@@ -1413,11 +1414,16 @@ Format results in a form suitable for passing to the template
 # IMO this subroutine is pretty messy still -- it's responsible for
 # building the HTML output for the template
 sub searchResults {
-    my ( $search_context, $searchdesc, $hits, $results_per_page, $offset, $scan, @marcresults, $hidelostitems ) = @_;
+    my ( $search_context, $searchdesc, $hits, $results_per_page, $offset, $scan, $marcresults ) = @_;
     my $dbh = C4::Context->dbh;
     my @newresults;
 
-    $search_context = 'opac' unless $search_context eq 'opac' or $search_context eq 'intranet';
+    $search_context = 'opac' if !$search_context || $search_context ne 'intranet';
+    my ($is_opac, $hidelostitems);
+    if ($search_context eq 'opac') {
+        $hidelostitems = C4::Context->preference('hidelostitems');
+        $is_opac       = 1;
+    }
 
     #Build branchnames hash
     #find branchname
@@ -1480,12 +1486,11 @@ sub searchResults {
 	my $marcflavour = C4::Context->preference("marcflavour");
     # We get the biblionumber position in MARC
     my ($bibliotag,$bibliosubf)=GetMarcFromKohaField('biblio.biblionumber','');
-    my $fw;
 
     # loop through all of the records we've retrieved
     for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) {
-        my $marcrecord = MARC::File::USMARC::decode( $marcresults[$i] );
-        $fw = $scan
+        my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] );
+        my $fw = $scan
              ? undef
              : $bibliotag < 10
                ? GetFrameworkCode($marcrecord->field($bibliotag)->data)
@@ -1603,18 +1608,18 @@ sub searchResults {
         my $other_count           = 0;
         my $wthdrawn_count        = 0;
         my $itemlost_count        = 0;
+        my $hideatopac_count      = 0;
         my $itembinding_count     = 0;
         my $itemdamaged_count     = 0;
         my $item_in_transit_count = 0;
         my $can_place_holds       = 0;
-	my $item_onhold_count     = 0;
+        my $item_onhold_count     = 0;
         my $items_count           = scalar(@fields);
-        my $maxitems =
-          ( C4::Context->preference('maxItemsinSearchResults') )
-          ? C4::Context->preference('maxItemsinSearchResults') - 1
-          : 1;
+        my $maxitems_pref = C4::Context->preference('maxItemsinSearchResults');
+        my $maxitems = $maxitems_pref ? $maxitems_pref - 1 : 1;
 
         # loop through every item
+	      my @hiddenitems;
         foreach my $field (@fields) {
             my $item;
 
@@ -1624,9 +1629,11 @@ sub searchResults {
             }
 
 	        # Hidden items
-	        my @items = ($item);
-	        my (@hiddenitems) = GetHiddenItemnumbers(@items);
-    	    $item->{'hideatopac'} = 1 if (@hiddenitems); 
+            if ($is_opac) {
+	            my @hi = GetHiddenItemnumbers($item);
+    	        $item->{'hideatopac'} = @hi; 
+              push @hiddenitems, @hi;
+            }
 
             my $hbranch     = C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch' ? 'homebranch'    : 'holdingbranch';
             my $otherbranch = C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch' ? 'holdingbranch' : 'homebranch';
@@ -1710,6 +1717,7 @@ sub searchResults {
                     $wthdrawn_count++        if $item->{wthdrawn};
                     $itemlost_count++        if $item->{itemlost};
                     $itemdamaged_count++     if $item->{damaged};
+                    $hideatopac_count++      if $item->{hideatopac};
                     $item_in_transit_count++ if $transfertwhen ne '';
 		    $item_onhold_count++     if $reservestatus eq 'Waiting';
                     $item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
@@ -1748,11 +1756,11 @@ sub searchResults {
                 }
             }
         }    # notforloan, item level and biblioitem level
+
+        next if $is_opac       && $hideatopac_count >= $items_count;
+        next if $hidelostitems && $itemlost_count   >= $items_count;
+
         my ( $availableitemscount, $onloanitemscount, $otheritemscount );
-        $maxitems =
-          ( C4::Context->preference('maxItemsinSearchResults') )
-          ? C4::Context->preference('maxItemsinSearchResults') - 1
-          : 1;
         for my $key ( sort keys %$onloan_items ) {
             (++$onloanitemscount > $maxitems) and last;
             push @onloan_items_loop, $onloan_items->{$key};
@@ -1766,20 +1774,7 @@ sub searchResults {
             push @available_items_loop, $available_items->{$key}
         }
 
-        # XSLT processing of some stuff
-	use C4::Charset;
-	SetUTF8Flag($marcrecord);
-	$debug && warn $marcrecord->as_formatted;
-        if (!$scan && $search_context eq 'opac' && C4::Context->preference("OPACXSLTResultsDisplay")) {
-            # 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);
-                # 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 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;
@@ -1803,8 +1798,8 @@ sub searchResults {
         $oldbiblio->{intransitcount}       = $item_in_transit_count;
         $oldbiblio->{onholdcount}          = $item_onhold_count;
         $oldbiblio->{orderedcount}         = $ordered_count;
-        $oldbiblio->{isbn} =~
-          s/-//g;    # deleting - in isbn to enable amazon content
+        # deleting - in isbn to enable amazon content
+        $oldbiblio->{isbn} =~ s/-//g;
 
         if (C4::Context->preference("AlternateHoldingsField") && $items_count == 0) {
             my $fieldspec = C4::Context->preference("AlternateHoldingsField");
@@ -1834,10 +1829,24 @@ sub searchResults {
             $oldbiblio->{'alternateholdings_count'} = $alternateholdingscount;
         }
 
-        push( @newresults, $oldbiblio )
-            if(not $hidelostitems
-               or (($items_count > $itemlost_count )
-                    && $hidelostitems));
+       # 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 );
     }
 
     return @newresults;
diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 8bc4000..41fca01 100755
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -121,12 +121,12 @@ sub getAuthorisedValues4MARCSubfields {
 my $stylesheet;
 
 sub XSLTParse4Display {
-    my ( $biblionumber, $orig_record, $xsl_suffix, $interface, $fixamps ) = @_;
+    my ( $biblionumber, $orig_record, $xsl_suffix, $interface, $fixamps, $hidden_items ) = @_;
     $interface = 'opac' unless $interface;
     # grab the XML, run it through our stylesheet, push it out to the browser
     my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
     #return $record->as_formatted();
-    my $itemsxml  = buildKohaItemsNamespace($biblionumber);
+    my $itemsxml  = buildKohaItemsNamespace($biblionumber, $hidden_items);
     my $xmlrecord = $record->as_xml(C4::Context->preference('marcflavour'));
     my $sysxml = "<sysprefs>\n";
     foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow
@@ -180,8 +180,13 @@ sub XSLTParse4Display {
 }
 
 sub buildKohaItemsNamespace {
-    my ($biblionumber) = @_;
+    my ($biblionumber, $hidden_items) = @_;
+
     my @items = C4::Items::GetItemsInfo($biblionumber);
+    if ($hidden_items && @$hidden_items) {
+        my %hi = map {$_ => 1} @$hidden_items;
+        @items = grep { !$hi{$_->{itemnumber}} } @items;
+    }
     my $branches = GetBranches();
     my $itemtypes = GetItemTypes();
     my $xml = '';
diff --git a/catalogue/search.pl b/catalogue/search.pl
index 907efdb..24f2978 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -547,7 +547,7 @@ for (my $i=0;$i<@servers;$i++) {
         $hits = $results_hashref->{$server}->{"hits"};
         my $page = $cgi->param('page') || 0;
         my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan,
-                                       @{$results_hashref->{$server}->{"RECORDS"}});
+                                       $results_hashref->{$server}->{"RECORDS"});
         $total = $total + $results_hashref->{$server}->{"hits"};
         ## If there's just one result, redirect to the detail page
         if ($total == 1) {         
diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index 5e89ef8..38e8024 100755
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -86,7 +86,7 @@ if ($query) {
     # format output
     # SimpleSearch() give the results per page we want, so 0 offet here
     my $total = @{$marcresults};
-    my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, @{$marcresults} );
+    my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, $marcresults );
     $template->param(
         total          => $total_hits,
         query          => $query,
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 7201a82..deda677 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -380,7 +380,6 @@ $(document).ready(function(){
                 <td class="select selectcol">[% IF ( opacbookbag ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% ELSE %]
 [% IF ( virtualshelves ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% ELSE %]
 [% IF ( RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( opacuserlogin ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% END %][% END %][% END %][% END %][% END %]</td>
-                <td class="select selectcol">[% SEARCH_RESULT.result_number %].</td>
 
 				[% UNLESS ( item_level_itypes ) %]
                 [% UNLESS ( noItemTypeImages ) %]
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 42eb0ec..13d9f0d 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -487,12 +487,12 @@ for (my $i=0;$i<@servers;$i++) {
                 # we want as specified by $offset and $results_per_page,
                 # we need to set the offset parameter of searchResults to 0
                 my @group_results = searchResults( 'opac', $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
-                                                   @{ $group->{"RECORDS"} }, C4::Context->preference('hidelostitems'));
+                                                   $group->{"RECORDS"});
                 push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results };
             }
         } else {
             @newresults = searchResults('opac', $query_desc, $hits, $results_per_page, $offset, $scan,
-                                        @{$results_hashref->{$server}->{"RECORDS"}},, C4::Context->preference('hidelostitems'));
+                                        $results_hashref->{$server}->{"RECORDS"});
         }
 		my $tag_quantity;
 		if (C4::Context->preference('TagsEnabled') and
-- 
1.6.5


From Katrin.Fischer.83 at web.de  Fri Dec  9 07:44:05 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri,  9 Dec 2011 07:44:05 +0100
Subject: [Koha-patches] [PATCH] Bug 7338: Link on serial collection page
	wrong
Message-ID: <1323413045-5300-1-git-send-email-Katrin.Fischer.83@web.de>

This was a scoping error. The links are not supposed to show up
when you open that page with a subscription id in the URL.

To test:
1) Check links don't show up now.
---
 .../prog/en/modules/serials/serials-collection.tt  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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 93c4fdc..f7538b7 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
@@ -183,7 +183,7 @@ $(document).ready(function() {
 <div id="subscription-year-[% year.year %]">
         <table>
 	  <tr>
-[% UNLESS ( year.onesubscription ) %]
+[% UNLESS ( onesubscription ) %]
                 <th># Subs</th>
 [% END %]
                 <th>Date published
@@ -205,7 +205,7 @@ $(document).ready(function() {
             </tr>
       [% FOREACH serial IN year.serials %]
     [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
-[% UNLESS ( serial.onesubscription ) %]
+[% UNLESS ( onesubscription ) %]
                  <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid %]">[% serial.subscriptionid %]</a></td>
 [% END %]
                 <td>
-- 
1.7.5.4


From alex.arnaud at biblibre.com  Fri Dec  9 10:45:24 2011
From: alex.arnaud at biblibre.com (alex.arnaud at biblibre.com)
Date: Fri,  9 Dec 2011 10:45:24 +0100
Subject: [Koha-patches] [PATCH] bug 7342 - neworderempty: Fix empty values
	in statistic 1 and 2 dropboxes
Message-ID: <1323423924-12008-1-git-send-email-alex.arnaud@biblibre.com>

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

---
 acqui/fetch_sort_dropbox.pl                        |   74 ++++++++++++++++++++
 .../prog/en/modules/acqui/neworderempty.tt         |   10 ++--
 2 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100755 acqui/fetch_sort_dropbox.pl

diff --git a/acqui/fetch_sort_dropbox.pl b/acqui/fetch_sort_dropbox.pl
new file mode 100755
index 0000000..4045016
--- /dev/null
+++ b/acqui/fetch_sort_dropbox.pl
@@ -0,0 +1,74 @@
+#!/usr/bin/perl
+
+# Copyright 2008-2009 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use strict;
+use CGI;
+use C4::Context;
+use C4::Output;
+use C4::Auth;
+use C4::Budgets;
+
+=head1
+
+fetch_sort_dropbox : 
+
+=cut
+
+my $input = new CGI;
+
+my $budget_id = $input->param('budget_id');
+my $sort_id   = $input->param('sort');
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {   template_name   => "acqui/ajax.tmpl", # FIXME: REMOVE TMPL DEP?
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired => {editcatalogue => 'edit_catalogue'},
+        debug => 0,
+    }
+);
+
+#my $dropbox_values;
+my $budget = GetBudget($budget_id);
+my $dropbox_values = GetAuthvalueDropbox( $budget->{'sort'.$sort_id.'_authcat'}, '' );
+
+my @authorised_values;
+my %authorised_lib;
+
+foreach ( @$dropbox_values) {
+    push @authorised_values, $_->{value};
+    $authorised_lib{$_->{value}} = $_->{label};
+}
+
+my $budget_authvalue_dropbox = CGI::scrolling_list(
+    -values   => \@authorised_values,
+    -labels   => \%authorised_lib,
+    -default  => $authorised_values[0],
+);
+
+
+#strip off select tags ;/
+$budget_authvalue_dropbox =~ s/^\<select.*?\"\>//;
+$budget_authvalue_dropbox =~ s/\<\/select\>$//;
+chomp $budget_authvalue_dropbox;
+
+$template->param( return => $budget_authvalue_dropbox );
+output_html_with_http_headers $input, $cookie, $template->output;
+1;
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 d58582e..26db40d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -475,9 +475,9 @@ $(document).ready(function()
                     <select id="sort1" size="1" name="sort1">
                     [% FOREACH sort_opt IN CGIsort1 %]
                        [% IF sort_opt.default %]
-                          <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
+                          <option value="[% sort_opt.value %]" selected="selected">[% sort_opt.label %]</option>
                         [% ELSE %]
-                          <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
+                          <option value="[% sort_opt.value %]">[% sort_opt.label %]</option>
                         [% END %]
                     [% END %]
                     </select>
@@ -490,12 +490,12 @@ $(document).ready(function()
                 <label for="sort2">Statistic 2: </label>
 
                 [% IF CGIsort2 %]
-                    <select id="sort2" size="1" name="sort1">
+                    <select id="sort2" size="1" name="sort2">
                     [% FOREACH sort_opt IN CGIsort2 %]
                        [% IF sort_opt.default %]
-                          <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
+                          <option value="[% sort_opt.value %]" selected="selected">[% sort_opt.label %]</option>
                         [% ELSE %]
-                          <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
+                          <option value="[% sort_opt.value %]">[% sort_opt.label %]</option>
                         [% END %]
                     [% END %]
                     </select>
-- 
1.7.0.4


From alex.arnaud at biblibre.com  Fri Dec  9 14:03:40 2011
From: alex.arnaud at biblibre.com (alex.arnaud at biblibre.com)
Date: Fri,  9 Dec 2011 14:03:40 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6694: Problem with
	casAuthentication syspref
Message-ID: <1323435820-13186-1-git-send-email-alex.arnaud@biblibre.com>

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

A missing test in checkauth caused anonymous session to be destroyed and
re-created at every call when this syspref was set.
Almost the same issue is also fixed in check_api_auth, which caused
C4::Service->init to fail.

Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
---
 C4/Auth.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index e360e10..17b8469 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -688,7 +688,8 @@ sub checkauth {
             $userid   = $session->param('id');
 			$sessiontype = $session->param('sessiontype');
         }
-        if ( ($query->param('koha_login_context')) && ($query->param('userid') ne $session->param('id')) ) {
+        if ( ( ($query->param('koha_login_context')) && ($query->param('userid') ne $session->param('id')) )
+          || ( $cas && $query->param('ticket') ) ) {
             #if a user enters an id ne to the id in the current session, we need to log them in...
             #first we need to clear the anonymous session...
             $debug and warn "query id = " . $query->param('userid') . " but session id = " . $session->param('id');
@@ -751,7 +752,7 @@ sub checkauth {
        	C4::Context->_new_userenv($sessionID);
         $cookie = $query->cookie(CGISESSID => $sessionID);
 	    $userid    = $query->param('userid');
-    	    if ($cas || $userid) {
+            if (($cas && $query->param('ticket')) || $userid) {
         	my $password = $query->param('password');
 		my ($return, $cardnumber);
 		if ($cas && $query->param('ticket')) {
@@ -1117,7 +1118,7 @@ sub check_api_auth {
     unless ($query->param('userid')) {
         $sessionID = $query->cookie("CGISESSID");
     }
-    if ($sessionID && not $cas) {
+    if ($sessionID && not ($cas && $query->param('PT')) ) {
         my $session = get_session($sessionID);
         C4::Context->_new_userenv($sessionID);
         if ($session) {
-- 
1.7.0.4


From jcamins at cpbibliography.com  Sat Dec 10 20:26:59 2011
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Sat, 10 Dec 2011 14:26:59 -0500
Subject: [Koha-patches] [PATCH] Bug 1633: Add support for uploading images
	to Koha
Message-ID: <1323545219-15281-1-git-send-email-jcamins@cpbibliography.com>

A frequently-requested feature for Koha, especially by special libraries, is the
ability to upload local cover images into Koha. This patch adds that ability.

This counter-patch builds on the work by Koustubha Kale at Anant Corporation,
but adds the following additional features:
1. Moves the code for handling image retrieval/saving into the Koha namespace
2. The ability to have multiple cover images for a biblio
3. Handling for "full size" (800x600) and thumbnail-size (200x140) images
4. A separate image viewer page
5. Javascript-based handling of cover image placement for the cover images in
   the OPAC (as opposed to static <img /> tags embedded into pages)
6. Local cover display in the staff client
7. Uploading images directly from the record view

How to use/test :
Assign user permission to the user Tools > (upload_local_cover_images Upload
local cover images).  In order to upload local  images, login to the staff
client. Go to Home ? Tools ? Upload Cover Images. Here you can upload cover
images either singly or in bulk in the form of a zip file.  If uploading singly,
click on image file, browse the image from your local disk, type in the biblio
number of the catalogue entry and press upload.  If uploading in bulk as a zip
file, the zip file must contain (in addition to cover images) one text file named
either datalink.txt OR idlink.txt. This file should have mapping of biblionumber
to image file name in the zip one per line with comma or tab as delimiters. For
example:

1, scanned_cover_image_of_bib_no_1.jpg
2, scanned_cover_image_of_bib_no_1.jpg

Cover images will be resized to a large image of 800x600 and a thumbnail of
200x140. Depending on the setting of AllowMultipleCovers, it is possible to
upload multiple images for a single bibliographic record. However, even if
multiple covers are permitted, you have the option of replacing the existing
covers by checking the "Replace existing covers" option on the upload screen.

1. The patch adds a menu link in Tools from where you can upload local cover
   images
2. It adds a user permission to enable access control to this menu item under
   Tools
3. It adds a system preference OPACLocalCoverImages under Enhanced Content.
   This needs to be turned on to show local cover images in OPAC.

Once you have uploaded local images, if you search for the biblio, the local
cover should show up in search as well as search detail pages in the OPAC, and
the details view in the Intranet.

Koustubha Kale is working on another patch which will allow us to set a cover
image source priority in system preferences, and which will then gracefully
fail over to the next source if image is not available from the first choice
source.

Detailed test plan:
1.  Install update (database updates are in
    installer/data/mysql/atomicupdate/local_cover_images.pl)
2.  Enable LocalCoverImages and OPACLocalCoverImages in the Enhanced content
    preferences screen
3.  Upload an image of type GIF, JPEG, PNG, or XPM either from the "Local Cover
    Image" tool and choosing "Image file" as its type and entering a valid
    biblionumber, or by viewing a record and clicking the "Upload Image" option
    under the Edit button in the toolbar
4.  View the record in the Intranet and OPAC. The image should show up directly
    in OPAC search results and details, and there should be an "Images" tab on
    both the Intranet and the OPAC detail view
5.  Upload another image and attach it to the same bibliographic record.
6.  Confirm that the new image (only) shows up in the OPAC and Intranet
7.  Change the AllowMultipleCovers to "Allow" in the Enhanced content preferences
    screen
8.  Add several images to a bibliographic record
9.  Confirm that they all show up in the "Images" tab on the Intranet and OPAC
    and only one shows up in the main display in the OPAC details and search
    results pages
10. Create a zip file containing at least one image and a text file "idlink.txt"
    with one or more lines that looks like this:
    1, filename.jpg
    Replace the '1' with a valid biblionumber, and 'filename.jpg' with the name
    of the image file you are adding to the zip file
11. Upload the zip file from the "Local Cover Image" tool (being sure to choose
    "zip file" as the filetype)
12. Check that the image(s) have been attached to the appropriate bibliographic
    record(s)

Special thanks to Koustubha Kale and Anant Corporation for the initial
implementation of local cover images, and to Chris Nighswonger of Foundation
Bible College for his prior work on patron images.
---
 C4/Auth.pm                                         |    5 +-
 C4/UploadedFile.pm                                 |   18 ++
 Koha/Images.pm                                     |  149 +++++++++++++++++
 catalogue/detail.pl                                |    6 +
 catalogue/image.pl                                 |  111 +++++++++++++
 catalogue/imageviewer.pl                           |   51 ++++++
 .../data/mysql/atomicupdate/local_cover_images.pl  |   20 +++
 .../data/mysql/en/mandatory/userpermissions.sql    |    1 +
 installer/data/mysql/kohastructure.sql             |   15 ++
 installer/data/mysql/sysprefs.sql                  |    4 +-
 .../intranet-tmpl/prog/en/css/staff-global.css     |    3 +
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    3 +-
 .../prog/en/includes/doc-head-close.inc            |    8 +
 .../intranet-tmpl/prog/en/includes/tools-menu.inc  |    3 +
 koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js  |   44 +++++
 .../admin/preferences/enhanced_content.pref        |   19 +++
 .../prog/en/modules/catalogue/detail.tt            |   12 ++
 .../prog/en/modules/catalogue/imageviewer.tt       |   43 +++++
 .../prog/en/modules/tools/tools-home.tt            |    5 +
 .../prog/en/modules/tools/upload-images.tt         |  130 +++++++++++++++
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    9 +
 koha-tmpl/opac-tmpl/prog/en/js/localcovers.js      |   44 +++++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   18 ++
 .../opac-tmpl/prog/en/modules/opac-imageviewer.tt  |   43 +++++
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    2 +
 opac/opac-detail.pl                                |   11 ++
 opac/opac-image.pl                                 |  111 +++++++++++++
 opac/opac-imageviewer.pl                           |   51 ++++++
 opac/opac-search.pl                                |    4 +
 tools/upload-cover-image.pl                        |  167 ++++++++++++++++++++
 30 files changed, 1107 insertions(+), 3 deletions(-)
 create mode 100644 Koha/Images.pm
 create mode 100755 catalogue/image.pl
 create mode 100755 catalogue/imageviewer.pl
 create mode 100644 installer/data/mysql/atomicupdate/local_cover_images.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/js/localcovers.js
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
 create mode 100755 opac/opac-image.pl
 create mode 100755 opac/opac-imageviewer.pl
 create mode 100755 tools/upload-cover-image.pl

diff --git a/C4/Auth.pm b/C4/Auth.pm
index e360e10..2b997dd 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -389,7 +389,9 @@ sub get_template_and_user {
             virtualshelves              => C4::Context->preference("virtualshelves"),
             StaffSerialIssueDisplayCount => C4::Context->preference("StaffSerialIssueDisplayCount"),
             NoZebra                     => C4::Context->preference('NoZebra'),
-		EasyAnalyticalRecords => C4::Context->preference('EasyAnalyticalRecords'),
+            EasyAnalyticalRecords       => C4::Context->preference('EasyAnalyticalRecords'),
+            LocalCoverImages            => C4::Context->preference('LocalCoverImages'),
+            AllowMultipleCovers         => C4::Context->preference('AllowMultipleCovers'),
         );
     }
     else {
@@ -494,6 +496,7 @@ sub get_template_and_user {
             SyndeticsAwards              => C4::Context->preference("SyndeticsAwards"),
             SyndeticsSeries              => C4::Context->preference("SyndeticsSeries"),
             SyndeticsCoverImageSize      => C4::Context->preference("SyndeticsCoverImageSize"),
+            OPACLocalCoverImages         => C4::Context->preference("OPACLocalCoverImages"),
         );
 
         $template->param(OpacPublic => '1') if ($user || C4::Context->preference("OpacPublic"));
diff --git a/C4/UploadedFile.pm b/C4/UploadedFile.pm
index da29c1f..e8c9080 100644
--- a/C4/UploadedFile.pm
+++ b/C4/UploadedFile.pm
@@ -159,6 +159,24 @@ sub name {
     }
 }
 
+=head2 filename
+
+  my $filename = $uploaded_file->filename();
+
+Accessor method for the name by which the file is to be known.
+
+=cut
+
+sub filename {
+    my $self = shift;
+    if (@_) {
+        $self->{'tmp_file_name'} = shift;
+        $self->_serialize();
+    } else {
+        return $self->{'tmp_file_name'};
+    }
+}
+
 =head2 max_size
 
   my $max_size = $uploaded_file->max_size();
diff --git a/Koha/Images.pm b/Koha/Images.pm
new file mode 100644
index 0000000..80ef437
--- /dev/null
+++ b/Koha/Images.pm
@@ -0,0 +1,149 @@
+package Koha::Images;
+use strict;
+use warnings;
+use 5.010;
+
+use C4::Context;
+use GD;
+
+use vars qw($debug $VERSION @ISA @EXPORT);
+
+BEGIN {
+	# set the version for version checking
+	$VERSION = 3.03;
+	require Exporter;
+	@ISA    = qw(Exporter);
+	@EXPORT = qw(
+        &PutImage 
+        &RetrieveImage
+        &ListImagesForBiblio
+        &DelImage
+    );
+	$debug = $ENV{KOHA_DEBUG} || $ENV{DEBUG} || 0;
+}
+
+=head2 PutImage
+
+    PutImage($biblionumber, $srcimage, $replace);
+
+Stores binary image data and thumbnail in database, optionally replacing existing images for the given biblio.
+
+=cut
+
+sub PutImage {
+    my ($biblionumber, $srcimage, $replace) = @_;
+
+    return -1 unless defined($srcimage);
+
+    if ($replace) {
+        foreach (ListImagesForBiblio($biblionumber)) {
+            DelImage($_);
+        }
+    }
+
+    my $dbh = C4::Context->dbh;
+    my $query = "INSERT INTO biblioimages (biblionumber, mimetype, imagefile, thumbnail) VALUES (?,?,?,?);";
+    my $sth = $dbh->prepare($query);
+
+    my $mimetype = 'image/png';	# GD autodetects three basic image formats: PNG, JPEG, XPM; we will convert all to PNG which is lossless...
+# Check the pixel size of the image we are about to import...
+    my $thumbnail = _scale_image($srcimage, 140, 200);    # MAX pixel dims are 140 X 200 for thumbnail...
+    my $fullsize = _scale_image($srcimage, 600, 800);   # MAX pixel dims are 600 X 800 for full-size image...
+    $debug and warn "thumbnail is " . length($thumbnail) . " bytes.";
+
+    $sth->execute($biblionumber,$mimetype,$fullsize->png(),$thumbnail->png());
+    my $dberror = $sth->errstr;
+    warn "Error returned inserting $biblionumber.$mimetype." if $sth->errstr;
+    undef $thumbnail;
+    undef $fullsize;
+    return $dberror;
+}
+
+=head2 RetrieveImage
+    my ($imagedata, $error) = RetrieveImage($imagenumber);
+
+Retrieves the specified image.
+
+=cut
+
+sub RetrieveImage {
+    my ($imagenumber) = @_;
+
+    my $dbh = C4::Context->dbh;
+    my $query = 'SELECT mimetype, imagefile, thumbnail FROM biblioimages WHERE imagenumber = ?';
+    my $sth = $dbh->prepare($query);
+    $sth->execute($imagenumber);
+    my $imagedata = $sth->fetchrow_hashref;
+    warn "Database error!" if $sth->errstr;
+    return $imagedata, $sth->errstr;
+}
+
+=head2 ListImagesForBiblio
+    my (@images) = ListImagesForBiblio($biblionumber);
+
+Gets a list of all images associated with a particular biblio.
+
+=cut
+
+
+sub ListImagesForBiblio {
+    my ($biblionumber) = @_;
+
+    my @imagenumbers;
+    my $dbh = C4::Context->dbh;
+    my $query = 'SELECT imagenumber FROM biblioimages WHERE biblionumber = ?';
+    my $sth = $dbh->prepare($query);
+    $sth->execute($biblionumber);
+    if (!$sth->errstr) {
+        while (my $row = $sth->fetchrow_hashref) {
+            push @imagenumbers, $row->{'imagenumber'};
+        }
+    }
+    warn "Database error!" if $sth->errstr;
+    return @imagenumbers, $sth->errstr;
+}
+
+=head2 DelImage
+
+    my ($dberror) = DelImage($imagenumber);
+
+Removes the image with the supplied imagenumber.
+
+=cut
+
+sub DelImage {
+    my ($imagenumber) = @_;
+    warn "Imagenumber passed to DelImage is $imagenumber" if $debug;
+    my $dbh = C4::Context->dbh;
+    my $query = "DELETE FROM biblioimages WHERE imagenumber = ?;";
+    my $sth = $dbh->prepare($query);
+    $sth->execute($imagenumber);
+    my $dberror = $sth->errstr;
+    warn "Database error!" if $sth->errstr;
+    return $dberror;
+}
+
+sub _scale_image {
+    my ($image, $maxwidth, $maxheight) = @_;
+    my ($width, $height) = $image->getBounds();
+    $debug and warn "image is $width pix X $height pix.";
+    if ($width > $maxwidth || $height > $maxheight) {
+#        $debug and warn "$filename exceeds the maximum pixel dimensions of $maxwidth X $maxheight. Resizing...";
+        my $percent_reduce;    # Percent we will reduce the image dimensions by...
+            if ($width > $maxwidth) {
+                $percent_reduce = sprintf("%.5f",($maxwidth/$width));    # If the width is oversize, scale based on width overage...
+            } else {
+                $percent_reduce = sprintf("%.5f",($maxheight/$height));    # otherwise scale based on height overage.
+            }
+        my $width_reduce = sprintf("%.0f", ($width * $percent_reduce));
+        my $height_reduce = sprintf("%.0f", ($height * $percent_reduce));
+        $debug and warn "Reducing image by " . ($percent_reduce * 100) . "\% or to $width_reduce pix X $height_reduce pix";
+        my $newimage = GD::Image->new($width_reduce, $height_reduce, 1); #'1' creates true color image...
+        $newimage->copyResampled($image,0,0,0,0,$width_reduce,$height_reduce,$width,$height);
+        return $newimage;
+    } else {
+        return $image;
+    }
+}
+
+1;
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 580949d..7719c77 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -37,6 +37,7 @@ use C4::External::Amazon;
 use C4::Search;		# enabled_staff_search_views
 use C4::VirtualShelves;
 use C4::XSLT;
+use Koha::Images;
 
 # use Smart::Comments;
 
@@ -379,6 +380,11 @@ if ( C4::Context->preference("AmazonEnabled") == 1 ) {
     }
 }
 
+if ( C4::Context->preference("LocalCoverImages") == 1 ) {
+    my @images = ListImagesForBiblio($biblionumber);
+    $template->{VARS}->{localimages} = \@images;
+}
+
 # Get OPAC URL
 if (C4::Context->preference('OPACBaseURL')){
      $template->param( OpacUrl => C4::Context->preference('OPACBaseURL') );
diff --git a/catalogue/image.pl b/catalogue/image.pl
new file mode 100755
index 0000000..8721299
--- /dev/null
+++ b/catalogue/image.pl
@@ -0,0 +1,111 @@
+#!/usr/bin/perl
+#
+# based on patronimage.pl
+#
+# 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; #qw(:standard escapeHTML);
+use C4::Context;
+use Koha::Images;
+
+$|=1;
+
+my $DEBUG = 1;
+my $data = new CGI;
+my $imagenumber;
+
+=head1 NAME
+
+image.pl - Script for retrieving and formatting local cover images for display
+
+=head1 SYNOPSIS
+
+<img src="image.pl?imagenumber=X" />
+<img src="image.pl?biblionumber=X" />
+<img src="image.pl?imagenumber=X&thumbnail=1" />
+<img src="image.pl?biblionumber=X&thumbnail=1" />
+
+=head1 DESCRIPTION
+
+This script, when called from within HTML and passed a valid imagenumber or
+biblionumber, will retrieve the image data associated with that biblionumber
+if one exists, format it in proper HTML format and pass it back to be displayed.
+If the parameter thumbnail has been provided, a thumbnail will be returned
+rather than the full-size image. When a biblionumber is provided rather than an
+imagenumber, a random image is selected.
+
+=cut
+
+if (defined $data->param('imagenumber')) {
+    $imagenumber = $data->param('imagenumber');
+} elsif (defined $data->param('biblionumber')) {
+    my @imagenumbers = ListImagesForBiblio($data->param('biblionumber'));
+    if (@imagenumbers) {
+        $imagenumber = $imagenumbers[0];
+    } else {
+        warn "No images for this biblio" if $DEBUG;
+        error();
+    }
+} else {
+    $imagenumber = shift;
+}
+
+if ($imagenumber) {
+    warn "imagenumber passed in: $imagenumber" if $DEBUG;
+    my ($imagedata, $dberror) = RetrieveImage($imagenumber);
+
+    if ($dberror) {
+        warn "Database Error!" if $DEBUG;
+        error();
+    }
+
+    if ($imagedata) {
+        my $image;
+        if ($data->param('thumbnail')) {
+            $image = $imagedata->{'thumbnail'};
+        } else {
+            $image = $imagedata->{'imagefile'};
+        }
+        print $data->header (-type => $imagedata->{'mimetype'}, -'Cache-Control' => 'no-store', -expires => 'now', -Content_Length => length ($image)), $image;
+        exit;
+    } else {
+        warn "No image exists for $imagenumber" if $DEBUG;
+        error();
+    }
+} else {
+    error();
+}
+
+error();
+
+sub error {
+    print $data->header ( -status=> '404', -expires => 'now' );
+    exit;
+}
+
+=head1 AUTHOR
+
+Chris Nighswonger cnighswonger <at> foundations <dot> edu
+
+modified for local cover images by Koustubha Kale kmkale <at> anantcorp <dot> com
+
+=cut
diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
new file mode 100755
index 0000000..fae6243
--- /dev/null
+++ b/catalogue/imageviewer.pl
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+
+# Copyright 2011 C & P Bibliography Services
+#
+# 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::Biblio;
+use C4::Output;
+use Koha::Images;
+
+my $query = new CGI;
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "catalogue/imageviewer.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+    }
+);
+
+my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my ($count, $biblio) = GetBiblio($biblionumber);
+
+if (C4::Context->preference("LocalCoverImages")) {
+    my @images = ListImagesForBiblio($biblionumber);
+    $template->{VARS}->{'LocalCoverImages'} = 1;
+    $template->{VARS}->{'images'} = \@images;
+}
+
+$template->{VARS}->{'biblio'} = $biblio;
+
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/installer/data/mysql/atomicupdate/local_cover_images.pl b/installer/data/mysql/atomicupdate/local_cover_images.pl
new file mode 100644
index 0000000..a698e7f
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/local_cover_images.pl
@@ -0,0 +1,20 @@
+#! /usr/bin/perl
+use strict;
+use warnings;
+use C4::Context;
+my $dbh=C4::Context->dbh;
+
+$dbh->do( q|CREATE TABLE `biblioimages` (
+      `imagenumber` int(11) NOT NULL AUTO_INCREMENT,
+      `biblionumber` int(11) NOT NULL,
+      `mimetype` varchar(15) NOT NULL,
+      `imagefile` mediumblob NOT NULL,
+      `thumbnail` mediumblob NOT NULL,
+      PRIMARY KEY (`imagenumber`),
+      CONSTRAINT `bibliocoverimage_fk1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8|);
+$dbh->do( q|INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACLocalCoverImages','0','Display local cover images on OPAC search and details pages.','1','YesNo')|);
+$dbh->do( q|INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('LocalCoverImages','0','Display local cover images on intranet search and details pages.','1','YesNo')|);
+$dbh->do( q|INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllowMultipleCovers','0','Allow multiple cover images to be attached to each bibliographic record.','1','YesNo')|);
+$dbh->do( q|INSERT INTO permissions (module_bit, code, description) VALUES (13, 'upload_local_cover_images', 'Upload local cover images')|);
+print "Upgrade done (Added support for local cover images)\n";
diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql
index ec61ea0..873089a 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -36,6 +36,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'manage_csv_profiles', 'Manage CSV export profiles'),
    (13, 'moderate_tags', 'Moderate patron tags'),
    (13, 'rotating_collections', 'Manage rotating collections'),
+   (13, 'upload_local_cover_images', 'Upload local cover images'),
    (15, 'check_expiration', 'Check the expiration of a serial'),
    (15, 'claim_serials', 'Claim missing serials'),
    (15, 'create_subscription', 'Create a new subscription'),
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 452173d..7340eee 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2667,6 +2667,21 @@ CREATE TABLE `fieldmapping` ( -- koha to keyword mapping
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+--
+-- Table structure for table `bibliocoverimage`
+--
+
+DROP TABLE IF EXISTS `bibliocoverimage`;
+
+CREATE TABLE `bibliocoverimage` (
+ `imagenumber` int(11) NOT NULL AUTO_INCREMENT,
+ `biblionumber` int(11) NOT NULL,
+ `mimetype` varchar(15) NOT NULL,
+ `imagefile` mediumblob NOT NULL,
+ `thumbnail` mediumblob NOT NULL,
+ PRIMARY KEY (`imagenumber`),
+ CONSTRAINT `bibliocoverimage_fk1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
 
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index ae2c1cb..99e88c1 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -328,4 +328,6 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
 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 ('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/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 7710eda..c1d4b43 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2093,3 +2093,6 @@ div.pager input.pagedisplay {
 	font-weight: bold;
 	text-align : center;
 }
+.localimage {
+    padding: .3em;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 4b54c40..64f5c4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -101,7 +101,8 @@ function confirm_items_deletion() {
 	        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=&amp;op=" },[% END %]
 	        [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]" },[% END %]
 	        [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Attach Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]" },[% END %]
-                [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Link to Host Item"), url: "/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]" },[% END %][% END %]
+            [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Link to Host Item"), url: "/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]" },[% END %][% END %]
+            [% IF ( LocalCoverImages ) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]{ text: _("Upload Image"), url: "/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&filetype=image" },[% END %][% END %]
 	        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=&amp;op=duplicate" },[% END %]
 			[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Replace Record via Z39.50"), onclick: {fn: PopupZ3950 } },[% END %]
 			[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Delete Record"), onclick: {fn: confirm_deletion }[% IF ( count ) %],id:'disabled'[% END %] },[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 6a2dae0..53f6843 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -99,3 +99,11 @@
     [% IF ( virtualshelves || intranetbookbag ) %]
         <script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js"></script>
     [% END %]
+[% IF LocalCoverImages %]
+<script type="text/javascript" language="javascript" src="[% themelang %]/js/localcovers.js"></script>
+<script type="text/javascript" language="javascript">
+//<![CDATA[
+var NO_LOCAL_JACKET = _("No cover image available");
+//]]>
+</script>
+[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index e3896cc..8a739d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -70,6 +70,9 @@
     [% IF ( CAN_user_tools_manage_staged_marc ) %]
 	<li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC management</a></li>
     [% END %]
+    [% IF ( CAN_user_tools_upload_local_cover_images ) %]
+	<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload Local Cover Image</a></li>
+    [% END %]
 </ul>
 <h5>Additional Tools</h5>
 <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js b/koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js
new file mode 100644
index 0000000..981af75
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js
@@ -0,0 +1,44 @@
+if (typeof KOHA == "undefined" || !KOHA) {
+    var KOHA = {};
+}
+
+/**
+ * A namespace for local cover related functions.
+ */
+KOHA.LocalCover = {
+
+
+    /**
+     * Search all:
+     *    <div title="biblionumber" id="isbn" class="openlibrary-thumbnail"></div>
+     * or
+     *    <div title="biblionumber" id="isbn" class="openlibrary-thumbnail-preview"></div>
+     * and run a search with all collected isbns to Open Library Book Search.
+     * The result is asynchronously returned by OpenLibrary and catched by
+     * olCallBack().
+     */
+    GetCoverFromBibnumber: function(uselink) {
+        $("div [id^=local-thumbnail]").each(function(i) {
+            var mydiv = this;
+            var message = document.createElement("span");
+            $(message).attr("class","no-image");
+            $(message).html(NO_LOCAL_JACKET);
+            $(mydiv).append(message);
+            var img = $("<img />").attr('src',
+                '/cgi-bin/koha/catalogue/image.pl?thumbnail=1&biblionumber=' + $(mydiv).attr("class"))
+                .load(function () {
+                    if (!this.complete || typeof this.naturalWidth == "undefined" || this.naturalWidth == 0) {
+                    } else {
+                        if (uselink) {
+                            var a = $("<a />").attr('href', '/cgi-bin/koha/catalogue/imageviewer.pl?biblionumber=' + $(mydiv).attr("class"));
+                            $(a).append(img);
+                            $(mydiv).append(a);
+                        } else {
+                            $(mydiv).append(img);
+                        }
+                        $(mydiv).children('.no-image').remove();
+                    }
+                })
+        });
+    }
+};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
index 171b5f4..f5828ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
@@ -311,3 +311,22 @@ Enhanced Content:
             - pref: TagsExternalDictionary
               class: file
             - on the server to be approved without moderation.
+    Local Cover Images:
+        -
+            - pref: LocalCoverImages
+              choices:
+                  yes: Display
+                  no: "Don't display"
+            - local cover images on intranet search and details pages.
+        -
+            - pref: OPACLocalCoverImages
+              choices:
+                  yes: Display
+                  no: "Don't display"
+            - local cover images on OPAC search and details pages.
+        -
+            - pref: AllowMultipleCovers
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - multiple images to be attached to each bibliographic record.
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 019fa10..9174d94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -228,6 +228,7 @@ function verify_images() {
 [% IF ( subscriptionsnumber ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#subscriptions">Subscriptions</a></li>[% END %]
 [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#editions">Editions</a></li>[% END %][% END %]
 [% IF ( AmazonSimilarItems ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#related">Related Titles</a></li>[% END %]
+[% IF ( LocalCoverImages ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#images">Images</a></li>[% END %]
  </ul>
 
 <div id="holdings">
@@ -516,6 +517,17 @@ function verify_images() {
 </div>
 [% END %][% END %]
 
+[% IF ( LocalCoverImages ) %]
+<div id="images">
+<div>Click on an image to view it in the image viewer</div>
+[% FOREACH image IN localimages %]
+[% IF image %]
+<span class="localimage"><a href="/cgi-bin/koha/catalogue/imageviewer.pl?biblionumber=[% biblionumber %]&imagenumber=[% image %]"><img alt="img" src="/cgi-bin/koha/catalogue/image.pl?thumbnail=1&imagenumber=[% image %]" /></a></span>
+[% END %]
+[% END %]
+</div>
+[% END %]
+
 </div><!-- /bibliodetails -->
 
 <div class="yui-g" id="export" style="margin-top: 1em;">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
new file mode 100644
index 0000000..c5ab657
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
@@ -0,0 +1,43 @@
+[% INCLUDE 'doc-head-open.inc' %]
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Images for: [% biblio.title |html %]
+[% INCLUDE 'doc-head-close.inc' %]
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+
+$(document).ready(function(){
+    showCover($('.thumbnail').attr('id'));
+});
+
+function showCover(img) {
+    $('.thumbnail').attr('class', 'thumbnail');
+    $('#largeCoverImg').attr('src', '/cgi-bin/koha/catalogue/image.pl?imagenumber=' + img);
+    $('#' + img + '.thumbnail').attr('class', 'thumbnail selected');
+}
+//]]>
+</script>
+<style type="text/css">
+img.thumbnail {
+    border-style: solid;
+    border-width: 3px;
+    border-color: white;
+}
+
+img.selected {
+    border-color: black;
+}
+</style>
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+<body id="imageviewer">
+<div id="largeCover"><img id="largeCoverImg" alt="Large view" /></div>
+[% IF LocalCoverImages == 1 %]
+[% FOREACH img IN images %]
+[% IF img %]
+<a href='#' onclick='showCover([% img %])'><img class='thumbnail' id='[% img %]' src='/cgi-bin/koha/catalogue/image.pl?imagenumber=[% img %]&thumbnail=1' alt='Image'/></a>
+[% END %]
+[% END %]
+[% biblio.title %] [% biblio.author %]
+[% ELSE %]
+Unfortunately, images are not enabled for this catalog at this time.
+[% END %]
+</body>
+</html>
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 05bdb47..b71a1ee 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
@@ -140,6 +140,11 @@
     <dd>Managed staged MARC records, including completing and reversing imports</dd>
     [% END %]
 
+    [% IF ( CAN_user_tools_upload_local_cover_images ) %]
+    <dt><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload Local Cover Image</a></dt>
+    <dd>Utility to upload scanned cover images for display in OPAC</dd>
+    [% END %]
+
 </dl>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
new file mode 100644
index 0000000..1f1b964
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
@@ -0,0 +1,130 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Tools &rsaquo; Upload Images</title>
+[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'file-upload.inc' %]
+[% INCLUDE 'background-job.inc' %]
+<style type="text/css">
+	#uploadpanel,#fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
+	#fileuploadstatus,#jobstatus { margin:.4em; }
+	#fileuploadprogress,#jobprogress{ width:150px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; }</style>
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function(){
+	$("#processfile").hide();
+	$("#zipfile").click(function(){
+		$("#bibnum").hide();
+	});
+	$("#image").click(function(){
+		$("#bibnum").show();
+	});
+});
+function CheckForm(f) {
+    if ($("#fileToUpload").value == '') {
+        alert(_('Please upload a file first.'));
+    } else {
+        return submitBackgroundJob(f);
+    }
+    return false;
+}
+
+//]]>
+</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/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( uploadimage ) %]<a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload Local Cover Image</a> &rsaquo; Upload Results[% ELSE %]Upload Local Cover Image[% END %]</div>
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b">
+
+<h1>Upload Local Cover Image</h1>
+[% IF ( uploadimage ) %]
+<p>Image upload results :</p>
+<ul>
+	<li>[% total %]  images found</li>
+    [% IF ( error ) %]
+    <div class="dialog alert">
+    [% IF ( error == 'UZIPFAIL' ) %]<p><b>Failed to unzip archive.<br />Please ensure you are uploading a valid zip file and try again.</b></p>
+    [% ELSIF ( error == 'OPNLINK' ) %]<p><b>Cannot open folder index (idlink.txt or datalink.txt) to read.<br />Please verify that it exists.</b></p>
+    [% ELSIF ( error == 'OPNIMG' ) %]<p><b>Cannot process file as an image.<br />Please ensure you only upload GIF, JPEG, PNG, or XPM images.</b></p>
+    [% ELSIF ( error == 'DELERR' ) %]<p><b>Unrecognized or missing field delimiter.<br />Please verify that you are using either a single quote or a tab.</b></p>
+    [% ELSIF ( error == 'DBERR' ) %]<p><b>Unable to save image to database.</b></p>
+    [% ELSE %]<p><b>An unknown error has occurred.<br />Please review the error log for more details.</b></p>[% END %]
+    </div>
+    </li>
+    [% END %]
+    <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">View final record</a></li>
+	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Back</a></li>
+</ul>
+<hr />
+[% END %]
+<ul>
+	<li>Select an image file or ZIP file to upload. The tool will accept images in GIF, JPEG, PNG, and XPM formats.</li>
+</ul>
+<form method="post" action="[% SCRIPT_NAME %]" id="uploadfile" enctype="multipart/form-data">
+<fieldset class="rows" id="uploadform">
+<legend>Upload images</legend>
+<ol>
+	<li>
+        <div id="fileuploadform">
+		<label for="fileToUpload">Select the file to upload: </label>
+		<input type="file" id="fileToUpload" name="fileToUpload" />
+        </div>	</li>
+</ol>
+  <fieldset class="action"><button class="submit" onclick="return ajaxFileUpload();">Upload file</button></fieldset>
+</fieldset>
+		
+        <div id="uploadpanel"><div id="fileuploadstatus">Upload progress: <div id="fileuploadprogress"></div> <span id="fileuploadpercent">0</span>%</div>
+        <div id="fileuploadfailed"></div></div>
+</form>
+
+    <form method="post" id="processfile" action="[% SCRIPT_NAME %]" enctype="multipart/form-data">
+<fieldset class="rows">
+        <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
+        <input type="hidden" name="runinbackground" id="runinbackground" value="" />
+        <input type="hidden" name="completedJobID" id="completedJobID" value="" />
+	</fieldset>
+  <fieldset class="rows">
+    <legend>File type</legend>
+    <ol>
+      <li class="radio">
+        <input type="radio" id="zipfile" name="filetype" value="zip" [% IF (filetype != 'image' ) %]checked="checked"[% END %] />
+        <label for="zipfile">ZIP file</label>
+      </li>
+      <li class="radio">
+        <input type="radio" id="image" name="filetype" value="image" [% IF (filetype == 'image' ) %]checked="checked"[% END %] />
+        <label for="imagefile">Image file</label>
+      </li>
+      <li class="radio">
+        [% IF ( filetype == 'image' ) %]<span id="bibnum">[% ELSE %]<span id="bibnum" style="display: none">[% END %]<label for="biblionumber">Enter cover biblionumber: </label><input type="text" id="biblionumber" name="biblionumber" value="[% biblionumber %]" size="15" /></span>
+      </li>
+    </ol>
+  </fieldset>
+  <fieldset class="rows">
+    <legend>Options</legend>
+    <ol>
+      <li class="checkbox">
+        <input type="checkbox" id="replace" name="replace" [% IF AllowMultipleCovers == 0 %]checked="checked" disabled="disabled"[% END %] />
+        <label for="replace">Replace existing covers</label>
+      </li>
+    </ol>
+  </fieldset>
+  <fieldset class="action"><input type="submit" value="Process images" /></fieldset>
+ 
+       <div id="jobpanel"><div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
+     <div id="jobfailed"></div></div>
+  
+</form>
+
+</div>
+</div>
+<div class="yui-b">
+[% INCLUDE 'tools-menu.inc' %]
+</div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 15bea79..18e5917 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -98,6 +98,15 @@ var NO_OL_JACKET = _("No cover image available");
 </script>
 [% END %]
 
+[% IF OPACLocalCoverImages %]
+<script type="text/javascript" language="javascript" src="[% themelang %]/js/localcovers.js"></script>
+<script type="text/javascript" language="javascript">
+//<![CDATA[
+var NO_LOCAL_JACKET = _("No cover image available");
+//]]>
+</script>
+[% END %]
+
 [% IF ( BakerTaylorEnabled ) %]<script type="text/javascript" language="javascript" src="[% themelang %]/js/bakertaylorimages.js"></script>
 <script type="text/javascript" language="javascript">
 	//<![CDATA[
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/localcovers.js b/koha-tmpl/opac-tmpl/prog/en/js/localcovers.js
new file mode 100644
index 0000000..298a20e
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/js/localcovers.js
@@ -0,0 +1,44 @@
+if (typeof KOHA == "undefined" || !KOHA) {
+    var KOHA = {};
+}
+
+/**
+ * A namespace for local cover related functions.
+ */
+KOHA.LocalCover = {
+
+
+    /**
+     * Search all:
+     *    <div title="biblionumber" id="isbn" class="openlibrary-thumbnail"></div>
+     * or
+     *    <div title="biblionumber" id="isbn" class="openlibrary-thumbnail-preview"></div>
+     * and run a search with all collected isbns to Open Library Book Search.
+     * The result is asynchronously returned by OpenLibrary and catched by
+     * olCallBack().
+     */
+    GetCoverFromBibnumber: function(uselink) {
+        $("div [id^=local-thumbnail]").each(function(i) {
+            var mydiv = this;
+            var message = document.createElement("span");
+            $(message).attr("class","no-image");
+            $(message).html(NO_LOCAL_JACKET);
+            $(mydiv).append(message);
+            var img = $("<img />").attr('src',
+                '/cgi-bin/koha/opac-image.pl?thumbnail=1&biblionumber=' + $(mydiv).attr("class"))
+                .load(function () {
+                    if (!this.complete || typeof this.naturalWidth == "undefined" || this.naturalWidth == 0) {
+                    } else {
+                        if (uselink) {
+                            var a = $("<a />").attr('href', '/cgi-bin/koha/opac-imageviewer.pl?biblionumber=' + $(mydiv).attr("class"));
+                            $(a).append(img);
+                            $(mydiv).append(a);
+                        } else {
+                            $(mydiv).append(img);
+                        }
+                        $(mydiv).children('.no-image').remove();
+                    }
+                })
+        });
+    }
+};
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 3175d47..fc2da3f 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -39,6 +39,9 @@
 	[% IF OpenLibraryCovers %]
 	KOHA.OpenLibrary.GetCoverFromIsbn();
 	[% END %]
+	[% IF OPACLocalCoverImages %]
+	KOHA.LocalCover.GetCoverFromBibnumber(true);
+	[% END %]
         [% IF ( NovelistSelectProfile ) %]
         novSelect.loadContentForISBN('[% normalized_isbn %]','[% NovelistSelectProfile %]', '[% NovelistSelectPassword %]', function(d){});
         [% END %]
@@ -224,6 +227,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <div id="catalogue_detail_biblio">
 
     <div id="bookcover">
+    [% IF ( OPACLocalCoverImages ) %]<div style="block" title="[% biblionumber |url %]" class="[% biblionumber %]" id="local-thumbnail-preview"></div>[% END %]
     [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover Image" /></a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover Image" /></a>[% END %][% END %][% END %]
 
     [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( content_identifier_exists ) %][% IF ( using_https ) %]
@@ -543,6 +547,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 		[% ELSE %]<li>[% END %]
 		<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#serialcollection">Serial Collection</a></li>
     [% END %]
+
+    [% IF ( OPACLocalCoverImages ) %]<li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#images">Images</a></li>[% END %]
 </ul>
 
 [% IF ( serialcollection ) %]
@@ -979,6 +985,18 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% END %]
 
 
+[% IF ( OPACLocalCoverImages ) %]
+<div id="images">
+<div>Click on an image to view it in the image viewer</div>
+[% FOREACH image IN localimages %]
+[% IF image %]
+<span class="localimage"><a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber %]&imagenumber=[% image %]"><img alt="img" src="/cgi-bin/koha/opac-image.pl?thumbnail=1&imagenumber=[% image %]" /></a></span>
+[% END %]
+[% END %]
+</div>
+[% END %]
+
+
 </div>
 [% IF ( NovelistSelectProfile ) %][% IF ( NovelistSelectView == 'below' ) %]
 <div id="NovelistSelect">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
new file mode 100644
index 0000000..d6633e1
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
@@ -0,0 +1,43 @@
+[% INCLUDE 'doc-head-open.inc' %]
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Images for: [% biblio.title |html %]
+[% INCLUDE 'doc-head-close.inc' %]
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+
+$(document).ready(function(){
+    showCover($('.thumbnail').attr('id'));
+});
+
+function showCover(img) {
+    $('.thumbnail').attr('class', 'thumbnail');
+    $('#largeCoverImg').attr('src', '/cgi-bin/koha/opac-image.pl?imagenumber=' + img);
+    $('#' + img + '.thumbnail').attr('class', 'thumbnail selected');
+}
+//]]>
+</script>
+<style type="text/css">
+img.thumbnail {
+    border-style: solid;
+    border-width: 3px;
+    border-color: white;
+}
+
+img.selected {
+    border-color: black;
+}
+</style>
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+<body id="opac-imageviewer">
+<div id="largeCover"><img id="largeCoverImg" alt="Large view" /></div>
+[% IF OPACLocalCoverImages == 1 %]
+[% FOREACH img IN images %]
+[% IF img %]
+<a href='#' onclick='showCover([% img %])'><img class='thumbnail' id='[% img %]' src='/cgi-bin/koha/opac-image.pl?imagenumber=[% img %]&thumbnail=1' alt='Image'/></a>
+[% END %]
+[% END %]
+[% biblio.title %] [% biblio.author %]
+[% ELSE %]
+Unfortunately, images are not enabled for this catalog at this time.
+[% END %]
+</body>
+</html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 7201a82..2565c8f 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -229,6 +229,7 @@ $(document).ready(function(){
         [% END %]
     [% END %][% END %]
     [% IF OpenLibraryCovers %]KOHA.OpenLibrary.GetCoverFromIsbn();[% END %]
+	[% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %]
     [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
 });
 //]]>
@@ -528,6 +529,7 @@ $(document).ready(function(){
 				</span>
 				</td><td>
 					<a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">
+            [% IF ( OPACLocalCoverImages ) %]<div style="block" title="[% SEARCH_RESULT.biblionumber |url %]" class="[% SEARCH_RESULT.biblionumber %]" id="local-thumbnail[% loop.count %]"></div>[% END %]
                     [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<img src="http://images.amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
 
 					[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %]
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index f82dde2..714ea24 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -45,6 +45,7 @@ use C4::Charset;
 use MARC::Record;
 use MARC::Field;
 use List::MoreUtils qw/any none/;
+use Koha::Images;
 
 BEGIN {
 	if (C4::Context->preference('BakerTaylorEnabled')) {
@@ -686,6 +687,11 @@ if (scalar(@serialcollections) > 0) {
 	serialcollections => \@serialcollections);
 }
 
+# Local cover Images stuff
+if (C4::Context->preference("OPACLocalCoverImages")){
+		$template->param(OPACLocalCoverImages => 1);
+}
+
 # Amazon.com Stuff
 if ( C4::Context->preference("OPACAmazonEnabled") ) {
     $template->param( AmazonTld => get_amazon_tld() );
@@ -911,4 +917,9 @@ my $defaulttab =
         ? 'serialcollection' : 'subscription';
 $template->param('defaulttab' => $defaulttab);
 
+if (C4::Context->preference('OPACLocalCoverImages') == 1) {
+    my @images = ListImagesForBiblio($biblionumber);
+    $template->{VARS}->{localimages} = \@images;
+}
+
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/opac/opac-image.pl b/opac/opac-image.pl
new file mode 100755
index 0000000..de44152
--- /dev/null
+++ b/opac/opac-image.pl
@@ -0,0 +1,111 @@
+#!/usr/bin/perl
+#
+# based on patronimage.pl
+#
+# 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; #qw(:standard escapeHTML);
+use C4::Context;
+use Koha::Images;
+
+$|=1;
+
+my $DEBUG = 1;
+my $data = new CGI;
+my $imagenumber;
+
+=head1 NAME
+
+opac-image.pl - Script for retrieving and formatting local cover images for display
+
+=head1 SYNOPSIS
+
+<img src="opac-image.pl?imagenumber=X" />
+<img src="opac-image.pl?biblionumber=X" />
+<img src="opac-image.pl?imagenumber=X&thumbnail=1" />
+<img src="opac-image.pl?biblionumber=X&thumbnail=1" />
+
+=head1 DESCRIPTION
+
+This script, when called from within HTML and passed a valid imagenumber or
+biblionumber, will retrieve the image data associated with that biblionumber
+if one exists, format it in proper HTML format and pass it back to be displayed.
+If the parameter thumbnail has been provided, a thumbnail will be returned
+rather than the full-size image. When a biblionumber is provided rather than an
+imagenumber, a random image is selected.
+
+=cut
+
+if (defined $data->param('imagenumber')) {
+    $imagenumber = $data->param('imagenumber');
+} elsif (defined $data->param('biblionumber')) {
+    my @imagenumbers = ListImagesForBiblio($data->param('biblionumber'));
+    if (@imagenumbers) {
+        $imagenumber = $imagenumbers[0];
+    } else {
+        warn "No images for this biblio" if $DEBUG;
+        error();
+    }
+} else {
+    $imagenumber = shift;
+}
+
+if ($imagenumber) {
+    warn "imagenumber passed in: $imagenumber" if $DEBUG;
+    my ($imagedata, $dberror) = RetrieveImage($imagenumber);
+
+    if ($dberror) {
+        warn "Database Error!" if $DEBUG;
+        error();
+    }
+
+    if ($imagedata) {
+        my $image;
+        if ($data->param('thumbnail')) {
+            $image = $imagedata->{'thumbnail'};
+        } else {
+            $image = $imagedata->{'imagefile'};
+        }
+        print $data->header (-type => $imagedata->{'mimetype'}, -'Cache-Control' => 'no-store', -expires => 'now', -Content_Length => length ($image)), $image;
+        exit;
+    } else {
+        warn "No image exists for $imagenumber" if $DEBUG;
+        error();
+    }
+} else {
+    error();
+}
+
+error();
+
+sub error {
+    print $data->header ( -status=> '404', -expires => 'now' );
+    exit;
+}
+
+=head1 AUTHOR
+
+Chris Nighswonger cnighswonger <at> foundations <dot> edu
+
+modified for local cover images by Koustubha Kale kmkale <at> anantcorp <dot> com
+
+=cut
diff --git a/opac/opac-imageviewer.pl b/opac/opac-imageviewer.pl
new file mode 100755
index 0000000..6d2f326
--- /dev/null
+++ b/opac/opac-imageviewer.pl
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+
+# Copyright 2011 C & P Bibliography Services
+#
+# 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::Biblio;
+use C4::Output;
+use Koha::Images;
+
+my $query = new CGI;
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-imageviewer.tmpl",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+        flagsrequired   => { borrow => 1 },
+    }
+);
+
+my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my ($count, $biblio) = GetBiblio($biblionumber);
+
+if (C4::Context->preference("OPACLocalCoverImages")) {
+    my @images = ListImagesForBiblio($biblionumber);
+    $template->{VARS}->{'OPACLocalCoverImages'} = 1;
+    $template->{VARS}->{'images'} = \@images;
+}
+
+$template->{VARS}->{'biblio'} = $biblio;
+
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 42eb0ec..365bd72 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -612,6 +612,10 @@ for (my $i=0;$i<@servers;$i++) {
             $template->param(SEARCH_RESULTS => \@newresults,
                                 OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay") eq "itemdetails"?1:0),
                             );
+	    if (C4::Context->preference("OPACLocalCoverImages")){
+		$template->param(OPACLocalCoverImages => 1);
+		$template->param(OPACLocalCoverImagesPriority => C4::Context->preference("OPACLocalCoverImagesPriority"));
+	    }
             ## Build the page numbers on the bottom of the page
             my @page_numbers;
             # total number of pages there will be
diff --git a/tools/upload-cover-image.pl b/tools/upload-cover-image.pl
new file mode 100755
index 0000000..af45cbc
--- /dev/null
+++ b/tools/upload-cover-image.pl
@@ -0,0 +1,167 @@
+#!/usr/bin/perl
+#
+# Copyright 2011 C & P Bibliography Services
+#
+# 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+#
+#
+#
+=head1 NAME
+
+upload-cover-image.pl - Script for handling uploading of both single and bulk coverimages and importing them into the database.
+
+=head1 SYNOPSIS
+
+upload-cover-image.pl
+
+=head1 DESCRIPTION
+
+This script is called and presents the user with an interface allowing him/her to upload a single cover image or bulk cover images via a zip file.
+Files greater than 100K will be refused. Images should be 140x200 pixels. If they are larger they will be auto-resized to comply.
+
+=cut
+
+
+use strict;
+use warnings;
+
+use File::Temp;
+use CGI;
+use GD;
+use C4::Context;
+use C4::Auth;
+use C4::Output;
+use Koha::Images;
+use C4::UploadedFile;
+
+my $debug = 1;
+
+my $input = new CGI;
+
+my $fileID=$input->param('uploadedfileid');
+my ($template, $loggedinuser, $cookie)
+	= get_template_and_user({template_name => "tools/upload-images.tmpl",
+					query => $input,
+					type => "intranet",
+					authnotrequired => 0,
+					flagsrequired => { tools => 'upload_cover_images'},
+					debug => 0,
+					});
+
+my $filetype            = $input->param('filetype');
+my $biblionumber        = $input->param('biblionumber');
+my $uploadfilename      = $input->param('uploadfile');
+my $replace             = $input->param('replace');
+my $op                  = $input->param('op');
+my %cookies             = parse CGI::Cookie($cookie);
+my $sessionID           = $cookies{'CGISESSID'}->value;
+
+my $error;
+
+$template->{VARS}->{'filetype'} = $filetype;
+$template->{VARS}->{'biblionumber'} = $biblionumber;
+
+my $total = 0;
+
+if ($fileID) {
+    my $uploaded_file = C4::UploadedFile->fetch($sessionID, $fileID);
+    if ($filetype eq 'image') {
+        my $fh = $uploaded_file->fh();
+        my $srcimage = GD::Image->new($fh);
+        if (defined $srcimage) {
+            my $dberror = PutImage($biblionumber, $srcimage, $replace);
+            if ($dberror) {
+                $error = 'DBERR';
+            } else {
+                $total = 1;
+            }
+        } else {
+            $error = 'OPNIMG';
+        }
+        undef $srcimage;
+    } else {
+        my $filename = $uploaded_file->filename();
+        my $dirname = File::Temp::tempdir( CLEANUP => 1);
+        unless (system("unzip", $filename,  '-d', $dirname) == 0) {
+            $error = 'UZIPFAIL';
+        } else {
+            my @directories;
+            push @directories, "$dirname";
+            foreach my $recursive_dir ( @directories ) {
+                my $dir;
+                opendir $dir, $recursive_dir;
+                while ( my $entry = readdir $dir ) {
+                    push @directories, "$recursive_dir/$entry" if ( -d "$recursive_dir/$entry" and $entry !~ /^[._]/ );
+                }
+                closedir $dir;
+            }
+            foreach my $dir ( @directories ) {
+                my $file;
+                if ( -e "$dir/idlink.txt" ) {
+                    $file = "$dir/idlink.txt";
+                } elsif ( -e "$dir/datalink.txt" ) {
+                    $file = "$dir/datalink.txt";
+                } else {
+                    next;
+                }
+                if (open (FILE, $file)) {
+                    while (my $line = <FILE>) {
+                        my $delim = ($line =~ /\t/) ? "\t" : ($line =~ /,/) ? "," : "";
+                        #$debug and warn "Delimeter is \'$delim\'";
+                        unless ( $delim eq "," || $delim eq "\t" ) {
+                            warn "Unrecognized or missing field delimeter. Please verify that you are using either a ',' or a 'tab'";
+                            $error = 'DELERR';
+                        } else {
+                            ($biblionumber, $filename) = split $delim, $line;
+                            $biblionumber =~ s/[\"\r\n]//g;  # remove offensive characters
+                            $filename   =~ s/[\"\r\n\s]//g;
+                            my $srcimage = GD::Image->new("$dir/$filename");
+                            if (defined $srcimage) {
+                                $total++;
+                                my $dberror = PutImage($biblionumber, $srcimage, $replace);
+                                if ($dberror) {
+                                    $error = 'DBERR';
+                                }
+                            } else {
+                                $error = 'OPNIMG';
+                            }
+                            undef $srcimage;
+                        }
+                    }
+                    close(FILE);
+                } else {
+                    $error = 'OPNLINK';
+                }
+            }
+        }
+    }
+    $template->{VARS}->{'total'} = $total;
+    $template->{VARS}->{'uploadimage'} = 1;
+    $template->{VARS}->{'error'} = $error;
+    $template->{VARS}->{'biblionumber'} = $biblionumber;
+}
+
+output_html_with_http_headers $input, $cookie, $template->output;
+
+exit 0;
+
+=head1 AUTHORS
+
+Written by Jared Camins-Esakov of C & P Bibliography Services, in part based on
+code by Koustubha Kale of Anant Corporation and Chris Nighswonger of Foundation
+Bible College.
+
+=cut
-- 
1.7.2.5


From jcamins at cpbibliography.com  Sun Dec 11 02:25:24 2011
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Sat, 10 Dec 2011 20:25:24 -0500
Subject: [Koha-patches] [PATCH] Bug 7345: Enable exporting records sans
	private fields
Message-ID: <1323566724-17817-1-git-send-email-jcamins@cpbibliography.com>

Add an option for marcstd to the opac-export.pl and catalogue/export.pl
scripts. This new format removes all 9XX, X9X, XX9 fields and subfield $9
(with the exception of 490 in flavours of MARC other than UNIMARC). The work is
done in C4::Record::marc2marc.

Testing plan:
1. Export a record in "MARC (Unicode/UTF-8)" format as a control
2. In the OPAC, run the following jQuery to add the marcstd option to the UI:
> $("#export #format").append("<option value='marcstd'>MARC (no 9xx)</option>");
3. Export the same record in "MARC (no 9xx)" format
4. Compare the two, noticing that any subfield $9 or fields including 9 (other
   than 490 in flavours of MARC other than UNIMARC) have been removed
---
 C4/Record.pm        |   27 ++++++++++++++++++++++++++-
 catalogue/export.pl |    4 ++++
 opac/opac-export.pl |    4 ++++
 3 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/C4/Record.pm b/C4/Record.pm
index cecb6ed..9c55abb 100644
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -77,7 +77,32 @@ Returns an ISO-2709 scalar
 
 sub marc2marc {
 	my ($marc,$to_flavour,$from_flavour,$encoding) = @_;
-	my $error = "Feature not yet implemented\n";
+	my $error;
+    if ($to_flavour =~ m/marcstd/) {
+        my $marc_record_obj;
+        if ($marc =~ /^MARC::Record/) { # it's already a MARC::Record object
+            $marc_record_obj = $marc;
+        } else { # it's not a MARC::Record object, make it one
+            eval { $marc_record_obj = MARC::Record->new_from_usmarc($marc) }; # handle exceptions
+
+# conversion to MARC::Record object failed, populate $error
+                if ($@) { $error .="\nCreation of MARC::Record object failed: ".$MARC::File::ERROR };
+        }
+        unless ($error) {
+            my @privatefields;
+            foreach my $field ($marc_record_obj->fields()) {
+                if ($field->tag() =~ m/9/ && ($field->tag() != '490' || C4::Context->preference("marcflavour") eq 'UNIMARC')) {
+                    push @privatefields, $field;
+                } elsif (! ($field->is_control_field())) {
+                    $field->delete_subfield(code => '9') if ($field->subfield('9'));
+                }
+            }
+            $marc_record_obj->delete_field(@privatefields);
+            $marc = $marc_record_obj->as_usmarc();
+        }
+    } else {
+        $error = "Feature not yet implemented\n";
+    }
 	return ($error,$marc);
 }
 
diff --git a/catalogue/export.pl b/catalogue/export.pl
index 2b55d9f..db69af9 100755
--- a/catalogue/export.pl
+++ b/catalogue/export.pl
@@ -51,6 +51,10 @@ if ($op eq "export") {
 				C4::Charset::SetUTF8Flag($marc, 1);
 				$marc = $marc->as_usmarc();
 			}
+            elsif ($format =~ /marcstd/) {
+                C4::Charset::SetUTF8Flag($marc,1);
+                ($error,$marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour'));
+            }
 			print $query->header(
 				-type => 'application/octet-stream',
                 -attachment=>"bib-$biblionumber.$format");
diff --git a/opac/opac-export.pl b/opac/opac-export.pl
index 411fd3f..fb8dee7 100755
--- a/opac/opac-export.pl
+++ b/opac/opac-export.pl
@@ -66,6 +66,10 @@ elsif ($format =~ /utf8/) {
     C4::Charset::SetUTF8Flag($marc,1);
     $marc = $marc->as_usmarc();
 }
+elsif ($format =~ /marcstd/) {
+    C4::Charset::SetUTF8Flag($marc,1);
+    ($error,$marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour'));
+}
 else {
     $error= "Format $format is not supported.";
 }
-- 
1.7.2.5


From Katrin.Fischer.83 at web.de  Mon Dec 12 08:44:08 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon, 12 Dec 2011 08:44:08 +0100
Subject: [Koha-patches] [PATCH 1/2] Bug 7338 Links on Serial Collection page
Message-ID: <1323675849-4500-1-git-send-email-Katrin.Fischer.83@web.de>

From: Fr?d?ric Demians <f.demians at tamil.fr>

Don't display link to the serial, when the collection page displays just
one subscription. Display it when several subscriptions. Alway display a
link for displaying biblio record other subscriptions.
---
 .../prog/en/modules/serials/serials-collection.tt  |   11 +++++------
 serials/serials-collection.pl                      |    1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

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 93c4fdc..ed126af 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
@@ -71,7 +71,7 @@ $(document).ready(function() {
 
 [% IF ( subscriptions ) %]
 <table>
-[% IF ( onesubscription ) %]
+[% IF ( subscriptions.size == 1 ) %]
 <caption> Subscription Summary</caption>
 [% ELSE %]
 <caption> Subscription Summaries</caption>
@@ -161,9 +161,8 @@ $(document).ready(function() {
       </tr>
 [% END %]
 [% IF ( subscr ) %]
-[% UNLESS ( onesubscription ) %]
-<tr ><td colspan="7">  <a href="serials-collection.pl?biblionumber=[% biblionumber %]">See any subscription attached to this biblio</a></td>
-</tr>[% END %]
+<tr ><td colspan="8">  <a href="serials-collection.pl?biblionumber=[% biblionumber %]">See any subscription attached to this biblio</a></td>
+</tr>
 [% END %]
 </table>
 [% END %]
@@ -183,7 +182,7 @@ $(document).ready(function() {
 <div id="subscription-year-[% year.year %]">
         <table>
 	  <tr>
-[% UNLESS ( year.onesubscription ) %]
+[% IF ( subscriptions.size > 1 ) %]
                 <th># Subs</th>
 [% END %]
                 <th>Date published
@@ -205,7 +204,7 @@ $(document).ready(function() {
             </tr>
       [% FOREACH serial IN year.serials %]
     [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
-[% UNLESS ( serial.onesubscription ) %]
+[% IF ( subscriptions.size > 1 ) %]
                  <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid %]">[% serial.subscriptionid %]</a></td>
 [% END %]
                 <td>
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 8c7c32b..c4605e0 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -147,7 +147,6 @@ foreach (@$location) {
 
 chop $subscriptionidlist;
 $template->param(
-          onesubscription => (scalar(@$subscriptiondescs)==1),
           subscriptionidlist => $subscriptionidlist,
           biblionumber => $biblionumber,
           subscriptions => $subscriptiondescs,
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Mon Dec 12 08:44:09 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon, 12 Dec 2011 08:44:09 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 7338: Follow up: show link only when
	there is more than 1 subscription
In-Reply-To: <1323675849-4500-1-git-send-email-Katrin.Fischer.83@web.de>
References: <1323675849-4500-1-git-send-email-Katrin.Fischer.83@web.de>
Message-ID: <1323675849-4500-2-git-send-email-Katrin.Fischer.83@web.de>

To be tested together with
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6690

1) Create a subscription for a title
- check the link 'Show any subscription...' doesn't show now
- check the serials collection page works correctly and shows all
necessary information

2) Create a second subscription for the same title
- check a new link 'Show any subscription...' shows up now
- use links in the issue table to change between viewing the single subscription
and the overview page
- check it works correctly and all information shows up
---
 .../prog/en/modules/serials/serials-collection.tt  |    2 ++
 serials/serials-collection.pl                      |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)

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 ed126af..3777f47 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
@@ -161,9 +161,11 @@ $(document).ready(function() {
       </tr>
 [% END %]
 [% IF ( subscr ) %]
+[% IF ( subscriptioncount > 1 ) %]
 <tr ><td colspan="8">  <a href="serials-collection.pl?biblionumber=[% biblionumber %]">See any subscription attached to this biblio</a></td>
 </tr>
 [% END %]
+[% END %]
 </table>
 [% END %]
 
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index c4605e0..a67db7a 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -93,6 +93,7 @@ if($op eq 'gennext' && @subscriptionid){
     print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid);
 }
 
+my $subscriptioncount;
 my ($location, $callnumber);
 if (@subscriptionid){
    my @subscriptioninformation=();
@@ -123,6 +124,7 @@ if (@subscriptionid){
     @subscriptioninformation=(@$tmpsubscription, at subscriptioninformation);
   }
   $subscriptions=PrepareSerialsData(\@subscriptioninformation);
+  $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
 } else {
   $subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber) ;
   my $subscriptioninformation = GetFullSubscriptionsFromBiblionumber($biblionumber);
@@ -157,6 +159,7 @@ $template->param(
           suggestion => C4::Context->preference("suggestion"),
           virtualshelves => C4::Context->preference("virtualshelves"),
           subscr=>$query->param('subscriptionid'),
+          subscriptioncount => $subscriptioncount,
     location	       => $locationlib,
     callnumber	       => $callnumber,
           );
-- 
1.7.5.4


From wizzyrea at gmail.com  Wed Dec  7 23:35:44 2011
From: wizzyrea at gmail.com (Liz Rea)
Date: Wed,  7 Dec 2011 16:35:44 -0600
Subject: [Koha-patches] [PATCH] Bug 7333 - modifying Members.t to use a
	branchcode that exists in the sample data
Message-ID: <1323297344-12564-1-git-send-email-wizzyrea@gmail.com>

To test:
Create a fresh koha db with all of the sample data (if you have one that has the sample branches in it, that will work too)
run the test: prove t/db_dependent/Members.t

All subtests should complete.
---
 t/db_dependent/Members.t |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/db_dependent/Members.t b/t/db_dependent/Members.t
index c1e4d85..420f7f3 100755
--- a/t/db_dependent/Members.t
+++ b/t/db_dependent/Members.t
@@ -18,7 +18,7 @@ my $CARDNUMBER   = 'TESTCARD01';
 my $FIRSTNAME    = 'Marie';
 my $SURNAME      = 'Mcknight';
 my $CATEGORYCODE = 'S';
-my $BRANCHCODE   = 's';
+my $BRANCHCODE   = 'CPL';
 
 my $CHANGED_FIRSTNAME = "Marry Ann";
 my $EMAIL             = "Marie\@email.com";
-- 
1.7.2.5


From wizzyrea at gmail.com  Wed Dec  7 23:51:17 2011
From: wizzyrea at gmail.com (Liz Rea)
Date: Wed,  7 Dec 2011 16:51:17 -0600
Subject: [Koha-patches] [PATCH 2/2] Bug 5327 - fixing
	t/db_dependent/Record.t to not fail because of whitespace.
Message-ID: <1323298277-12952-1-git-send-email-wizzyrea@gmail.com>

To test:
run prove -v t/db_dependent/Record.t
The test should complete successfully.

I should note - if this test was actually testing the whitespace and the problem with the output was valid, please go ahead and fix that problem and disregard this patch.
To me, the generated output looked better than the expected result, so I made them match.
---
 t/db_dependent/Record.t |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/t/db_dependent/Record.t b/t/db_dependent/Record.t
index b0e1894..2e04449 100755
--- a/t/db_dependent/Record.t
+++ b/t/db_dependent/Record.t
@@ -74,11 +74,11 @@ is ($marcqualified, $test3xml, "testing marcQualified");
 my $mods=marc2modsxml($marc);
 my $test4xml=qq(<?xml version="1.0" encoding="UTF-8"?>
 <mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" version="3.1" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-1.xsd">
-<typeOfResource/>
-<originInfo>
-<issuance/>
-</originInfo>
-<recordInfo/>
+  <typeOfResource/>
+  <originInfo>
+    <issuance/>
+  </originInfo>
+  <recordInfo/>
 </mods>
 );
 
-- 
1.7.2.5


From f.demians at tamil.fr  Mon Dec 12 09:48:52 2011
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Mon, 12 Dec 2011 09:48:52 +0100
Subject: [Koha-patches] [PATCH] Bug 3216 Add CHR/ICU Zebra tokenization
	choice to installation
Message-ID: <1323679732-3846-1-git-send-email-f.demians@tamil.fr>

Word search with multi-part facets works properly only with Zebra ICU
tokenization. This patch add a new question to Koha command line
installer:

  Zebra has two methods to perform records tokenization
  and characters normalization: CHR and ICU. ICU is
  recommended for catalogs containing non-Latin
  characters. (chr, icu) [chr]

How to test:

  - perl ./Makefile.PL
  - Try each possible value for new parameter
  - Take a look at zebradb/etc/default.idx file.
    Depending of the parameter you get this line:
      icuchain words-icu.xml
    or this one:
      charmap word-phrase-utf.chr
---
 Makefile.PL                   |   22 +++++++++++++++++++---
 etc/zebradb/etc/default.idx   |    5 ++---
 etc/zebradb/etc/words-icu.xml |   12 ++++++++++++
 rewrite-config.PL             |    1 +
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 etc/zebradb/etc/words-icu.xml

diff --git a/Makefile.PL b/Makefile.PL
index 074ff55..5ca3103 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -409,6 +409,7 @@ my %config_defaults = (
   'AUTH_INDEX_MODE'   => 'dom',
   'ZEBRA_MARC_FORMAT' => 'marc21',
   'ZEBRA_LANGUAGE'    => 'en',
+  'ZEBRA_TOKENIZER'   => 'chr',
   'ZEBRA_USER'        => 'kohauser',
   'ZEBRA_PASS'        => 'zebrastripes',
   'ZEBRA_SRU_HOST'    => 'localhost',
@@ -460,6 +461,7 @@ my %valid_config_values = (
   'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
   'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
   'ZEBRA_LANGUAGE'    => { 'en' => 1, 'fr' => 1, 'nb' => 1 }, # FIXME should generate from contents of distribution
+  'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
   'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
   'USE_MEMCACHED'      => { 'yes' => 1, 'no' => 1 },
 );
@@ -486,11 +488,12 @@ my $pl_files = {
       'rewrite-config.PL' => [
          'blib/KOHA_CONF_DIR/koha-conf.xml',
          'blib/KOHA_CONF_DIR/koha-httpd.conf',
+         'blib/ZEBRA_CONF_DIR/etc/default.idx',
          'blib/MISC_DIR/koha-install-log'
          ],
 	  'fix-perl-path.PL' => [	# this script ensures the correct shebang line for the platform installed on...
 		 'blib'
-		 ]
+		 ],
 };
 
 if ($config{'INSTALL_ZEBRA'} eq "yes") {
@@ -527,6 +530,10 @@ if ($config{'INSTALL_MODE'} ne "dev") {
     );
 }
 
+$config{ZEBRA_TOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
+    ? 'icuchain words-icu.xml'
+    : 'charmap word-phrase-utf.chr';
+
 my %test_suite_override_dirs = (
     KOHA_CONF_DIR  => ['etc'],
     ZEBRA_CONF_DIR => ['etc', 'zebradb'],
@@ -917,8 +924,8 @@ Since you've chosen to use Zebra with Koha,
 you must specify the primary MARC format of the
 records to be indexed by Zebra.
 
-Koha provides Zebra configuration files for MARC 21
-and UNIMARC.
+Koha provides Zebra configuration files for MARC21,
+NORMARC and UNIMARC.
 
 MARC format for Zebra indexing);
         $msg .= _add_valid_values_disp('ZEBRA_MARC_FORMAT', $valid_values);
@@ -946,6 +953,15 @@ Authorities indexing mode);
         $config{'AUTH_INDEX_MODE'} = _get_value('AUTH_INDEX_MODE', $msg, $defaults->{'AUTH_INDEX_MODE'}, $valid_values, $install_log_values);
 
         $msg = q(
+Zebra has two methods to perform records tokenization
+and characters normalization: CHR and ICU. ICU is
+recommended for catalogs containing non-Latin
+characters.);
+
+        $msg .= _add_valid_values_disp('ZEBRA_TOKENIZER', $valid_values);
+        $config{'ZEBRA_TOKENIZER'} = _get_value('ZEBRA_TOKENIZER', $msg, $defaults->{'ZEBRA_TOKENIZER'}, $valid_values, $install_log_values);
+
+        $msg = q(
 Please specify Zebra database user);
         $config{'ZEBRA_USER'} = _get_value('ZEBRA_USER', $msg, $defaults->{'ZEBRA_USER'}, $valid_values, $install_log_values);
 
diff --git a/etc/zebradb/etc/default.idx b/etc/zebradb/etc/default.idx
index 8ffbc59..d6314c6 100644
--- a/etc/zebradb/etc/default.idx
+++ b/etc/zebradb/etc/default.idx
@@ -10,16 +10,15 @@ completeness 0
 position 1
 alwaysmatches 1
 firstinfield 1
-charmap word-phrase-utf.chr
-#firstinfield 1
+__ZEBRA_TOKENIZER_STMT__
 
 # Phrase index
 # Used if completeness is 'complete {sub}field' (@attr 6=2, @attr 6=1)
 # and structure is word/phrase/word-list/free-form-text/document-text
 index p
 completeness 1
-charmap word-phrase-utf.chr
 firstinfield 1
+__ZEBRA_TOKENIZER_STMT__
 
 # URX (URL) index
 # Used if structure=urx (@attr 4=104)
diff --git a/etc/zebradb/etc/words-icu.xml b/etc/zebradb/etc/words-icu.xml
new file mode 100644
index 0000000..38af51f
--- /dev/null
+++ b/etc/zebradb/etc/words-icu.xml
@@ -0,0 +1,12 @@
+<icu_chain locale="">
+  <transliterate rule="\'>\ "/>
+  <transliterate rule="[:Number:] { '-' > '' "/>
+  <transform rule="[:Control:] Any-Remove"/>
+  <tokenize rule="l"/>
+  <transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
+  <transform rule="NFD"/>
+  <transform rule="[:Nonspacing Mark:] Remove"/>
+  <transform rule="NFC"/>
+  <display/>
+  <casemap rule="l"/>
+</icu_chain>
diff --git a/rewrite-config.PL b/rewrite-config.PL
index 7817f91..967a546 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -120,6 +120,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   '__ZEBRA_RUN_DIR__' => "$prefix/var/run/zebradb",
   '__ZEBRA_MARC_FORMAT__' => 'marc21',
   '__ZEBRA_LANGUAGE__' => 'en',
+  '__ZEBRA_TOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
   '__ZEBRA_AUTH_CFG__' => 'zebra-authorities.cfg',
   '__AUTH_RETRIEVAL_CFG__' => 'retrieval-info-auth-grs1.xml',
   "__MERGE_SERVER_HOST__" => $myhost,
-- 
1.7.8


From adrien.saurat at biblibre.com  Mon Dec 12 12:27:14 2011
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Mon, 12 Dec 2011 12:27:14 +0100
Subject: [Koha-patches] [PATCH] Bug 6374: defines a default value for "size"
	in Results
Message-ID: <1323689234-6862-1-git-send-email-adrien.saurat@biblibre.com>

If no size is stored in the database for a given biblio,
the script search.pl will now define a default size
(empty space) to avoid conflicts with TT (which uses
a size parameter too).
---
 catalogue/search.pl |   39 ++++++++++++++++++++++-----------------
 1 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 907efdb..104b505 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -440,18 +440,18 @@ if ($params->{'limit-yr'}) {
 # $ %z3950p will be a hash ref if the indexes are present (advacned search), otherwise undef
 my $z3950par;
 my $indexes2z3950 = {
-	kw=>'title', au=>'author', 'au,phr'=>'author', nb=>'isbn', ns=>'issn',
-	'lcn,phr'=>'dewey', su=>'subject', 'su,phr'=>'subject', 
-	ti=>'title', 'ti,phr'=>'title', se=>'title'
+    kw=>'title', au=>'author', 'au,phr'=>'author', nb=>'isbn', ns=>'issn',
+    'lcn,phr'=>'dewey', su=>'subject', 'su,phr'=>'subject', 
+    ti=>'title', 'ti,phr'=>'title', se=>'title'
 };
 for (my $ii = 0; $ii < @operands; ++$ii)
 {
-	my $name = $indexes2z3950->{$indexes[$ii]};
-	if (defined $name && defined $operands[$ii])
-	{
-		$z3950par ||= {};
-		$z3950par->{$name} = $operands[$ii] if !exists $z3950par->{$name};
-	}
+    my $name = $indexes2z3950->{$indexes[$ii]};
+    if (defined $name && defined $operands[$ii])
+    {
+        $z3950par ||= {};
+        $z3950par->{$name} = $operands[$ii] if !exists $z3950par->{$name};
+    }
 }
 
 
@@ -484,9 +484,9 @@ for my $this_cgi ( split('&',$query_cgi) ) {
     my $input_name = $1;
     my $input_value = $2;
     push @query_inputs, { input_name => $input_name, input_value => $input_value };
-	if ($input_name eq 'idx') {
-    	$scan_index_to_use = $input_value; # unless $scan_index_to_use;
-	}
+    if ($input_name eq 'idx') {
+        $scan_index_to_use = $input_value; # unless $scan_index_to_use;
+    }
 }
 $template->param ( QUERY_INPUTS => \@query_inputs,
                    scan_index_to_use => $scan_index_to_use );
@@ -552,8 +552,8 @@ for (my $i=0;$i<@servers;$i++) {
         ## If there's just one result, redirect to the detail page
         if ($total == 1) {         
             my $biblionumber = $newresults[0]->{biblionumber};
-			my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
-			my $views = { C4::Search::enabled_staff_search_views }; 
+            my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
+            my $views = { C4::Search::enabled_staff_search_views }; 
             if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
                 print $cgi->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber");
             } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
@@ -578,12 +578,17 @@ for (my $i=0;$i<@servers;$i++) {
             $template->param(limit_desc => $limit_desc);
             $template->param(offset     => $offset);
             $template->param(DisplayMultiPlaceHold => $DisplayMultiPlaceHold);
-			$template->param (z3950_search_params => C4::Search::z3950_search_args($query_desc));
+            $template->param (z3950_search_params => C4::Search::z3950_search_args($query_desc));
             if ($query_desc || $limit_desc) {
                 $template->param(searchdesc => 1);
             }
             $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
             $template->param(results_per_page =>  $results_per_page);
+            # must define a value for size if not present in DB
+            # in order to avoid problems generated by the default size value in TT
+            foreach my $line (@newresults) {
+                if ( not exists $line->{'size'} ) { $line->{'size'} = "" }
+            }
             $template->param(SEARCH_RESULTS => \@newresults);
 
             ## FIXME: add a global function for this, it's better than the current global one
@@ -649,7 +654,7 @@ for (my $i=0;$i<@servers;$i++) {
         # no hits
         else {
             $template->param(searchdesc => 1,query_desc => $query_desc,limit_desc => $limit_desc);
-			$template->param (z3950_search_params => C4::Search::z3950_search_args($z3950par || $query_desc));
+            $template->param (z3950_search_params => C4::Search::z3950_search_args($z3950par || $query_desc));
         }
 
     } # end of the if local
@@ -679,7 +684,7 @@ $template->param(
             total => $total,
             opacfacets => 1,
             facets_loop => $facets,
-	    displayFacetCount=> C4::Context->preference('displayFacetCount')||0,
+            displayFacetCount=> C4::Context->preference('displayFacetCount')||0,
             scan => $scan,
             search_error => $error,
 );
-- 
1.7.4.1


From tomascohen at gmail.com  Mon Dec 12 19:38:38 2011
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Mon, 12 Dec 2011 15:38:38 -0300
Subject: [Koha-patches] [PATCH] Add my name to .mailmap
Message-ID: <1323715118-32608-1-git-send-email-tomascohen@gmail.com>

---
 .mailmap |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
index b186da0..0609b39 100644
--- a/.mailmap
+++ b/.mailmap
@@ -34,6 +34,7 @@ Owen Leonard                    <oleonard at myacpl.org>
 Paul Poulain                    <paul.poulain at biblibre.com>
 Robin Sheat                     <robin at catalyst.net.nz>
 Srdjan Jankovic                 <srdjan at catalyst.net.nz>
+Tomas Cohen Arazi               <tomascohen at gmail.com>
 
 # Name to name mapping: the name in the right column will be mapped to the name in the left
 
@@ -44,4 +45,5 @@ Chris Nighswonger               Chris R. Nighswonger
 <cnighswonger at foundations.edu>  <chris.nighswonger at gmail.com>
 <frederick.capovilla at libeo.com> <fredericiapovilla at sys-tech.net>
 <katrin.fischer at bsz-bw.de>      <Katrin.Fischer.83 at web.de>
+<tomascohen at gmail.com>          <tcohen at psi.unc.edu.ar>
 
-- 
1.7.5.4


From lrea at nekls.org  Tue Dec 13 00:04:08 2011
From: lrea at nekls.org (lrea at nekls.org)
Date: Mon, 12 Dec 2011 17:04:08 -0600
Subject: [Koha-patches] [PATCH] Bug 7157 - Improve the j2a.pl cronjob
Message-ID: <1323731048-17421-1-git-send-email-lrea@nekls.org>

From: Liz Rea <lrea at nekls.org>

- Calculates updates date based on the upper age limit defined in the patron categories.
- Allows libraries to work on all branches or only one.
- Allows libraries to specify which Adult patron category to update child categories to.
- Allows libraries to specify a single Child patron category to update to an adult category.
- Has a test mode to display what transforms would be done on the database without executing the changes.

Includes improved help, copyright statement, and uses warnings. Also incorporates Paul's suggestions regarding --help and --man.

To test:

Create two patron categories, a child and an adult category. Make sure they
have an upper age limit.

Create or modify some patrons in multiple branches that fall into the category
of "my birthdate is less than or equal to today's date minus the upper age
limit"

1. Run the script with no flags - nothing should  happen, it will suggest you try the -help flag.
2. Run the script with the -help flag - you should see the help
3. Run the script with the -fromcat=<child category> -tocat=<adult category> -v -n - should show you results from all branches but take no action and tell you what its computations are.
4. Run the script with the -fromcat=<child category> -tocat=<adult category> -branch=<branchcode> -v -n - should show you results from your specified branch, but take no action and tell you what it's computations are.
5. Run the script with the -fromcat=<child category> -tocat=<adult category> -v -branch=<branchcode> - should show you the computations and tell you how many patrons were modified in your single branch. It will not show you the information on which patrons were updated.
6. Run the script with the -fromcat=<child category> -tocat=<adult category> -v - should show you the computations and tell you how many patrons were modified across all branches.
7. Run the script without the -v flag, if you care what the non-verbose output looks like.

Known limitation - if you give it an unknown tocat, it will fail with a rather ugly error. I'm going to fix that but in another patch.

There is more this script could do, please feel free to take it and run.
---
 misc/cronjobs/j2a.pl |  230 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 214 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 misc/cronjobs/j2a.pl

diff --git a/misc/cronjobs/j2a.pl b/misc/cronjobs/j2a.pl
old mode 100755
new mode 100644
index ec5d207..b445b10
--- a/misc/cronjobs/j2a.pl
+++ b/misc/cronjobs/j2a.pl
@@ -1,7 +1,26 @@
 #!/usr/bin/perl 
-#run nightly -- changes J to A on someone's 18th birthday
+
+# 2011 Liz Rea - Northeast Kansas Library System <lrea at nekls.org>
+
+# 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+#
+
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
+
 BEGIN {
     # find Koha's Perl modules
     # test carefully before changing this
@@ -9,26 +28,205 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
+
 use C4::Context;
-my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)
-                                            = localtime(time);
+use C4::Members;
+use Getopt::Long;
+use Pod::Usage;
+
+=head1 NAME
+
+juv2adult.pl - convert juvenile/child patrons from juvenile patron category and category code to corresponding adult patron category and category code when they reach the upper age limit defined in the Patron Categories.
+
+=head1 SYNOPSIS
+
+juv2adult.pl [ -branch=<branchcode> -fromcat=<categorycode> -tocat=<categorycode> ]
+
+ Options:
+   --help					brief help message
+   --man					full documentation
+   -v						verbose mode
+   -n						take no action, display only
+   -branch	<branchname>	only deal with patrons from this library/branch
+   -fromcat	<categorycode>	change patron category from this category
+   -tocat	<categorycode>	change patron category to this category
+=head1 OPTIONS
+
+=over 8
+
+=item B<--help>
+
+Print a brief help message and exits.
+
+=item B<--man>
+
+Prints the manual page and exits.
+
+=item B<-v>
+
+Verbose. Without this flag set, only fatal errors are reported.
+
+=item B<-n>
+
+No Action. With this flag set, script will report changes but not actually execute them on the database.
+
+=item B<-branch>
+
+changes patrons for one specific branch. Use the value in the
+branches.branchcode table.
+
+=item B<-fromcat>
+
+*required* defines the juvenile category to update. Expects the code from categories.categorycode.
+
+=item B<-tocat>
+
+*required* defines the category juvenile patrons will be converted to. Expects the code from categories.categorycode.
+
+=back
+
+=head1 DESCRIPTION
+
+This script is designed to update patrons from juvenile to adult patron types, remove the guarantor, and update their category codes appropriately when they reach the upper age limit defined in the Patron Categories.
+
+=head1 USAGE EXAMPLES
+
+C<juv2adult.pl> - Suggests that you read this help. :)
+
+C<juv2adult.pl> -branch=<branchcode> -fromcat=<categorycode> -tocat=<categorycode>  - Processes a single branch, and updates the patron categories from fromcat to tocat.
+
+C<juv2adult.pl> -fromcat=<categorycode> -tocat=<categorycode> -v -n - Processes all branches, shows all messages, and reports the patrons who would be affected. Takes no action on the database.
+=cut
+
+# These variables are set by command line options.
+# They are initially set to default values.
+
+
+my $help    = 0;
+my $man     = 0;
+my $verbose = 0;
+my $noaction = 0;
+my $mybranch;
+my $fromcat;
+my $tocat;
+
+GetOptions(
+    'help|?'         => \$help,
+    'man'            => \$man,
+    'v'              => \$verbose,
+    'n'				 => \$noaction,
+    'fromcat=s'	     => \$fromcat,
+    'tocat=s'	     => \$tocat,
+    'branch=s'      => \$mybranch,
+) or pod2usage(2);
+pod2usage(1) if $help;
+pod2usage( -verbose => 2 ) if $man;
+
+if(not $fromcat && $tocat) { #make sure we've specified the info we need.
+	print "please specify -help for usage tips.\n";
+		exit;
+}
+
+my $dbh=C4::Context->dbh;
+my @branches = C4::Branch::GetBranches();
+#get today's date, format it and subtract upperagelimit
+my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
 $year +=1900;
 $mon +=1; if ($mon < 10) {$mon = "0".$mon;}
 if ($mday < 10) {$mday = "0".$mday;}
+# get the upperagelimit from the category to be transitioned from
+my $query=qq|SELECT upperagelimit from categories where categorycode =?|;
+my $sth=$dbh->prepare( $query );
+$sth->execute( $fromcat ) 
+   or die "Couldn't execute statement: " . $sth->errstr;
+my $agelimit = $sth->fetchrow_array();
+if ( not $agelimit ) {
 
-$year -=18; #18 year olds here: if your J turns to A before this change here
-my $dbh=C4::Context->dbh;
+	die "No patron category with that category code. Please try again. \n";
+}
+$sth->finish(  );
+$year -=$agelimit;
+
+$verbose and print "The age limit for category $fromcat is $agelimit\n";
 
-#get today's date, format it and subtract 18 yrs.
 my $itsyourbirthday = "$year-$mon-$mday";
 
-my $query=qq|UPDATE borrowers 
-	   SET categorycode='A',
-	    guarantorid ='0'	 
-	   WHERE dateofbirth<=? 
-	   AND dateofbirth!='0000-00-00' 
-	   AND categorycode IN (select categorycode from categories where category_type='C')|;
-my $sth=$dbh->prepare($query);
-my $res = $sth->execute($itsyourbirthday) or die "can't execute";
-print "$res\n"; #did it work?
+
+if ( not $noaction) {
+	if ( $mybranch ) { #yep, we received a specific branch to work on.
+		$verbose and print "Looking for patrons of $mybranch to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
+		my $query=qq|UPDATE borrowers 
+		   SET categorycode='A',
+		    guarantorid ='0',	 
+		    categorycode =?
+		   WHERE dateofbirth<=? 
+		   AND dateofbirth!='0000-00-00' 
+		   AND branchcode=?
+		   AND categorycode IN (select categorycode from categories where category_type='C' and categorycode=?)|;
+		my $sth=$dbh->prepare($query);
+		my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat ) or die "can't execute";
+		if ($res eq '0E0') { print "No patrons updated\n"; 
+		} else { print "Updated $res patrons\n"; }
+	} else { # branch was not supplied, processing all branches
+		$verbose and print "Looking in all branches for patrons to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
+		foreach my $branchcode (@branches) {
+			my $query=qq|UPDATE borrowers 
+			   SET categorycode='A',
+			    guarantorid ='0',	 
+			    categorycode =?
+			   WHERE dateofbirth<=? 
+			   AND dateofbirth!='0000-00-00' 
+			   AND categorycode IN (select categorycode from categories where category_type='C' and categorycode=?)|;
+			my $sth=$dbh->prepare($query);
+			my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat ) or die "can't execute";
+			if ($res eq '0E0') { print "No patrons updated\n"; 
+			} else { print "Updated $res patrons\n"; }
+	}
+	}	
+} else {
+	my $birthday;
+	if ( $mybranch ) {
+		$verbose and print "Displaying patrons that would be updated from $fromcat to $tocat from $mybranch\n";
+		my $query=qq|SELECT firstname, 
+		 surname, 
+		 cardnumber, 
+		 dateofbirth 
+		FROM borrowers
+		WHERE dateofbirth<=? 
+		AND dateofbirth!='0000-00-00' 
+		AND branchcode=?
+		AND categorycode IN (select categorycode from categories where category_type='C' and categorycode=?)|;
+		my $sth=$dbh->prepare( $query );
+		$sth->execute( $itsyourbirthday, $mybranch, $fromcat ) 
+		   or die "Couldn't execute statement: " . $sth->errstr;
+		while ( my @res = $sth->fetchrow_array()) {
+	            my $firstname = $res[0];
+	            my $surname = $res[1];
+	            my $barcode = $res[2];
+	            $birthday = $res[3];
+	            print "$firstname $surname $barcode $birthday\n";
+	          }
+	} else { 
+		$verbose and print "Displaying patrons that would be updated from $fromcat to $tocat.\n";
+		my $query=qq|SELECT firstname, 
+		 surname, 
+		 cardnumber, 
+		 dateofbirth 
+		FROM borrowers
+		WHERE dateofbirth<=? 
+		AND dateofbirth!='0000-00-00' 
+		AND categorycode IN (select categorycode from categories where category_type='C' and categorycode=?)|;
+		my $sth=$dbh->prepare( $query );
+		$sth->execute( $itsyourbirthday, $fromcat ) 
+		   or die "Couldn't execute statement: " . $sth->errstr;
+		while ( my @res = $sth->fetchrow_array()) {
+	            my $firstname = $res[0];
+	            my $surname = $res[1];
+	            my $barcode = $res[2];
+	            $birthday = $res[3];
+	            print "$firstname $surname $barcode $birthday\n";
+	          }
+	}
+	$sth->finish(  );
+}
 $dbh->disconnect();
-- 
1.7.2.5


From christophe.croullebois at biblibre.com  Tue Dec 13 11:33:57 2011
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Tue, 13 Dec 2011 11:33:57 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 7350: In neworderempty.pl
	duplicating an item does not preserve select box selections
Message-ID: <1323772437-12080-1-git-send-email-christophe.croullebois@biblibre.com>

cloneNode() does not preserve select box selections, I have created a function to duplicate them : "clone_with_selected".
It is included in "cloneItemBlock", that's all.
Now the values selected in ddl are duplicated as the imput-texts are.
---
 koha-tmpl/intranet-tmpl/prog/en/js/additem.js |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
index efcb8eb..2f6c3fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
@@ -6,7 +6,7 @@ function deleteItemBlock(index) {
 }
 function cloneItemBlock(index) {    
     var original = document.getElementById(index); //original <div>
-    var clone = original.cloneNode(true);
+    var clone = clone_with_selected(original)
     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.
@@ -55,6 +55,19 @@ function check_additem() {
 	// duplicates within the form.  
 	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);
-- 
1.7.0.4


From adrien.saurat at biblibre.com  Tue Dec 13 16:08:26 2011
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Tue, 13 Dec 2011 16:08:26 +0100
Subject: [Koha-patches] [PATCH] Bug 7349: corrects sort order for Patron
	search
Message-ID: <1323788906-10517-1-git-send-email-adrien.saurat@biblibre.com>

Sorting by cardnumber now works (removed a client-side
sort, the server-side sort is enough).
---
 .../prog/en/modules/members/member.tt              |   10 ----------
 1 files changed, 0 insertions(+), 10 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 4bff548..f625220 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -99,14 +99,4 @@
 
     </div>
 </div>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/javascript">//<![CDATA[
-$(document).ready(function() {
-	$("#memberresultst").tablesorter({
-		sortList: [[1,0]],
-		widgets:	['zebra']
-	});
-});
-//]]>
-</script>
 [% INCLUDE 'intranet-bottom.inc' %]
-- 
1.7.4.1


From oleonard at myacpl.org  Tue Dec 13 18:32:02 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 13 Dec 2011 12:32:02 -0500
Subject: [Koha-patches] [PATCH] Bug 1633 - Add ability to take book cover
	images from local img db
Message-ID: <1323797523-16828-1-git-send-email-oleonard@myacpl.org>

OPAC Template revisions:

- Revised OPAC imageviewer template to match structure of
  other OPAC pages (with masthead search, footer, etc)
- Added link back to detail page (controlled by
  BiblioDefaultView preference)
- Added link style to thumbnails on opac-detail to add a sense of
  "clickability" to them
- Revised OPAC imageviewer template to allow it to function
  with JavaScript turned off. Now even without JS main image
  will load, thumbnails will be properly styled, and thumbnail
  links will work.
- Changes to the script are only to pass missing variables
  to the template

TODO: Corresponding changes for the staff client
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    5 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    4 +-
 .../opac-tmpl/prog/en/modules/opac-imageviewer.tt  |   82 ++++++++++++++++----
 opac/opac-imageviewer.pl                           |    3 +
 4 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 21dc08f..f904af2 100755
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -2289,3 +2289,8 @@ a.koha_url {
 
 .nav_results  #listResults li a { color:#FFFFFF; font-weight:normal;}
 
+a.localimage img {
+	border : 1px solid #8EB3E7;
+	margin : 0 .5em;
+	padding : .3em;
+}
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 717c5b6..7f52117 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -987,10 +987,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
 [% IF ( OPACLocalCoverImages ) %]
 <div id="images">
-<div>Click on an image to view it in the image viewer</div>
+<p>Click on an image to view it in the image viewer</p>
 [% FOREACH image IN localimages %]
 [% IF image %]
-<span class="localimage"><a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber %]&imagenumber=[% image %]"><img alt="img" src="/cgi-bin/koha/opac-image.pl?thumbnail=1&imagenumber=[% image %]" /></a></span>
+<a class="localimage" href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber %]&amp;imagenumber=[% image %]"><img alt="" src="/cgi-bin/koha/opac-image.pl?thumbnail=1&amp;imagenumber=[% image %]" /></a>
 [% END %]
 [% END %]
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
index d6633e1..a14e61d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
@@ -1,11 +1,12 @@
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Images for: [% biblio.title |html %]
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/JavaScript" language="JavaScript">
+<script type="text/javascript">
 //<![CDATA[
 
 $(document).ready(function(){
-    showCover($('.thumbnail').attr('id'));
+	$("#largeCoverImg").attr("src","/opac-tmpl/prog/images/loading.gif");
+    showCover([% imagenumber %]);
 });
 
 function showCover(img) {
@@ -16,28 +17,75 @@ function showCover(img) {
 //]]>
 </script>
 <style type="text/css">
+#largeCoverImg {
+	border : 1px solid #CCCCCC;
+	display : block;
+	margin : auto;
+	padding : 1em;
+}
+#thumbnails {
+	text-align : center;
+}
+#thumbnails a img {
+	border : 2px solid #8EB3E7;
+}
 img.thumbnail {
-    border-style: solid;
-    border-width: 3px;
-    border-color: white;
+	display : block;
+    float : none;
+    padding : .5em;
 }
 
-img.selected {
+#thumbnails a img.selected {
     border-color: black;
+    cursor : default;
+    opacity:0.4;
+	filter:alpha(opacity=40); /* For IE8 and earlier */
 }
 </style>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+</head>
 <body id="opac-imageviewer">
-<div id="largeCover"><img id="largeCoverImg" alt="Large view" /></div>
-[% IF OPACLocalCoverImages == 1 %]
-[% FOREACH img IN images %]
-[% IF img %]
-<a href='#' onclick='showCover([% img %])'><img class='thumbnail' id='[% img %]' src='/cgi-bin/koha/opac-image.pl?imagenumber=[% img %]&thumbnail=1' alt='Image'/></a>
-[% END %]
-[% END %]
-[% biblio.title %] [% biblio.author %]
+[% IF ( OpacNav ) %]<div id="doc3" class="yui-t1">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
+   <div id="bd">
+[% INCLUDE 'masthead.inc' %]
+	<div id="yui-main">
+	<div class="yui-b">
+	<div class="yui-ge">
+	<div class="container">
+	<h1 class="title">Images for 				[% IF ( BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber |url %]" title="View details for this title">
+                                [% ELSE %]
+                                [% IF ( BiblioDefaultViewisbd ) %]<a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber |url %]" title="View details for this title">
+                                [% ELSE %]<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber |url %]" title="View details for this title">
+                                [% END %]
+                                [% END %][% biblio.title %]</a> [% biblio.author %]</h1>
+	<div class="yui-u first">
+
+		<div id="largeCover"><img id="largeCoverImg" alt="" src="/cgi-bin/koha/opac-image.pl?imagenumber=[% imagenumber %]" /></div></div>
+
+	[% IF OPACLocalCoverImages == 1 %]
+	<div class="yui-u"><div id="thumbnails">
+			[% FOREACH img IN images %]
+				[% IF img %]
+				<a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber %]&amp;imagenumber=[% img %]" onclick="showCover([% img %]); return false;">
+				[% IF ( imagenumber == img ) %]<img class="thumbnail selected" id="[% img %]" src="/cgi-bin/koha/opac-image.pl?imagenumber=[% img %]&amp;thumbnail=1" alt=""/>
+				[% ELSE %]
+				<img class="thumbnail" id="[% img %]" src="/cgi-bin/koha/opac-image.pl?imagenumber=[% img %]&amp;thumbnail=1" alt=""/>
+				[% END %]
+				</a>
+				[% END %]
+			[% END %]
+		</div></div>
+	</div>
 [% ELSE %]
 Unfortunately, images are not enabled for this catalog at this time.
 [% END %]
-</body>
-</html>
+
+</div>
+</div>
+</div>
+[% IF ( OpacNav ) %]
+<div class="yui-b"><div id="leftmenus" class="container">
+[% INCLUDE 'navigation.inc' %]
+</div></div>
+[% END %]
+</div>
+[% INCLUDE 'opac-bottom.inc' %]
diff --git a/opac/opac-imageviewer.pl b/opac/opac-imageviewer.pl
index 6d2f326..cddc45c 100755
--- a/opac/opac-imageviewer.pl
+++ b/opac/opac-imageviewer.pl
@@ -38,12 +38,15 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my $imagenumber = $query ->param('imagenumber');
 my ($count, $biblio) = GetBiblio($biblionumber);
 
 if (C4::Context->preference("OPACLocalCoverImages")) {
     my @images = ListImagesForBiblio($biblionumber);
     $template->{VARS}->{'OPACLocalCoverImages'} = 1;
     $template->{VARS}->{'images'} = \@images;
+    $template->{VARS}->{'biblionumber'} = $biblionumber;
+    $template->{VARS}->{'imagenumber'} = $imagenumber;
 }
 
 $template->{VARS}->{'biblio'} = $biblio;
-- 
1.7.3


From oleonard at myacpl.org  Tue Dec 13 20:39:26 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 13 Dec 2011 14:39:26 -0500
Subject: [Koha-patches] [PATCH] Bug 7135 - in addbiblio,
	make save button floating to have it on always on screen
Message-ID: <1323805166-17599-1-git-send-email-oleonard@myacpl.org>

Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.
---
 .../prog/en/lib/jquery/plugins/jquery.fixFloat.js  |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.fixFloat.js b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.fixFloat.js
index 9fb63e0..0a6fde0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.fixFloat.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.fixFloat.js
@@ -26,7 +26,6 @@
       tbh.width(tbh.width());
       tbh.css({'position':'absolute'});
     }
-      tbh.css({'z-index':1000});
 
     if(options.enabled){
       $(window).scroll(function(){
@@ -48,7 +47,8 @@
         if(fixMe){
           var cssObj = {
             'position' : 'fixed',
-            'top' : '0px'
+            'top' : '0px',
+            'z-index' : '1000'
           }
           tbh.css(cssObj);
           tbh.addClass("floating");
@@ -56,7 +56,8 @@
         if(repositionMe){
           var cssObj = {
             'position' : 'absolute',
-            'top' : originalOffset
+            'top' : originalOffset,
+            'z-index' : '1'
           }
           tbh.css(cssObj);
           tbh.removeClass("floating");
-- 
1.7.3


From f.demians at tamil.fr  Wed Dec 14 08:54:34 2011
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Wed, 14 Dec 2011 08:54:34 +0100
Subject: [Koha-patches] [PATCH] Bug 7335 Note subfields are not displayed in
	TEXTAREA if hidden
Message-ID: <1323849274-20192-1-git-send-email-f.demians@tamil.fr>

In the data entry form, there is a (hidden) functionality for note subfields.
MARC21 500-599 and UNIMARC 300-399 subfields are displayed in TEXTAREA rather
than INPUT tags. This is good since usually notes can be pretty long. But if
one of those fields is marked in the framework as 'hidden', then it isn't
displayed at first when you create a record and when you expand the field by
clicking on its label the field is displayed in a one-line INPUT tag.

To reproduce this bug:

- Modify your framework:
  MARC21: 500$a, hidden=1
  UNIMARC: 300$a, hidden=1
- Create a new biblio record with this framework
- Open the tab containing 500 or 300 field
- 500 or 300 tab is collapsed
- Click on 500 or 300 label to expand the field
- 500$a or 300$a is displayed in a one-line INPUT tag, not in a TEXTAREA
  as it should
---
 cataloguing/addbiblio.pl |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 71d43d7..b80c805 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -467,21 +467,9 @@ sub create_input {
                     value=\"$value\" \/>
             ";
     }
-    elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) {
-        $subfield_data{marc_value} =
-            "<input type=\"text\"
-                    id=\"".$subfield_data{id}."\"
-                    name=\"".$subfield_data{id}."\"
-                    class=\"input_marceditor\"
-                    tabindex=\"1\"
-                    size=\"67\"
-                    maxlength=\"$max_length\"
-                    value=\"$value\"
-            \/>";
-
-        # it's a standard field
     }
     else {
+        # it's a standard field
         if (
             length($value) > 100
             or
-- 
1.7.8


From marc at msys.ch  Wed Dec 14 09:59:10 2011
From: marc at msys.ch (Marc Balmer)
Date: Wed, 14 Dec 2011 09:59:10 +0100
Subject: [Koha-patches] Fixing some typos
Message-ID: <4EE8655E.802@msys.ch>

While reading the code I found some typos and fixed them.  The patches
must be applied in order.

0001  functionnal -> functional
0002  wether -> whether
0003  developper -> developer
0004  'the the ' - > 'the '

Please some kind soul sign these off and an even kinder sould commit
them to the master branch ;)

Thanks,
Marc
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-Typo.patch
URL: </pipermail/koha-patches/attachments/20111214/ad1b60fe/attachment-0002.asc>

From marc at msys.ch  Sun Dec 11 19:00:14 2011
From: marc at msys.ch (Marc Balmer)
Date: Sun, 11 Dec 2011 19:00:14 +0100
Subject: [PATCH 1/4] Typo.
Message-ID: <mailman.29.1323853161.8147.koha-patches@lists.koha-community.org>

---
 kohaversion.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kohaversion.pl b/kohaversion.pl
index 29b43df..f5dfcb1 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -6,7 +6,7 @@
 
 the kohaversion is divided in 4 parts :
  - #1 : the major number. 3 atm
- - #2 : the functionnal release. 00 atm
+ - #2 : the functional release. 00 atm
  - #3 : the subnumber, moves only on a public release
  - #4 : the developer version. The 4th number is the database subversion.
         used by developers when the database changes. updatedatabase take care of the changes itself
-- 
1.7.2.5


--------------080600010502090104060004
Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
 name="0002-Fix-typo-wether-whether.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
 filename="0002-Fix-typo-wether-whether.patch"


From marc at msys.ch  Wed Dec 14 09:26:01 2011
From: marc at msys.ch (Marc Balmer)
Date: Wed, 14 Dec 2011 09:26:01 +0100
Subject: [PATCH 2/4] Fix typo:  wether -> whether.
Message-ID: <mailman.30.1323853161.8147.koha-patches@lists.koha-community.org>

---
 INSTALL.opensuse                                   |    2 +-
 authorities/authorities.pl                         |    2 +-
 cataloguing/addbiblio.pl                           |    2 +-
 cataloguing/plugin_launcher.pl                     |    2 +-
 installer/install.pl                               |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    4 ++--
 .../po/zh-Hans-CN-i-staff-t-prog-v-3006000.po      |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/INSTALL.opensuse b/INSTALL.opensuse
index f80fe4b..b028fd3 100644
--- a/INSTALL.opensuse
+++ b/INSTALL.opensuse
@@ -802,7 +802,7 @@ XML::LibXML::SAX::Parser=HASH(0x8356e0c)
 == Install the Zebra package ==
 
 Zebra is already in the standard repository of openSUSE 11.3, so it seems better to install it.
-In the next chapter a question will be asked wether it is installed, so you better install it; no harm done.
+In the next chapter a question will be asked whether it is installed, so you better install it; no harm done.
 Because you may need the documentation, that will also be installed.
 Note that the package name is idzebra.
 
diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 2f82f5a..1ba9122 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -204,7 +204,7 @@ sub create_input {
     }
     elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
 
-        # opening plugin. Just check wether we are on a developper computer on a production one
+        # opening plugin. Just check whether we are on a developper computer on a production one
         # (the cgidir differs)
         my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder";
         unless (-r $cgidir and -d $cgidir) {
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 71d43d7..f69efea 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -414,7 +414,7 @@ sub create_input {
     }
     elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
 
-        # opening plugin. Just check wether we are on a developper computer on a production one
+        # opening plugin. Just check whether we are on a developper computer on a production one
         # (the cgidir differs)
         my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder";
         unless ( opendir( DIR, "$cgidir" ) ) {
diff --git a/cataloguing/plugin_launcher.pl b/cataloguing/plugin_launcher.pl
index 9a264ab..bbd3f1f 100755
--- a/cataloguing/plugin_launcher.pl
+++ b/cataloguing/plugin_launcher.pl
@@ -27,7 +27,7 @@ use C4::Output;
 my $input = new CGI;
 my $plugin_name="cataloguing/value_builder/".$input->param("plugin_name");
 
-# opening plugin. Just check wether we are on a developper computer on a production one
+# opening plugin. Just check whether we are on a developper computer on a production one
 # (the cgidir differs)
 my $cgidir = C4::Context->intranetdir ."/cgi-bin";
 my $vbdir = "$cgidir/cataloguing/value_builder";
diff --git a/installer/install.pl b/installer/install.pl
index ae478b6..f95eee3 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -330,7 +330,7 @@ elsif ( $step && $step == 3 ) {
     }
     else {
         #
-        # check wether it's a 1st install or an update
+        # check whether it's a 1st install or an update
         #
         #Check if there are enough tables.
         # Paul has cleaned up tables so reduced the count
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index e6d2315..b137f59 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -76,14 +76,14 @@ DDApp = {
         if (uls[i].className == "draglist" || uls[i].className == "draglist_alt") {
             ddtarget = YAHOO.util.DragDropMgr.getDDById(uls[i].id);
 // The yahoo drag and drop is written (broken or not) in such a way, that if an element is subscribed as a target multiple times,
-// it has to be unlinked multiple times, so we need to test wether it is allready a target, otherwise we'll have a problem when closing the group
+// it has to be unlinked multiple times, so we need to test whether it is allready a target, otherwise we'll have a problem when closing the group
             if( ! ddtarget ) {
                 new YAHOO.util.DDTarget(uls[i].id);
             }
             var children = uls[i].getElementsByTagName('li');
             for( j=0; j<children.length; j=j+1) {
 // The yahoo drag and drop is (broken or not) in such a way, that if an element is subscribed as a target multiple times,
-// it has to be unlinked multiple times, so we need to test wether it is allready a target, otherwise we'll have a problem when closing the group
+// it has to be unlinked multiple times, so we need to test whether it is allready a target, otherwise we'll have a problem when closing the group
                 ddtarget = YAHOO.util.DragDropMgr.getDDById(children[j].id);
                 if( ! ddtarget ) {
                     new DDList(children[j].id);
diff --git a/misc/translator/po/zh-Hans-CN-i-staff-t-prog-v-3006000.po b/misc/translator/po/zh-Hans-CN-i-staff-t-prog-v-3006000.po
index d204f8d..df7d689 100644
--- a/misc/translator/po/zh-Hans-CN-i-staff-t-prog-v-3006000.po
+++ b/misc/translator/po/zh-Hans-CN-i-staff-t-prog-v-3006000.po
@@ -84976,7 +84976,7 @@ msgstr ""
 #~ msgid ""
 #~ " Select a file to import into the reservoir. It will be parsed, and for "
 #~ "each ISBN found, a new record will be created in the reservoir. If an "
-#~ "ISBN already exists in the reservoir, you can choose wether to ignore the "
+#~ "ISBN already exists in the reservoir, you can choose whether to ignore the "
 #~ "new one, or overwrite the old one."
 #~ msgstr ""
 #~ " ?????????????????????Breeding Farm?????????????????????????????????????????????????????????????????????"
-- 
1.7.2.5


--------------080600010502090104060004
Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
 name="0003-developper-developer.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0003-developper-developer.patch"


From marc at msys.ch  Wed Dec 14 09:37:43 2011
From: marc at msys.ch (Marc Balmer)
Date: Wed, 14 Dec 2011 09:37:43 +0100
Subject: [PATCH 3/4] developper -> developer.
Message-ID: <mailman.31.1323853161.8147.koha-patches@lists.koha-community.org>

---
 authorities/authorities.pl                  |    2 +-
 cataloguing/addbiblio.pl                    |    2 +-
 cataloguing/plugin_launcher.pl              |    2 +-
 misc/migration_tools/build6xx.pl            |    2 +-
 misc/release_notes/release_notes_200RC2.txt |    2 +-
 misc/release_notes/release_notes_200RC3.txt |    2 +-
 misc/release_notes/release_notes_210.txt    |    8 ++++----
 misc/release_notes/release_notes_211.txt    |    2 +-
 misc/release_notes/release_notes_220.txt    |    4 ++--
 misc/release_notes/release_notes_221.txt    |    4 ++--
 misc/release_notes/release_notes_222.txt    |    4 ++--
 misc/release_notes/release_notes_223.txt    |    4 ++--
 misc/release_notes/release_notes_22RC1.txt  |    2 +-
 misc/release_notes/release_notes_22RC2.txt  |    2 +-
 misc/release_notes/release_notes_22RC3.txt  |    2 +-
 misc/release_notes/release_notes_22RC4.txt  |    2 +-
 misc/release_notes/release_notes_22RC5.txt  |    2 +-
 17 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 1ba9122..23653f6 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -204,7 +204,7 @@ sub create_input {
     }
     elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
 
-        # opening plugin. Just check whether we are on a developper computer on a production one
+        # opening plugin. Just check whether we are on a developer computer on a production one
         # (the cgidir differs)
         my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder";
         unless (-r $cgidir and -d $cgidir) {
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index f69efea..568007e 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -414,7 +414,7 @@ sub create_input {
     }
     elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
 
-        # opening plugin. Just check whether we are on a developper computer on a production one
+        # opening plugin. Just check whether we are on a developer computer on a production one
         # (the cgidir differs)
         my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder";
         unless ( opendir( DIR, "$cgidir" ) ) {
diff --git a/cataloguing/plugin_launcher.pl b/cataloguing/plugin_launcher.pl
index bbd3f1f..f3ef3e8 100755
--- a/cataloguing/plugin_launcher.pl
+++ b/cataloguing/plugin_launcher.pl
@@ -27,7 +27,7 @@ use C4::Output;
 my $input = new CGI;
 my $plugin_name="cataloguing/value_builder/".$input->param("plugin_name");
 
-# opening plugin. Just check whether we are on a developper computer on a production one
+# opening plugin. Just check whether we are on a developer computer on a production one
 # (the cgidir differs)
 my $cgidir = C4::Context->intranetdir ."/cgi-bin";
 my $vbdir = "$cgidir/cataloguing/value_builder";
diff --git a/misc/migration_tools/build6xx.pl b/misc/migration_tools/build6xx.pl
index 5c02f12..2c4bf2b 100755
--- a/misc/migration_tools/build6xx.pl
+++ b/misc/migration_tools/build6xx.pl
@@ -234,7 +234,7 @@ while (my ($bibid) = $sth->fetchrow) {
                     }
                 }
                 if ($#x >4) {
-                    # too many $x, not handled, warn the developper that tries to migrate
+                    # too many $x, not handled, warn the developer that tries to migrate
                     print "warning there is ".$#x.'$x values';
                 }
             }
diff --git a/misc/release_notes/release_notes_200RC2.txt b/misc/release_notes/release_notes_200RC2.txt
index 21fc394..aa6248e 100644
--- a/misc/release_notes/release_notes_200RC2.txt
+++ b/misc/release_notes/release_notes_200RC2.txt
@@ -6,7 +6,7 @@ If you want to adopt Koha, please do, but you're warned that this release candid
 If you test it and let us know about any we haven't seen yet, it will help us to fix them.
 
 The 2.0.x series version is "feature freezed". Only bugs or minor changes will be made in this branch.
-The koha team is already working on the 2.2.x version. In CVS (HEAD branch), developpers can already get 1st draft of a working z3950 server.
+The koha team is already working on the 2.2.x version. In CVS (HEAD branch), developers can already get 1st draft of a working z3950 server.
 
 
 INSTALLATION
diff --git a/misc/release_notes/release_notes_200RC3.txt b/misc/release_notes/release_notes_200RC3.txt
index 0560597..89c7387 100644
--- a/misc/release_notes/release_notes_200RC3.txt
+++ b/misc/release_notes/release_notes_200RC3.txt
@@ -6,7 +6,7 @@ If you want to adopt Koha, please do, but you're warned that this release candid
 If you test it and let us know about any we haven't seen yet, it will help us to fix them.
 
 The 2.0.x series version is "feature freezed". Only bugs or minor changes will be made in this branch.
-The koha team is already working on the 2.2.x version. In CVS (HEAD branch), developpers can already get 1st draft of a working z3950 server.
+The koha team is already working on the 2.2.x version. In CVS (HEAD branch), developers can already get 1st draft of a working z3950 server.
 
 
 INSTALLATION
diff --git a/misc/release_notes/release_notes_210.txt b/misc/release_notes/release_notes_210.txt
index f810421..3610236 100644
--- a/misc/release_notes/release_notes_210.txt
+++ b/misc/release_notes/release_notes_210.txt
@@ -48,7 +48,7 @@ WHAT'S NEW
 1 Auto installer
 ****************
 If you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question.
-A very usefull feature for developpers that want to install/uninstall Koha quite often.
+A very usefull feature for developers that want to install/uninstall Koha quite often.
 A sample of auto_install_file is provided in misc/auto_install_file.
 
 2 Uninstaller
@@ -102,7 +102,7 @@ Circulation has been heavily rewritten...
 You can define rules like : "up to 2 CDROM, up to 10 books, max 10 items".
 * circulation works now like this (internally) :
 - get borrower cardnumber & item number
-- check "can book be issued". This sub (canbookbeissued) checks everything. For each problem, 2 arrays can be set up : MUSTCONFIRM and IMPOSSIBLE. MUSTCONFIRM entries needs a librarian confirmation before effective issuing. IMPOSSIBLE entries makes the issue impossible. It's now very easy to alter issuing rules for a given library (with a developper), as every test is heavily documented & in  a single sub.
+- check "can book be issued". This sub (canbookbeissued) checks everything. For each problem, 2 arrays can be set up : MUSTCONFIRM and IMPOSSIBLE. MUSTCONFIRM entries needs a librarian confirmation before effective issuing. IMPOSSIBLE entries makes the issue impossible. It's now very easy to alter issuing rules for a given library (with a developer), as every test is heavily documented & in  a single sub.
 - if >=1 IMPOSSIBLE entry : issuing is impossible, show why.
 - if >=1 MUSTCONFIRM : show problems, and ask for confirmation.
 - if both are empty : issue.
@@ -139,7 +139,7 @@ Should be used for MARC21 with some work. We need volunteers here.
 ==============
 HELP NEEDED
 ==============
-We alway accept new developpers wanting to code or test features of the Roadmap.
+We alway accept new developers wanting to code or test features of the Roadmap.
 We still can accept features not in the RoadMap if :
 - strongly supported/coded by someone.
 - compatible with other features.
@@ -167,4 +167,4 @@ Frameworks have to be defined to be choosable at installation stage. The idea be
 Same as for MARC21 frameworks. Except we don't have authority structure for MARC21 (we have for UNIMARC in french, thanks to ENSMP)
 
 * provide ISBD for MARC21 
-(ISBD for UNIMARC is being done, thanks to doXulting)
\ No newline at end of file
+(ISBD for UNIMARC is being done, thanks to doXulting)
diff --git a/misc/release_notes/release_notes_211.txt b/misc/release_notes/release_notes_211.txt
index 2d68bcf..20b996b 100644
--- a/misc/release_notes/release_notes_211.txt
+++ b/misc/release_notes/release_notes_211.txt
@@ -61,4 +61,4 @@ The next release will probably be 2.2RC1.
 It should contains :
 * bugfixes.
 * some new code for a better LDAP handling (automatic creation of the borrower if it does not exist, getting informations from LDAP directory)
-* a barcode generator ! it's a new feature that should be commited by a new developper coming from south america (argentina). I've seen the code, it's clean & nice. Just a new dependencay, for PDF generating. Should be non mandatory for ppl that don't want to print barcodes.
+* a barcode generator ! it's a new feature that should be commited by a new developer coming from south america (argentina). I've seen the code, it's clean & nice. Just a new dependencay, for PDF generating. Should be non mandatory for ppl that don't want to print barcodes.
diff --git a/misc/release_notes/release_notes_220.txt b/misc/release_notes/release_notes_220.txt
index 3b95480..5677f2d 100644
--- a/misc/release_notes/release_notes_220.txt
+++ b/misc/release_notes/release_notes_220.txt
@@ -4,7 +4,7 @@ RELEASE NOTES
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
@@ -196,7 +196,7 @@ General :
 * (almost) complete rewrite of librarian GUI : now Koha uses CSS, and is easier to use. However, users of Koha 2.0.0 won't be lost, as the general organisation of the product has not changed.
 * Online Help : an online help is available everywhere in the librarian interface. It's complete in the parameters section of Koha and for new features. It will be completed for the rest of the product.
 * Better LDAP suport : Koha 2.2 can be "connected" to a LDAP server and get all borrower informations from there (including borrower category where applicable). However, to avoid problems for libraries without LDAP server, the LDAP features have been stored in modules/C4/Auth_with_ldap.pm file. The standard Auth.pm don't use it. If you want LDAP, just perldoc Auth_with_ldap.pm and manually tune your Auth package !
-* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developpers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
+* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
 * Uninstaller : run misc/uninstall.pl, provide the mysql root password. that's all. Koha is completely deleted and can be reinstalled. With the previous feature, it's a very nice solution for test platform.
 * mod_perl : Koha should now work under mod_perl, that gives a big performance boost (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
 * Nelsonville have shared their templates. They are available as NPL theme.
diff --git a/misc/release_notes/release_notes_221.txt b/misc/release_notes/release_notes_221.txt
index 06ceb19..24afbb7 100644
--- a/misc/release_notes/release_notes_221.txt
+++ b/misc/release_notes/release_notes_221.txt
@@ -4,7 +4,7 @@ RELEASE NOTES
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
@@ -215,7 +215,7 @@ General :
 * (almost) complete rewrite of librarian GUI : now Koha uses CSS, and is easier to use. However, users of Koha 2.0.0 won't be lost, as the general organisation of the product has not changed.
 * Online Help : an online help is available everywhere in the librarian interface. It's complete in the parameters section of Koha and for new features. It will be completed for the rest of the product.
 * Better LDAP suport : Koha 2.2 can be "connected" to a LDAP server and get all borrower informations from there (including borrower category where applicable). However, to avoid problems for libraries without LDAP server, the LDAP features have been stored in modules/C4/Auth_with_ldap.pm file. The standard Auth.pm don't use it. If you want LDAP, just perldoc Auth_with_ldap.pm and manually tune your Auth package !
-* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developpers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
+* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
 * Uninstaller : run misc/uninstall.pl, provide the mysql root password. that's all. Koha is completely deleted and can be reinstalled. With the previous feature, it's a very nice solution for test platform.
 * mod_perl : Koha should now work under mod_perl, that gives a big performance boost (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
 * Nelsonville have shared their templates. They are available as NPL theme.
diff --git a/misc/release_notes/release_notes_222.txt b/misc/release_notes/release_notes_222.txt
index 0522389..6b11e75 100644
--- a/misc/release_notes/release_notes_222.txt
+++ b/misc/release_notes/release_notes_222.txt
@@ -4,7 +4,7 @@ RELEASE NOTES
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
@@ -361,7 +361,7 @@ General :
 * (almost) complete rewrite of librarian GUI : now Koha uses CSS, and is easier to use. However, users of Koha 2.0.0 won't be lost, as the general organisation of the product has not changed.
 * Online Help : an online help is available everywhere in the librarian interface. It's complete in the parameters section of Koha and for new features. It will be completed for the rest of the product.
 * Better LDAP suport : Koha 2.2 can be "connected" to a LDAP server and get all borrower informations from there (including borrower category where applicable). However, to avoid problems for libraries without LDAP server, the LDAP features have been stored in modules/C4/Auth_with_ldap.pm file. The standard Auth.pm don't use it. If you want LDAP, just perldoc Auth_with_ldap.pm and manually tune your Auth package !
-* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developpers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
+* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
 * Uninstaller : run misc/uninstall.pl, provide the mysql root password. that's all. Koha is completely deleted and can be reinstalled. With the previous feature, it's a very nice solution for test platform.
 * mod_perl : Koha should now work under mod_perl, that gives a big performance boost (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
 * Nelsonville have shared their templates. They are available as NPL theme.
diff --git a/misc/release_notes/release_notes_223.txt b/misc/release_notes/release_notes_223.txt
index 6eb7311..5ecc63e 100644
--- a/misc/release_notes/release_notes_223.txt
+++ b/misc/release_notes/release_notes_223.txt
@@ -4,7 +4,7 @@ RELEASE NOTES
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
@@ -408,7 +408,7 @@ General :
 * (almost) complete rewrite of librarian GUI : now Koha uses CSS, and is easier to use. However, users of Koha 2.0.0 won't be lost, as the general organisation of the product has not changed.
 * Online Help : an online help is available everywhere in the librarian interface. It's complete in the parameters section of Koha and for new features. It will be completed for the rest of the product.
 * Better LDAP suport : Koha 2.2 can be "connected" to a LDAP server and get all borrower informations from there (including borrower category where applicable). However, to avoid problems for libraries without LDAP server, the LDAP features have been stored in modules/C4/Auth_with_ldap.pm file. The standard Auth.pm don't use it. If you want LDAP, just perldoc Auth_with_ldap.pm and manually tune your Auth package !
-* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developpers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
+* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
 * Uninstaller : run misc/uninstall.pl, provide the mysql root password. that's all. Koha is completely deleted and can be reinstalled. With the previous feature, it's a very nice solution for test platform.
 * mod_perl : Koha should now work under mod_perl, that gives a big performance boost (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
 * Nelsonville have shared their templates. They are available as NPL theme.
diff --git a/misc/release_notes/release_notes_22RC1.txt b/misc/release_notes/release_notes_22RC1.txt
index 2b6cc5f..bdbfa15 100644
--- a/misc/release_notes/release_notes_22RC1.txt
+++ b/misc/release_notes/release_notes_22RC1.txt
@@ -5,7 +5,7 @@ Welcome to the 1st Release Candidate of the 2.2 version of Koha.
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators !).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators !).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
diff --git a/misc/release_notes/release_notes_22RC2.txt b/misc/release_notes/release_notes_22RC2.txt
index 162630a..8484c5c 100644
--- a/misc/release_notes/release_notes_22RC2.txt
+++ b/misc/release_notes/release_notes_22RC2.txt
@@ -4,7 +4,7 @@ RELEASE NOTES
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators !).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators !).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
diff --git a/misc/release_notes/release_notes_22RC3.txt b/misc/release_notes/release_notes_22RC3.txt
index 2c9aa08..4121fb1 100644
--- a/misc/release_notes/release_notes_22RC3.txt
+++ b/misc/release_notes/release_notes_22RC3.txt
@@ -4,7 +4,7 @@ RELEASE NOTES
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators !).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators !).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
diff --git a/misc/release_notes/release_notes_22RC4.txt b/misc/release_notes/release_notes_22RC4.txt
index 3608697..7db7665 100644
--- a/misc/release_notes/release_notes_22RC4.txt
+++ b/misc/release_notes/release_notes_22RC4.txt
@@ -4,7 +4,7 @@ RELEASE NOTES
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
diff --git a/misc/release_notes/release_notes_22RC5.txt b/misc/release_notes/release_notes_22RC5.txt
index 6f5009d..8a6ac1e 100644
--- a/misc/release_notes/release_notes_22RC5.txt
+++ b/misc/release_notes/release_notes_22RC5.txt
@@ -4,7 +4,7 @@ RELEASE NOTES
 Koha is the 1st Open-Source Integrated Library System.
 Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
 
-Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developers (excluding translators).
 
 With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
 
-- 
1.7.2.5


--------------080600010502090104060004
Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
 name="0004-Remove-duplicated-word-the-the-the.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="0004-Remove-duplicated-word-the-the-the.patch"

RnJvbSBjZmE2MmI4NGUwMzQwZDkxMDZkMGIxZTMyMTY4ODJlZTA2ZDE2MWExIE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJjIEJhbG1lciA8bWFyY0Btc3lzLmNoPgpEYXRl
OiBXZWQsIDE0IERlYyAyMDExIDA5OjUyOjQ3ICswMTAwClN1YmplY3Q6IFtQQVRDSCA0LzRd
IFJlbW92ZSBkdXBsaWNhdGVkIHdvcmQ6ICAndGhlIHRoZSAnIC0+ICd0aGUgJy4KCi0tLQog
QzQvTGFiZWxzL0xhYmVsLnBtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg
ICA2ICsrKy0tLQogQzQvUmVjb3JkLnBtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgfCAgICAyICstCiBldGMvemVicmFkYi9jY2wucHJvcGVydGllcyAgICAgICAg
ICAgICAgICAgICAgICAgICB8ICAgIDIgKy0KIGluc3RhbGxlci9kYXRhL215c3FsL2tvaGFz
dHJ1Y3R1cmUuc3FsICAgICAgICAgICAgIHwgICAgNCArKy0tCiAuLi4vaW50cmFuZXQtdG1w
bC9wcm9nL2VuL2pzL3RpbnltY2UvY2hhbmdlbG9nICAgICB8ICAgIDQgKystLQogLi4uL3Ro
ZW1lcy9hZHZhbmNlZC9jc3MvZWRpdG9yX2NvbnRlbnQuY3NzICAgICAgICAgfCAgICAyICst
CiAuLi4vcHJvZy9lbi9saWIveXVpL2NhbGVuZGFyL2NhbGVuZGFyLWRlYnVnLmpzICAgICB8
ICAgIDIgKy0KIC4uLi9wcm9nL2VuL2xpYi95dWkvY2FsZW5kYXIvY2FsZW5kYXIuanMgICAg
ICAgICAgIHwgICAgMiArLQogLi4uL3Byb2cvZW4vbGliL3l1aS9kcmFnZHJvcC9kcmFnZHJv
cC1kZWJ1Zy5qcyAgICAgfCAgICAyICstCiAuLi4vcHJvZy9lbi9saWIveXVpL2RyYWdkcm9w
L2RyYWdkcm9wLmpzICAgICAgICAgICB8ICAgIDIgKy0KIC4uLi9wcm9nL2VuL2xpYi95dWkv
ZWRpdG9yL2VkaXRvci1kZWJ1Zy5qcyAgICAgICAgIHwgICAgMiArLQogLi4uL2ludHJhbmV0
LXRtcGwvcHJvZy9lbi9saWIveXVpL2VkaXRvci9lZGl0b3IuanMgfCAgICAyICstCiAuLi4v
cHJvZy9lbi9saWIveXVpL2VkaXRvci9zaW1wbGVlZGl0b3ItZGVidWcuanMgICB8ICAgIDIg
Ky0KIC4uLi9wcm9nL2VuL2xpYi95dWkvZWRpdG9yL3NpbXBsZWVkaXRvci5qcyAgICAgICAg
IHwgICAgMiArLQogLi4uL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL2dldC9nZXQt
ZGVidWcuanMgfCAgICAyICstCiBrb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xp
Yi95dWkvZ2V0L2dldC5qcyB8ICAgIDIgKy0KIC4uLi9wcm9nL2VuL2xpYi95dWkvbWVudS9t
ZW51LWRlYnVnLmpzICAgICAgICAgICAgIHwgICAgNCArKy0tCiAuLi4vaW50cmFuZXQtdG1w
bC9wcm9nL2VuL2xpYi95dWkvbWVudS9tZW51LmpzICAgICB8ICAgIDQgKystLQogLi4uL3By
b2cvZW4vbGliL3l1aS95YWhvby95YWhvby1kZWJ1Zy5qcyAgICAgICAgICAgfCAgICAyICst
CiAuLi4vaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkveWFob28veWFob28uanMgICB8
ICAgIDIgKy0KIC4uLi9wcm9nL2VuL2xpYi95dWkveXVpbG9hZGVyL3l1aWxvYWRlci1kZWJ1
Zy5qcyAgIHwgICAgNiArKystLS0KIC4uLi9wcm9nL2VuL2xpYi95dWkveXVpbG9hZGVyL3l1
aWxvYWRlci5qcyAgICAgICAgIHwgICAgNiArKystLS0KIC4uLi9lbi9tb2R1bGVzL2hlbHAv
dG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0ICAgIHwgICAgMiArLQogLi4uL3Byb2cvZW4v
bW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50dCAgICAgfCAgICAyICstCiAuLi4v
cHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvcGljdHVyZS11cGxvYWQudHQgICB8ICAgIDQg
KystLQogLi4uL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dCAgICAg
ICAgfCAgICA0ICsrLS0KIC4uLi9wby9hbS1FdGhpLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAw
MC5wbyAgICAgICAgIHwgICAgOCArKysrLS0tLQogLi4uL3BvL2FyLUFyYWItaS1zdGFmZi10
LXByb2ctdi0zMDA2MDAwLnBvICAgICAgICAgfCAgICA4ICsrKystLS0tCiAuLi4vcG8vYXot
QVotaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAgICAgICB8ICAgMTAgKysrKyst
LS0tLQogbWlzYy90cmFuc2xhdG9yL3BvL2Jlbi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAu
cG8gfCAgICA4ICsrKystLS0tCiAuLi4vcG8vY2EtVkEtaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvICAgICAgICAgICB8ICAgIDggKysrKy0tLS0KIC4uLi9wby9kYS1ESy1pLXN0YWZm
LXQtcHJvZy12LTMwMDYwMDAucG8gICAgICAgICAgIHwgICAgOCArKysrLS0tLQogLi4uL3Bv
L2RlLURFLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAgICAgICAgICAgfCAgIDEwICsr
KysrLS0tLS0KIC4uLi9wby9lbC1HUi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gICAg
ICAgICAgIHwgICAxMCArKysrKy0tLS0tCiAuLi4vcG8vZW4tR0ItaS1zdGFmZi10LXByb2ct
di0zMDA2MDAwLnBvICAgICAgICAgICB8ICAgMTIgKysrKysrLS0tLS0tCiAuLi4vcG8vZW4t
TlotaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAgICAgICB8ICAgMTIgKysrKysr
LS0tLS0tCiAuLi4vcG8vZXMtRVMtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAg
ICAgICB8ICAgIDggKysrKy0tLS0KIC4uLi9wby9maS1GSS1pLXN0YWZmLXQtcHJvZy12LTMw
MDYwMDAucG8gICAgICAgICAgIHwgICAgOCArKysrLS0tLQogLi4uL3BvL2ZyLUNBLWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAgICAgICAgICAgfCAgICA4ICsrKystLS0tCiAuLi4v
cG8vZnItRlItaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAgICAgICB8ICAgIDgg
KysrKy0tLS0KIG1pc2MvdHJhbnNsYXRvci9wby9oaS1pLXN0YWZmLXQtcHJvZy12LTMwMDYw
MDAucG8gIHwgICAgOCArKysrLS0tLQogLi4uL3BvL2hyLUhSLWktc3RhZmYtdC1wcm9nLXYt
MzAwNjAwMC5wbyAgICAgICAgICAgfCAgICA4ICsrKystLS0tCiAuLi4vcG8vaHUtSFUtaS1z
dGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAgICAgICB8ICAgIDggKysrKy0tLS0KIC4u
Li9wby9oeS1Bcm1uLWktc3RhZmYtcHJvZy12LTMwMDYwMDAucG8gICAgICAgICAgIHwgICAg
NCArKy0tCiAuLi4vcG8vaHktQXJtbi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gICAg
ICAgICB8ICAgIDggKysrKy0tLS0KIC4uLi9wby9pZC1JRC1pLXN0YWZmLXQtcHJvZy12LTMw
MDYwMDAucG8gICAgICAgICAgIHwgICAgOCArKysrLS0tLQogLi4uL3BvL2l0LUlULWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAgICAgICAgICAgfCAgICA4ICsrKystLS0tCiAuLi4v
cG8va24tS25kYS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gICAgICAgICB8ICAgIDIg
Ky0KIC4uLi9wby9sby1MYW9vLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAgICAgICAg
IHwgICAgOCArKysrLS0tLQogbWlzYy90cmFuc2xhdG9yL3BvL21vbi1pLXN0YWZmLXQtcHJv
Zy12LTMwMDYwMDAucG8gfCAgIDEwICsrKysrLS0tLS0KIC4uLi9wby9tcy1NWS1pLXN0YWZm
LXQtcHJvZy12LTMwMDYwMDAucG8gICAgICAgICAgIHwgICAgOCArKysrLS0tLQogLi4uL3Bv
L25iLU5PLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAgICAgICAgICAgfCAgICA4ICsr
KystLS0tCiAuLi4vcG8vbmwtQkUtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAg
ICAgICB8ICAgIDggKysrKy0tLS0KIC4uLi9wby9ubC1OTC1pLXN0YWZmLXQtcHJvZy12LTMw
MDYwMDAucG8gICAgICAgICAgIHwgICAgOCArKysrLS0tLQogbWlzYy90cmFuc2xhdG9yL3Bv
L25uLU5PLWktc3RhZmYtcHJvZy12LTMwMDYwMDAucG8gfCAgICA2ICsrKy0tLQogLi4uL3Bv
L25uLU5PLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAgICAgICAgICAgfCAgICA4ICsr
KystLS0tCiAuLi4vcG8vcGwtUEwtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAg
ICAgICB8ICAgIDggKysrKy0tLS0KIC4uLi9wby9wdC1CUi1pLXN0YWZmLXQtcHJvZy12LTMw
MDYwMDAucG8gICAgICAgICAgIHwgICAgOCArKysrLS0tLQogLi4uL3BvL3B0LVBULWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAgICAgICAgICAgfCAgIDEwICsrKysrLS0tLS0KIC4u
Li9wby9yby1STy1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gICAgICAgICAgIHwgICAg
OCArKysrLS0tLQogLi4uL3BvL3J1LVJVLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAg
ICAgICAgICAgfCAgIDEwICsrKysrLS0tLS0KIC4uLi9wby9zZC1QSy1pLXN0YWZmLXQtcHJv
Zy12LTMwMDYwMDAucG8gICAgICAgICAgIHwgICAgOCArKysrLS0tLQogLi4uL3BvL3N2LVNF
LWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyAgICAgICAgICAgfCAgICA4ICsrKystLS0t
CiBtaXNjL3RyYW5zbGF0b3IvcG8vdGV0LWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyB8
ICAgIDggKysrKy0tLS0KIC4uLi9wby90aC1USEEtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAw
LnBvICAgICAgICAgIHwgICAgOCArKysrLS0tLQogLi4uL3BvL3RyLVRSLWktc3RhZmYtdC1w
cm9nLXYtMzAwNjAwMC5wbyAgICAgICAgICAgfCAgIDEwICsrKysrLS0tLS0KIC4uLi9wby91
ay1VQS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gICAgICAgICAgIHwgICAgOCArKysr
LS0tLQogLi4uL3BvL3VyLUFyYWItaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAg
ICAgfCAgICA4ICsrKystLS0tCiAuLi4vcG8vemgtSGFucy1DTi1pLXN0YWZmLXQtcHJvZy12
LTMwMDYwMDAucG8gICAgICB8ICAgMTAgKysrKystLS0tLQogLi4uL3BvL3poLUhhbnMtVFct
aS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvICAgICAgfCAgICA4ICsrKystLS0tCiA3MCBm
aWxlcyBjaGFuZ2VkLCAyMjAgaW5zZXJ0aW9ucygrKSwgMjIwIGRlbGV0aW9ucygtKQoKZGlm
ZiAtLWdpdCBhL0M0L0xhYmVscy9MYWJlbC5wbSBiL0M0L0xhYmVscy9MYWJlbC5wbQppbmRl
eCA5MzBlMGY2Li4wYWVjMGE2IDEwMDY0NAotLS0gYS9DNC9MYWJlbHMvTGFiZWwucG0KKysr
IGIvQzQvTGFiZWxzL0xhYmVsLnBtCkBAIC0yNzMsNyArMjczLDcgQEAgc3ViIF9CSUIgewog
CiBzdWIgX0JBUiB7CiAgICAgbXkgJHNlbGYgPSBzaGlmdDsKLSAgICBteSAkYmFyY29kZV9s
bHggPSAkc2VsZi0+eydsbHgnfSArICRzZWxmLT57J2xlZnRfdGV4dF9tYXJnaW4nfTsgICAg
ICMgdGhpcyBwbGFjZXMgdGhlIGJvdHRvbSBsZWZ0IG9mIHRoZSBiYXJjb2RlIHRoZSBsZWZ0
IHRleHQgbWFyZ2luIGRpc3RhbmNlIHRvIHJpZ2h0IG9mIHRoZSB0aGUgbGVmdCBlZGdlIG9m
IHRoZSBsYWJlbCAoJGxseCkKKyAgICBteSAkYmFyY29kZV9sbHggPSAkc2VsZi0+eydsbHgn
fSArICRzZWxmLT57J2xlZnRfdGV4dF9tYXJnaW4nfTsgICAgICMgdGhpcyBwbGFjZXMgdGhl
IGJvdHRvbSBsZWZ0IG9mIHRoZSBiYXJjb2RlIHRoZSBsZWZ0IHRleHQgbWFyZ2luIGRpc3Rh
bmNlIHRvIHJpZ2h0IG9mIHRoZSBsZWZ0IGVkZ2Ugb2YgdGhlIGxhYmVsICgkbGx4KQogICAg
IG15ICRiYXJjb2RlX2xseSA9ICRzZWxmLT57J2xseSd9ICsgJHNlbGYtPnsndG9wX3RleHRf
bWFyZ2luJ307ICAgICAgIyB0aGlzIHBsYWNlcyB0aGUgYm90dG9tIGxlZnQgb2YgdGhlIGJh
cmNvZGUgdGhlIHRvcCB0ZXh0IG1hcmdpbiBkaXN0YW5jZSBhYm92ZSB0aGUgYm90dG9tIG9m
IHRoZSBsYWJlbCAoJGxseSkKICAgICBteSAkYmFyY29kZV93aWR0aCA9IDAuOCAqICRzZWxm
LT57J3dpZHRoJ307ICAgICAgICAgICAgICAgICAgICAgICAgICMgdGhpcyBzY2FsZXMgdGhl
IGJhcmNvZGUgd2lkdGggdG8gODAlIG9mIHRoZSBsYWJlbCB3aWR0aAogICAgIG15ICRiYXJj
b2RlX3lfc2NhbGVfZmFjdG9yID0gMC4wMSAqICRzZWxmLT57J2hlaWdodCd9OyAgICAgICAg
ICAgICAgIyB0aGlzIHNjYWxlcyB0aGUgYmFyY29kZSBoZWlnaHQgdG8gMTAlIG9mIHRoZSBs
YWJlbCBoZWlnaHQKQEAgLTI4Miw3ICsyODIsNyBAQCBzdWIgX0JBUiB7CiAKIHN1YiBfQklC
QkFSIHsKICAgICBteSAkc2VsZiA9IHNoaWZ0OwotICAgIG15ICRiYXJjb2RlX2xseCA9ICRz
ZWxmLT57J2xseCd9ICsgJHNlbGYtPnsnbGVmdF90ZXh0X21hcmdpbid9OyAgICAgIyB0aGlz
IHBsYWNlcyB0aGUgYm90dG9tIGxlZnQgb2YgdGhlIGJhcmNvZGUgdGhlIGxlZnQgdGV4dCBt
YXJnaW4gZGlzdGFuY2UgdG8gcmlnaHQgb2YgdGhlIHRoZSBsZWZ0IGVkZ2Ugb2YgdGhlIGxh
YmVsICgkc2VsZi0+eydsbHgnfSkKKyAgICBteSAkYmFyY29kZV9sbHggPSAkc2VsZi0+eyds
bHgnfSArICRzZWxmLT57J2xlZnRfdGV4dF9tYXJnaW4nfTsgICAgICMgdGhpcyBwbGFjZXMg
dGhlIGJvdHRvbSBsZWZ0IG9mIHRoZSBiYXJjb2RlIHRoZSBsZWZ0IHRleHQgbWFyZ2luIGRp
c3RhbmNlIHRvIHJpZ2h0IG9mIHRoZSBsZWZ0IGVkZ2Ugb2YgdGhlIGxhYmVsICgkc2VsZi0+
eydsbHgnfSkKICAgICBteSAkYmFyY29kZV9sbHkgPSAkc2VsZi0+eydsbHknfSArICRzZWxm
LT57J3RvcF90ZXh0X21hcmdpbid9OyAgICAgICMgdGhpcyBwbGFjZXMgdGhlIGJvdHRvbSBs
ZWZ0IG9mIHRoZSBiYXJjb2RlIHRoZSB0b3AgdGV4dCBtYXJnaW4gZGlzdGFuY2UgYWJvdmUg
dGhlIGJvdHRvbSBvZiB0aGUgbGFiZWwgKCRsbHkpCiAgICAgbXkgJGJhcmNvZGVfd2lkdGgg
PSAwLjggKiAkc2VsZi0+eyd3aWR0aCd9OyAgICAgICAgICAgICAgICAgICAgICAgICAjIHRo
aXMgc2NhbGVzIHRoZSBiYXJjb2RlIHdpZHRoIHRvIDgwJSBvZiB0aGUgbGFiZWwgd2lkdGgK
ICAgICBteSAkYmFyY29kZV95X3NjYWxlX2ZhY3RvciA9IDAuMDEgKiAkc2VsZi0+eydoZWln
aHQnfTsgICAgICAgICAgICAgICMgdGhpcyBzY2FsZXMgdGhlIGJhcmNvZGUgaGVpZ2h0IHRv
IDEwJSBvZiB0aGUgbGFiZWwgaGVpZ2h0CkBAIC0yOTQsNyArMjk0LDcgQEAgc3ViIF9CSUJC
QVIgewogCiBzdWIgX0JBUkJJQiB7CiAgICAgbXkgJHNlbGYgPSBzaGlmdDsKLSAgICBteSAk
YmFyY29kZV9sbHggPSAkc2VsZi0+eydsbHgnfSArICRzZWxmLT57J2xlZnRfdGV4dF9tYXJn
aW4nfTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgdGhpcyBwbGFjZXMgdGhlIGJv
dHRvbSBsZWZ0IG9mIHRoZSBiYXJjb2RlIHRoZSBsZWZ0IHRleHQgbWFyZ2luIGRpc3RhbmNl
IHRvIHJpZ2h0IG9mIHRoZSB0aGUgbGVmdCBlZGdlIG9mIHRoZSBsYWJlbCAoJHNlbGYtPnsn
bGx4J30pCisgICAgbXkgJGJhcmNvZGVfbGx4ID0gJHNlbGYtPnsnbGx4J30gKyAkc2VsZi0+
eydsZWZ0X3RleHRfbWFyZ2luJ307ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIHRo
aXMgcGxhY2VzIHRoZSBib3R0b20gbGVmdCBvZiB0aGUgYmFyY29kZSB0aGUgbGVmdCB0ZXh0
IG1hcmdpbiBkaXN0YW5jZSB0byByaWdodCBvZiB0aGUgbGVmdCBlZGdlIG9mIHRoZSBsYWJl
bCAoJHNlbGYtPnsnbGx4J30pCiAgICAgbXkgJGJhcmNvZGVfbGx5ID0gKCRzZWxmLT57J2xs
eSd9ICsgJHNlbGYtPnsnaGVpZ2h0J30pIC0gJHNlbGYtPnsndG9wX3RleHRfbWFyZ2luJ307
ICAgICAgICAjIHRoaXMgcGxhY2VzIHRoZSBib3R0b20gbGVmdCBvZiB0aGUgYmFyY29kZSB0
aGUgdG9wIHRleHQgbWFyZ2luIGRpc3RhbmNlIGJlbG93IHRoZSB0b3Agb2YgdGhlIGxhYmVs
ICgkc2VsZi0+eydsbHknfSkKICAgICBteSAkYmFyY29kZV93aWR0aCA9IDAuOCAqICRzZWxm
LT57J3dpZHRoJ307ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICMgdGhpcyBzY2FsZXMgdGhlIGJhcmNvZGUgd2lkdGggdG8gODAlIG9mIHRoZSBs
YWJlbCB3aWR0aAogICAgIG15ICRiYXJjb2RlX3lfc2NhbGVfZmFjdG9yID0gMC4wMSAqICRz
ZWxmLT57J2hlaWdodCd9OyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IyB0aGlzIHNjYWxlcyB0aGUgYmFyY29kZSBoZWlnaHQgdG8gMTAlIG9mIHRoZSBsYWJlbCBo
ZWlnaHQKZGlmZiAtLWdpdCBhL0M0L1JlY29yZC5wbSBiL0M0L1JlY29yZC5wbQppbmRleCBj
ZWNiNmVkLi5lOTA2ODUwIDEwMDY0NAotLS0gYS9DNC9SZWNvcmQucG0KKysrIGIvQzQvUmVj
b3JkLnBtCkBAIC0zOTgsNyArMzk4LDcgQEAgc3ViIG1hcmNyZWNvcmQyY3N2IHsKICAgICAj
IEdldHRpbmcgdGhlIG1hcmNmaWVsZHMgYXMgYW4gYXJyYXkKICAgICBteSBAbWFyY2ZpZWxk
c2FycmF5ID0gc3BsaXQoJ1x8JywgJG1hcmNmaWVsZHNsaXN0KTsKIAotICAgIyBTZXBhcmF0
aW5nIHRoZSBtYXJjZmllbGRzIGZyb20gdGhlIHRoZSB1c2VyLXN1cHBsaWVkIGhlYWRlcnMK
KyAgICMgU2VwYXJhdGluZyB0aGUgbWFyY2ZpZWxkcyBmcm9tIHRoZSB1c2VyLXN1cHBsaWVk
IGhlYWRlcnMKICAgICBteSBAbWFyY2ZpZWxkczsKICAgICBmb3JlYWNoIChAbWFyY2ZpZWxk
c2FycmF5KSB7CiAgICAgICAgIG15IEByZXN1bHQgPSBzcGxpdCgnPScsICRfKTsKZGlmZiAt
LWdpdCBhL2V0Yy96ZWJyYWRiL2NjbC5wcm9wZXJ0aWVzIGIvZXRjL3plYnJhZGIvY2NsLnBy
b3BlcnRpZXMKaW5kZXggZTQyN2Q1Yy4uZjkzZGU5NiAxMDA2NDQKLS0tIGEvZXRjL3plYnJh
ZGIvY2NsLnByb3BlcnRpZXMKKysrIGIvZXRjL3plYnJhZGIvY2NsLnByb3BlcnRpZXMKQEAg
LTgzMSw3ICs4MzEsNyBAQCBUaXRsZS11bmlmb3JtLWhlYWRpbmcgMT1UaXRsZS11bmlmb3Jt
LWhlYWRpbmcKIFRpdGxlLXVuaWZvcm0tc2VlIDE9VGl0bGUtdW5pZm9ybS1zZWUKIFRpdGxl
LXVuaWZvcm0tc2VlYWxzbyAxPVRpdGxlLXVuaWZvcm0tc2VlYWxzbwogCi0jQXV0aG9yaXR5
LW51bWJlciAgICAgICAgICAgS29oYS1BdXRoLU51bWJlciAgVGhlIGlkZW50aWZpZXIgb2Yg
dGhlIHRoZSBhdXRob3JpdHkKKyNBdXRob3JpdHktbnVtYmVyICAgICAgICAgICBLb2hhLUF1
dGgtTnVtYmVyICBUaGUgaWRlbnRpZmllciBvZiB0aGUgYXV0aG9yaXR5CiAjICAgICAgICAg
ICAgICAgICAgICAgICAgICAgcmVjb3JkLCBzdG9yZWQgaW4gMDAxIGluIHRoZSBhdXRob3Jp
dHkgcmVjb3JkLCBhbmQgJDkvJDAgaW4gdGhlCiAjICAgICAgICAgICAgICAgICAgICAgICAg
ICAgZmllbGQgdGhhdCByZWNvcmQgaXMgbGlua2VkIHRvIGluIHRoZSBiaWIgcmVjb3JkCiBB
dXRob3JpdHktTnVtYmVyIDE9S29oYS1BdXRoLU51bWJlcgpkaWZmIC0tZ2l0IGEvaW5zdGFs
bGVyL2RhdGEvbXlzcWwva29oYXN0cnVjdHVyZS5zcWwgYi9pbnN0YWxsZXIvZGF0YS9teXNx
bC9rb2hhc3RydWN0dXJlLnNxbAppbmRleCBhMDNiZDIzLi5iY2FiMjRjIDEwMDY0NAotLS0g
YS9pbnN0YWxsZXIvZGF0YS9teXNxbC9rb2hhc3RydWN0dXJlLnNxbAorKysgYi9pbnN0YWxs
ZXIvZGF0YS9teXNxbC9rb2hhc3RydWN0dXJlLnNxbApAQCAtMTM5Myw3ICsxMzkzLDcgQEAg
Q1JFQVRFIFRBQkxFIGBvbGRfcmVzZXJ2ZXNgICggLS0gdGhpcyB0YWJsZSBob2xkcyBhbGwg
aG9sZHMvcmVzZXJ2ZXMgdGhhdCBoYXZlIGIKICAgYGNhbmNlbGxhdGlvbmRhdGVgIGRhdGUg
ZGVmYXVsdCBOVUxMLCAtLSB0aGUgZGF0ZSB0aGlzIGhvbGQgd2FzIGNhbmNlbGxlZAogICBg
cmVzZXJ2ZW5vdGVzYCBtZWRpdW10ZXh0LCAtLSBub3RlcyByZWxhdGVkIHRvIHRoaXMgaG9s
ZAogICBgcHJpb3JpdHlgIHNtYWxsaW50KDYpIGRlZmF1bHQgTlVMTCwgLS0gd2hlcmUgaW4g
dGhlIHF1ZXVlIHRoZSBwYXRyb24gc2l0cwotICBgZm91bmRgIHZhcmNoYXIoMSkgZGVmYXVs
dCBOVUxMLCAtLSBhIG9uZSBsZXR0ZXIgY29kZSBkZWZpbmluZyB3aGF0IHRoZSB0aGUgc3Rh
dHVzIGlzIG9mIHRoZSBob2xkIGlzIGFmdGVyIGl0IGhhcyBiZWVuIGNvbmZpcm1lZAorICBg
Zm91bmRgIHZhcmNoYXIoMSkgZGVmYXVsdCBOVUxMLCAtLSBhIG9uZSBsZXR0ZXIgY29kZSBk
ZWZpbmluZyB3aGF0IHRoZSBzdGF0dXMgaXMgb2YgdGhlIGhvbGQgaXMgYWZ0ZXIgaXQgaGFz
IGJlZW4gY29uZmlybWVkCiAgIGB0aW1lc3RhbXBgIHRpbWVzdGFtcCBOT1QgTlVMTCBkZWZh
dWx0IENVUlJFTlRfVElNRVNUQU1QIG9uIHVwZGF0ZSBDVVJSRU5UX1RJTUVTVEFNUCwgLS0g
dGhlIGRhdGUgYW5kIHRpbWUgdGhpcyBob2xkIHdhcyBsYXN0IHVwZGF0ZWQKICAgYGl0ZW1u
dW1iZXJgIGludCgxMSkgZGVmYXVsdCBOVUxMLCAtLSBmb3JlaWduIGtleSBmcm9tIHRoZSBp
dGVtcyB0YWJsZSBkZWZpbmluZyB0aGUgc3BlY2lmaWMgaXRlbSB0aGUgcGF0cm9uIGhhcyBw
bGFjZWQgb24gaG9sZCBvciB0aGUgaXRlbSB0aGlzIGhvbGQgd2FzIGZpbGxlZCB3aXRoCiAg
IGB3YWl0aW5nZGF0ZWAgZGF0ZSBkZWZhdWx0IE5VTEwsIC0tIHRoZSBkYXRlIHRoZSBpdGVt
IHdhcyBtYXJrZWQgYXMgd2FpdGluZyBmb3IgdGhlIHBhdHJvbiBhdCB0aGUgbGlicmFyeQpA
QCAtMTU2OCw3ICsxNTY4LDcgQEAgQ1JFQVRFIFRBQkxFIGByZXNlcnZlc2AgKCAtLSBpbmZv
cm1hdGlvbiByZWxhdGVkIHRvIGhvbGRzL3Jlc2VydmVzIGluIEtvaGEKICAgYGNhbmNlbGxh
dGlvbmRhdGVgIGRhdGUgZGVmYXVsdCBOVUxMLCAtLSB0aGUgZGF0ZSB0aGlzIGhvbGQgd2Fz
IGNhbmNlbGxlZAogICBgcmVzZXJ2ZW5vdGVzYCBtZWRpdW10ZXh0LCAtLSBub3RlcyByZWxh
dGVkIHRvIHRoaXMgaG9sZAogICBgcHJpb3JpdHlgIHNtYWxsaW50KDYpIGRlZmF1bHQgTlVM
TCwgLS0gd2hlcmUgaW4gdGhlIHF1ZXVlIHRoZSBwYXRyb24gc2l0cwotICBgZm91bmRgIHZh
cmNoYXIoMSkgZGVmYXVsdCBOVUxMLCAtLSBhIG9uZSBsZXR0ZXIgY29kZSBkZWZpbmluZyB3
aGF0IHRoZSB0aGUgc3RhdHVzIGlzIG9mIHRoZSBob2xkIGlzIGFmdGVyIGl0IGhhcyBiZWVu
IGNvbmZpcm1lZAorICBgZm91bmRgIHZhcmNoYXIoMSkgZGVmYXVsdCBOVUxMLCAtLSBhIG9u
ZSBsZXR0ZXIgY29kZSBkZWZpbmluZyB3aGF0IHRoZSBzdGF0dXMgaXMgb2YgdGhlIGhvbGQg
aXMgYWZ0ZXIgaXQgaGFzIGJlZW4gY29uZmlybWVkCiAgIGB0aW1lc3RhbXBgIHRpbWVzdGFt
cCBOT1QgTlVMTCBkZWZhdWx0IENVUlJFTlRfVElNRVNUQU1QIG9uIHVwZGF0ZSBDVVJSRU5U
X1RJTUVTVEFNUCwgLS0gdGhlIGRhdGUgYW5kIHRpbWUgdGhpcyBob2xkIHdhcyBsYXN0IHVw
ZGF0ZWQKICAgYGl0ZW1udW1iZXJgIGludCgxMSkgZGVmYXVsdCBOVUxMLCAtLSBmb3JlaWdu
IGtleSBmcm9tIHRoZSBpdGVtcyB0YWJsZSBkZWZpbmluZyB0aGUgc3BlY2lmaWMgaXRlbSB0
aGUgcGF0cm9uIGhhcyBwbGFjZWQgb24gaG9sZCBvciB0aGUgaXRlbSB0aGlzIGhvbGQgd2Fz
IGZpbGxlZCB3aXRoCiAgIGB3YWl0aW5nZGF0ZWAgZGF0ZSBkZWZhdWx0IE5VTEwsIC0tIHRo
ZSBkYXRlIHRoZSBpdGVtIHdhcyBtYXJrZWQgYXMgd2FpdGluZyBmb3IgdGhlIHBhdHJvbiBh
dCB0aGUgbGlicmFyeQpkaWZmIC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJv
Zy9lbi9qcy90aW55bWNlL2NoYW5nZWxvZyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3By
b2cvZW4vanMvdGlueW1jZS9jaGFuZ2Vsb2cKaW5kZXggYzE1ZmRiNC4uMGQxNjZlYSAxMDA2
NDQKLS0tIGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9qcy90aW55bWNlL2No
YW5nZWxvZworKysgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2pzL3Rpbnlt
Y2UvY2hhbmdlbG9nCkBAIC0yNDMsNyArMjQzLDcgQEAgVmVyc2lvbiAyLjAuNiAoMjAwNi0w
NS0wMykKIAlBZGRlZCBuZXcgQ1NTIHN0eWxlIHByb3BlcnRpZXMgc3VwcG9ydCwgdGhpcyB3
YXMgYXMgYSBwbHVnaW4gY2FsbGVkIHN0eWxlLg0KIAlGaXhlZCBidWcgd2hlcmUgVGlueU1D
RSB3YXMgcmVwb3J0aW5nIGEgd2FybmluZyB3aGVuIGluc2VydGluZyBhIGltYWdlIHdoaWxl
IHJ1bm5pbmcgb24gSFRUUFMuDQogCUZpeGVkIGJ1ZyB3aGVyZSBwcmVzc2luZyB0aGUgYnJv
d3NlciBiYWNrIGJ1dHRvbiBhZnRlciBzdWJtaXQgcmVtb3ZlZCBlbXB0eSBwYXJhZ3JhcGhz
IGluIE1TSUUuDQotCUZpeGVkIGJ1ZyB3aGVyZSBsaW5rcyB0aGUgdGhlIHNhbWUgcGFnZSBh
cyB0aGUgZWRpdG9yIHBhZ2Ugd2FzIGNvbnZlcnRlZCBpbnRvIGEgLy4NCisJRml4ZWQgYnVn
IHdoZXJlIGxpbmtzIHRoZSBzYW1lIHBhZ2UgYXMgdGhlIGVkaXRvciBwYWdlIHdhcyBjb252
ZXJ0ZWQgaW50byBhIC8uDQogCUZpeGVkIGJ1ZyB3aGVyZSB0aGUgZ2V0U2VsZWN0ZWRIVE1M
IG1ldGhvZCB3YXMgcmV0dXJuaW5nIHVuZGVmaW5lZCB3aGVuIHNlbGVjdGluZyBjb250cm9s
cyBpbiBNU0lFLg0KIAlGaXhlZCBidWcgd2l0aCB1bnRlcm1pbmF0ZWQgc3RyaW5nIGxpdGVy
YWwgZXJyb3JzIHdoZXJlIHJlcG9ydGVkIGluIHNvbWUgYnJvd3NlcnMuDQogCUZpeGVkIGJ1
ZyB3aGVyZSBzcmMgYW5kIGhyZWYgd2hlcmUgY29udmVydGVkIGludG8geHNyYyBhbmQgeGhy
ZWYgaW4gdGV4dC4NCkBAIC03MjgsNyArNzI4LDcgQEAgVmVyc2lvbiAxLjQ1IFJDMSAoMjAw
NS0wNS0yNykKIAlGaXhlZCBzbyB0aGUgY29udGV4dG1lbnUgcGx1Z2luIHVzZXMgaW1hZ2Vz
IGZyb20gdGhlIGNvbmZpZ3VyYXRlZCB0aGVtZSBpbnN0ZWFkIG9mIHRoZSBhZHZhbmNlZCB0
aGVtZS4NCiAJRml4ZWQgc28gdGhlIGV4dGVybmFsX2xpbmtfbGlzdF91cmwvZXh0ZXJuYWxf
aW1hZ2VfbGlzdF91cmwgb3B0aW9ucyBjYW4gdXNlIHJlbGF0aXZlIG9yIGFic29sdXRlIHBh
dGguDQogCUZpeGVkIHNvIHRoZSBleHRlcm5hbF9saW5rX2xpc3RfdXJsL2V4dGVybmFsX2lt
YWdlX2xpc3RfdXJsIGhhcyBhIHJhbmRvbSBxdWVyeSBwYXJhbWV0ZXIgdG8gcHJldmVudCBp
dCBmcm9tIGNhY2hlLg0KLQlBZGRlZCBuZXcgbWNlSW5zZXJ0UmF3SFRNTCBjb21tYW5kLCB0
aGlzIGluc2VydHMgcmF3IGFzIGl0IGlzIEhUTUwgY29kZSBpbiB0aGUgdGhlIHNlbGVjdGVk
IHBvc2l0aW9uLg0KKwlBZGRlZCBuZXcgbWNlSW5zZXJ0UmF3SFRNTCBjb21tYW5kLCB0aGlz
IGluc2VydHMgcmF3IGFzIGl0IGlzIEhUTUwgY29kZSBpbiB0aGUgc2VsZWN0ZWQgcG9zaXRp
b24uDQogCUFkZGVkIHBhc3RlIHBsYWluIHRleHQgcGx1Z2luIGNvbnRyaWJ1dGVkIGJ5IFJ5
YW4gRGVtbWVyLCBjb252ZXJ0ZWQgaXQgaW50byBhIHBhc3RlIHBsdWdpbi4NCiAJQWRkZWQg
dXBkYXRlZCBwYXN0ZSBwbHVnaW4gY29udHJpYnV0ZWQgYnkgc3BlZWRuZXQsIGluY2x1ZGVz
IHBhc3RlIGRpcmVjdGx5IGZlYXR1cmUgZm9yIE1TSUUuDQogCUFkZGVkIHNwbGl0L21lcmdl
IHRhYmxlIGNlbGxzIHN1cHBvcnQsIHRvIHRhYmxlIHBsdWdpbiBhbmQgY29udGV4dCBtZW51
cy4NCmRpZmYgLS1naXQgYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2pzL3Rp
bnltY2UvanNjcmlwdHMvdGlueV9tY2UvdGhlbWVzL2FkdmFuY2VkL2Nzcy9lZGl0b3JfY29u
dGVudC5jc3MgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2pzL3RpbnltY2Uv
anNjcmlwdHMvdGlueV9tY2UvdGhlbWVzL2FkdmFuY2VkL2Nzcy9lZGl0b3JfY29udGVudC5j
c3MKaW5kZXggMTgyZTc5MS4uYWFkZDk3YSAxMDA2NDQKLS0tIGEva29oYS10bXBsL2ludHJh
bmV0LXRtcGwvcHJvZy9lbi9qcy90aW55bWNlL2pzY3JpcHRzL3RpbnlfbWNlL3RoZW1lcy9h
ZHZhbmNlZC9jc3MvZWRpdG9yX2NvbnRlbnQuY3NzCisrKyBiL2tvaGEtdG1wbC9pbnRyYW5l
dC10bXBsL3Byb2cvZW4vanMvdGlueW1jZS9qc2NyaXB0cy90aW55X21jZS90aGVtZXMvYWR2
YW5jZWQvY3NzL2VkaXRvcl9jb250ZW50LmNzcwpAQCAtMSw1ICsxLDUgQEAKIC8qIFRoaXMg
ZmlsZSBjb250YWlucyB0aGUgQ1NTIGRhdGEgZm9yIHRoZSBlZGl0YWJsZSBhcmVhKGlmcmFt
ZSkgb2YgVGlueU1DRSAqLw0KLS8qIFlvdSBjYW4gZXh0ZW5kIHRoaXMgQ1NTIGJ5IGFkZGlu
ZyB5b3VyIG93biBDU1MgZmlsZSB3aXRoIHRoZSB0aGUgY29udGVudF9jc3Mgb3B0aW9uICov
DQorLyogWW91IGNhbiBleHRlbmQgdGhpcyBDU1MgYnkgYWRkaW5nIHlvdXIgb3duIENTUyBm
aWxlIHdpdGggdGhlIGNvbnRlbnRfY3NzIG9wdGlvbiAqLw0KIA0KIGJvZHksIHRkLCBwcmUg
ew0KIAlmb250LWZhbWlseTogVmVyZGFuYSwgQXJpYWwsIEhlbHZldGljYSwgc2Fucy1zZXJp
ZjsNCmRpZmYgLS1naXQgYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95
dWkvY2FsZW5kYXIvY2FsZW5kYXItZGVidWcuanMgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1w
bC9wcm9nL2VuL2xpYi95dWkvY2FsZW5kYXIvY2FsZW5kYXItZGVidWcuanMKaW5kZXggOGQ1
Mjc1My4uNTAxNTg0NCAxMDA2NDQKLS0tIGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJv
Zy9lbi9saWIveXVpL2NhbGVuZGFyL2NhbGVuZGFyLWRlYnVnLmpzCisrKyBiL2tvaGEtdG1w
bC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9jYWxlbmRhci9jYWxlbmRhci1kZWJ1
Zy5qcwpAQCAtMjQ0Niw3ICsyNDQ2LDcgQEAgQ2FsZW5kYXIucHJvdG90eXBlID0gewogICAg
ICAgICAqIDwvcD4KICAgICAgICAgKiA8cD4KICAgICAgICAgKiBUaGlzIHByb3BlcnR5IGNh
biBhbHNvIGJlIHNldCB0byBhbiBvYmplY3QgbGl0ZXJhbCBjb250YWluaW5nIGNvbmZpZ3Vy
YXRpb24gcHJvcGVydGllcyBmb3IgdGhlIENhbGVuZGFyTmF2aWdhdG9yIFVJLgotICAgICAg
ICAqIFRoZSBjb25maWd1cmF0aW9uIG9iamVjdCBleHBlY3RzIHRoZSB0aGUgZm9sbG93aW5n
IGNhc2Utc2Vuc2l0aXZlIHByb3BlcnRpZXMsIHdpdGggdGhlICJzdHJpbmdzIiBwcm9wZXJ0
eSBiZWluZyBhIG5lc3RlZCBvYmplY3QuCisgICAgICAgICogVGhlIGNvbmZpZ3VyYXRpb24g
b2JqZWN0IGV4cGVjdHMgdGhlIGZvbGxvd2luZyBjYXNlLXNlbnNpdGl2ZSBwcm9wZXJ0aWVz
LCB3aXRoIHRoZSAic3RyaW5ncyIgcHJvcGVydHkgYmVpbmcgYSBuZXN0ZWQgb2JqZWN0Lgog
ICAgICAgICAqIEFueSBwcm9wZXJ0aWVzIHdoaWNoIGFyZSBub3QgcHJvdmlkZWQgd2lsbCB1
c2UgdGhlIGRlZmF1bHQgdmFsdWVzIChkZWZpbmVkIGluIHRoZSBDYWxlbmRhck5hdmlnYXRv
ciBjbGFzcykuCiAgICAgICAgICogPC9wPgogICAgICAgICAqIDxkbD4KZGlmZiAtLWdpdCBh
L2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9jYWxlbmRhci9jYWxl
bmRhci5qcyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9jYWxl
bmRhci9jYWxlbmRhci5qcwppbmRleCBkNmUyMDE2Li5lNTJmMmFmIDEwMDY0NAotLS0gYS9r
b2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkvY2FsZW5kYXIvY2FsZW5k
YXIuanMKKysrIGIva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL2Nh
bGVuZGFyL2NhbGVuZGFyLmpzCkBAIC0yNDM2LDcgKzI0MzYsNyBAQCBDYWxlbmRhci5wcm90
b3R5cGUgPSB7CiAgICAgICAgICogPC9wPgogICAgICAgICAqIDxwPgogICAgICAgICAqIFRo
aXMgcHJvcGVydHkgY2FuIGFsc28gYmUgc2V0IHRvIGFuIG9iamVjdCBsaXRlcmFsIGNvbnRh
aW5pbmcgY29uZmlndXJhdGlvbiBwcm9wZXJ0aWVzIGZvciB0aGUgQ2FsZW5kYXJOYXZpZ2F0
b3IgVUkuCi0gICAgICAgICogVGhlIGNvbmZpZ3VyYXRpb24gb2JqZWN0IGV4cGVjdHMgdGhl
IHRoZSBmb2xsb3dpbmcgY2FzZS1zZW5zaXRpdmUgcHJvcGVydGllcywgd2l0aCB0aGUgInN0
cmluZ3MiIHByb3BlcnR5IGJlaW5nIGEgbmVzdGVkIG9iamVjdC4KKyAgICAgICAgKiBUaGUg
Y29uZmlndXJhdGlvbiBvYmplY3QgZXhwZWN0cyB0aGUgZm9sbG93aW5nIGNhc2Utc2Vuc2l0
aXZlIHByb3BlcnRpZXMsIHdpdGggdGhlICJzdHJpbmdzIiBwcm9wZXJ0eSBiZWluZyBhIG5l
c3RlZCBvYmplY3QuCiAgICAgICAgICogQW55IHByb3BlcnRpZXMgd2hpY2ggYXJlIG5vdCBw
cm92aWRlZCB3aWxsIHVzZSB0aGUgZGVmYXVsdCB2YWx1ZXMgKGRlZmluZWQgaW4gdGhlIENh
bGVuZGFyTmF2aWdhdG9yIGNsYXNzKS4KICAgICAgICAgKiA8L3A+CiAgICAgICAgICogPGRs
PgpkaWZmIC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVp
L2RyYWdkcm9wL2RyYWdkcm9wLWRlYnVnLmpzIGIva29oYS10bXBsL2ludHJhbmV0LXRtcGwv
cHJvZy9lbi9saWIveXVpL2RyYWdkcm9wL2RyYWdkcm9wLWRlYnVnLmpzCmluZGV4IDliNjM0
YTUuLjJjM2FlNDMgMTAwNjQ0Ci0tLSBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cv
ZW4vbGliL3l1aS9kcmFnZHJvcC9kcmFnZHJvcC1kZWJ1Zy5qcworKysgYi9rb2hhLXRtcGwv
aW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkvZHJhZ2Ryb3AvZHJhZ2Ryb3AtZGVidWcu
anMKQEAgLTI0NSw3ICsyNDUsNyBAQCBZQUhPTy51dGlsLkRyYWdEcm9wTWdyID0gZnVuY3Rp
b24oKSB7CiAgICAgICAgIGxvY2tlZDogZmFsc2UsCiAKICAgICAgICAgLyoqCi0gICAgICAg
ICAqIFByb3ZpZGVzIGFkZGl0aW9uYWwgaW5mb3JtYXRpb24gYWJvdXQgdGhlIHRoZSBjdXJy
ZW50IHNldCBvZgorICAgICAgICAgKiBQcm92aWRlcyBhZGRpdGlvbmFsIGluZm9ybWF0aW9u
IGFib3V0IHRoZSBjdXJyZW50IHNldCBvZgogICAgICAgICAgKiBpbnRlcmFjdGlvbnMuICBD
YW4gYmUgYWNjZXNzZWQgZnJvbSB0aGUgZXZlbnQgaGFuZGxlcnMuIEl0CiAgICAgICAgICAq
IGNvbnRhaW5zIHRoZSBmb2xsb3dpbmcgcHJvcGVydGllczoKICAgICAgICAgICoKZGlmZiAt
LWdpdCBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9kcmFnZHJv
cC9kcmFnZHJvcC5qcyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1
aS9kcmFnZHJvcC9kcmFnZHJvcC5qcwppbmRleCA5MDA0NzQ5Li5hZjVmMGNkIDEwMDY0NAot
LS0gYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkvZHJhZ2Ryb3Av
ZHJhZ2Ryb3AuanMKKysrIGIva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIv
eXVpL2RyYWdkcm9wL2RyYWdkcm9wLmpzCkBAIC0yNDEsNyArMjQxLDcgQEAgWUFIT08udXRp
bC5EcmFnRHJvcE1nciA9IGZ1bmN0aW9uKCkgewogICAgICAgICBsb2NrZWQ6IGZhbHNlLAog
CiAgICAgICAgIC8qKgotICAgICAgICAgKiBQcm92aWRlcyBhZGRpdGlvbmFsIGluZm9ybWF0
aW9uIGFib3V0IHRoZSB0aGUgY3VycmVudCBzZXQgb2YKKyAgICAgICAgICogUHJvdmlkZXMg
YWRkaXRpb25hbCBpbmZvcm1hdGlvbiBhYm91dCB0aGUgY3VycmVudCBzZXQgb2YKICAgICAg
ICAgICogaW50ZXJhY3Rpb25zLiAgQ2FuIGJlIGFjY2Vzc2VkIGZyb20gdGhlIGV2ZW50IGhh
bmRsZXJzLiBJdAogICAgICAgICAgKiBjb250YWlucyB0aGUgZm9sbG93aW5nIHByb3BlcnRp
ZXM6CiAgICAgICAgICAqCmRpZmYgLS1naXQgYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9w
cm9nL2VuL2xpYi95dWkvZWRpdG9yL2VkaXRvci1kZWJ1Zy5qcyBiL2tvaGEtdG1wbC9pbnRy
YW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9lZGl0b3IvZWRpdG9yLWRlYnVnLmpzCmluZGV4
IDVkZjBjZTcuLmQ0YmEwOGYgMTAwNjQ0Ci0tLSBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBs
L3Byb2cvZW4vbGliL3l1aS9lZGl0b3IvZWRpdG9yLWRlYnVnLmpzCisrKyBiL2tvaGEtdG1w
bC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9lZGl0b3IvZWRpdG9yLWRlYnVnLmpz
CkBAIC05NTMsNyArOTUzLDcgQEAgdmFyIERvbSA9IFlBSE9PLnV0aWwuRG9tLAogCiAgICAg
ICAgICAgICAvKioKICAgICAgICAgICAgICogQGF0dHJpYnV0ZSBjb2xsYXBzZQotICAgICAg
ICAgICAgKiBAZGVzY3JpcHRpb24gQm9vbGVhbiBpbmRpY2F0aW5nIGlmIHRoZSB0aGUgdGl0
bGViYXIgc2hvdWxkIGhhdmUgYSBjb2xsYXBzZSBidXR0b24uCisgICAgICAgICAgICAqIEBk
ZXNjcmlwdGlvbiBCb29sZWFuIGluZGljYXRpbmcgaWYgdGhlIHRpdGxlYmFyIHNob3VsZCBo
YXZlIGEgY29sbGFwc2UgYnV0dG9uLgogICAgICAgICAgICAgKiBUaGUgY29sbGFwc2UgYnV0
dG9uIHdpbGwgbm90IHJlbW92ZSB0aGUgdG9vbGJhciwgaXQgd2lsbCBtaW5pbWl6ZSBpdCB0
byB0aGUgdGl0bGViYXIKICAgICAgICAgICAgICogQGRlZmF1bHQgZmFsc2UKICAgICAgICAg
ICAgICogQHR5cGUgQm9vbGVhbgpkaWZmIC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0LXRt
cGwvcHJvZy9lbi9saWIveXVpL2VkaXRvci9lZGl0b3IuanMgYi9rb2hhLXRtcGwvaW50cmFu
ZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkvZWRpdG9yL2VkaXRvci5qcwppbmRleCA3NmE0Nzg4
Li5mOTY3ZjdlIDEwMDY0NAotLS0gYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2Vu
L2xpYi95dWkvZWRpdG9yL2VkaXRvci5qcworKysgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1w
bC9wcm9nL2VuL2xpYi95dWkvZWRpdG9yL2VkaXRvci5qcwpAQCAtOTQ0LDcgKzk0NCw3IEBA
IHZhciBEb20gPSBZQUhPTy51dGlsLkRvbSwKIAogICAgICAgICAgICAgLyoqCiAgICAgICAg
ICAgICAqIEBhdHRyaWJ1dGUgY29sbGFwc2UKLSAgICAgICAgICAgICogQGRlc2NyaXB0aW9u
IEJvb2xlYW4gaW5kaWNhdGluZyBpZiB0aGUgdGhlIHRpdGxlYmFyIHNob3VsZCBoYXZlIGEg
Y29sbGFwc2UgYnV0dG9uLgorICAgICAgICAgICAgKiBAZGVzY3JpcHRpb24gQm9vbGVhbiBp
bmRpY2F0aW5nIGlmIHRoZSB0aXRsZWJhciBzaG91bGQgaGF2ZSBhIGNvbGxhcHNlIGJ1dHRv
bi4KICAgICAgICAgICAgICogVGhlIGNvbGxhcHNlIGJ1dHRvbiB3aWxsIG5vdCByZW1vdmUg
dGhlIHRvb2xiYXIsIGl0IHdpbGwgbWluaW1pemUgaXQgdG8gdGhlIHRpdGxlYmFyCiAgICAg
ICAgICAgICAqIEBkZWZhdWx0IGZhbHNlCiAgICAgICAgICAgICAqIEB0eXBlIEJvb2xlYW4K
ZGlmZiAtLWdpdCBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9l
ZGl0b3Ivc2ltcGxlZWRpdG9yLWRlYnVnLmpzIGIva29oYS10bXBsL2ludHJhbmV0LXRtcGwv
cHJvZy9lbi9saWIveXVpL2VkaXRvci9zaW1wbGVlZGl0b3ItZGVidWcuanMKaW5kZXggYTc4
YTkyNy4uZjI0ZDE4MCAxMDA2NDQKLS0tIGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJv
Zy9lbi9saWIveXVpL2VkaXRvci9zaW1wbGVlZGl0b3ItZGVidWcuanMKKysrIGIva29oYS10
bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL2VkaXRvci9zaW1wbGVlZGl0b3It
ZGVidWcuanMKQEAgLTk1Myw3ICs5NTMsNyBAQCB2YXIgRG9tID0gWUFIT08udXRpbC5Eb20s
CiAKICAgICAgICAgICAgIC8qKgogICAgICAgICAgICAgKiBAYXR0cmlidXRlIGNvbGxhcHNl
Ci0gICAgICAgICAgICAqIEBkZXNjcmlwdGlvbiBCb29sZWFuIGluZGljYXRpbmcgaWYgdGhl
IHRoZSB0aXRsZWJhciBzaG91bGQgaGF2ZSBhIGNvbGxhcHNlIGJ1dHRvbi4KKyAgICAgICAg
ICAgICogQGRlc2NyaXB0aW9uIEJvb2xlYW4gaW5kaWNhdGluZyBpZiB0aGUgdGl0bGViYXIg
c2hvdWxkIGhhdmUgYSBjb2xsYXBzZSBidXR0b24uCiAgICAgICAgICAgICAqIFRoZSBjb2xs
YXBzZSBidXR0b24gd2lsbCBub3QgcmVtb3ZlIHRoZSB0b29sYmFyLCBpdCB3aWxsIG1pbmlt
aXplIGl0IHRvIHRoZSB0aXRsZWJhcgogICAgICAgICAgICAgKiBAZGVmYXVsdCBmYWxzZQog
ICAgICAgICAgICAgKiBAdHlwZSBCb29sZWFuCmRpZmYgLS1naXQgYS9rb2hhLXRtcGwvaW50
cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkvZWRpdG9yL3NpbXBsZWVkaXRvci5qcyBiL2tv
aGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9lZGl0b3Ivc2ltcGxlZWRp
dG9yLmpzCmluZGV4IGU3YTFiNDkuLmY1OWIxZTUgMTAwNjQ0Ci0tLSBhL2tvaGEtdG1wbC9p
bnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9lZGl0b3Ivc2ltcGxlZWRpdG9yLmpzCisr
KyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS9lZGl0b3Ivc2lt
cGxlZWRpdG9yLmpzCkBAIC05NDQsNyArOTQ0LDcgQEAgdmFyIERvbSA9IFlBSE9PLnV0aWwu
RG9tLAogCiAgICAgICAgICAgICAvKioKICAgICAgICAgICAgICogQGF0dHJpYnV0ZSBjb2xs
YXBzZQotICAgICAgICAgICAgKiBAZGVzY3JpcHRpb24gQm9vbGVhbiBpbmRpY2F0aW5nIGlm
IHRoZSB0aGUgdGl0bGViYXIgc2hvdWxkIGhhdmUgYSBjb2xsYXBzZSBidXR0b24uCisgICAg
ICAgICAgICAqIEBkZXNjcmlwdGlvbiBCb29sZWFuIGluZGljYXRpbmcgaWYgdGhlIHRpdGxl
YmFyIHNob3VsZCBoYXZlIGEgY29sbGFwc2UgYnV0dG9uLgogICAgICAgICAgICAgKiBUaGUg
Y29sbGFwc2UgYnV0dG9uIHdpbGwgbm90IHJlbW92ZSB0aGUgdG9vbGJhciwgaXQgd2lsbCBt
aW5pbWl6ZSBpdCB0byB0aGUgdGl0bGViYXIKICAgICAgICAgICAgICogQGRlZmF1bHQgZmFs
c2UKICAgICAgICAgICAgICogQHR5cGUgQm9vbGVhbgpkaWZmIC0tZ2l0IGEva29oYS10bXBs
L2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL2dldC9nZXQtZGVidWcuanMgYi9rb2hh
LXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkvZ2V0L2dldC1kZWJ1Zy5qcwpp
bmRleCBlZDg3OTgyLi44NmY5MTFhIDEwMDY0NAotLS0gYS9rb2hhLXRtcGwvaW50cmFuZXQt
dG1wbC9wcm9nL2VuL2xpYi95dWkvZ2V0L2dldC1kZWJ1Zy5qcworKysgYi9rb2hhLXRtcGwv
aW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkvZ2V0L2dldC1kZWJ1Zy5qcwpAQCAtNTYy
LDcgKzU2Miw3IEBAIFlBSE9PLnV0aWwuR2V0ID0gZnVuY3Rpb24oKSB7CiAgICAgICAgIFRJ
TUVPVVQ6IDIwMDAsCiAgICAgICAgIAogICAgICAgICAvKioKLSAgICAgICAgICogQ2FsbGVk
IGJ5IHRoZSB0aGUgaGVscGVyIGZvciBkZXRlY3Rpbmcgc2NyaXB0IGxvYWQgaW4gU2FmYXJp
CisgICAgICAgICAqIENhbGxlZCBieSB0aGUgaGVscGVyIGZvciBkZXRlY3Rpbmcgc2NyaXB0
IGxvYWQgaW4gU2FmYXJpCiAgICAgICAgICAqIEBtZXRob2QgX2ZpbmFsaXplCiAgICAgICAg
ICAqIEBwYXJhbSBpZCB7c3RyaW5nfSB0aGUgdHJhbnNhY3Rpb24gaWQKICAgICAgICAgICog
QHByaXZhdGUKZGlmZiAtLWdpdCBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4v
bGliL3l1aS9nZXQvZ2V0LmpzIGIva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9s
aWIveXVpL2dldC9nZXQuanMKaW5kZXggODhiYjdlMS4uMzY5M2JhZiAxMDA2NDQKLS0tIGEv
a29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL2dldC9nZXQuanMKKysr
IGIva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL2dldC9nZXQuanMK
QEAgLTU0OSw3ICs1NDksNyBAQCBZQUhPTy51dGlsLkdldCA9IGZ1bmN0aW9uKCkgewogICAg
ICAgICBUSU1FT1VUOiAyMDAwLAogICAgICAgICAKICAgICAgICAgLyoqCi0gICAgICAgICAq
IENhbGxlZCBieSB0aGUgdGhlIGhlbHBlciBmb3IgZGV0ZWN0aW5nIHNjcmlwdCBsb2FkIGlu
IFNhZmFyaQorICAgICAgICAgKiBDYWxsZWQgYnkgdGhlIGhlbHBlciBmb3IgZGV0ZWN0aW5n
IHNjcmlwdCBsb2FkIGluIFNhZmFyaQogICAgICAgICAgKiBAbWV0aG9kIF9maW5hbGl6ZQog
ICAgICAgICAgKiBAcGFyYW0gaWQge3N0cmluZ30gdGhlIHRyYW5zYWN0aW9uIGlkCiAgICAg
ICAgICAqIEBwcml2YXRlCmRpZmYgLS1naXQgYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9w
cm9nL2VuL2xpYi95dWkvbWVudS9tZW51LWRlYnVnLmpzIGIva29oYS10bXBsL2ludHJhbmV0
LXRtcGwvcHJvZy9lbi9saWIveXVpL21lbnUvbWVudS1kZWJ1Zy5qcwppbmRleCAwZDA2YTg3
Li40NDAyNjU0IDEwMDY0NAotLS0gYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2Vu
L2xpYi95dWkvbWVudS9tZW51LWRlYnVnLmpzCisrKyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10
bXBsL3Byb2cvZW4vbGliL3l1aS9tZW51L21lbnUtZGVidWcuanMKQEAgLTIzODUsNyArMjM4
NSw3IEBAIF9zdWJzY3JpYmVUb0l0ZW1FdmVudHM6IGZ1bmN0aW9uIChwX29JdGVtKSB7CiAK
IC8qKgogKiBAbWV0aG9kIF9vblZpc2libGVDaGFuZ2UKLSogQGRlc2NyaXB0aW9uIENoYW5n
ZSBldmVudCBoYW5kbGVyIGZvciB0aGUgdGhlIG1lbnUncyAidmlzaWJsZSIgY29uZmlndXJh
dGlvbgorKiBAZGVzY3JpcHRpb24gQ2hhbmdlIGV2ZW50IGhhbmRsZXIgZm9yIHRoZSBtZW51
J3MgInZpc2libGUiIGNvbmZpZ3VyYXRpb24KICogcHJvcGVydHkuCiAqIEBwcml2YXRlCiAq
IEBwYXJhbSB7U3RyaW5nfSBwX3NUeXBlIFN0cmluZyByZXByZXNlbnRpbmcgdGhlIG5hbWUg
b2YgdGhlIGV2ZW50IHRoYXQgCkBAIC00ODUyLDcgKzQ4NTIsNyBAQCBfc2V0U2Nyb2xsSGVp
Z2h0OiBmdW5jdGlvbiAocF9uU2Nyb2xsSGVpZ2h0KSB7CiAJCiAKIAkJCS8qCi0JCQkJT25s
eSBjbGVhciB0aGUgdGhlICJ3aWR0aCIgY29uZmlndXJhdGlvbiBwcm9wZXJ0eSBpZiBpdCB3
YXMgc2V0IHRoZSAKKwkJCQlPbmx5IGNsZWFyIHRoZSAid2lkdGgiIGNvbmZpZ3VyYXRpb24g
cHJvcGVydHkgaWYgaXQgd2FzIHNldCB0aGUgCiAJCQkJIl9zZXRTY3JvbGxIZWlnaHQiIG1l
dGhvZCBhbmQgd2Fzbid0IGNoYW5nZWQgYnkgc29tZSBvdGhlciBtZWFucyBhZnRlciBpdCB3
YXMgc2V0LgogCQkJKi8JCiAJCmRpZmYgLS1naXQgYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1w
bC9wcm9nL2VuL2xpYi95dWkvbWVudS9tZW51LmpzIGIva29oYS10bXBsL2ludHJhbmV0LXRt
cGwvcHJvZy9lbi9saWIveXVpL21lbnUvbWVudS5qcwppbmRleCBmZmIyMmM2Li45NjMwNWIw
IDEwMDY0NAotLS0gYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkv
bWVudS9tZW51LmpzCisrKyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGli
L3l1aS9tZW51L21lbnUuanMKQEAgLTIzNTAsNyArMjM1MCw3IEBAIF9zdWJzY3JpYmVUb0l0
ZW1FdmVudHM6IGZ1bmN0aW9uIChwX29JdGVtKSB7CiAKIC8qKgogKiBAbWV0aG9kIF9vblZp
c2libGVDaGFuZ2UKLSogQGRlc2NyaXB0aW9uIENoYW5nZSBldmVudCBoYW5kbGVyIGZvciB0
aGUgdGhlIG1lbnUncyAidmlzaWJsZSIgY29uZmlndXJhdGlvbgorKiBAZGVzY3JpcHRpb24g
Q2hhbmdlIGV2ZW50IGhhbmRsZXIgZm9yIHRoZSBtZW51J3MgInZpc2libGUiIGNvbmZpZ3Vy
YXRpb24KICogcHJvcGVydHkuCiAqIEBwcml2YXRlCiAqIEBwYXJhbSB7U3RyaW5nfSBwX3NU
eXBlIFN0cmluZyByZXByZXNlbnRpbmcgdGhlIG5hbWUgb2YgdGhlIGV2ZW50IHRoYXQgCkBA
IC00ODExLDcgKzQ4MTEsNyBAQCBfc2V0U2Nyb2xsSGVpZ2h0OiBmdW5jdGlvbiAocF9uU2Ny
b2xsSGVpZ2h0KSB7CiAJCiAKIAkJCS8qCi0JCQkJT25seSBjbGVhciB0aGUgdGhlICJ3aWR0
aCIgY29uZmlndXJhdGlvbiBwcm9wZXJ0eSBpZiBpdCB3YXMgc2V0IHRoZSAKKwkJCQlPbmx5
IGNsZWFyIHRoZSAid2lkdGgiIGNvbmZpZ3VyYXRpb24gcHJvcGVydHkgaWYgaXQgd2FzIHNl
dCB0aGUgCiAJCQkJIl9zZXRTY3JvbGxIZWlnaHQiIG1ldGhvZCBhbmQgd2Fzbid0IGNoYW5n
ZWQgYnkgc29tZSBvdGhlciBtZWFucyBhZnRlciBpdCB3YXMgc2V0LgogCQkJKi8JCiAJCmRp
ZmYgLS1naXQgYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkveWFo
b28veWFob28tZGVidWcuanMgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xp
Yi95dWkveWFob28veWFob28tZGVidWcuanMKaW5kZXggOTQ5ZjFmMy4uNTc4N2UyZSAxMDA2
NDQKLS0tIGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL3lhaG9v
L3lhaG9vLWRlYnVnLmpzCisrKyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4v
bGliL3l1aS95YWhvby95YWhvby1kZWJ1Zy5qcwpAQCAtMTI4LDcgKzEyOCw3IEBAIFlBSE9P
Lm5hbWVzcGFjZSA9IGZ1bmN0aW9uKCkgewogICogQHBhcmFtICB7U3RyaW5nfSAgY2F0ICBU
aGUgbG9nIGNhdGVnb3J5IGZvciB0aGUgbWVzc2FnZS4gIERlZmF1bHQKICAqICAgICAgICAg
ICAgICAgICAgICAgICAgY2F0ZWdvcmllcyBhcmUgImluZm8iLCAid2FybiIsICJlcnJvciIs
IHRpbWUiLgogICogICAgICAgICAgICAgICAgICAgICAgICBDdXN0b20gY2F0ZWdvcmllcyBj
YW4gYmUgdXNlZCBhcyB3ZWxsLiAob3B0KQotICogQHBhcmFtICB7U3RyaW5nfSAgc3JjICBU
aGUgc291cmNlIG9mIHRoZSB0aGUgbWVzc2FnZSAob3B0KQorICogQHBhcmFtICB7U3RyaW5n
fSAgc3JjICBUaGUgc291cmNlIG9mIHRoZSBtZXNzYWdlIChvcHQpCiAgKiBAcmV0dXJuIHtC
b29sZWFufSAgICAgIFRydWUgaWYgdGhlIGxvZyBvcGVyYXRpb24gd2FzIHN1Y2Nlc3NmdWwu
CiAgKi8KIFlBSE9PLmxvZyA9IGZ1bmN0aW9uKG1zZywgY2F0LCBzcmMpIHsKZGlmZiAtLWdp
dCBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS95YWhvby95YWhv
by5qcyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbGliL3l1aS95YWhvby95
YWhvby5qcwppbmRleCA5NDlmMWYzLi41Nzg3ZTJlIDEwMDY0NAotLS0gYS9rb2hhLXRtcGwv
aW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkveWFob28veWFob28uanMKKysrIGIva29o
YS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL3lhaG9vL3lhaG9vLmpzCkBA
IC0xMjgsNyArMTI4LDcgQEAgWUFIT08ubmFtZXNwYWNlID0gZnVuY3Rpb24oKSB7CiAgKiBA
cGFyYW0gIHtTdHJpbmd9ICBjYXQgIFRoZSBsb2cgY2F0ZWdvcnkgZm9yIHRoZSBtZXNzYWdl
LiAgRGVmYXVsdAogICogICAgICAgICAgICAgICAgICAgICAgICBjYXRlZ29yaWVzIGFyZSAi
aW5mbyIsICJ3YXJuIiwgImVycm9yIiwgdGltZSIuCiAgKiAgICAgICAgICAgICAgICAgICAg
ICAgIEN1c3RvbSBjYXRlZ29yaWVzIGNhbiBiZSB1c2VkIGFzIHdlbGwuIChvcHQpCi0gKiBA
cGFyYW0gIHtTdHJpbmd9ICBzcmMgIFRoZSBzb3VyY2Ugb2YgdGhlIHRoZSBtZXNzYWdlIChv
cHQpCisgKiBAcGFyYW0gIHtTdHJpbmd9ICBzcmMgIFRoZSBzb3VyY2Ugb2YgdGhlIG1lc3Nh
Z2UgKG9wdCkKICAqIEByZXR1cm4ge0Jvb2xlYW59ICAgICAgVHJ1ZSBpZiB0aGUgbG9nIG9w
ZXJhdGlvbiB3YXMgc3VjY2Vzc2Z1bC4KICAqLwogWUFIT08ubG9nID0gZnVuY3Rpb24obXNn
LCBjYXQsIHNyYykgewpkaWZmIC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJv
Zy9lbi9saWIveXVpL3l1aWxvYWRlci95dWlsb2FkZXItZGVidWcuanMgYi9rb2hhLXRtcGwv
aW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkveXVpbG9hZGVyL3l1aWxvYWRlci1kZWJ1
Zy5qcwppbmRleCA4NDQwNDEwLi4yNjcyYzYwIDEwMDY0NAotLS0gYS9rb2hhLXRtcGwvaW50
cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkveXVpbG9hZGVyL3l1aWxvYWRlci1kZWJ1Zy5q
cworKysgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkveXVpbG9h
ZGVyL3l1aWxvYWRlci1kZWJ1Zy5qcwpAQCAtMTI4LDcgKzEyOCw3IEBAIFlBSE9PLm5hbWVz
cGFjZSA9IGZ1bmN0aW9uKCkgewogICogQHBhcmFtICB7U3RyaW5nfSAgY2F0ICBUaGUgbG9n
IGNhdGVnb3J5IGZvciB0aGUgbWVzc2FnZS4gIERlZmF1bHQKICAqICAgICAgICAgICAgICAg
ICAgICAgICAgY2F0ZWdvcmllcyBhcmUgImluZm8iLCAid2FybiIsICJlcnJvciIsIHRpbWUi
LgogICogICAgICAgICAgICAgICAgICAgICAgICBDdXN0b20gY2F0ZWdvcmllcyBjYW4gYmUg
dXNlZCBhcyB3ZWxsLiAob3B0KQotICogQHBhcmFtICB7U3RyaW5nfSAgc3JjICBUaGUgc291
cmNlIG9mIHRoZSB0aGUgbWVzc2FnZSAob3B0KQorICogQHBhcmFtICB7U3RyaW5nfSAgc3Jj
ICBUaGUgc291cmNlIG9mIHRoZSBtZXNzYWdlIChvcHQpCiAgKiBAcmV0dXJuIHtCb29sZWFu
fSAgICAgIFRydWUgaWYgdGhlIGxvZyBvcGVyYXRpb24gd2FzIHN1Y2Nlc3NmdWwuCiAgKi8K
IFlBSE9PLmxvZyA9IGZ1bmN0aW9uKG1zZywgY2F0LCBzcmMpIHsKQEAgLTE2MTgsNyArMTYx
OCw3IEBAIFlBSE9PLnV0aWwuR2V0ID0gZnVuY3Rpb24oKSB7CiAgICAgICAgIFRJTUVPVVQ6
IDIwMDAsCiAgICAgICAgIAogICAgICAgICAvKioKLSAgICAgICAgICogQ2FsbGVkIGJ5IHRo
ZSB0aGUgaGVscGVyIGZvciBkZXRlY3Rpbmcgc2NyaXB0IGxvYWQgaW4gU2FmYXJpCisgICAg
ICAgICAqIENhbGxlZCBieSB0aGUgaGVscGVyIGZvciBkZXRlY3Rpbmcgc2NyaXB0IGxvYWQg
aW4gU2FmYXJpCiAgICAgICAgICAqIEBtZXRob2QgX2ZpbmFsaXplCiAgICAgICAgICAqIEBw
YXJhbSBpZCB7c3RyaW5nfSB0aGUgdHJhbnNhY3Rpb24gaWQKICAgICAgICAgICogQHByaXZh
dGUKQEAgLTI0NjIsNyArMjQ2Miw3IEBAIFlBSE9PLnJlZ2lzdGVyKCJnZXQiLCBZQUhPTy51
dGlsLkdldCwge3ZlcnNpb246ICIyLjguMHI0IiwgYnVpbGQ6ICIyNDQ5In0pOwogICAgICAg
ICB0aGlzLmNvbWJvQmFzZSA9IFlVSS5pbmZvLmNvbWJvQmFzZTsKIAogICAgICAgICAvKioK
LSAgICAgICAgICogSWYgY29uZmlndXJlZCwgWVVJIHdpbGwgdXNlIHRoZSB0aGUgY29tYm8g
aGFuZGxlciBvbiB0aGUKKyAgICAgICAgICogSWYgY29uZmlndXJlZCwgWVVJIHdpbGwgdXNl
IHRoZSBjb21ibyBoYW5kbGVyIG9uIHRoZQogICAgICAgICAgKiBZYWhvbyEgQ0ROIHRvIHBv
bnRlbnRpYWxseSByZWR1Y2UgdGhlIG51bWJlciBvZiBodHRwIHJlcXVlc3RzCiAgICAgICAg
ICAqIHJlcXVpcmVkLgogICAgICAgICAgKiBAcHJvcGVydHkgY29tYmluZQpkaWZmIC0tZ2l0
IGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9saWIveXVpL3l1aWxvYWRlci95
dWlsb2FkZXIuanMgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkv
eXVpbG9hZGVyL3l1aWxvYWRlci5qcwppbmRleCA4NDQwNDEwLi4yNjcyYzYwIDEwMDY0NAot
LS0gYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xpYi95dWkveXVpbG9hZGVy
L3l1aWxvYWRlci5qcworKysgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2xp
Yi95dWkveXVpbG9hZGVyL3l1aWxvYWRlci5qcwpAQCAtMTI4LDcgKzEyOCw3IEBAIFlBSE9P
Lm5hbWVzcGFjZSA9IGZ1bmN0aW9uKCkgewogICogQHBhcmFtICB7U3RyaW5nfSAgY2F0ICBU
aGUgbG9nIGNhdGVnb3J5IGZvciB0aGUgbWVzc2FnZS4gIERlZmF1bHQKICAqICAgICAgICAg
ICAgICAgICAgICAgICAgY2F0ZWdvcmllcyBhcmUgImluZm8iLCAid2FybiIsICJlcnJvciIs
IHRpbWUiLgogICogICAgICAgICAgICAgICAgICAgICAgICBDdXN0b20gY2F0ZWdvcmllcyBj
YW4gYmUgdXNlZCBhcyB3ZWxsLiAob3B0KQotICogQHBhcmFtICB7U3RyaW5nfSAgc3JjICBU
aGUgc291cmNlIG9mIHRoZSB0aGUgbWVzc2FnZSAob3B0KQorICogQHBhcmFtICB7U3RyaW5n
fSAgc3JjICBUaGUgc291cmNlIG9mIHRoZSBtZXNzYWdlIChvcHQpCiAgKiBAcmV0dXJuIHtC
b29sZWFufSAgICAgIFRydWUgaWYgdGhlIGxvZyBvcGVyYXRpb24gd2FzIHN1Y2Nlc3NmdWwu
CiAgKi8KIFlBSE9PLmxvZyA9IGZ1bmN0aW9uKG1zZywgY2F0LCBzcmMpIHsKQEAgLTE2MTgs
NyArMTYxOCw3IEBAIFlBSE9PLnV0aWwuR2V0ID0gZnVuY3Rpb24oKSB7CiAgICAgICAgIFRJ
TUVPVVQ6IDIwMDAsCiAgICAgICAgIAogICAgICAgICAvKioKLSAgICAgICAgICogQ2FsbGVk
IGJ5IHRoZSB0aGUgaGVscGVyIGZvciBkZXRlY3Rpbmcgc2NyaXB0IGxvYWQgaW4gU2FmYXJp
CisgICAgICAgICAqIENhbGxlZCBieSB0aGUgaGVscGVyIGZvciBkZXRlY3Rpbmcgc2NyaXB0
IGxvYWQgaW4gU2FmYXJpCiAgICAgICAgICAqIEBtZXRob2QgX2ZpbmFsaXplCiAgICAgICAg
ICAqIEBwYXJhbSBpZCB7c3RyaW5nfSB0aGUgdHJhbnNhY3Rpb24gaWQKICAgICAgICAgICog
QHByaXZhdGUKQEAgLTI0NjIsNyArMjQ2Miw3IEBAIFlBSE9PLnJlZ2lzdGVyKCJnZXQiLCBZ
QUhPTy51dGlsLkdldCwge3ZlcnNpb246ICIyLjguMHI0IiwgYnVpbGQ6ICIyNDQ5In0pOwog
ICAgICAgICB0aGlzLmNvbWJvQmFzZSA9IFlVSS5pbmZvLmNvbWJvQmFzZTsKIAogICAgICAg
ICAvKioKLSAgICAgICAgICogSWYgY29uZmlndXJlZCwgWVVJIHdpbGwgdXNlIHRoZSB0aGUg
Y29tYm8gaGFuZGxlciBvbiB0aGUKKyAgICAgICAgICogSWYgY29uZmlndXJlZCwgWVVJIHdp
bGwgdXNlIHRoZSBjb21ibyBoYW5kbGVyIG9uIHRoZQogICAgICAgICAgKiBZYWhvbyEgQ0RO
IHRvIHBvbnRlbnRpYWxseSByZWR1Y2UgdGhlIG51bWJlciBvZiBodHRwIHJlcXVlc3RzCiAg
ICAgICAgICAqIHJlcXVpcmVkLgogICAgICAgICAgKiBAcHJvcGVydHkgY29tYmluZQpkaWZm
IC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAv
dG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0IGIva29oYS10bXBsL2ludHJhbmV0LXRtcGwv
cHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0CmluZGV4
IDU0YmQzZjcuLmMzMWQxZDYgMTAwNjQ0Ci0tLSBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBs
L3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50dAorKysg
Yi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9t
YW5hZ2UtbWFyYy1pbXBvcnQudHQKQEAgLTQwLDcgKzQwLDcgQEAKIDwvbGk+CiA8L3VsPgog
Ci08cD48c3Ryb25nPlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1h
bmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlIDxhIGhyZWY9Imh0dHA6Ly9tYW51
YWwua29oYS1jb21tdW5pdHkub3JnLzMuNi9lbi9tYW5hZ2VzdGFnZWQuaHRtbCI+bWFudWFs
PC9hPiAob25saW5lKS48L3N0cm9uZz48L3A+Cis8cD48c3Ryb25nPlNlZSB0aGUgZnVsbCBk
b2N1bWVudGF0aW9uIGZvciB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0
aGUgPGEgaHJlZj0iaHR0cDovL21hbnVhbC5rb2hhLWNvbW11bml0eS5vcmcvMy42L2VuL21h
bmFnZXN0YWdlZC5odG1sIj5tYW51YWw8L2E+IChvbmxpbmUpLjwvc3Ryb25nPjwvcD4KIAog
WyUgSU5DTFVERSAnaGVscC1ib3R0b20uaW5jJyAlXQogCmRpZmYgLS1naXQgYS9rb2hhLXRt
cGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9vdmVyZHVlcnVs
ZXMudHQgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90
b29scy9vdmVyZHVlcnVsZXMudHQKaW5kZXggNjVlNWE4NS4uYTFjYjg1YiAxMDA2NDQKLS0t
IGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMv
b3ZlcmR1ZXJ1bGVzLnR0CisrKyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4v
bW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50dApAQCAtNDEsNyArNDEsNyBAQAog
CiA8cD5TaW5jZXJlbHksIExpYnJhcnkgU3RhZmY8L3A+CiAKLTxwPjxzdHJvbmc+U2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVz
IFRyaWdnZXJzIGluIHRoZSA8YSBocmVmPSJodHRwOi8vbWFudWFsLmtvaGEtY29tbXVuaXR5
Lm9yZy8zLjYvZW4vbm90aWNldHJpZ2dlcnMuaHRtbCI+bWFudWFsPC9hPiAob25saW5lKS48
L3N0cm9uZz48L3A+Cis8cD48c3Ryb25nPlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZv
ciB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSA8YSBocmVmPSJo
dHRwOi8vbWFudWFsLmtvaGEtY29tbXVuaXR5Lm9yZy8zLjYvZW4vbm90aWNldHJpZ2dlcnMu
aHRtbCI+bWFudWFsPC9hPiAob25saW5lKS48L3N0cm9uZz48L3A+CiAKIFslIElOQ0xVREUg
J2hlbHAtYm90dG9tLmluYycgJV0KIApkaWZmIC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0
LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvcGljdHVyZS11cGxvYWQudHQgYi9r
b2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9waWN0
dXJlLXVwbG9hZC50dAppbmRleCBhMWU3MGRlLi5lODFkNzJkIDEwMDY0NAotLS0gYS9rb2hh
LXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9waWN0dXJl
LXVwbG9hZC50dAorKysgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVs
ZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9hZC50dApAQCAtMjAsNiArMjAsNiBAQAogCiA8
cCBzdHlsZT0iY29sb3I6Izk5MDAwMDsiPkltcG9ydGFudDogVGhlcmUgaXMgYSBsaW1pdCBv
ZiA1MjBLIG9uIHRoZSBzaXplIG9mIHRoZSBwaWN0dXJlIHVwbG9hZGVkIGFuZCBpdCBpcyBy
ZWNvbW1lbmRlZCB0aGF0IHRoZSBpbWFnZSBiZSAyMDB4MzAwIHBpeGVscywgYnV0IHNtYWxs
ZXIgaW1hZ2VzIHdpbGwgd29yayBhcyB3ZWxsLjwvcD4KIAotPHA+PHN0cm9uZz5TZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIg
aW4gdGhlIDxhIGhyZWY9Imh0dHA6Ly9tYW51YWwua29oYS1jb21tdW5pdHkub3JnLzMuNi9l
bi91cGxvYWRwYXRyb25pbWFnZXMuaHRtbCI+bWFudWFsPC9hPiAob25saW5lKS48L3N0cm9u
Zz48L3A+Cis8cD48c3Ryb25nPlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUg
UGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSA8YSBocmVmPSJodHRwOi8vbWFudWFsLmtv
aGEtY29tbXVuaXR5Lm9yZy8zLjYvZW4vdXBsb2FkcGF0cm9uaW1hZ2VzLmh0bWwiPm1hbnVh
bDwvYT4gKG9ubGluZSkuPC9zdHJvbmc+PC9wPgogCi1bJSBJTkNMVURFICdoZWxwLWJvdHRv
bS5pbmMnICVdClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorWyUgSU5DTFVERSAnaGVs
cC1ib3R0b20uaW5jJyAlXQpkaWZmIC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwv
cHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0IGIva29oYS10bXBsL2lu
dHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0Cmlu
ZGV4IDU1NTM3YjQuLjQ2MjZjMjEgMTAwNjQ0Ci0tLSBhL2tvaGEtdG1wbC9pbnRyYW5ldC10
bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dAorKysgYi9rb2hh
LXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVs
ZXIudHQKQEAgLTIzLDYgKzIzLDYgQEAKIAogPHA+VGFzayBzY2hlZHVsZXIgd2lsbCBub3Qg
d29yayBpZiB0aGUgdXNlciB0aGUgd2ViIHNlcnZlciBydW5zIGFzIGRvZXNuJ3QgaGF2ZSB0
aGUgcGVybWlzc2lvbiB0byB1c2UgaXQuIFRvIGZpbmQgb3V0IGlmIHRoZSByaWdodCB1c2Vy
IGhhcyB0aGUgcGVybWlzc2lvbnMgbmVjZXNzYXJ5LCBjaGVjayAvZXRjL2F0LmFsbG93IHRv
IHNlZSB3aGF0IHVzZXJzIGFyZSBpbiBpdC4gSWYgeW91IGRvbid0IGhhdmUgdGhhdCBmaWxl
LCBjaGVjayBldGMvYXQuZGVueS4gSWYgYXQuZGVueSBleGlzdHMgYnV0IGlzIGJsYW5rLCB0
aGVuIGV2ZXJ5IHVzZXIgY2FuIHVzZSBpdC4gVGFsayB0byB5b3VyIHN5c3RlbSBhZG1pbiBh
Ym91dCBhZGRpbmcgdGhlIHVzZXIgdG8gdGhlIHJpZ2h0IHBsYWNlIHRvIG1ha2UgdGhlIHRh
c2sgc2NoZWR1bGVyIHdvcmsuPC9wPgogCi08cD48c3Ryb25nPlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSA8YSBocmVmPSJo
dHRwOi8vbWFudWFsLmtvaGEtY29tbXVuaXR5Lm9yZy8zLjYvZW4vdGFza3NjaGVkdWxlci5o
dG1sIj5tYW51YWw8L2E+IChvbmxpbmUpLjwvc3Ryb25nPjwvcD4KKzxwPjxzdHJvbmc+U2Vl
IHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUg
PGEgaHJlZj0iaHR0cDovL21hbnVhbC5rb2hhLWNvbW11bml0eS5vcmcvMy42L2VuL3Rhc2tz
Y2hlZHVsZXIuaHRtbCI+bWFudWFsPC9hPiAob25saW5lKS48L3N0cm9uZz48L3A+CiAKLVsl
IElOQ0xVREUgJ2hlbHAtYm90dG9tLmluYycgJV0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBm
aWxlCitbJSBJTkNMVURFICdoZWxwLWJvdHRvbS5pbmMnICVdCmRpZmYgLS1naXQgYS9taXNj
L3RyYW5zbGF0b3IvcG8vYW0tRXRoaS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gYi9t
aXNjL3RyYW5zbGF0b3IvcG8vYW0tRXRoaS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8K
aW5kZXggMDU1YThiMi4uNGU4MDczZCAxMDA2NDQKLS0tIGEvbWlzYy90cmFuc2xhdG9yL3Bv
L2FtLUV0aGktaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNs
YXRvci9wby9hbS1FdGhpLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNTg5MjQs
MjMgKzU4OTI0LDIzIEBAIG1zZ3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21v
ZHVsZXMvaGVscC90b29scy9tYW5hZ2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGMtZm9ybWF0
CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1h
bmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9j
dW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhl
ICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxw
L3Rvb2xzL292ZXJkdWVydWxlcy50dDo0NAogIywgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2Vl
IHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3Rh
dHVzIFRyaWdnZXJzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0ciAi
IgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3BpY3R1
cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgor
bXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgUGF0cm9uIEltYWdl
IFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9n
L2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0Ci1t
c2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgVGFzayBTY2hl
ZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQt
dG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvaW52ZW50b3J5LnR0OjE5NwpkaWZmIC0tZ2l0
IGEvbWlzYy90cmFuc2xhdG9yL3BvL2FyLUFyYWItaS1zdGFmZi10LXByb2ctdi0zMDA2MDAw
LnBvIGIvbWlzYy90cmFuc2xhdG9yL3BvL2FyLUFyYWItaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvCmluZGV4IDA5M2JhYmIuLjhmNDY2NzcgMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNs
YXRvci9wby9hci1BcmFiLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbworKysgYi9taXNj
L3RyYW5zbGF0b3IvcG8vYXItQXJhYi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KQEAg
LTU5MjY3LDIzICs1OTI2NywyMyBAQCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwvcHJv
Zy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAjLCBm
dXp6eSwgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgorIlNl
ZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMg
UmVjb3JkcyBpbiB0aGUgIgogbXNnc3RyICImcnNhcXVvO9ij2K/YsSDYqtiz2KzZitmE2KfY
qiDZhdin2LHZgyDYp9mE2YXZhti42YXYqSAiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9l
bi9tb2R1bGVzL2hlbHAvdG9vbHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAjLCBmdXp6eSwgYy1m
b3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0
aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCisiU2VlIHRoZSBm
dWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dl
cnMgaW4gdGhlICIKIG1zZ3N0ciAi2KXYrti32KfYsSDYp9mE2KrYo9iu2YrYsSAvINin2YTY
rdin2YTYqSDZhdix2LPZhNipIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxl
cy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAotbXNnaWQg
IlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJbWFnZSBV
cGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZv
ciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzog
aW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIudHQ6
MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dzdHIg
IiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvaW52ZW50b3J5
LnR0OjE5NwpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xhdG9yL3BvL2F6LUFaLWktc3RhZmYt
dC1wcm9nLXYtMzAwNjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9hei1BWi1pLXN0YWZm
LXQtcHJvZy12LTMwMDYwMDAucG8KaW5kZXggZDBhMzAyNi4uZjIwNTYzNiAxMDA2NDQKLS0t
IGEvbWlzYy90cmFuc2xhdG9yL3BvL2F6LUFaLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5w
bworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8vYXotQVotaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvCkBAIC01OTYwOSwyMyArNTk2MDksMjMgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5l
dC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50
dDo0MwogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4g
dGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0
YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiJnJzYXF1bzsgRMO8emVubGVu
bWnFnyBNQVJDIEthecSxdGxhcsSxbsSxIFnDtm5ldCIKIAogIzogaW50cmFuZXQtdG1wbC9w
cm9nL2VuL21vZHVsZXMvaGVscC90b29scy9vdmVyZHVlcnVsZXMudHQ6NDQKICMsIGZ1enp5
LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUg
dGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBU
cmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICJHZWNpa21lICdNZXNhasSxL0R1cnVtdSB0ZXRp
a2xleWljaWxlcmknICIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVs
cC90b29scy9waWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUg
dGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2Fk
ZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhl
IFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJh
bmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAj
LCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUg
dGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3Vt
ZW50YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAK
ICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDox
OTcKQEAgLTkyNzcxLDcgKzkyNzcxLDcgQEAgbXNnc3RyICIiCiAjfiAiUHJlZmVyZW5jZSBo
YXMgYmVlbiBlbmFibGVkLCBib3RoIHN0YWZmIGFuZCBwYXRyb25zIG1heSBjcmVhdGUgTGlz
dHMuIEFuICIKICN+ICJpdGVtIGluY2x1ZGVkIG9uIGEgTGlzdCBpcyBkaXJlY3RseSBsaW5r
ZWQgdG8gdGhhdCBpdGVtJnJzcXVvO3MgIgogI34gImJpYmxpb2dyYXBoaWMgcmVjb3JkIGlu
IHRoZSBPbmxpbmUgQ2F0YWxvZy4gQ2xpY2tpbmcgb24gdGhlIGl0ZW0gd2lsbCAiCi0jfiAi
dGFrZSB5b3UgZGlyZWN0bHkgdGhlIHRoZSBpdGVtJnJzcXVvO3MgJmxkcXVvO0RldGFpbHMg
U2NyZWVuJnJkcXVvOyBhbmQgIgorI34gInRha2UgeW91IGRpcmVjdGx5IHRoZSBpdGVtJnJz
cXVvO3MgJmxkcXVvO0RldGFpbHMgU2NyZWVuJnJkcXVvOyBhbmQgIgogI34gImFsbG93IHlv
dSB0byBjaGVjayBmb3IgYXZhaWxhYmlsaXR5LCBmaW5kIHRoZSBpdGVtJnJzcXVvO3MgbG9j
YXRpb24gb3IgIgogI34gInJlc2VydmUgdGhlIGl0ZW0uIgogI34gbXNnc3RyICIiCmRpZmYg
LS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8vYmVuLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAw
MC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9iZW4taS1zdGFmZi10LXByb2ctdi0zMDA2MDAw
LnBvCmluZGV4IGVmNmYyNzUuLmMzMjM3MzIgMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNsYXRv
ci9wby9iZW4taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNs
YXRvci9wby9iZW4taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCkBAIC01ODkyNCwyMyAr
NTg5MjQsMjMgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxl
cy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50dDo0MwogIywgYy1mb3JtYXQKIG1z
Z2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgTWFuYWdp
bmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVu
dGF0aW9uIGZvciB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgog
bXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9v
bHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAjLCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMg
VHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhl
IE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICIiCiAK
ICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvcGljdHVyZS11
cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50
YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCittc2dp
ZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBQYXRyb24gSW1hZ2UgVXBs
b2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4v
bW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dDoyNgogIywgYy1mb3JtYXQKLW1zZ2lk
ICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBUYXNrIFNjaGVkdWxl
ciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUg
VGFzayBTY2hlZHVsZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBs
L3Byb2cvZW4vbW9kdWxlcy90b29scy9pbnZlbnRvcnkudHQ6MTk3CmRpZmYgLS1naXQgYS9t
aXNjL3RyYW5zbGF0b3IvcG8vY2EtVkEtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIv
bWlzYy90cmFuc2xhdG9yL3BvL2NhLVZBLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpp
bmRleCBlYWU4NjFmLi5lMjI1ODMxIDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8v
Y2EtVkEtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRv
ci9wby9jYS1WQS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KQEAgLTU4OTI2LDIzICs1
ODkyNiwyMyBAQCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVz
L2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAjLCBjLWZvcm1hdAogbXNn
aWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2lu
ZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50
YXRpb24gZm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBt
c2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29s
cy9vdmVyZHVlcnVsZXMudHQ6NDQKICMsIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBU
cmlnZ2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUg
T3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBtc2dzdHIgIiIKIAog
IzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9waWN0dXJlLXVw
bG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRh
dGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKK21zZ2lk
ICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxv
YWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9t
b2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQg
IlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVy
IGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBU
YXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwv
cHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcKZGlmZiAtLWdpdCBhL21p
c2MvdHJhbnNsYXRvci9wby9kYS1ESy1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gYi9t
aXNjL3RyYW5zbGF0b3IvcG8vZGEtREstaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCmlu
ZGV4IGM5MDA1YzEuLjM4MWU3ZDggMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNsYXRvci9wby9k
YS1ESy1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlzYy90cmFuc2xhdG9y
L3BvL2RhLURLLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNjA3ODEsMjMgKzYw
NzgxLDIzIEBAIG1zZ3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMv
aGVscC90b29scy9tYW5hZ2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGZ1enp5LCBjLWZvcm1h
dAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBN
YW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRv
Y3VtZW50YXRpb24gZm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRo
ZSAiCiBtc2dzdHIgIkJlc8O4ZyBzdGFydHNpZGVuIGZvciBmb3J0dmFsdG5pbmcgYWYga2xh
cmdqb3J0ZSBNQVJDLXBvc3RlciIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVs
ZXMvaGVscC90b29scy9vdmVyZHVlcnVsZXMudHQ6NDQKICMsIGZ1enp5LCBjLWZvcm1hdAog
bXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVy
ZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9j
dW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0
aGUgIgogbXNnc3RyICJLcsOmdmVyIGluZHN0aWxsaW5nIGFmIHVkZXN0w6VlbmRlICdOb3Rp
dHMvc3RhdHVzLXVkbMO4c2VyJyIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVs
ZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lk
ICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2Ug
VXBsb2FkZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBm
b3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6
IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0
OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZv
ciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxs
IGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3Ry
ICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9y
eS50dDoxOTcKZGlmZiAtLWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9kZS1ERS1pLXN0YWZm
LXQtcHJvZy12LTMwMDYwMDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8vZGUtREUtaS1zdGFm
Zi10LXByb2ctdi0zMDA2MDAwLnBvCmluZGV4IGNiZTZmYTcuLjg2NmFjNTMgMTAwNjQ0Ci0t
LSBhL21pc2MvdHJhbnNsYXRvci9wby9kZS1ERS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAu
cG8KKysrIGIvbWlzYy90cmFuc2xhdG9yL3BvL2RlLURFLWktc3RhZmYtdC1wcm9nLXYtMzAw
NjAwMC5wbwpAQCAtNTcyODEsMjQgKzU3MjgxLDI0IEBAIG1zZ3N0ciAiRGllIHZvbGxzdMOk
bmRpZ2UgSGlsZmUgenVtIFJlcG9ydC1Xw7ZydGVyYnVjaCBmaW5kZW4gU2llIGltICIKIAog
IzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9tYW5hZ2UtbWFy
Yy1pbXBvcnQudHQ6NDMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3Vt
ZW50YXRpb24gZm9yIHRoZSB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0
aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgTWFuYWdp
bmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgogbXNnc3RyICJEaWUgdm9sbHN0w6Ru
ZGlnZSBIaWxmZSB6dXIgVmVyd2FsdHVuZyB2b24gendpc2NoZW5nZXNwZWljaGVydGVuIE1B
UkMtRGF0ZW5zw6R0emVuIGZpbmRlbiBTaWUgaW0gIgogCiAjOiBpbnRyYW5ldC10bXBsL3By
b2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50dDo0NAogIywgYy1mb3Jt
YXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVy
ZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1
bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2Vy
cyBpbiB0aGUgIgogbXNnc3RyICJEaWUgdm9sbHN0w6RuZGlnZSBIaWxmZSB6dSBkZW4gTWFo
bnRyaWdnZXJuIGZpbmRlbiBTaWUgaW0gIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4v
bW9kdWxlcy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAot
bXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJ
bWFnZSBVcGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0
aW9uIGZvciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIiIK
ICJEaWUgdm9sbHN0w6RuZGlnZSBISWxmZSB6dW0gV2Vya3pldWcgZsO8ciBkZW4gVXBsb2Fk
IHZvbiBCZW51dHplcmZvdG9zIGZpbmRlbiAiCiAiU2llIGltICIKIAogIzogaW50cmFuZXQt
dG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIudHQ6MjYKICMsIGMt
Zm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUg
VGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRh
dGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dzdHIgIkRpZSB2b2xs
c3TDpG5kaWdlIEhpbGZlIHp1bSBBdWZnYWJlbnBsYW5lciBmaW5kZW4gU2llIGltICIKIAog
IzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvaW52ZW50b3J5LnR0OjE5
NwpAQCAtODgwOTIsNyArODgwOTIsNyBAQCBtc2dzdHIgIuKAoVslIE1BUkNTVUJKRUNUX1NV
QkZJRUxEU19MT08uY29kZSAlXSBbJSBNQVJDU1VCSkVDVF9TVUJGSUVMRFNfTE9PLnZhbAog
I34gIlByZWZlcmVuY2UgaGFzIGJlZW4gZW5hYmxlZCwgYm90aCBzdGFmZiBhbmQgcGF0cm9u
cyBtYXkgY3JlYXRlIExpc3RzLiBBbiAiCiAjfiAiaXRlbSBpbmNsdWRlZCBvbiBhIExpc3Qg
aXMgZGlyZWN0bHkgbGlua2VkIHRvIHRoYXQgaXRlbSZyc3F1bztzICIKICN+ICJiaWJsaW9n
cmFwaGljIHJlY29yZCBpbiB0aGUgT25saW5lIENhdGFsb2cuIENsaWNraW5nIG9uIHRoZSBp
dGVtIHdpbGwgIgotI34gInRha2UgeW91IGRpcmVjdGx5IHRoZSB0aGUgaXRlbSZyc3F1bztz
ICZsZHF1bztEZXRhaWxzIFNjcmVlbiZyZHF1bzsgYW5kICIKKyN+ICJ0YWtlIHlvdSBkaXJl
Y3RseSB0aGUgaXRlbSZyc3F1bztzICZsZHF1bztEZXRhaWxzIFNjcmVlbiZyZHF1bzsgYW5k
ICIKICN+ICJhbGxvdyB5b3UgdG8gY2hlY2sgZm9yIGF2YWlsYWJpbGl0eSwgZmluZCB0aGUg
aXRlbSZyc3F1bztzIGxvY2F0aW9uIG9yICIKICN+ICJyZXNlcnZlIHRoZSBpdGVtLiIKICN+
IG1zZ3N0ciAiIgpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xhdG9yL3BvL2VsLUdSLWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9lbC1HUi1pLXN0
YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KaW5kZXggZTIzMTVlZi4uYWU0ZDdkMSAxMDA2NDQK
LS0tIGEvbWlzYy90cmFuc2xhdG9yL3BvL2VsLUdSLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAw
MC5wbworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8vZWwtR1ItaS1zdGFmZi10LXByb2ctdi0z
MDA2MDAwLnBvCkBAIC02MDI5NywyNCArNjAyOTcsMjQgQEAgbXNnc3RyICIiCiAjOiBpbnRy
YW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9y
dC50dDo0MwogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBk
b2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMg
aW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5n
IFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiIgogIs6gzrfOs86xzq/O
vc+EzrUgz4PPhM63zr0gzrrPjc+BzrnOsSDOv864z4zOvc63IM+Ezr/PhSDOtc+BzrPOsc67
zrXOr86/z4UgzpTOuc6xz4fOtc6vz4HOuc+DzrfPgiDOn8+BzrPOsc69z4nOvM6tzr3Pic69
IM6VzrPOs8+BzrHPhs+Ozr0gTUFSQyIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21v
ZHVsZXMvaGVscC90b29scy9vdmVyZHVlcnVsZXMudHQ6NDQKICMsIGZ1enp5LCBjLWZvcm1h
dAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBP
dmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBp
biB0aGUgIgogbXNnc3RyICLOlc65zrTOv8+Azr/Or863z4POtyDOtc66z4DPgc+MzrjOtc+D
zrzOv8+FL866zrHPhM6sz4PPhM6xz4POtyDOtc69zrXPgc6zzr/PgM6/zq/Ot8+DzrfPgiIK
IAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9waWN0dXJl
LXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1l
bnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKK21z
Z2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFnZSBV
cGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9l
bi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNn
aWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1
bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRo
ZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRt
cGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcKQEAgLTk1MjM5LDcg
Kzk1MjM5LDcgQEAgbXNnc3RyICIiCiAjfiAiUHJlZmVyZW5jZSBoYXMgYmVlbiBlbmFibGVk
LCBib3RoIHN0YWZmIGFuZCBwYXRyb25zIG1heSBjcmVhdGUgTGlzdHMuIEFuICIKICN+ICJp
dGVtIGluY2x1ZGVkIG9uIGEgTGlzdCBpcyBkaXJlY3RseSBsaW5rZWQgdG8gdGhhdCBpdGVt
JnJzcXVvO3MgIgogI34gImJpYmxpb2dyYXBoaWMgcmVjb3JkIGluIHRoZSBPbmxpbmUgQ2F0
YWxvZy4gQ2xpY2tpbmcgb24gdGhlIGl0ZW0gd2lsbCAiCi0jfiAidGFrZSB5b3UgZGlyZWN0
bHkgdGhlIHRoZSBpdGVtJnJzcXVvO3MgJmxkcXVvO0RldGFpbHMgU2NyZWVuJnJkcXVvOyBh
bmQgIgorI34gInRha2UgeW91IGRpcmVjdGx5IHRoZSBpdGVtJnJzcXVvO3MgJmxkcXVvO0Rl
dGFpbHMgU2NyZWVuJnJkcXVvOyBhbmQgIgogI34gImFsbG93IHlvdSB0byBjaGVjayBmb3Ig
YXZhaWxhYmlsaXR5LCBmaW5kIHRoZSBpdGVtJnJzcXVvO3MgbG9jYXRpb24gb3IgIgogI34g
InJlc2VydmUgdGhlIGl0ZW0uIgogI34gbXNnc3RyICIiCmRpZmYgLS1naXQgYS9taXNjL3Ry
YW5zbGF0b3IvcG8vZW4tR0ItaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlzYy90
cmFuc2xhdG9yL3BvL2VuLUdCLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCA5
NDFjOTgxLi44MDhkYTU1IDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vZW4tR0It
aS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9wby9l
bi1HQi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KQEAgLTYwMzg1LDIzICs2MDM4NSwy
MyBAQCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAv
dG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAjLCBmdXp6eSwgYy1mb3JtYXQKIG1z
Z2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgTWFuYWdp
bmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVu
dGF0aW9uIGZvciB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgog
bXNnc3RyICJWaXNpdCB0aGUgbWFpbiBzY3JlZW4gb2YgdGhlIE1hbmFnZSBTdGFnZWQgTUFS
QyBSZWNvcmRzIHRvb2wiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hl
bHAvdG9vbHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAjLCBmdXp6eSwgYy1mb3JtYXQKIG1zZ2lk
ICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBO
b3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50
YXRpb24gZm9yIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIK
IG1zZ3N0ciAiT3ZlcmR1ZSAnTm90aWNlL1N0YXR1cyBUcmlnZ2VycyciCiAKICM6IGludHJh
bmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvcGljdHVyZS11cGxvYWQudHQ6
MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4g
dGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9o
ZWxwL3Rvb2xzL3NjaGVkdWxlci50dDoyNgogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUg
IgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgVGFzayBTY2hl
ZHVsZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4v
bW9kdWxlcy90b29scy9pbnZlbnRvcnkudHQ6MTk3CkBAIC05MzI1Miw3ICs5MzI1Miw3IEBA
IG1zZ3N0ciAiIgogI34gIlByZWZlcmVuY2UgaGFzIGJlZW4gZW5hYmxlZCwgYm90aCBzdGFm
ZiBhbmQgcGF0cm9ucyBtYXkgY3JlYXRlIExpc3RzLiBBbiAiCiAjfiAiaXRlbSBpbmNsdWRl
ZCBvbiBhIExpc3QgaXMgZGlyZWN0bHkgbGlua2VkIHRvIHRoYXQgaXRlbSZyc3F1bztzICIK
ICN+ICJiaWJsaW9ncmFwaGljIHJlY29yZCBpbiB0aGUgT25saW5lIENhdGFsb2cuIENsaWNr
aW5nIG9uIHRoZSBpdGVtIHdpbGwgIgotI34gInRha2UgeW91IGRpcmVjdGx5IHRoZSB0aGUg
aXRlbSZyc3F1bztzICZsZHF1bztEZXRhaWxzIFNjcmVlbiZyZHF1bzsgYW5kICIKKyN+ICJ0
YWtlIHlvdSBkaXJlY3RseSB0aGUgaXRlbSZyc3F1bztzICZsZHF1bztEZXRhaWxzIFNjcmVl
biZyZHF1bzsgYW5kICIKICN+ICJhbGxvdyB5b3UgdG8gY2hlY2sgZm9yIGF2YWlsYWJpbGl0
eSwgZmluZCB0aGUgaXRlbSZyc3F1bztzIGxvY2F0aW9uIG9yICIKICN+ICJyZXNlcnZlIHRo
ZSBpdGVtLiIKICN+IG1zZ3N0ciAiIgpAQCAtOTMyNjAsNyArOTMyNjAsNyBAQCBtc2dzdHIg
IiIKICN+ICJQcmVmZXJlbmNlIGhhcyBiZWVuIGVuYWJsZWQsIGJvdGggc3RhZmYgYW5kIHVz
ZXJzIG1heSBjcmVhdGUgTGlzdHMuIEFuICIKICN+ICJpdGVtIGluY2x1ZGVkIG9uIGEgTGlz
dCBpcyBkaXJlY3RseSBsaW5rZWQgdG8gdGhhdCBpdGVtJnJzcXVvO3MgIgogI34gImJpYmxp
b2dyYXBoaWMgcmVjb3JkIGluIHRoZSBPbmxpbmUgQ2F0YWxvZ3VlLiBDbGlja2luZyBvbiB0
aGUgaXRlbSB3aWxsICIKLSN+ICJ0YWtlIHlvdSBkaXJlY3RseSB0aGUgdGhlIGl0ZW0mcnNx
dW87cyAmbGRxdW87RGV0YWlscyBTY3JlZW4mcmRxdW87IGFuZCAiCisjfiAidGFrZSB5b3Ug
ZGlyZWN0bHkgdGhlIGl0ZW0mcnNxdW87cyAmbGRxdW87RGV0YWlscyBTY3JlZW4mcmRxdW87
IGFuZCAiCiAjfiAiYWxsb3cgeW91IHRvIGNoZWNrIGZvciBhdmFpbGFiaWxpdHksIGZpbmQg
dGhlIGl0ZW0mcnNxdW87cyBsb2NhdGlvbiBvciAiCiAjfiAicmVzZXJ2ZSB0aGUgaXRlbS4i
CiAKZGlmZiAtLWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9lbi1OWi1pLXN0YWZmLXQtcHJv
Zy12LTMwMDYwMDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8vZW4tTlotaS1zdGFmZi10LXBy
b2ctdi0zMDA2MDAwLnBvCmluZGV4IDg5ZjE0MzYuLjExOGM1OTYgMTAwNjQ0Ci0tLSBhL21p
c2MvdHJhbnNsYXRvci9wby9lbi1OWi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysr
IGIvbWlzYy90cmFuc2xhdG9yL3BvL2VuLU5aLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5w
bwpAQCAtNDQ0ODMsNyArNDQ0ODMsNyBAQCBtc2dpZCAiIgogIkluICdGaXJzdCBpc3N1ZSBw
dWJsaWNhdGlvbiBkYXRlJyB5b3Ugd2FudCB0byBlbnRlciB0aGUgZGF0ZSBvZiB0aGUgaXNz
dWUgIgogInlvdSBoYXZlIGluIHlvdXIgaGFuZCwgdGhlIGRhdGUgZnJvbSB3aGljaCB0aGUg
cHJlZGljdGlvbiBwYXR0ZXJuIHdpbGwgc3RhcnQiCiBtc2dzdHIgIiIKLSJJbiAnRmlyc3Qg
aXNzdWUgcHVibGljYXRpb24nIHlvdSB3YW50IHRvIGVudGVyIHRoZSB0aGUgZGF0ZSBvZiB0
aGUgaXNzdWUgeW91ICIKKyJJbiAnRmlyc3QgaXNzdWUgcHVibGljYXRpb24nIHlvdSB3YW50
IHRvIGVudGVyIHRoZSBkYXRlIG9mIHRoZSBpc3N1ZSB5b3UgIgogImhhdmUgaW4geW91ciBo
YW5kLCB0aGUgZGF0ZSBmcm9tIHdoaWNoIHRoZSBwcmVkaWN0aW9uIHBhdHRlcm4gd2lsbCBz
dGFydCIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC9hZG1pbi9z
bWFydC1ydWxlcy50dDo1OApAQCAtNTk5MDIsMjMgKzU5OTAyLDIzIEBAIG1zZ3N0ciAiIgog
IzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9tYW5hZ2UtbWFy
Yy1pbXBvcnQudHQ6NDMKICMsIGZ1enp5LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBS
ZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBN
YW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBtc2dzdHIgIlZpc2l0IHRo
ZSBtYWluIHNjcmVlbiBvZiB0aGUgTWFuYWdlIFN0YWdlZCBNQVJDIFJlY29yZHMgdG9vbCIK
IAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9vdmVyZHVl
cnVsZXMudHQ6NDQKICMsIGZ1enp5LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1
bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJp
Z2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92
ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICJPdmVyZHVl
ICdOb3RpY2UvU3RhdHVzIFRyaWdnZXJzJyIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2Vu
L21vZHVsZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQK
LW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24g
SW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRh
dGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIi
CiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1
bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0
aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgog
bXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2lu
dmVudG9yeS50dDoxOTcKQEAgLTkzOTI1LDcgKzkzOTI1LDcgQEAgbXNnc3RyICIiCiAjfiAi
VGhlcmUgYXJlIG51bWJlciBvZiBwcmVkZWZpbmVkIHJlcG9ydHMgaW4gS29oYS4gQ2hlY2sg
dGhlIENpcmN1bGF0aW9uICIKICN+ICJtb2R1bGUgZm9yIGFkZGl0aW9uYWwgQ2lyY3VsYXRp
b24gc3BlY2lmaWMgcmVwb3J0cy4iCiAjfiBtc2dzdHIgIiIKLSN+ICJUaGVyZSBhcmUgbnVt
YmVyIG9mIHByZWRlZmluZWQgcmVwb3J0cyBpbiBLb2hhLiBDaGVjayB0aGUgdGhlIENpcmN1
bGF0aW9uICIKKyN+ICJUaGVyZSBhcmUgbnVtYmVyIG9mIHByZWRlZmluZWQgcmVwb3J0cyBp
biBLb2hhLiBDaGVjayB0aGUgQ2lyY3VsYXRpb24gIgogI34gIm1vZHVsZSBmb3IgYWRkaXRp
b25hbCBDaXJjdWxhdGlvbiBzcGVjaWZpYyByZXBvcnRzLiIKIAogI34gbXNnaWQgIlRoZXJl
IGFyZSB0aHJlZSBraW5kcyBvZiAnbGlzdHMnIgpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xh
dG9yL3BvL2VzLUVTLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyBiL21pc2MvdHJhbnNs
YXRvci9wby9lcy1FUy1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KaW5kZXggMWQ4ZWVi
YS4uMzFhZGRjZiAxMDA2NDQKLS0tIGEvbWlzYy90cmFuc2xhdG9yL3BvL2VzLUVTLWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8vZXMtRVMt
aS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCkBAIC02MTEyNCw3ICs2MTEyNCw3IEBAIG1z
Z3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9t
YW5hZ2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGZ1enp5LCBjLWZvcm1hdAogbXNnaWQgIiIK
LSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2luZyBTdGFn
ZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBtc2dzdHIg
IiIKICJWaXNpdGUgbGEgcGFudGFsbGEgcHJpbmNpcGFsIGRlIGxhIGhlcnJhbWllbnRhIGRl
IEFkbWluaXN0cmFyIFJlZ2lzdHJvcyAiCiAiUHJlcGFyYWRvcyBNQVJDIgpAQCAtNjExMzIs
MTcgKzYxMTMyLDE3IEBAIG1zZ3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21v
ZHVsZXMvaGVscC90b29scy9vdmVyZHVlcnVsZXMudHQ6NDQKICMsIGZ1enp5LCBjLWZvcm1h
dAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBP
dmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBp
biB0aGUgIgogbXNnc3RyICInRGlzcGFyYWRvcmVzIGRlIGVzdGFkby9hdmlzbycgZGUgcmV0
cmFzb3MiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMv
cGljdHVyZS11cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxs
IGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRo
ZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBQYXRyb24g
SW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBs
L3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dDoyNgogIywgYy1mb3Jt
YXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBUYXNr
IFNjaGVkdWxlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9u
IGZvciB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRy
YW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy9pbnZlbnRvcnkudHQ6MTk3CmRpZmYg
LS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8vZmktRkktaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvIGIvbWlzYy90cmFuc2xhdG9yL3BvL2ZpLUZJLWktc3RhZmYtdC1wcm9nLXYtMzAw
NjAwMC5wbwppbmRleCBjMjgyMjMyLi5hMjhiYWVkIDEwMDY0NAotLS0gYS9taXNjL3RyYW5z
bGF0b3IvcG8vZmktRkktaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2Mv
dHJhbnNsYXRvci9wby9maS1GSS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KQEAgLTU5
MTczLDIzICs1OTE3MywyMyBAQCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwvcHJvZy9l
bi9tb2R1bGVzL2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAjLCBjLWZv
cm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRo
ZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxs
IGRvY3VtZW50YXRpb24gZm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGlu
IHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMv
aGVscC90b29scy9vdmVyZHVlcnVsZXMudHQ6NDQKICMsIGMtZm9ybWF0CiBtc2dpZCAiIgot
IlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90aWNl
L1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9u
IGZvciB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBtc2dz
dHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9w
aWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhl
ICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJ
bWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwv
cHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1h
dAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sg
U2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJh
bmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcKZGlmZiAt
LWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9mci1DQS1pLXN0YWZmLXQtcHJvZy12LTMwMDYw
MDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8vZnItQ0EtaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvCmluZGV4IGU0ZjU0MTkuLjdhMmQzZWUgMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNs
YXRvci9wby9mci1DQS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlzYy90
cmFuc2xhdG9yL3BvL2ZyLUNBLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNTk5
NDgsMjMgKzU5OTQ4LDIzIEBAIG1zZ3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2Vu
L21vZHVsZXMvaGVscC90b29scy9tYW5hZ2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGZ1enp5
LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNv
cmRzIGluIHRoZSAiCiBtc2dzdHIgIiZyc2FxdW87IEfDqXJlciBsZXMgbm90aWNlcyBNQVJD
IHByw6lwYXLDqWVzIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxw
L3Rvb2xzL292ZXJkdWVydWxlcy50dDo0NAogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAi
IgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90
aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0
aW9uIGZvciB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBt
c2dzdHIgIkTDqWNsZW5jaGV1cnMgZGUgcmVsYW5jZXMvc3RhdHV0IHJldGFyZCIKIAogIzog
aW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9h
ZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlv
biBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKK21zZ2lkICJT
ZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRl
ciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1
bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNl
ZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGlu
IHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNr
IFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJv
Zy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcKZGlmZiAtLWdpdCBhL21pc2Mv
dHJhbnNsYXRvci9wby9mci1GUi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gYi9taXNj
L3RyYW5zbGF0b3IvcG8vZnItRlItaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCmluZGV4
IDVmZjE5Y2UuLjdkMGYwODYgMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNsYXRvci9wby9mci1G
Ui1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlzYy90cmFuc2xhdG9yL3Bv
L2ZyLUZSLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNjE1MjMsMjQgKzYxNTIz
LDI0IEBAIG1zZ3N0ciAiUG91ciBwbHVzIGQnaW5mb3JtYXRpb24sIHZvaXIgbGUgIgogIzog
aW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9tYW5hZ2UtbWFyYy1p
bXBvcnQudHQ6NDMKICMsIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4g
dGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0
YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiIgogIlZvaXIgbGEgZG9jdW1l
bnRhdGlvbiBjb21wbMOodGUgZGFucyBsZSAiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9l
bi9tb2R1bGVzL2hlbHAvdG9vbHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAjLCB1enp5LCBjLWZv
cm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRo
ZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1
bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2Vy
cyBpbiB0aGUgIgogbXNnc3RyICJWb2lyIGxhIGRvY3VtZW50YXRpb24gY29tcGzDqHRlIGRh
bnMgbGUgIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xz
L3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVs
bCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0
aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgUGF0cm9u
IEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIlZvaXIgbGEgZG9jdW1lbnRhdGlv
biBjb21wbMOodGUgZGFucyBsZSAiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1
bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNl
ZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGlu
IHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNr
IFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICJWb2lyIGxhIGRvY3VtZW50YXRpb24gY29t
cGzDqHRlIGRhbnMgbGUgIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90
b29scy9pbnZlbnRvcnkudHQ6MTk3CmRpZmYgLS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8v
aGktaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlzYy90cmFuc2xhdG9yL3BvL2hp
LWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCBiZWE1YzQ0Li40NzNkM2U4IDEw
MDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vaGktaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9wby9oaS1pLXN0YWZmLXQtcHJvZy12LTMw
MDYwMDAucG8KQEAgLTU5NDY1LDIzICs1OTQ2NSwyMyBAQCBtc2dzdHIgIiIKICM6IGludHJh
bmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0
LnR0OjQzCiAjLCBmdXp6eSwgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRv
Y3VtZW50YXRpb24gZm9yIHRoZSB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBp
biB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgTWFuYWdpbmcg
U3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgogbXNnc3RyICImcnNhcXVvOyDgpKrgpY3g
pLDgpKzgpILgpKfgpL/gpKQg4KSu4KSC4KSa4KSoIE1BUkMg4KSw4KS/4KSV4KS+4KSw4KWN
4KShICIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9v
dmVyZHVlcnVsZXMudHQ6NDQKICMsIGZ1enp5LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUg
dGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0
dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICLg
pIXgpKTgpL/gpKbgpYfgpK8gJ+CkuOClguCkmuCkqOCkvi/gpLjgpY3gpKTgpLAgVHJpZ2dl
cnMnICIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9w
aWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhl
ICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJ
bWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwv
cHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1h
dAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sg
U2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJh
bmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcKZGlmZiAt
LWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9oci1IUi1pLXN0YWZmLXQtcHJvZy12LTMwMDYw
MDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8vaHItSFItaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvCmluZGV4IDRkMWM1MzQuLmU0ZjdmNmEgMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNs
YXRvci9wby9oci1IUi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlzYy90
cmFuc2xhdG9yL3BvL2hyLUhSLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNTg5
NTcsMjMgKzU4OTU3LDIzIEBAIG1zZ3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2Vu
L21vZHVsZXMvaGVscC90b29scy9tYW5hZ2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGMtZm9y
bWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhl
IE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4g
dGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9o
ZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50dDo0NAogIywgYy1mb3JtYXQKIG1zZ2lkICIiCi0i
U2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2Uv
U3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0
ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3Bp
Y3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBk
b2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUg
IgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgUGF0cm9uIElt
YWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9w
cm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0
Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgVGFzayBT
Y2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBm
b3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFu
ZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvaW52ZW50b3J5LnR0OjE5NwpkaWZmIC0t
Z2l0IGEvbWlzYy90cmFuc2xhdG9yL3BvL2h1LUhVLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAw
MC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9odS1IVS1pLXN0YWZmLXQtcHJvZy12LTMwMDYw
MDAucG8KaW5kZXggOGQ3MDkzZC4uNWJjODYyMCAxMDA2NDQKLS0tIGEvbWlzYy90cmFuc2xh
dG9yL3BvL2h1LUhVLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbworKysgYi9taXNjL3Ry
YW5zbGF0b3IvcG8vaHUtSFUtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCkBAIC01OTMy
MCwyMyArNTkzMjAsMjMgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4v
bW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50dDo0MwogIywgZnV6enks
IGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0
aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29y
ZHMgaW4gdGhlICIKIG1zZ3N0ciAiJnJzYXF1bzsgS2V6ZWxkIGEgZsOpbHJldGV0dCBNQVJD
IHTDqXRlbGVrZXQiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAv
dG9vbHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAjLCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUg
dGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0
dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICIi
CiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvcGljdHVy
ZS11cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3Vt
ZW50YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCitt
c2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBQYXRyb24gSW1hZ2Ug
VXBsb2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cv
ZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dDoyNgogIywgYy1mb3JtYXQKLW1z
Z2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBUYXNrIFNjaGVk
dWxlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0
aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10
bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy9pbnZlbnRvcnkudHQ6MTk3CmRpZmYgLS1naXQg
YS9taXNjL3RyYW5zbGF0b3IvcG8vaHktQXJtbi1pLXN0YWZmLXByb2ctdi0zMDA2MDAwLnBv
IGIvbWlzYy90cmFuc2xhdG9yL3BvL2h5LUFybW4taS1zdGFmZi1wcm9nLXYtMzAwNjAwMC5w
bwppbmRleCA5ZTIwMTY2Li41Y2IxODNkIDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3Iv
cG8vaHktQXJtbi1pLXN0YWZmLXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNs
YXRvci9wby9oeS1Bcm1uLWktc3RhZmYtcHJvZy12LTMwMDYwMDAucG8KQEAgLTM1MTA0LDcg
KzM1MTA0LDcgQEAgbXNnc3RyICLVidWv1aHVtiDVsNWr1bfVvtWh1a4g1bDVodW31b7VpdW/
1b7VuNaC1anVtdW41oLVttW21aXWgNaJIDxhMT7Uv9Wh1bzVuAogIzogLi4vLi4va29oYS10
bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvcmVwb3J0cy9yZXBvcnRz
LWhvbWUudG1wbDo5CiAjLCBmdXp6eQogbXNnaWQgIiIKLSJUaGVyZSBhcmUgbnVtYmVyIG9m
IHByZWRlZmluZWQgcmVwb3J0cyBpbiBLb2hhLiBDaGVjayB0aGUgdGhlIENpcmN1bGF0aW9u
ICIKKyJUaGVyZSBhcmUgbnVtYmVyIG9mIHByZWRlZmluZWQgcmVwb3J0cyBpbiBLb2hhLiBD
aGVjayB0aGUgQ2lyY3VsYXRpb24gIgogIm1vZHVsZSBmb3IgYWRkaXRpb25hbCBDaXJjdWxh
dGlvbiBzcGVjaWZpYyByZXBvcnRzLiIKIG1zZ3N0ciAiIgogIiDUv9W41bDVodW11bjWgtW0
INWv1aHVtiDVttWh1a3VodW61aXVvSDVvdWh1bDVtNWh1bbVvtWh1a4g1bDVodW31b7VpdW/
1b7VuNaC1anVtdW41oLVttW21aXWgNaJINWN1b/VuNaC1aPVq9aAINWP1aHWgdaE1asg1bTV
uNWk1bjWgtWs1aggIgpAQCAtNTc0MDYsNyArNTc0MDYsNyBAQCBtc2dzdHIgIu+7vyIKICN+
ICJQcmVmZXJlbmNlIGhhcyBiZWVuIGVuYWJsZWQsIGJvdGggc3RhZmYgYW5kIHBhdHJvbnMg
bWF5IGNyZWF0ZSBMaXN0cy4gQW4gIgogI34gIml0ZW0gaW5jbHVkZWQgb24gYSBMaXN0IGlz
IGRpcmVjdGx5IGxpbmtlZCB0byB0aGF0IGl0ZW0mcnNxdW87cyAiCiAjfiAiYmlibGlvZ3Jh
cGhpYyByZWNvcmQgaW4gdGhlIE9ubGluZSBDYXRhbG9nLiBDbGlja2luZyBvbiB0aGUgaXRl
bSB3aWxsICIKLSN+ICJ0YWtlIHlvdSBkaXJlY3RseSB0aGUgdGhlIGl0ZW0mcnNxdW87cyAm
bGRxdW87RGV0YWlscyBTY3JlZW4mcmRxdW87IGFuZCAiCisjfiAidGFrZSB5b3UgZGlyZWN0
bHkgdGhlIGl0ZW0mcnNxdW87cyAmbGRxdW87RGV0YWlscyBTY3JlZW4mcmRxdW87IGFuZCAi
CiAjfiAiYWxsb3cgeW91IHRvIGNoZWNrIGZvciBhdmFpbGFiaWxpdHksIGZpbmQgdGhlIGl0
ZW0mcnNxdW87cyBsb2NhdGlvbiBvciAiCiAjfiAicmVzZXJ2ZSB0aGUgaXRlbS4iCiAjfiBt
c2dzdHIgIiIKZGlmZiAtLWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9oeS1Bcm1uLWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9oeS1Bcm1uLWkt
c3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCA2MjY3ZWM4Li5iMDE5YzM2IDEwMDY0
NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vaHktQXJtbi1pLXN0YWZmLXQtcHJvZy12LTMw
MDYwMDAucG8KKysrIGIvbWlzYy90cmFuc2xhdG9yL3BvL2h5LUFybW4taS1zdGFmZi10LXBy
b2ctdi0zMDA2MDAwLnBvCkBAIC02MDIwMSwyNSArNjAyMDEsMjUgQEAgbXNnc3RyICIiCiAj
OiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJj
LWltcG9ydC50dDo0MwogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJl
Y29yZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1h
bmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAi1LHVtdaB1aXV
rNWr1oAg1oPVuNaC1azVodW+1bjWgNW+1aHVriBNQVJDINWj1oDVodW81bjWgtW01bbVpdaA
INWj1bjWgNWu1avWhNWrINWw1avVtNW21aHVr9W2INW61aHVvdW/1aHVvNWoIgogCiAjOiBp
bnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50
dDo0NAogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBp
biB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgT3ZlcmR1ZSBO
b3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBtc2dzdHIgIiIKICLVj9Wl1bLVodWk
1oDVq9aAINWw1avVt9Wl1oHVtNWh1bYv1a/VodaA1aPVodW+1avVs9Wh1a/VqyDVvdWv1abV
otW21aHVvtW41oDVuNWy1bbVpdaA1agg1arVodW01a/VpdW/1aHVttaBINW21bXVuNaC1anV
pdaA1asg1bDVodW01aHWgCAgIgogIijVhNW41oLVv9aEINWq1aHVtNWv1aXVv9Wh1bbWgSDV
ttW31bjWgtW01bbVpdaA1asg1Y7Vq9Wz1aHVry/Vv9aA1avVo9Wj1aXWgNW21aXWgNWrINSz
1bjWgNWu1avWhCkiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAv
dG9vbHMvcGljdHVyZS11cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVy
IGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBQ
YXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5l
dC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dDoyNgogIywg
Yy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRo
ZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVu
dGF0aW9uIGZvciB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAj
OiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy9pbnZlbnRvcnkudHQ6MTk3
CmRpZmYgLS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8vaWQtSUQtaS1zdGFmZi10LXByb2ct
di0zMDA2MDAwLnBvIGIvbWlzYy90cmFuc2xhdG9yL3BvL2lkLUlELWktc3RhZmYtdC1wcm9n
LXYtMzAwNjAwMC5wbwppbmRleCA3NTZhZGI3Li4wMDEyMTY1IDEwMDY0NAotLS0gYS9taXNj
L3RyYW5zbGF0b3IvcG8vaWQtSUQtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBi
L21pc2MvdHJhbnNsYXRvci9wby9pZC1JRC1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8K
QEAgLTU4OTI0LDIzICs1ODkyNCwyMyBAQCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwv
cHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAj
LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNv
cmRzIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21v
ZHVsZXMvaGVscC90b29scy9vdmVyZHVlcnVsZXMudHQ6NDQKICMsIGMtZm9ybWF0CiBtc2dp
ZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUg
Tm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVu
dGF0aW9uIGZvciB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAi
CiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90
b29scy9waWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIg
aW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBh
dHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0
LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBj
LWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhl
IFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50
YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6
IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcK
ZGlmZiAtLWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9pdC1JVC1pLXN0YWZmLXQtcHJvZy12
LTMwMDYwMDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8vaXQtSVQtaS1zdGFmZi10LXByb2ct
di0zMDA2MDAwLnBvCmluZGV4IDQyYjE3N2QuLjcyMTVlNmMgMTAwNjQ0Ci0tLSBhL21pc2Mv
dHJhbnNsYXRvci9wby9pdC1JVC1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIv
bWlzYy90cmFuc2xhdG9yL3BvL2l0LUlULWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpA
QCAtNjEyNjYsMjMgKzYxMjY2LDIzIEBAIG1zZ3N0ciAiVmVkaSBsYSBkb2N1bWVudGF6aW9u
ZSBjb21wbGV0YSBwZXIgaWwgRGl6aW9uYXJpbyBkZWkgUmVwb3J0IG5lbCAiCiAjOiBpbnRy
YW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9y
dC50dDo0MwogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBk
b2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMg
aW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5n
IFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiVmVkaSBsYSBkb2N1bWVu
dGF6aW9uZSBjb21wbGV0YSBwZXIgbGEgR2VzdGlvbmUgZGkgcmVjb3JkIGxhdm9yYXRpIG5l
bCAiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvb3Zl
cmR1ZXJ1bGVzLnR0OjQ0CiAjLCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dl
cnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJk
dWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICJWZWRpIGxhIGRv
Y3VtZW50YXppb25lIGNvbXBsZXRhIHBlciBpIHRyaWdnZXJzIGRpIHJpdGFyZG8vc3RhdHVz
IG5lbCAiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMv
cGljdHVyZS11cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxs
IGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRo
ZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBQYXRyb24g
SW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAiVmVkaSBsYSBkb2N1bWVudGF6aW9u
ZSBjb21wbGV0YSBwZXIgaWwgQ2FyaWNhbWVudG8gZGkgZm90byB1dGVudGUgbmVsICIKIAog
IzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIu
dHQ6MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1
bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dz
dHIgIlZlZGkgbGEgZG9jdW1lbnRhemlvbmUgY29tcGxldGEgcGVyIGlsIEdlc3RvcmUgZGkg
VGFzayBuZWwgIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy9p
bnZlbnRvcnkudHQ6MTk3CmRpZmYgLS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8va24tS25k
YS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8va24t
S25kYS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KaW5kZXggMTY3MjVmZS4uYTRkZjlm
NiAxMDA2NDQKLS0tIGEvbWlzYy90cmFuc2xhdG9yL3BvL2tuLUtuZGEtaS1zdGFmZi10LXBy
b2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9wby9rbi1LbmRhLWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtMzIzNjgsNyArMzIzNjgsNyBAQCBtc2dzdHIg
IiIKIAogIzogLi4vLi4va29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVz
L2hlbHAvcmVwb3J0cy9yZXBvcnRzLWhvbWUudG1wbDo5CiBtc2dpZCAiIgotIlRoZXJlIGFy
ZSBudW1iZXIgb2YgcHJlZGVmaW5lZCByZXBvcnRzIGluIEtvaGEuIENoZWNrIHRoZSB0aGUg
Q2lyY3VsYXRpb24gIgorIlRoZXJlIGFyZSBudW1iZXIgb2YgcHJlZGVmaW5lZCByZXBvcnRz
IGluIEtvaGEuIENoZWNrIHRoZSBDaXJjdWxhdGlvbiAiCiAibW9kdWxlIGZvciBhZGRpdGlv
bmFsIENpcmN1bGF0aW9uIHNwZWNpZmljIHJlcG9ydHMuIgogbXNnc3RyICIiCiAKZGlmZiAt
LWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9sby1MYW9vLWktc3RhZmYtdC1wcm9nLXYtMzAw
NjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9sby1MYW9vLWktc3RhZmYtdC1wcm9nLXYt
MzAwNjAwMC5wbwppbmRleCBmM2IxNGQ5Li5mYjAwZGY3IDEwMDY0NAotLS0gYS9taXNjL3Ry
YW5zbGF0b3IvcG8vbG8tTGFvby1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIv
bWlzYy90cmFuc2xhdG9yL3BvL2xvLUxhb28taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBv
CkBAIC01ODkyNSwyMyArNTg5MjUsMjMgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5ldC10bXBs
L3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50dDo0Mwog
IywgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgorIlNlZSB0
aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVj
b3JkcyBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9t
b2R1bGVzL2hlbHAvdG9vbHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAjLCBjLWZvcm1hdAogbXNn
aWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVl
IE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1l
bnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUg
IgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAv
dG9vbHMvcGljdHVyZS11cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVy
IGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBQ
YXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5l
dC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dDoyNgogIywg
Yy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRo
ZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVu
dGF0aW9uIGZvciB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAj
OiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy9pbnZlbnRvcnkudHQ6MTk3
CmRpZmYgLS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8vbW9uLWktc3RhZmYtdC1wcm9nLXYt
MzAwNjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9tb24taS1zdGFmZi10LXByb2ctdi0z
MDA2MDAwLnBvCmluZGV4IGQ1ZTU2MzguLjgzYTEwNzUgMTAwNjQ0Ci0tLSBhL21pc2MvdHJh
bnNsYXRvci9wby9tb24taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2Mv
dHJhbnNsYXRvci9wby9tb24taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCkBAIC01OTYx
MywyMyArNTk2MTMsMjMgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4v
bW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50dDo0MwogIywgZnV6enks
IGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0
aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29y
ZHMgaW4gdGhlICIKIG1zZ3N0ciAiJnJzYXF1bzsg0q7Qt9Kv0q/Qu9GN0LPQtNGB0Y3QvSBN
QVJDINCx0LjRh9C70Y3Qs9Kv0q/QtNC40LnQsyDQt9C+0YXQuNGG0YPRg9C70LDRhSAiCiAK
ICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvb3ZlcmR1ZXJ1
bGVzLnR0OjQ0CiAjLCBmdXp6eSwgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxs
IGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdn
ZXJzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBPdmVy
ZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0ciAi0KXRg9Cz0LDR
htCw0LAg0YXRjdGC0YDRjdC7ICfQodCw0L3QsNC80LYv0KLTqdC706nQsi3QvSDSr9Kv0YHQ
s9GN0LPRh9C40LQnIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxw
L3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0
aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRl
ciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUg
UGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFu
ZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIudHQ6MjYKICMs
IGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0
aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1l
bnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAog
IzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvaW52ZW50b3J5LnR0OjE5
NwpAQCAtOTE0NTYsNyArOTE0NTYsNyBAQCBtc2dzdHIgIiIKICN+ICJQcmVmZXJlbmNlIGhh
cyBiZWVuIGVuYWJsZWQsIGJvdGggc3RhZmYgYW5kIHBhdHJvbnMgbWF5IGNyZWF0ZSBMaXN0
cy4gQW4gIgogI34gIml0ZW0gaW5jbHVkZWQgb24gYSBMaXN0IGlzIGRpcmVjdGx5IGxpbmtl
ZCB0byB0aGF0IGl0ZW0mcnNxdW87cyAiCiAjfiAiYmlibGlvZ3JhcGhpYyByZWNvcmQgaW4g
dGhlIE9ubGluZSBDYXRhbG9nLiBDbGlja2luZyBvbiB0aGUgaXRlbSB3aWxsICIKLSN+ICJ0
YWtlIHlvdSBkaXJlY3RseSB0aGUgdGhlIGl0ZW0mcnNxdW87cyAmbGRxdW87RGV0YWlscyBT
Y3JlZW4mcmRxdW87IGFuZCAiCisjfiAidGFrZSB5b3UgZGlyZWN0bHkgdGhlIGl0ZW0mcnNx
dW87cyAmbGRxdW87RGV0YWlscyBTY3JlZW4mcmRxdW87IGFuZCAiCiAjfiAiYWxsb3cgeW91
IHRvIGNoZWNrIGZvciBhdmFpbGFiaWxpdHksIGZpbmQgdGhlIGl0ZW0mcnNxdW87cyBsb2Nh
dGlvbiBvciAiCiAjfiAicmVzZXJ2ZSB0aGUgaXRlbS4iCiAjfiBtc2dzdHIgIiIKZGlmZiAt
LWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9tcy1NWS1pLXN0YWZmLXQtcHJvZy12LTMwMDYw
MDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8vbXMtTVktaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvCmluZGV4IDgzNzZmMzEuLmZiMTlmMGUgMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNs
YXRvci9wby9tcy1NWS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlzYy90
cmFuc2xhdG9yL3BvL21zLU1ZLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNTg5
ODUsMjMgKzU4OTg1LDIzIEBAIG1zZ3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2Vu
L21vZHVsZXMvaGVscC90b29scy9tYW5hZ2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGMtZm9y
bWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhl
IE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4g
dGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9o
ZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50dDo0NAogIywgYy1mb3JtYXQKIG1zZ2lkICIiCi0i
U2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2Uv
U3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0
ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3Bp
Y3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBk
b2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUg
IgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgUGF0cm9uIElt
YWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9w
cm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0
Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgVGFzayBT
Y2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBm
b3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFu
ZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvaW52ZW50b3J5LnR0OjE5NwpkaWZmIC0t
Z2l0IGEvbWlzYy90cmFuc2xhdG9yL3BvL25iLU5PLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAw
MC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9uYi1OTy1pLXN0YWZmLXQtcHJvZy12LTMwMDYw
MDAucG8KaW5kZXggMmFlYjBlNi4uNGQ0OWRkOSAxMDA2NDQKLS0tIGEvbWlzYy90cmFuc2xh
dG9yL3BvL25iLU5PLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbworKysgYi9taXNjL3Ry
YW5zbGF0b3IvcG8vbmItTk8taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCkBAIC01OTYy
NiwyMyArNTk2MjYsMjMgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4v
bW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50dDo0MwogIywgZnV6enks
IGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0
aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29y
ZHMgaW4gdGhlICIKIG1zZ3N0ciAiJnJzYXF1bzsgQmVoYW5kbGUgdmlzdGUgTUFSQy1wb3N0
ZXIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvb3Zl
cmR1ZXJ1bGVzLnR0OjQ0CiAjLCBmdXp6eSwgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVz
IFRyaWdnZXJzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRo
ZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0ciAiRm9y
ZmFsbHNtZWxkaW5nL3N0YXR1c3V0bMO4c2VyIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cv
ZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1h
dAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJv
biBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVu
dGF0aW9uIGZvciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIg
IiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hl
ZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50
YXRpb24gZm9yIHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUg
dGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAi
CiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMv
aW52ZW50b3J5LnR0OjE5NwpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xhdG9yL3BvL25sLUJF
LWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9ubC1C
RS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KaW5kZXggMzgyN2ZmZS4uYjRmYTJiMiAx
MDA2NDQKLS0tIGEvbWlzYy90cmFuc2xhdG9yL3BvL25sLUJFLWktc3RhZmYtdC1wcm9nLXYt
MzAwNjAwMC5wbworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8vbmwtQkUtaS1zdGFmZi10LXBy
b2ctdi0zMDA2MDAwLnBvCkBAIC01ODkzOCwyMyArNTg5MzgsMjMgQEAgbXNnc3RyICIiCiAj
OiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJj
LWltcG9ydC50dDo0MwogIywgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRv
Y3VtZW50YXRpb24gZm9yIHRoZSB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBp
biB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgTWFuYWdpbmcg
U3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0
LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAj
LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUg
dGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBU
cmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9l
bi9tb2R1bGVzL2hlbHAvdG9vbHMvcGljdHVyZS11cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0
Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9u
IEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50
YXRpb24gZm9yIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAi
IgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVk
dWxlci50dDoyNgogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRh
dGlvbiBmb3IgdGhlIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0
aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIK
IG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy9p
bnZlbnRvcnkudHQ6MTk3CmRpZmYgLS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8vbmwtTkwt
aS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlzYy90cmFuc2xhdG9yL3BvL25sLU5M
LWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCA3ZjQyZjM0Li45MmIxMGM4IDEw
MDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vbmwtTkwtaS1zdGFmZi10LXByb2ctdi0z
MDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9wby9ubC1OTC1pLXN0YWZmLXQtcHJv
Zy12LTMwMDYwMDAucG8KQEAgLTU4OTMzLDIzICs1ODkzMywyMyBAQCBtc2dzdHIgIiIKICM6
IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMt
aW1wb3J0LnR0OjQzCiAjLCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9j
dW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGlu
IHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBNYW5hZ2luZyBT
dGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQt
dG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9vdmVyZHVlcnVsZXMudHQ6NDQKICMs
IGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0
aGUgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgorIlNlZSB0
aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRy
aWdnZXJzIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2Vu
L21vZHVsZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQK
LW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24g
SW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRh
dGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIi
CiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1
bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0
aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgog
bXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2lu
dmVudG9yeS50dDoxOTcKZGlmZiAtLWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9ubi1OTy1p
LXN0YWZmLXByb2ctdi0zMDA2MDAwLnBvIGIvbWlzYy90cmFuc2xhdG9yL3BvL25uLU5PLWkt
c3RhZmYtcHJvZy12LTMwMDYwMDAucG8KaW5kZXggZDk5YjllMi4uYzA4NTQ0OSAxMDA2NDQK
LS0tIGEvbWlzYy90cmFuc2xhdG9yL3BvL25uLU5PLWktc3RhZmYtcHJvZy12LTMwMDYwMDAu
cG8KKysrIGIvbWlzYy90cmFuc2xhdG9yL3BvL25uLU5PLWktc3RhZmYtcHJvZy12LTMwMDYw
MDAucG8KQEAgLTMxNjI2LDcgKzMxNjI2LDcgQEAgbXNnc3RyICJEZXQgZXIgaW5nZW4gbGFn
cmEgcmFwcG9ydGFyIDxhMT5WaWwgZHUgbGFnYSBlaW4gbnkgcmFwcG9ydD88L2E+IgogIzog
Li4vLi4va29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvcmVw
b3J0cy9yZXBvcnRzLWhvbWUudG1wbDo5CiAjLCBmdXp6eQogbXNnaWQgIiIKLSJUaGVyZSBh
cmUgbnVtYmVyIG9mIHByZWRlZmluZWQgcmVwb3J0cyBpbiBLb2hhLiBDaGVjayB0aGUgdGhl
IENpcmN1bGF0aW9uICIKKyJUaGVyZSBhcmUgbnVtYmVyIG9mIHByZWRlZmluZWQgcmVwb3J0
cyBpbiBLb2hhLiBDaGVjayB0aGUgQ2lyY3VsYXRpb24gIgogIm1vZHVsZSBmb3IgYWRkaXRp
b25hbCBDaXJjdWxhdGlvbiBzcGVjaWZpYyByZXBvcnRzLiIKIG1zZ3N0ciAiIgogIkRldCBm
aW5zdCBtYW5nZSBmw7hyZWhhbmRzbGFnYSByYXBwb3J0YXIuICZuZGFzaDsgU2rDpSBpIHV0
bMOlbnNtb2R1bGVuIGV0dGVyICIKQEAgLTQ3MzIyLDcgKzQ3MzIyLDcgQEAgbXNnc3RyICLv
u78iCiAjfiAiUHJlZmVyZW5jZSBoYXMgYmVlbiBlbmFibGVkLCBib3RoIHN0YWZmIGFuZCBw
YXRyb25zIG1heSBjcmVhdGUgTGlzdHMuIEFuICIKICN+ICJpdGVtIGluY2x1ZGVkIG9uIGEg
TGlzdCBpcyBkaXJlY3RseSBsaW5rZWQgdG8gdGhhdCBpdGVtJnJzcXVvO3MgIgogI34gImJp
Ymxpb2dyYXBoaWMgcmVjb3JkIGluIHRoZSBPbmxpbmUgQ2F0YWxvZy4gQ2xpY2tpbmcgb24g
dGhlIGl0ZW0gd2lsbCAiCi0jfiAidGFrZSB5b3UgZGlyZWN0bHkgdGhlIHRoZSBpdGVtJnJz
cXVvO3MgJmxkcXVvO0RldGFpbHMgU2NyZWVuJnJkcXVvOyBhbmQgIgorI34gInRha2UgeW91
IGRpcmVjdGx5IHRoZSBpdGVtJnJzcXVvO3MgJmxkcXVvO0RldGFpbHMgU2NyZWVuJnJkcXVv
OyBhbmQgIgogI34gImFsbG93IHlvdSB0byBjaGVjayBmb3IgYXZhaWxhYmlsaXR5LCBmaW5k
IHRoZSBpdGVtJnJzcXVvO3MgbG9jYXRpb24gb3IgIgogI34gInJlc2VydmUgdGhlIGl0ZW0u
IgogI34gbXNnc3RyICIiCkBAIC01OTA5Myw3ICs1OTA5Myw3IEBAIG1zZ2lkICIiCiAiUHJl
ZmVyZW5jZSBoYXMgYmVlbiBlbmFibGVkLCBib3RoIHN0YWZmIGFuZCBwYXRyb25zIG1heSBj
cmVhdGUgTGlzdHMuIEFuICIKICJpdGVtIGluY2x1ZGVkIG9uIGEgTGlzdCBpcyBkaXJlY3Rs
eSBsaW5rZWQgdG8gdGhhdCBpdGVtJnJzcXVvO3MgIgogImJpYmxpb2dyYXBoaWMgcmVjb3Jk
IGluIHRoZSBPbmxpbmUgQ2F0YWxvZy4gQ2xpY2tpbmcgb24gdGhlIGl0ZW0gd2lsbCB0YWtl
ICIKLSJ5b3UgZGlyZWN0bHkgdGhlIHRoZSBpdGVtJnJzcXVvO3MgJmxkcXVvO0RldGFpbHMg
U2NyZWVuJnJkcXVvOyBhbmQgYWxsb3cgeW91ICIKKyJ5b3UgZGlyZWN0bHkgdGhlIGl0ZW0m
cnNxdW87cyAmbGRxdW87RGV0YWlscyBTY3JlZW4mcmRxdW87IGFuZCBhbGxvdyB5b3UgIgog
InRvIGNoZWNrIGZvciBhdmFpbGFiaWxpdHksIGZpbmQgdGhlIGl0ZW0mcnNxdW87cyBsb2Nh
dGlvbiBvciByZXNlcnZlIHRoZSAiCiAiaXRlbS4iCiBtc2dzdHIgIiIKZGlmZiAtLWdpdCBh
L21pc2MvdHJhbnNsYXRvci9wby9ubi1OTy1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8g
Yi9taXNjL3RyYW5zbGF0b3IvcG8vbm4tTk8taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBv
CmluZGV4IDhhNjJiYzAuLmM3ODk3NjggMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNsYXRvci9w
by9ubi1OTy1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlzYy90cmFuc2xh
dG9yL3BvL25uLU5PLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNTk0NDksMjMg
KzU5NDQ5LDIzIEBAIG1zZ3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVs
ZXMvaGVscC90b29scy9tYW5hZ2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGZ1enp5LCBjLWZv
cm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRo
ZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxs
IGRvY3VtZW50YXRpb24gZm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGlu
IHRoZSAiCiBtc2dzdHIgIiZyc2FxdW87IEhhbmRzYW1hIGxhZ3JhIE1BUkMtcG9zdGFyIgog
CiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVy
dWxlcy50dDo0NAogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVs
bCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmln
Z2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgT3Zl
cmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBtc2dzdHIgIkZvcmZhbGxz
bWVsZGluZy9zdGF0dXN1dGzDuHlzYXIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9t
b2R1bGVzL2hlbHAvdG9vbHMvcGljdHVyZS11cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1t
c2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9uIElt
YWdlIFVwbG9hZGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRp
b24gZm9yIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgog
CiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxl
ci50dDoyNgogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlv
biBmb3IgdGhlIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKIG1z
Z3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy9pbnZl
bnRvcnkudHQ6MTk3CmRpZmYgLS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8vcGwtUEwtaS1z
dGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlzYy90cmFuc2xhdG9yL3BvL3BsLVBMLWkt
c3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCAwMDMxZjQ1Li41ZmM5NTk1IDEwMDY0
NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vcGwtUEwtaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9wby9wbC1QTC1pLXN0YWZmLXQtcHJvZy12
LTMwMDYwMDAucG8KQEAgLTU5MTkwLDIzICs1OTE5MCwyMyBAQCBtc2dzdHIgIiIKICM6IGlu
dHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1w
b3J0LnR0OjQzCiAjLCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1l
bnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRo
ZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBNYW5hZ2luZyBTdGFn
ZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1w
bC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9vdmVyZHVlcnVsZXMudHQ6NDQKICMsIGMt
Zm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUg
dGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgorIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdn
ZXJzIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21v
ZHVsZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1z
Z2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1h
Z2UgVXBsb2FkZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlv
biBmb3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAK
ICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVy
LnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9u
IGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBm
dWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNn
c3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVu
dG9yeS50dDoxOTcKZGlmZiAtLWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby9wdC1CUi1pLXN0
YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8vcHQtQlItaS1z
dGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCmluZGV4IDE0Nzc5Y2YuLjFjZDg5YTggMTAwNjQ0
Ci0tLSBhL21pc2MvdHJhbnNsYXRvci9wby9wdC1CUi1pLXN0YWZmLXQtcHJvZy12LTMwMDYw
MDAucG8KKysrIGIvbWlzYy90cmFuc2xhdG9yL3BvL3B0LUJSLWktc3RhZmYtdC1wcm9nLXYt
MzAwNjAwMC5wbwpAQCAtNjExODEsMjQgKzYxMTgxLDI0IEBAIG1zZ3N0ciAiIgogIzogaW50
cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9tYW5hZ2UtbWFyYy1pbXBv
cnQudHQ6NDMKICMsIGZ1enp5LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRz
IGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBNYW5hZ2lu
ZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBtc2dzdHIgIlZpc2l0ZSBvIHRlbGEg
cHJpbmNpcGFsIGRhIGZlcnJhbWVudGEgVHJhdGFtZW50byBkZSBSZWdpc3Ryb3MgTUFSQyIK
IAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9vdmVyZHVl
cnVsZXMudHQ6NDQKICMsIGZ1enp5LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1
bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJp
Z2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92
ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICIiCiAiUmVx
dWVyIHF1ZSB2b2PDqiBjb25maWd1cmUgbyBBdmlzbyBkZSBBdHJhc28vU3RhdHVzIGRlIEHD
p8O1ZXMgQXV0b23DoXRpY2FzIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxl
cy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAotbXNnaWQg
IlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJbWFnZSBV
cGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZv
ciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzog
aW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIudHQ6
MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dzdHIg
IiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvaW52ZW50b3J5
LnR0OjE5NwpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xhdG9yL3BvL3B0LVBULWktc3RhZmYt
dC1wcm9nLXYtMzAwNjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9wby9wdC1QVC1pLXN0YWZm
LXQtcHJvZy12LTMwMDYwMDAucG8KaW5kZXggOGY0ZDdmNi4uNTdjYzRiMiAxMDA2NDQKLS0t
IGEvbWlzYy90cmFuc2xhdG9yL3BvL3B0LVBULWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5w
bworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8vcHQtUFQtaS1zdGFmZi10LXByb2ctdi0zMDA2
MDAwLnBvCkBAIC02MDM3NCwyMyArNjAzNzQsMjMgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5l
dC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50
dDo0MwogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4g
dGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0
YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiVmlzaXRlIG8gZWNyw6MgcHJp
bmNpcGFsIGRvcyByZWdpc3RvcyBNQVJDIHByZXBhcmFkb3MiCiAKICM6IGludHJhbmV0LXRt
cGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAjLCBm
dXp6eSwgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCisi
U2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0
dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0ciAiQWdlbmRhciBBdmlzb3MgZGUgQXRyYXNv
cyIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9waWN0
dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9j
dW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIK
K21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFn
ZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJv
Zy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAot
bXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2No
ZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0
LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcKQEAgLTk0MjQ5
LDcgKzk0MjQ5LDcgQEAgbXNnc3RyICIiCiAjfiAiUHJlZmVyZW5jZSBoYXMgYmVlbiBlbmFi
bGVkLCBib3RoIHN0YWZmIGFuZCBwYXRyb25zIG1heSBjcmVhdGUgTGlzdHMuIEFuICIKICN+
ICJpdGVtIGluY2x1ZGVkIG9uIGEgTGlzdCBpcyBkaXJlY3RseSBsaW5rZWQgdG8gdGhhdCBp
dGVtJnJzcXVvO3MgIgogI34gImJpYmxpb2dyYXBoaWMgcmVjb3JkIGluIHRoZSBPbmxpbmUg
Q2F0YWxvZy4gQ2xpY2tpbmcgb24gdGhlIGl0ZW0gd2lsbCAiCi0jfiAidGFrZSB5b3UgZGly
ZWN0bHkgdGhlIHRoZSBpdGVtJnJzcXVvO3MgJmxkcXVvO0RldGFpbHMgU2NyZWVuJnJkcXVv
OyBhbmQgIgorI34gInRha2UgeW91IGRpcmVjdGx5IHRoZSBpdGVtJnJzcXVvO3MgJmxkcXVv
O0RldGFpbHMgU2NyZWVuJnJkcXVvOyBhbmQgIgogI34gImFsbG93IHlvdSB0byBjaGVjayBm
b3IgYXZhaWxhYmlsaXR5LCBmaW5kIHRoZSBpdGVtJnJzcXVvO3MgbG9jYXRpb24gb3IgIgog
I34gInJlc2VydmUgdGhlIGl0ZW0uIgogI34gbXNnc3RyICIiCmRpZmYgLS1naXQgYS9taXNj
L3RyYW5zbGF0b3IvcG8vcm8tUk8taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlz
Yy90cmFuc2xhdG9yL3BvL3JvLVJPLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRl
eCBhY2JjNDIwLi44YTg4NmZmIDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vcm8t
Uk8taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9w
by9yby1STy1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KQEAgLTU5NzgzLDI1ICs1OTc4
MywyNSBAQCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hl
bHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAjLCBjLWZvcm1hdAogbXNnaWQg
IiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2luZyBT
dGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRp
b24gZm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBtc2dz
dHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9v
dmVyZHVlcnVsZXMudHQ6NDQKICMsIGZ1enp5LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUg
dGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0
dXMgVHJpZ2dlcnMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICIi
CiAiPGVtPkFqdW5nZcWjaSBhY29sbzo8L2VtPiBNYWkgbXVsdCAmZ3Q7IFVuZWx0ZSAmZ3Q7
IFJlbWFyY8SDIMOubnTDonJ6aWF0xIMvc3RhdHV0ICIKICJkZWNsYW7Fn2F0b3IiCiAKICM6
IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvcGljdHVyZS11cGxv
YWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRp
b24gZm9yIHRoZSB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCittc2dpZCAi
U2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2Fk
ZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9k
dWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dDoyNgogIywgYy1mb3JtYXQKLW1zZ2lkICJT
ZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBUYXNrIFNjaGVkdWxlciBp
biB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgVGFz
ayBTY2hlZHVsZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3By
b2cvZW4vbW9kdWxlcy90b29scy9pbnZlbnRvcnkudHQ6MTk3CmRpZmYgLS1naXQgYS9taXNj
L3RyYW5zbGF0b3IvcG8vcnUtUlUtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlz
Yy90cmFuc2xhdG9yL3BvL3J1LVJVLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRl
eCAyNzFiZjM1Li5iZDhjM2EwIDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vcnUt
UlUtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9w
by9ydS1SVS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KQEAgLTU5ODY2LDI0ICs1OTg2
NiwyNCBAQCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hl
bHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAjLCBmdXp6eSwgYy1mb3JtYXQK
IG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgTWFu
YWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUg
IgogbXNnc3RyICIiCiAi0J/QvtGB0LXRgtC40YLQtSDQvtGB0L3QvtCy0L3QvtC5INGN0LrR
gNCw0L0g0LjQvdGB0YLRgNGD0LzQtdC90YLQsCDCq9Cj0L/RgNCw0LLQu9C10L3QuNC1INC3
0LDQs9C+0YLQvtCy0LvQtdC90L3Ri9C80Lgg0JzQkNCg0Jot0LfQsNC/0LjRgdGP0LzQuMK7
IgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJk
dWVydWxlcy50dDo0NAogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBU
cmlnZ2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUg
T3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBtc2dzdHIgItCS0LrQ
u9GO0YfQsNGC0LXQu9C4INC+0L/QvtCy0LXRidC10L3QuNC5L9GB0YLQsNGC0YPRgdC+0LIg
0L/RgNC+0YHRgNC+0YfQtdC6IgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxl
cy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZvcm1hdAotbXNnaWQg
IlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBhdHJvbiBJbWFnZSBV
cGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZv
ciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzog
aW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9zY2hlZHVsZXIudHQ6
MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwg
ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCiBtc2dzdHIg
IiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvaW52ZW50b3J5
LnR0OjE5NwpAQCAtODYzMjAsNyArODYzMjAsNyBAQCBtc2dzdHIgIiIKICN+ICJUaGVyZSBh
cmUgbnVtYmVyIG9mIHByZWRlZmluZWQgcmVwb3J0cyBpbiBLb2hhLiBDaGVjayB0aGUgQ2ly
Y3VsYXRpb24gIgogI34gIm1vZHVsZSBmb3IgYWRkaXRpb25hbCBDaXJjdWxhdGlvbiBzcGVj
aWZpYyByZXBvcnRzLiIKICN+IG1zZ3N0ciAiIgotI34gIlRoZXJlIGFyZSBudW1iZXIgb2Yg
cHJlZGVmaW5lZCByZXBvcnRzIGluIEtvaGEuIENoZWNrIHRoZSB0aGUg0J7QsdC+0YDQvtGC
ICIKKyN+ICJUaGVyZSBhcmUgbnVtYmVyIG9mIHByZWRlZmluZWQgcmVwb3J0cyBpbiBLb2hh
LiBDaGVjayB0aGUg0J7QsdC+0YDQvtGCICIKICN+ICJtb2R1bGUgZm9yINCe0LHQvtGA0L7R
giBzcGVjaWZjIHJlcG9ydHMiCiAKICMsIGZ1enp5CmRpZmYgLS1naXQgYS9taXNjL3RyYW5z
bGF0b3IvcG8vc2QtUEstaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlzYy90cmFu
c2xhdG9yL3BvL3NkLVBLLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCBmOGFj
MGM0Li4zZGIxZjRhIDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vc2QtUEstaS1z
dGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9wby9zZC1Q
Sy1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KQEAgLTU4OTI0LDIzICs1ODkyNCwyMyBA
QCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9v
bHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAjLCBjLWZvcm1hdAogbXNnaWQgIiIKLSJT
ZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2luZyBTdGFnZWQg
TUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBtc2dzdHIgIiIK
IAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9vdmVyZHVl
cnVsZXMudHQ6NDQKICMsIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmlnZ2VycyBp
biB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgT3ZlcmR1ZSBO
b3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFu
ZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9hZC50dDoy
MwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhl
IGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0
aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hl
bHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAi
Cittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVk
dWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9t
b2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcKZGlmZiAtLWdpdCBhL21pc2MvdHJhbnNs
YXRvci9wby9zdi1TRS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gYi9taXNjL3RyYW5z
bGF0b3IvcG8vc3YtU0UtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCmluZGV4IDNlZTFm
MTguLjUxN2QyN2QgMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNsYXRvci9wby9zdi1TRS1pLXN0
YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlzYy90cmFuc2xhdG9yL3BvL3N2LVNF
LWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNTg5NDUsMjMgKzU4OTQ1LDIzIEBA
IG1zZ3N0ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29s
cy9tYW5hZ2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNl
ZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBN
QVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiIgog
CiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVy
dWxlcy50dDo0NAogIywgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3Vt
ZW50YXRpb24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGlu
IHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBPdmVyZHVlIE5v
dGljZS9TdGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5l
dC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIz
CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0
aGUgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRo
ZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVs
cC90b29scy9zY2hlZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBm
dWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIK
K21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1
bGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21v
ZHVsZXMvdG9vbHMvaW52ZW50b3J5LnR0OjE5NwpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xh
dG9yL3BvL3RldC1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gYi9taXNjL3RyYW5zbGF0
b3IvcG8vdGV0LWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCBhOTliYzgwLi4y
ZDgwNjhhIDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vdGV0LWktc3RhZmYtdC1w
cm9nLXYtMzAwNjAwMC5wbworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8vdGV0LWktc3RhZmYt
dC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNTk0NDAsMjMgKzU5NDQwLDIzIEBAIG1zZ3N0ciAi
IgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9tYW5hZ2Ut
bWFyYy1pbXBvcnQudHQ6NDMKICMsIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVs
bCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29y
ZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFn
aW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRy
YW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50dDo0
NAogIywgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24g
Zm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCisi
U2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0
dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBsL3By
b2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBjLWZv
cm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFBh
dHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1
bWVudGF0aW9uIGZvciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBtc2dz
dHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9z
Y2hlZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3Vt
ZW50YXRpb24gZm9yIHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lkICJT
ZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRo
ZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9v
bHMvaW52ZW50b3J5LnR0OjE5NwpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xhdG9yL3BvL3Ro
LVRIQS1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8gYi9taXNjL3RyYW5zbGF0b3IvcG8v
dGgtVEhBLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCA5ZDFjM2NhLi5kYmNk
OTg0IDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vdGgtVEhBLWktc3RhZmYtdC1w
cm9nLXYtMzAwNjAwMC5wbworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8vdGgtVEhBLWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwpAQCAtNTg5MjUsMjMgKzU4OTI1LDIzIEBAIG1zZ3N0
ciAiIgogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9tYW5h
Z2UtbWFyYy1pbXBvcnQudHQ6NDMKICMsIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJl
Y29yZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1h
bmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBp
bnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50
dDo0NAogIywgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRp
b24gZm9yIHRoZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAi
CisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBPdmVyZHVlIE5vdGljZS9T
dGF0dXMgVHJpZ2dlcnMgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBpbnRyYW5ldC10bXBs
L3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAjLCBj
LWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhl
IFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBk
b2N1bWVudGF0aW9uIGZvciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAiCiBt
c2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29s
cy9zY2hlZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxsIGRv
Y3VtZW50YXRpb24gZm9yIHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21zZ2lk
ICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVyIGlu
IHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMv
dG9vbHMvaW52ZW50b3J5LnR0OjE5NwpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xhdG9yL3Bv
L3RyLVRSLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9w
by90ci1UUi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KaW5kZXggYTJjMTQzNS4uZDdj
NGZlYiAxMDA2NDQKLS0tIGEvbWlzYy90cmFuc2xhdG9yL3BvL3RyLVRSLWktc3RhZmYtdC1w
cm9nLXYtMzAwNjAwMC5wbworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8vdHItVFItaS1zdGFm
Zi10LXByb2ctdi0zMDA2MDAwLnBvCkBAIC01OTc4NCwyMyArNTk3ODQsMjMgQEAgbXNnc3Ry
ICIiCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFn
ZS1tYXJjLWltcG9ydC50dDo0MwogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNl
ZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBN
QVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiJnJz
YXF1bzsgRMO8emVubGVubWnFnyBNQVJDIEthecSxdGxhcsSxbsSxIFnDtm5ldCIKIAogIzog
aW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9vdmVyZHVlcnVsZXMu
dHQ6NDQKICMsIGZ1enp5LCBjLWZvcm1hdAogbXNnaWQgIiIKLSJTZWUgdGhlIGZ1bGwgZG9j
dW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJpZ2dlcnMg
aW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE92ZXJkdWUg
Tm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgogbXNnc3RyICJHZWNpa21lICdNZXNh
asSxL0R1cnVtdSB0ZXRpa2xleWljaWxlcmknICIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9n
L2VuL21vZHVsZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9hZC50dDoyMwogIywgYy1mb3Jt
YXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBQYXRy
b24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKK21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1l
bnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgogbXNnc3Ry
ICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvc2No
ZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVu
dGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGluIHRoZSAiCittc2dpZCAiU2Vl
IHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUg
IgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xz
L2ludmVudG9yeS50dDoxOTcKQEAgLTkzMjM4LDcgKzkzMjM4LDcgQEAgbXNnc3RyICIiCiAj
fiAiUHJlZmVyZW5jZSBoYXMgYmVlbiBlbmFibGVkLCBib3RoIHN0YWZmIGFuZCBwYXRyb25z
IG1heSBjcmVhdGUgTGlzdHMuIEFuICIKICN+ICJpdGVtIGluY2x1ZGVkIG9uIGEgTGlzdCBp
cyBkaXJlY3RseSBsaW5rZWQgdG8gdGhhdCBpdGVtJnJzcXVvO3MgIgogI34gImJpYmxpb2dy
YXBoaWMgcmVjb3JkIGluIHRoZSBPbmxpbmUgQ2F0YWxvZy4gQ2xpY2tpbmcgb24gdGhlIGl0
ZW0gd2lsbCAiCi0jfiAidGFrZSB5b3UgZGlyZWN0bHkgdGhlIHRoZSBpdGVtJnJzcXVvO3Mg
JmxkcXVvO0RldGFpbHMgU2NyZWVuJnJkcXVvOyBhbmQgIgorI34gInRha2UgeW91IGRpcmVj
dGx5IHRoZSBpdGVtJnJzcXVvO3MgJmxkcXVvO0RldGFpbHMgU2NyZWVuJnJkcXVvOyBhbmQg
IgogI34gImFsbG93IHlvdSB0byBjaGVjayBmb3IgYXZhaWxhYmlsaXR5LCBmaW5kIHRoZSBp
dGVtJnJzcXVvO3MgbG9jYXRpb24gb3IgIgogI34gInJlc2VydmUgdGhlIGl0ZW0uIgogI34g
bXNnc3RyICIiCmRpZmYgLS1naXQgYS9taXNjL3RyYW5zbGF0b3IvcG8vdWstVUEtaS1zdGFm
Zi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlzYy90cmFuc2xhdG9yL3BvL3VrLVVBLWktc3Rh
ZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCBlMmJjYzUwLi5jYjEzMzJmIDEwMDY0NAot
LS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vdWstVUEtaS1zdGFmZi10LXByb2ctdi0zMDA2MDAw
LnBvCisrKyBiL21pc2MvdHJhbnNsYXRvci9wby91ay1VQS1pLXN0YWZmLXQtcHJvZy12LTMw
MDYwMDAucG8KQEAgLTYwMDEyLDI0ICs2MDAxMiwyNCBAQCBtc2dzdHIgIiIKICM6IGludHJh
bmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0
LnR0OjQzCiAjLCBmdXp6eSwgYy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRv
Y3VtZW50YXRpb24gZm9yIHRoZSB0aGUgTWFuYWdpbmcgU3RhZ2VkIE1BUkMgUmVjb3JkcyBp
biB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgTWFuYWdpbmcg
U3RhZ2VkIE1BUkMgUmVjb3JkcyBpbiB0aGUgIgogbXNnc3RyICIiCiAi0JLRltC00LLRltC0
0LDQudGC0LUg0L7RgdC90L7QstC90LjQuSDQtdC60YDQsNC9INGW0L3RgdGC0YDRg9C80LXQ
vdGC0YMg4oCe0JrQtdGA0YPQstCw0L3QvdGPINC30LDQs9C+0YLQvtCy0LvQtdC90LjQvNC4
INCc0JDQoNCaLdC30LDQv9C40YHQsNC80LjigJwiCiAKICM6IGludHJhbmV0LXRtcGwvcHJv
Zy9lbi9tb2R1bGVzL2hlbHAvdG9vbHMvb3ZlcmR1ZXJ1bGVzLnR0OjQ0CiAjLCBmdXp6eSwg
Yy1mb3JtYXQKIG1zZ2lkICIiCi0iU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRo
ZSB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCisiU2VlIHRo
ZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBPdmVyZHVlIE5vdGljZS9TdGF0dXMgVHJp
Z2dlcnMgaW4gdGhlICIKIG1zZ3N0ciAi0JLQvNC40LrQsNGH0ZYg0YHQv9C+0LLRltGJ0LXQ
vdGML9GB0YLQsNC90ZbQsiDQv9GA0L7RgdGC0YDQvtGH0LXQvdGMIgogCiAjOiBpbnRyYW5l
dC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIz
CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0
aGUgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUg
ZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRo
ZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVs
cC90b29scy9zY2hlZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBm
dWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIK
K21zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1
bGVyIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21v
ZHVsZXMvdG9vbHMvaW52ZW50b3J5LnR0OjE5NwpkaWZmIC0tZ2l0IGEvbWlzYy90cmFuc2xh
dG9yL3BvL3VyLUFyYWItaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvIGIvbWlzYy90cmFu
c2xhdG9yL3BvL3VyLUFyYWItaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCmluZGV4IGQ0
MDM3M2QuLmY3ZmY2MWUgMTAwNjQ0Ci0tLSBhL21pc2MvdHJhbnNsYXRvci9wby91ci1BcmFi
LWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbworKysgYi9taXNjL3RyYW5zbGF0b3IvcG8v
dXItQXJhYi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KQEAgLTU4OTI1LDIzICs1ODky
NSwyMyBAQCBtc2dzdHIgIiIKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2hl
bHAvdG9vbHMvbWFuYWdlLW1hcmMtaW1wb3J0LnR0OjQzCiAjLCBjLWZvcm1hdAogbXNnaWQg
IiIKLSJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIHRoZSBNYW5hZ2luZyBT
dGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCisiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRp
b24gZm9yIHRoZSBNYW5hZ2luZyBTdGFnZWQgTUFSQyBSZWNvcmRzIGluIHRoZSAiCiBtc2dz
dHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9v
dmVyZHVlcnVsZXMudHQ6NDQKICMsIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVs
bCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmln
Z2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgT3Zl
cmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzog
aW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90b29scy9waWN0dXJlLXVwbG9h
ZC50dDoyMwogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlv
biBmb3IgdGhlIHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKK21zZ2lkICJT
ZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRl
ciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1
bGVzL2hlbHAvdG9vbHMvc2NoZWR1bGVyLnR0OjI2CiAjLCBjLWZvcm1hdAotbXNnaWQgIlNl
ZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIFRhc2sgU2NoZWR1bGVyIGlu
IHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSBUYXNr
IFNjaGVkdWxlciBpbiB0aGUgIgogbXNnc3RyICIiCiAKICM6IGludHJhbmV0LXRtcGwvcHJv
Zy9lbi9tb2R1bGVzL3Rvb2xzL2ludmVudG9yeS50dDoxOTcKZGlmZiAtLWdpdCBhL21pc2Mv
dHJhbnNsYXRvci9wby96aC1IYW5zLUNOLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyBi
L21pc2MvdHJhbnNsYXRvci9wby96aC1IYW5zLUNOLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAw
MC5wbwppbmRleCBkZjdkNjg5Li4zYzY0YjZjIDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0
b3IvcG8vemgtSGFucy1DTi1pLXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlz
Yy90cmFuc2xhdG9yL3BvL3poLUhhbnMtQ04taS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBv
CkBAIC01OTIzMSwyMyArNTkyMzEsMjMgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5ldC10bXBs
L3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50dDo0Mwog
IywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0
aW9uIGZvciB0aGUgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIK
KyJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0YWdlZCBN
QVJDIFJlY29yZHMgaW4gdGhlICIKIG1zZ3N0ciAiJnJzYXF1bzsg566h55CGIE1BUkMg5Lmm
55uu6K6w5b2V5rGH5YWlIgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9o
ZWxwL3Rvb2xzL292ZXJkdWVydWxlcy50dDo0NAogIywgZnV6enksIGMtZm9ybWF0CiBtc2dp
ZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUg
Tm90aWNlL1N0YXR1cyBUcmlnZ2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVu
dGF0aW9uIGZvciB0aGUgT3ZlcmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAi
CiBtc2dzdHIgIumAvuacn+mAmuefpS/nirblhrUg6Kem5Y+RIgogCiAjOiBpbnRyYW5ldC10
bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3BpY3R1cmUtdXBsb2FkLnR0OjIzCiAj
LCBjLWZvcm1hdAotbXNnaWQgIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUg
dGhlIFBhdHJvbiBJbWFnZSBVcGxvYWRlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVs
bCBkb2N1bWVudGF0aW9uIGZvciB0aGUgUGF0cm9uIEltYWdlIFVwbG9hZGVyIGluIHRoZSAi
CiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvaGVscC90
b29scy9zY2hlZHVsZXIudHQ6MjYKICMsIGMtZm9ybWF0Ci1tc2dpZCAiU2VlIHRoZSBmdWxs
IGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKK21z
Z2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3IgdGhlIFRhc2sgU2NoZWR1bGVy
IGluIHRoZSAiCiBtc2dzdHIgIiIKIAogIzogaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVs
ZXMvdG9vbHMvaW52ZW50b3J5LnR0OjE5NwpAQCAtOTMwMTksNyArOTMwMTksNyBAQCBtc2dz
dHIgIiIKICN+ICJQcmVmZXJlbmNlIGhhcyBiZWVuIGVuYWJsZWQsIGJvdGggc3RhZmYgYW5k
IHBhdHJvbnMgbWF5IGNyZWF0ZSBMaXN0cy4gQW4gIgogI34gIml0ZW0gaW5jbHVkZWQgb24g
YSBMaXN0IGlzIGRpcmVjdGx5IGxpbmtlZCB0byB0aGF0IGl0ZW0mcnNxdW87cyAiCiAjfiAi
YmlibGlvZ3JhcGhpYyByZWNvcmQgaW4gdGhlIE9ubGluZSBDYXRhbG9nLiBDbGlja2luZyBv
biB0aGUgaXRlbSB3aWxsICIKLSN+ICJ0YWtlIHlvdSBkaXJlY3RseSB0aGUgdGhlIGl0ZW0m
cnNxdW87cyAmbGRxdW87RGV0YWlscyBTY3JlZW4mcmRxdW87IGFuZCAiCisjfiAidGFrZSB5
b3UgZGlyZWN0bHkgdGhlIGl0ZW0mcnNxdW87cyAmbGRxdW87RGV0YWlscyBTY3JlZW4mcmRx
dW87IGFuZCAiCiAjfiAiYWxsb3cgeW91IHRvIGNoZWNrIGZvciBhdmFpbGFiaWxpdHksIGZp
bmQgdGhlIGl0ZW0mcnNxdW87cyBsb2NhdGlvbiBvciAiCiAjfiAicmVzZXJ2ZSB0aGUgaXRl
bS4iCiAjfiBtc2dzdHIgIiIKZGlmZiAtLWdpdCBhL21pc2MvdHJhbnNsYXRvci9wby96aC1I
YW5zLVRXLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbyBiL21pc2MvdHJhbnNsYXRvci9w
by96aC1IYW5zLVRXLWktc3RhZmYtdC1wcm9nLXYtMzAwNjAwMC5wbwppbmRleCBjYmIyYzU3
Li5hOTYwMTJjIDEwMDY0NAotLS0gYS9taXNjL3RyYW5zbGF0b3IvcG8vemgtSGFucy1UVy1p
LXN0YWZmLXQtcHJvZy12LTMwMDYwMDAucG8KKysrIGIvbWlzYy90cmFuc2xhdG9yL3BvL3po
LUhhbnMtVFctaS1zdGFmZi10LXByb2ctdi0zMDA2MDAwLnBvCkBAIC01OTkxMCwyNCArNTk5
MTAsMjQgQEAgbXNnc3RyICIiCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9o
ZWxwL3Rvb2xzL21hbmFnZS1tYXJjLWltcG9ydC50dDo0MwogIywgZnV6enksIGMtZm9ybWF0
CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE1h
bmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhlICIKKyJTZWUgdGhlIGZ1bGwgZG9j
dW1lbnRhdGlvbiBmb3IgdGhlIE1hbmFnaW5nIFN0YWdlZCBNQVJDIFJlY29yZHMgaW4gdGhl
ICIKIG1zZ3N0ciAi566h55CGIE1BUkMg5pu455uu6KiY6YyE5Yyv5YWl5bel5YW3IgogCiAj
CiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL292ZXJkdWVy
dWxlcy50dDo0NAogIywgZnV6enksIGMtZm9ybWF0CiBtc2dpZCAiIgotIlNlZSB0aGUgZnVs
bCBkb2N1bWVudGF0aW9uIGZvciB0aGUgdGhlIE92ZXJkdWUgTm90aWNlL1N0YXR1cyBUcmln
Z2VycyBpbiB0aGUgIgorIlNlZSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIGZvciB0aGUgT3Zl
cmR1ZSBOb3RpY2UvU3RhdHVzIFRyaWdnZXJzIGluIHRoZSAiCiBtc2dzdHIgIumAvuacn+mA
muefpS/ni4Dms4Hop7jnmbwiCiAKICM6IGludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVz
L2hlbHAvdG9vbHMvcGljdHVyZS11cGxvYWQudHQ6MjMKICMsIGMtZm9ybWF0Ci1tc2dpZCAi
U2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9yIHRoZSB0aGUgUGF0cm9uIEltYWdlIFVw
bG9hZGVyIGluIHRoZSAiCittc2dpZCAiU2VlIHRoZSBmdWxsIGRvY3VtZW50YXRpb24gZm9y
IHRoZSBQYXRyb24gSW1hZ2UgVXBsb2FkZXIgaW4gdGhlICIKIG1zZ3N0ciAiIgogCiAjOiBp
bnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9oZWxwL3Rvb2xzL3NjaGVkdWxlci50dDoy
NgogIywgYy1mb3JtYXQKLW1zZ2lkICJTZWUgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBmb3Ig
dGhlIHRoZSBUYXNrIFNjaGVkdWxlciBpbiB0aGUgIgorbXNnaWQgIlNlZSB0aGUgZnVsbCBk
b2N1bWVudGF0aW9uIGZvciB0aGUgVGFzayBTY2hlZHVsZXIgaW4gdGhlICIKIG1zZ3N0ciAi
IgogCiAjOiBpbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy9pbnZlbnRvcnku
dHQ6MTk3Ci0tIAoxLjcuMi41Cgo=
--------------080600010502090104060004--

From marc at msys.ch  Wed Dec 14 10:17:29 2011
From: marc at msys.ch (Marc Balmer)
Date: Wed, 14 Dec 2011 10:17:29 +0100
Subject: [Koha-patches] Fixing some typos
In-Reply-To: <4EE8655E.802@msys.ch>
References: <4EE8655E.802@msys.ch>
Message-ID: <4EE869A9.8040700@msys.ch>

Am 14.12.11 09:59, schrieb Marc Balmer:
> 0001  functionnal -> functional
> 0002  wether -> whether
> 0003  developper -> developer
> 0004  'the the ' - > 'the '

I filed a bug, 7356, for this:

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7356

From jonathan.druart at biblibre.com  Wed Dec 14 15:11:51 2011
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Wed, 14 Dec 2011 15:11:51 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH_1/1=5D_Bug_5347=3A_Adds_columns?=
	=?utf-8?q?_claims=5Fcount_and_claimed=5Fdate_in_aqorders?=
Message-ID: <1323871911-22153-1-git-send-email-jonathan.druart@biblibre.com>

This patch adds 2 columns in the aqorders table :
- claims_count : number of claims for an orders
- claimed_date : date of the lastest claim

In the lateorders.pl table, you can not select orders from different
supplier because there is just one letter sent after clicking the "Claim
order" button. So, it's logic that you want to select only orders from
this supplier.

Modification in C4/Letters.pm:
refactoring code for claimacquisition and claimissues letter type.
Now, fields for theses letters check the table name. It's not possible
to chooce aqorders.title, this field doesn't exist !
Furthermore, you can add a <order> tag around your item fields, like
this :

-- Begin example
<<LibrarianFirstname>>
<<LibrarianSurname>>

<<aqbooksellers.contact>>
<<aqbooksellers.address1>>
<<aqbooksellers.phone>>
<<aqbasket.basketno>>
<<aqbooksellers.phone>>
<order>Library : <<items.homebranch>>
In your possesssion : <<biblio.author>>. <<biblio.title>>.
<<biblioitems.publishercode>>, <<biblioitems.publicationyear>>.
Callnumber : <<items.itemcallnumber>>. doc type : <<items.itype>>
Barcode : <<items.barcode>>
Date for the return : <<items.onloan>>.</order>

<<LibrarianSurname>>
-- End example
---
 C4/Acquisition.pm                                  |   31 +++
 C4/Letters.pm                                      |  198 ++++++++------------
 acqui/lateorders.pl                                |   18 ++-
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/en/mandatory/sample_notices.sql     |    2 +-
 .../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             |    2 +
 .../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 +-
 .../data/mysql/ru-RU/optional/sample_notices.sql   |    2 +-
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    2 +-
 .../data/mysql/uk-UA/optional/sample_notices.sql   |    2 +-
 installer/data/mysql/updatedatabase.pl             |    7 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |    8 +
 .../prog/en/modules/acqui/lateorders.tt            |   39 ++++-
 18 files changed, 190 insertions(+), 135 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 7127f24..6fe4804 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -61,6 +61,8 @@ BEGIN {
         &GetContracts &GetContract
 
         &GetItemnumbersFromOrder
+
+        &AddClaim
     );
 }
 
@@ -1416,9 +1418,12 @@ sub GetLateOrders {
         DATE(aqbasket.closedate)  AS orderdate,
         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,
         borrowers.branchcode      AS branch,
         aqbooksellers.name        AS supplier,
+        aqbooksellers.id          AS supplierid,
         biblio.author, biblio.title,
         biblioitems.publishercode AS publisher,
         biblioitems.publicationyear,
@@ -1480,6 +1485,7 @@ sub GetLateOrders {
     my @results;
     while (my $data = $sth->fetchrow_hashref) {
         $data->{orderdate} = format_date($data->{orderdate});
+        $data->{claimed_date} = format_date($data->{claimed_date});
         push @results, $data;
     }
     return @results;
@@ -1742,6 +1748,31 @@ sub GetContract {
     return $result;
 }
 
+=head3 AddClaim
+
+=over 4
+
+&AddClaim($ordernumber);
+
+Add a claim for an order
+
+=back
+
+=cut
+sub AddClaim {
+    my ($ordernumber) = @_;
+    my $dbh          = C4::Context->dbh;
+    my $query        = "
+        UPDATE aqorders SET
+            claims_count = claims_count + 1,
+            claimed_date = CURDATE()
+        WHERE ordernumber = ?
+        ";
+    my $sth = $dbh->prepare($query);
+    $sth->execute($ordernumber);
+
+}
+
 1;
 __END__
 
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 6846a00..0688c40 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -243,6 +243,7 @@ sub findrelatedto ($$) {
 sub SendAlerts {
     my ( $type, $externalid, $letter ) = @_;
     my $dbh = C4::Context->dbh;
+    my $strsth;
     if ( $type eq 'issue' ) {
 
         # 		warn "sending issues...";
@@ -290,99 +291,56 @@ sub SendAlerts {
                     );
                 sendmail(%mail) or carp $Mail::Sendmail::error;
 
-# warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
             }
         }
     }
     elsif ( $type eq 'claimacquisition' ) {
 
-        # 		warn "sending issues...";
-        my $letter = getletter( 'claimacquisition', $letter );
+        $letter = getletter( 'claimacquisition', $letter );
 
         # prepare the letter...
         # search the biblionumber
-        my $strsth =
-"select aqorders.*,aqbasket.*,biblio.*,biblioitems.* from aqorders LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno LEFT JOIN biblio on aqorders.biblionumber=biblio.biblionumber LEFT JOIN biblioitems on aqorders.biblioitemnumber=biblioitems.biblioitemnumber where aqorders.ordernumber IN ("
-          . join( ",", @$externalid ) . ")";
-        my $sthorders = $dbh->prepare($strsth);
-        $sthorders->execute;
-        my $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{booksellerid} );
-        my $sthbookseller =
-          $dbh->prepare("select * from aqbooksellers where id=?");
-        $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
-        my $databookseller = $sthbookseller->fetchrow_hashref;
-
-        # 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;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
-                }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
-            }
-        }
-        $letter->{content} =~ s/<<[^>]*>>//g;
-        my $innerletter = $letter;
-
-        # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} )
-        {
-            my %mail = (
-                To => $databookseller->{bookselleremail}
-                  . (
-                    $databookseller->{contemail}
-                    ? "," . $databookseller->{contemail}
-                    : ""
-                  ),
-                From           => $userenv->{emailaddress},
-                Subject        => "" . $innerletter->{title},
-                Message        => "" . $innerletter->{content},
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-        }
-        if ( C4::Context->preference("LetterLog") ) {
-            logaction(
-                "ACQUISITION",
-                "Send Acquisition claim letter",
-                "",
-                "order list : "
-                  . join( ",", @$externalid )
-                  . "\n$innerletter->{title}\n$innerletter->{content}"
-            );
+        $strsth = qq{
+            SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*,aqbooksellers.*
+            FROM aqorders
+            LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
+            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
+            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' ) {
 
-        # 		warn "sending issues...";
-        my $letter = getletter( 'claimissues', $letter );
+        $letter = getletter( 'claimissues', $letter );
 
         # prepare the letter...
         # search the biblionumber
-        my $strsth =
-"select serial.*,subscription.*, biblio.* from serial LEFT JOIN subscription on serial.subscriptionid=subscription.subscriptionid LEFT JOIN biblio on serial.biblionumber=biblio.biblionumber where serial.serialid IN ("
+        $strsth = 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 $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{aqbooksellerid} );
-        my $sthbookseller =
-          $dbh->prepare("select * from aqbooksellers where id=?");
-        $sthbookseller->execute( $dataorders->[0]->{aqbooksellerid} );
-        my $databookseller = $sthbookseller->fetchrow_hashref;
+        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;
+        }
 
         # parsing branch info
         my $userenv = C4::Context->userenv;
@@ -391,59 +349,65 @@ sub SendAlerts {
         # parsing librarian name
         $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
         $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
-        $letter->{content} =~
-          s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
+        $letter->{content} =~ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
+
+        # Get Fields remplacement
+        my $item_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 ( $item_format ) {
+            # For each order
+            foreach my $infos ( @orders_infos ) {
+                my $order_content = $item_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;
                 }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
+                $order_content =~ s/<\/{0,1}?item>//g;
+                $letter->{content} =~ s/<order>.*<\/order>/$order_content\n$item_format/xms;
             }
+            $letter->{content} =~ s/<order>.*<\/order>//xms;
         }
-        $letter->{content} =~ s/<<[^>]*>>//g;
+
         my $innerletter = $letter;
 
         # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} ) {
-            my $mail_to = $databookseller->{bookselleremail};
-            if ($databookseller->{contemail}) {
-                if (!$mail_to) {
-                    $mail_to = $databookseller->{contemail};
-                } else {
-                    $mail_to .= q|,|;
-                    $mail_to .= $databookseller->{contemail};
-                }
-            }
-            my $mail_subj = $innerletter->{title};
-            my $mail_msg  = $innerletter->{content};
-            $mail_msg  ||= q{};
-            $mail_subj ||= q{};
-
+        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 => $mail_to,
-                From    => $userenv->{emailaddress},
-                Subject => $mail_subj,
-                Message => $mail_msg,
+                To             => $to,
+                From           => $userenv->{emailaddress},
+                Subject        => "" . $innerletter->{title},
+                Message        => "" . $innerletter->{content},
                 'Content-Type' => 'text/plain; charset="utf8"',
             );
             sendmail(%mail) or carp $Mail::Sendmail::error;
-            logaction(
-                "ACQUISITION",
-                "CLAIM ISSUE",
-                undef,
-                "To="
-                  . $databookseller->{contemail}
-                  . " Title="
-                  . $innerletter->{title}
-                  . " Content="
-                  . $innerletter->{content}
-            ) if C4::Context->preference("LetterLog");
+            warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
+            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 {
+            die "This bookseller have no email\n";
         }
-    }    
-   # send an "account details" notice to a newly created user 
+
+        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}";
+    }
+
+    # 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;
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 810f665..fe27de4 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -76,6 +76,19 @@ unless ($delay =~ /^\d{1,3}$/) {
 	$delay = 30;	#default value for delay
 }
 
+if ($op and $op eq "send_alert"){
+    my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
+    eval {
+        SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
+        AddClaim ( $_ ) for @ordernums;
+    };
+    if ( $@ ) {
+        $template->param(error_claim => $@);
+    } else {
+        $template->param(info_claim => "Emails have been sent");
+    }
+}
+
 my %supplierlist = GetBooksellersWithLateOrders($delay);
 my (@sloopy);	# supplier loop
 foreach (keys %supplierlist){
@@ -100,11 +113,6 @@ foreach (keys %$letters){
 }
 $template->param(letters=>\@letters) if (@letters);
 
-if ($op and $op eq "send_alert"){
-	my @ordernums = $input->param("claim_for");									# FIXME: Fallback values?
-	SendAlerts('claimacquisition',\@ordernums,$input->param("letter_code"));	# FIXME: Fallback value?
-}
-
 $template->param(ERROR_LOOP => \@errors) if (@errors);
 $template->param(
 	lateorders => \@lateorders,
diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
index 166c36d..0d172db 100644
--- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql
+++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Mahnung','Mahnung','Liebe/r <<borrowers.firstname>> <<borrowers.surname>>,\n\nNach unseren Unterlagen haben Sie Medien entliehen, die nun ?berf?llig geworden sind. Unsere Bibliothek erhebt keine Mahngeb?hren, bitte geben Sie die entliehenen Medien schnellstm?glich zur?ck.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nTelefon: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nSie k?nnen die ?berf?lligen Medien soweit m?glich auch direkt ?ber Ihr Benutzerkonto online verl?ngern. Wenn ein Medium l?nger als 30 Tage ?berf?llig ist, wird Ihr Benutzeraccount gesperrt und Sie k?nnen keine Medien mehr entleihen.\n\nDie folgenden Medien sind zur Zeit ?berf?llig:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Geb?hr: <fine>EUR</fine></item>\n\nVielen Dank f?r die schnelle Erledigung.\n\n<<branches.branchname>> Ihr Bibliotheksteam\n'),
-('claimacquisition','ACQCLAIM','Reklamation (Erwerbung)','Titel nicht eingetroffen','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> bestellt) (je $<<aqorders.listprice>> ?) sind nicht eingetroffen.'),
+('claimacquisition','ACQCLAIM','Reklamation (Erwerbung)','Titel nicht eingetroffen','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> bestellt) (je $<<aqorders.listprice>> ?) sind nicht eingetroffen.</order>'),
 ('serial','RLIST','Umlaufliste','Zeitschrift ist jetzt verf?gbar','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nDas folgende Heft ist jetzt verf?gbar:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nBitte holen Sie es sobald m?glich ab.'),
 ('members','ACCTDETAILS','Kontoinformationen - Standard','Ihr neues Benutzerkonto','Liebe/r <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nDie Daten Ihres neuen Benutzerkontos sind:\r\n\r\nBenutzer:  <<borrowers.userid>>\r\nPasswort: <<borrowers.password>>\r\n\r\nWenn Sie Probleme in Hinsicht auf Ihr Benutzerkonto haben, wenden Sie sich bitte an die Bibliothek.\r\n\r\nVielen Dank,\r\nIhr Bibliotheksteam'), 
 ('circulation','DUE','F?lligkeitsbenachrichtigung','F?lligkeitsbenachrichtigung','Liebe/r <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nDie folgenden Medien sind ab heute f?llig:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
index 689fa0f..5ca7eaf 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.</order>'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
index 689fa0f..78b80fa 100644
--- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql
+++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.</order>'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
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 977e59d..9e9f66d 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
@@ -2,7 +2,7 @@ INSERT IGNORE INTO `letter`
 (module, code, name, title, content)
 VALUES
 ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.</order>'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'),
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'),
diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql
index 689fa0f..78b80fa 100644
--- a/installer/data/mysql/it-IT/necessari/notices.sql
+++ b/installer/data/mysql/it-IT/necessari/notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.</order>'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 452173d..c79c4b9 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2631,6 +2631,8 @@ CREATE TABLE `aqorders` (
   `sort1_authcat` varchar(10) default NULL,
   `sort2_authcat` varchar(10) default NULL,
   `uncertainprice` tinyint(1),
+  `claims_count` int(11) default 0,
+  `claimed_date` date default NULL,
   PRIMARY KEY  (`ordernumber`),
   KEY `basketno` (`basketno`),
   KEY `biblionumber` (`biblionumber`),
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 cdb5529..762da91 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
@@ -21,7 +21,7 @@
 
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Purring','Purring p? dokument','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har l?n som skulle v?rt levert. Biblioteket krever ikke inn gebyrer, men vennligst lever eller forny l?net/l?nene ved biblioteket.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nTelefon: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nE-post: <<branches.branchemail>>\n\nDersom du har et passord og l?net/l?nene kan fornyes kan du gj?re dette p? nettet. Dersom du overskrider l?netiden med mer enn 30 dager vil l?nekortet bli sperret.\n\nF?lgende l?n har g?tt over tiden:\n\n<item>"<<biblio.title>>" av <<biblio.author>>, <<items.itemcallnumber>>, Strekkode: <<items.barcode>> Gebyr: <fine>GBP</fine></item>\n\nP? forh?nd takk.\n\n<<branches.branchname>>\n'),
-('claimacquisition','ACQCLAIM','Periodikapurring','Eksemplar ikke mottatt','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nBestillingsnummer <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) har ikke blitt mottatt.'),
+('claimacquisition','ACQCLAIM','Periodikapurring','Eksemplar ikke mottatt','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Bestillingsnummer <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) har ikke blitt mottatt.</order>'),
 ('serial','RLIST','Sirkulasjon','Et dokument er n? tilgjengelig','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nDette dokumentet er tilgjengelig:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nVennligst kom og hent det n?r det passer.'),
 ('members','ACCTDETAILS','Mal for kontodetaljer - STANDARD','Dine nye kontodetaljer i Koha.','Hei <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nDine nye detaljer er:\r\n\r\nBruker:  <<borrowers.userid>>\r\nPassord: <<borrowers.password>>\r\n\r\nDersom det oppst?r problemer, vennligst kontakt biblioteket.\r\n\r\nVennlig hilsen,\r\nBiblioteket\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Innleveringsp?minnelse','Innleveringsp?minnelse','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nDette dokumentet m? n? leveres:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
index 6be2eb8..c101b0b 100644
--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
@@ -2,7 +2,7 @@ INSERT INTO `letter` (module, code, name, title, content)
 VALUES 
 ('circulation','ODUE','Overdue Notice',
 'Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.</order>'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
index 689fa0f..5ca7eaf 100644
--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.</order>'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/ru-RU/optional/sample_notices.sql b/installer/data/mysql/ru-RU/optional/sample_notices.sql
index 4f2001e..e2d6d99 100644
--- a/installer/data/mysql/ru-RU/optional/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/optional/sample_notices.sql
@@ -5,7 +5,7 @@ INSERT INTO `letter`
 VALUES
 ('circulation','ODUE','??????????? ? ?????????','??????? ???????????','???????? <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n?? ????? ???????? ???????, ? ??? ???? ????????????? ??????????. ???? ?????????? ?? ??????? ?????? ?? ?????????, ??, ??????????, ????????? ??? ???????? ?? ??? ????? ??????.\r\n\r\n<<branches.branchname>><<branches.branchaddress1>><<branches.branchaddress2>><<branches.branchaddress3>><<branches.branchphone>><<branches.branchfax>><<branches.branchemail>>???? ?? ???????????????? ?????? ? ??????????, ?? ?????? ???????????? ??? ? ????? ??????? ????????????? ?????? ??? ??????????? ??????. ???? ????????? ????? ????????? ????? ??? ?? 30 ????, ?? ?? ??????? ???????????? ??? ???????????? ????? ???? ?? ??????? ?????????. ????????? ????????? ? ????????? ????? ???????? ????????????:\r\n\r\n<<items.content>>'),
 
-('claimacquisition','ACQCLAIM','?????????? ????????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????? <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ??????) ???????? ?? ????.'),
+('claimacquisition','ACQCLAIM','?????????? ????????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>????? ?????? <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ??????) ???????? ?? ????.</order>'),
 
 ('serial','RLIST','?????? ??????????','?????????? ??????? ??? ?????????','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n????????? ?????? ??? ????????:\r\n\r\n<<items.content>>\r\n\r\n??????? ??????? ??? ? ????? ??????? ??? ??? ?????.'),
 
diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
index 358205b..6ab0e18 100644
--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
 INSERT INTO `letter` (module, code, name, title, content) 
 VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>> <<branches.branchaddress3>>\nPhone: <<branches.branchphone>>\nFax: <<branches.branchfax>>\nEmail: <<branches.branchemail>>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>\n\nThank-you for your prompt attention to this matter.\n\n<<branches.branchname>> Staff\n'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.'),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.</order>'),
 ('serial','RLIST','Routing List','Serial is now available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
 ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:  <<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), 
 ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), 
diff --git a/installer/data/mysql/uk-UA/optional/sample_notices.sql b/installer/data/mysql/uk-UA/optional/sample_notices.sql
index 6df324b..790ea5d 100644
--- a/installer/data/mysql/uk-UA/optional/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/optional/sample_notices.sql
@@ -5,7 +5,7 @@ INSERT INTO `letter`
 VALUES
 ('circulation','ODUE','???????????? ??? ????????????','??????? ???????????','???????? <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n?? ????? ???????? ???????, ? ??? ? ??????????? ??????????. ???? ?????????? ?? ?????? ?????? ?? ??????????, ???, ???? ?????, ????????? ??? ??????? ?? ?? ????? ??????.\r\n\r\n<<branches.branchname>><<branches.branchaddress1>><<branches.branchaddress2>><<branches.branchaddress3>><<branches.branchphone>><<branches.branchfax>><<branches.branchemail>>???? ?? ????????????? ?????? ? ??????????, ?? ?????? ??????????????? ???? ? ????? ??????? ????????????? ?????? ??? ??????????? ??????. ???? ????????? ??? ???????????? ????? ??? ?? 30 ????, ?? ?? ??????? ??????????????? ??? ????????? ?????? ???? ?? ????????? ?????????. ????????? ????????? ? ????? ??? ? ????????????:\r\n\r\n<<items.content>>'),
 
-('claimacquisition','ACQCLAIM','?????? ?????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n????? ?????????? <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ?????????) (<<aqorders.listprice>> ??????) ???????? ?? ????.'),
+('claimacquisition','ACQCLAIM','?????? ?????????','????????? ?? ????????','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\n<order>????? ?????????? <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ?????????) (<<aqorders.listprice>> ??????) ???????? ?? ????.</order>'),
 
 ('serial','RLIST','?????? ???????????','????????? ??????? ??? ????????','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\n????????? ?????? ??? ?????????:\r\n\r\n<<items.content>>\r\n\r\n???????? ??????? ???? ? ????-???? ??????? ??? ??? ???.'),
 
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index b5f96ef..8f493b2 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4578,6 +4578,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE `aqorders` ADD COLUMN `claims_count` INT(11)  DEFAULT 0, ADD COLUMN `claimed_date` DATE  DEFAULT NULL AFTER `claims_count`");
+    print "Upgrade to $DBversion done (Add claims_count and claimed_date fields in aqorders table)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 4e2bb3e..dc1659f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2085,3 +2085,11 @@ div.pager input.pagedisplay {
 	font-weight: bold;
 	text-align : center;
 }
+
+div.info {
+   border : 2px dashed #990000;
+   background-color : #99FFCC;
+   padding : .5em;
+   margin : 1em;
+}
+
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 1e64e1f..165f5c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -1,6 +1,20 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function() {
+    $("input:checkbox[name=claim_for]").click(function(){
+        var supplierid = $(this).attr('supplierid');
+        if ( $("input:checkbox[name=claim_for]:checked").length > 0) {
+            $("input:checkbox[name=claim_for][supplierid!="+supplierid+"]").attr('disabled', true);
+        } else {
+            $("input:checkbox[name=claim_for]").attr('disabled', false);
+        }
+    });
+});
+//]]>
+</script>
 </head>
 <body>
 [% INCLUDE 'header.inc' %]
@@ -17,6 +31,12 @@
 <h1>[% IF ( Supplier ) %][% Supplier %] : [% END %]Late orders</h1>
 <div id="acqui_lateorders">
 
+[% IF error_claim %]
+    <div class="error">[% error_claim %]</div>
+[% END %]
+[% IF info_claim %]
+    <div class="info">[% info_claim %]</div>
+[% END %]
 [% IF ( lateorders ) %]
 <form action="lateorders.pl" name="claim" method="post">
   <input type="hidden" name="op" value="send_alert" />
@@ -35,12 +55,20 @@
             <th>Information</th>
             <th>Total cost</th>
             <th>Basket</th>
-            <th>&nbsp;</th>
+            <th>Claims count</th>
+            <th>Claimed date</th>
+            <!-- TMPL_IF name="Supplier" -->
+            [% IF Supplier %]
+                <th><input type="checkbox" id="checkAll"></th>
+            [% ELSE %]
+                <th></th>
+            [% END %]
         </tr>
     [% FOREACH lateorder IN lateorders %]
         [% UNLESS ( loop.odd ) %]<tr class="highlight">
         [% ELSE %]<tr>[% END %]
             <td>
+                ([% lateorder.supplierid %])
                 [% lateorder.orderdate %]
                 ([% lateorder.latesince %] days)
             </td>
@@ -69,8 +97,13 @@
                  </p>
                  <p title="branch">[% lateorder.branch %]</p>
             </td>
+            <td>[% lateorder.claims_count %]</td>
+            <td>[% lateorder.claimed_date %]</td>
             <td>
-                <input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]" />
+                [% UNLESS lateorder.budget_lock %]
+                    <input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]"  supplierid="[% lateorder.supplierid %]"/>
+                [% END %]
+             </td>
             </td>
         </tr>
         [% END %]
@@ -79,6 +112,8 @@
             <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>
-- 
1.7.7.3


From henridamien.laurent at biblibre.com  Wed Dec 14 16:11:07 2011
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed, 14 Dec 2011 16:11:07 +0100
Subject: [Koha-patches] [PATCH] Bug 7358: reaffect a closed basket to a
	closed basketgroup
Message-ID: <1323875467-11178-1-git-send-email-henridamien.laurent@biblibre.com>

From: Admin User Koha <koha at biblibre.com>

The list of basketgroups when looking at a closed basket show all the basketgroups.
It should not be possible to affect a basket to a closed basketgroup,
since this basketgroup should have been sent to a supplier.
---
 acqui/basket.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/acqui/basket.pl b/acqui/basket.pl
index b836280..60a46f0 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -199,6 +199,7 @@ if ( $op eq 'delete_confirm' ) {
     my $member = GetMember(borrowernumber => $loggedinuser);
     if ($basket->{closedate} && haspermission({ acquisition => 'group_manage'} )) {
         $basketgroups = GetBasketgroups($basket->{booksellerid});
+        @$basketgroups= grep {!$_->{closed}} @$basketgroups;
         for my $bg ( @{$basketgroups} ) {
             if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){
                 $bg->{default} = 1;
-- 
1.7.2.5


From henridamien.laurent at biblibre.com  Wed Dec 14 17:35:35 2011
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed, 14 Dec 2011 17:35:35 +0100
Subject: [Koha-patches] [PATCH] Bug 7360 Import Default framework into other
	deletes default Framework
Message-ID: <1323880535-14933-1-git-send-email-henridamien.laurent@biblibre.com>

From: Admin User Koha <koha at biblibre.com>

Step to reproduce :
- export default framework as SQL
- create new framework
- Import the exported SQL file into this new framework.
Go to default framework :
It disappeared.

If some libraries want to share default frameworks, then it is a major bug.
This patch fixes the test in order to cope with 0 character framework name.
---
 C4/ImportExportFramework.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/ImportExportFramework.pm b/C4/ImportExportFramework.pm
index a2b650b..d85e64f 100755
--- a/C4/ImportExportFramework.pm
+++ b/C4/ImportExportFramework.pm
@@ -776,7 +776,7 @@ sub _parseSQLLine
                     my $stmt = SQL::Statement->new($line, $parser);
                     my $where = $stmt->where();
                     if ($where && $where->op() eq '=' && $line =~ /^\s*DELETE/) {
-                        $line =~ s/frameworkcode='.+?'/frameworkcode='$frameworkcode';/ unless ($_ =~ /frameworkcode='$frameworkcode'/);
+                        $line =~ s/frameworkcode='.*?'/frameworkcode='$frameworkcode';/ unless ($_ =~ /frameworkcode='$frameworkcode'/);
                     } else {
                         my @arrFields;
                         my @arrValues;
@@ -817,7 +817,7 @@ sub _parseSQLLine
             if ($error) {
                 $line .= ';' unless ($line =~ /;$/);
                 if ($line =~ /^\s*DELETE/) {
-                    $line =~ s/frameworkcode='.+?'/frameworkcode='$frameworkcode'/ unless ($_ =~ /frameworkcode='$frameworkcode'/);
+                    $line =~ s/frameworkcode='.*?'/frameworkcode='$frameworkcode'/ unless ($_ =~ /frameworkcode='$frameworkcode'/);
                 } elsif ($line =~ /^\s*INSERT\s+INTO\s+(.*?)\s+\((.*?frameworkcode.*?)\)\s+VALUES\s+\((.+)\)\s*;\s*$/) {
                     my $table = $1;
                     my $fields = $2;
-- 
1.7.2.5


From oleonard at myacpl.org  Wed Dec 14 18:15:15 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 14 Dec 2011 12:15:15 -0500
Subject: [Koha-patches] [PATCH] Bug 1633 - Interface revisions for the staff
	client
Message-ID: <1323882915-28706-1-git-send-email-oleonard@myacpl.org>

This patch revises the image viewer page to match other
biblio detail pages: a toolbar, a sidebar menu, etc.

Additional data is now pulled by imageviewer.pl in order
to provide information necessary for the proper functioning
of the toolbar and menus: item counts, hold availability,
biblio view options.

Other changes have been made to match the changes in the
OPAC interface like styling of the images and no-javascript
compatibility
---
 catalogue/image.pl                                 |    2 +-
 catalogue/imageviewer.pl                           |   30 ++++++-
 .../intranet-tmpl/prog/en/css/staff-global.css     |    9 +-
 .../prog/en/includes/biblio-view-menu.inc          |    2 +-
 .../prog/en/modules/catalogue/detail.tt            |    8 +-
 .../prog/en/modules/catalogue/imageviewer.tt       |  102 ++++++++++++++++----
 6 files changed, 121 insertions(+), 32 deletions(-)

diff --git a/catalogue/image.pl b/catalogue/image.pl
index 17621d7..13b2b4e 100755
--- a/catalogue/image.pl
+++ b/catalogue/image.pl
@@ -29,7 +29,7 @@ use C4::Images;
 
 $|=1;
 
-my $DEBUG = 1;
+my $DEBUG = 0;
 my $data = new CGI;
 my $imagenumber;
 
diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
index 395e4b7..caa793e 100755
--- a/catalogue/imageviewer.pl
+++ b/catalogue/imageviewer.pl
@@ -23,8 +23,10 @@ use warnings;
 use CGI;
 use C4::Auth;
 use C4::Biblio;
+use C4::Items;
 use C4::Output;
 use C4::Images;
+use C4::Search;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -38,14 +40,38 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my $imagenumber = $query ->param('imagenumber');
 my ($count, $biblio) = GetBiblio($biblionumber);
+my $itemcount = GetItemsCount($biblionumber);
+
+my @items = GetItemsInfo( $biblionumber );
+
+my $norequests = 1;
+foreach my $item (@items) {
+    # can place holds defaults to yes
+    $norequests = 0 unless ( ( $item->{'notforloan_per_itemtype'} > 0 ) || ( $item->{'itemnotforloan'} > 0 ) );
+}
+
+if($query->cookie("holdfor")){
+    my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
+    $template->param(
+        holdfor => $query->cookie("holdfor"),
+        holdfor_surname => $holdfor_patron->{'surname'},
+        holdfor_firstname => $holdfor_patron->{'firstname'},
+        holdfor_cardnumber => $holdfor_patron->{'cardnumber'},
+    );
+}
 
 if (C4::Context->preference("LocalCoverImages")) {
     my @images = ListImagesForBiblio($biblionumber);
     $template->{VARS}->{'LocalCoverImages'} = 1;
     $template->{VARS}->{'images'} = \@images;
+    $template->{VARS}->{'imagenumber'} = $imagenumber || $images[0] || '';
 }
-
-$template->{VARS}->{'biblio'} = $biblio;
+    $template->{VARS}->{'count'} = $itemcount;
+    $template->{VARS}->{'biblionumber'} = $biblionumber;
+    $template->{VARS}->{'norequests'} = $norequests;
+    $template->param( C4::Search::enabled_staff_search_views );
+    $template->{VARS}->{'biblio'} = $biblio;
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 30334ef..4d18ac6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2133,6 +2133,9 @@ div.pager input.pagedisplay {
 	font-weight: bold;
 	text-align : center;
 }
-.localimage {
-    padding: .3em;
-}
+
+a.localimage img {
+	border : 1px solid #0000CC;
+	margin : 0 .5em;
+	padding : .3em;
+}
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
index a944dc5..903cf3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
@@ -23,7 +23,7 @@
     [% IF ( CAN_user_reserveforothers ) %]
     [% IF ( holdsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% IF ( object ) %][% object %][% ELSE %][% biblionumber %][% END %]">Holds</a></li>
     [% END %]
-    [% IF ( EasyAnalyticalRecords ) %][% IF ( analyze ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% IF ( object ) %][% object %]&analyze=1[% ELSE %][% biblionumber %]&analyze=1[% END %]">Analytics</a></li>[% END %]
+    [% IF ( EasyAnalyticalRecords ) %][% IF ( analyze ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% IF ( object ) %][% object %]&amp;analyze=1[% ELSE %][% biblionumber %]&amp;analyze=1[% END %]">Analytics</a></li>[% END %]
 
     [% IF ( subscriptionsnumber ) %]<li><a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&amp;biblionumber=[% biblionumber %]">Subscription(s)</a></li>[% END %]
 </ul>
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 f9aff7f..4e9cd7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -510,7 +510,7 @@ function verify_images() {
 <ul>
 [% FOREACH AMAZON_SIMILAR_PRODUCT IN AMAZON_SIMILAR_PRODUCTS %]
 [% FOREACH similar_biblionumber IN AMAZON_SIMILAR_PRODUCT.similar_biblionumbers %]
-<li><img alt="img" src="http://images.amazon.com/images/P/[% similar_biblionumber.ASIN %].01._SS50_.jpg" /> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% similar_biblionumber.biblionumber %]">[% similar_biblionumber.title |html %]</a> </li>
+<li><img alt="" src="http://images.amazon.com/images/P/[% similar_biblionumber.ASIN %].01._SS50_.jpg" /> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% similar_biblionumber.biblionumber %]">[% similar_biblionumber.title |html %]</a> </li>
 [% END %]
 [% END %]
 </ul>
@@ -520,15 +520,15 @@ function verify_images() {
 [% IF ( LocalCoverImages ) %]
 <div id="images">
 [% IF ( localimages ) %]
-<div>Click on an image to view it in the image viewer</div>
+<p>Click on an image to view it in the image viewer</p>
 [% FOREACH image IN localimages %]
 [% IF image %]
-<span class="localimage"><a href="/cgi-bin/koha/catalogue/imageviewer.pl?biblionumber=[% biblionumber %]&imagenumber=[% image %]"><img alt="img" src="/cgi-bin/koha/catalogue/image.pl?thumbnail=1&imagenumber=[% image %]" /></a></span>
+<a class="localimage" href="/cgi-bin/koha/catalogue/imageviewer.pl?biblionumber=[% biblionumber %]&amp;imagenumber=[% image %]"><img alt="" src="/cgi-bin/koha/catalogue/image.pl?thumbnail=1&amp;imagenumber=[% image %]" /></a>
 [% END %]
 [% END %]
 [% ELSE %]
 [% IF ( CAN_user_tools_upload_local_cover_images ) %]
-<p>No images have been uploaded for this bibliographic record yet. Please <a href='/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&filetype=image'>upload</a> one.</p>
+<p>No images have been uploaded for this bibliographic record yet. Please <a href='/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&amp;filetype=image'>upload</a> one.</p>
 [% END %]
 [% END %]
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
index c5ab657..4c389b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
@@ -1,11 +1,12 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Images for: [% biblio.title |html %]
+<title>Koha &rsaquo; Catalog &rsaquo; Details for [% biblio.title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/JavaScript" language="JavaScript">
+[% IF ( LocalCoverImages == 1 ) %]
+<script type="text/JavaScript">
 //<![CDATA[
 
 $(document).ready(function(){
-    showCover($('.thumbnail').attr('id'));
+    showCover([% imagenumber %]);
 });
 
 function showCover(img) {
@@ -16,28 +17,87 @@ function showCover(img) {
 //]]>
 </script>
 <style type="text/css">
+#largeCoverImg {
+	border : 1px solid #CCCCCC;
+	display : block;
+	margin : auto;
+	padding : 1em;
+}
+#thumbnails {
+	text-align : center;
+}
+#thumbnails a img {
+	border : 1px solid #0000CC;
+}
 img.thumbnail {
-    border-style: solid;
-    border-width: 3px;
-    border-color: white;
+	display : block;
+    float : none;
+    margin: 0 5px 5px 0;
+    padding : .5em;
 }
 
-img.selected {
+#thumbnails a img.selected {
     border-color: black;
+    cursor : default;
+    opacity:0.4;
+	filter:alpha(opacity=40); /* For IE8 and earlier */
 }
-</style>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<body id="imageviewer">
-<div id="largeCover"><img id="largeCoverImg" alt="Large view" /></div>
-[% IF LocalCoverImages == 1 %]
-[% FOREACH img IN images %]
-[% IF img %]
-<a href='#' onclick='showCover([% img %])'><img class='thumbnail' id='[% img %]' src='/cgi-bin/koha/catalogue/image.pl?imagenumber=[% img %]&thumbnail=1' alt='Image'/></a>
-[% END %]
-[% END %]
-[% biblio.title %] [% biblio.author %]
+</style>[% END %]
+</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/catalogue/search.pl">Catalog</a>  &rsaquo; Images for <i>[% biblio.title |html %]  [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i></div>
+
+<div id="doc3" class="yui-t1">
+
+<div id="bd">
+	<div id="yui-main">
+	<div class="yui-b">
+	<div class="yui-ge">
+
+[% INCLUDE 'cat-toolbar.inc' %]
+
+<h3>Images for <i>[% biblio.title |html %]</i></h3>
+<h4>[% biblio.author %]</h4>
+
+[% IF ( LocalCoverImages == 1 ) %]
+	[% IF ( images.size > 1 ) %]
+		<div class="yui-u first">
+		<div id="largeCover">
+			<img id="largeCoverImg" alt="" src="/cgi-bin/koha/catalogue/image.pl?imagenumber=[% imagenumber %]" />
+		</div></div>
+
+		<div class="yui-u"><div id="thumbnails">
+
+			[% FOREACH img IN images %]
+				[% IF img %]
+				<a href="/cgi-bin/koha/catalogue/imageviewer.pl?biblionumber=[% biblionumber %]&amp;imagenumber=[% img %]" onclick="showCover([% img %]); return false;">
+					[% IF ( imagenumber == img ) %]
+						<img class="thumbnail selected" id="[% img %]" src="/cgi-bin/koha/catalogue/image.pl?imagenumber=[% img %]&amp;thumbnail=1" alt="" />
+					[% ELSE %]
+						<img class="thumbnail" id="[% img %]" src="/cgi-bin/koha/catalogue/image.pl?imagenumber=[% img %]&amp;thumbnail=1" alt="" />
+					[% END %]
+				</a>
+				[% END %]
+			[% END %]
+		</div></div>
+
+	[% ELSE %]
+		<div class="dialog message">There are no images for this record.</div>
+	[% END %]
 [% ELSE %]
-Unfortunately, images are not enabled for this catalog at this time.
+	<div class="dialog message">Local images have not been enabled by your system administrator.</div>
 [% END %]
-</body>
-</html>
+
+</div>
+</div>
+</div>
+<div class="yui-b">
+[% INCLUDE 'biblio-view-menu.inc' %]
+</div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
-- 
1.7.3


From M.de.Rooy at rijksmuseum.nl  Thu Dec 15 09:06:39 2011
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 15 Dec 2011 08:06:39 +0000
Subject: [Koha-patches] [PATCH] 6302 follow up
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA31382C93@S-MAIL-1B.rijksmuseum.intra>

Updates to_address in message queue when sending an email (when needed).
---
 C4/Letters.pm |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 862121c..2420e4a 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -836,8 +836,8 @@ sub _send_message_by_email ($;$$$) {
     if ( my $bcc = C4::Context->preference('OverdueNoticeBcc') ) {
        $sendmail_params{ Bcc } = $bcc;
     }
-    
 
+    _update_message_to_address($message->{'message_id'},$to_address) unless $message->{to_address}; #if initial message address was empty, coming here means that a to address was found and queue should be updated
     if ( sendmail( %sendmail_params ) ) {
         _set_message_status( { message_id => $message->{'message_id'},
                 status     => 'sent' } );
@@ -863,6 +863,12 @@ sub _send_message_by_sms ($) {
     return $success;
 }
 
+sub _update_message_to_address {
+    my ($id, $to)= @_;
+    my $dbh = C4::Context->dbh();
+    $dbh->do('UPDATE message_queue SET to_address=? WHERE message_id=?',undef,($to,$id));
+}
+
 sub _set_message_status ($) {
     my $params = shift or return undef;
 
-- 
1.6.0.6


From lrea at nekls.org  Thu Dec 15 17:29:13 2011
From: lrea at nekls.org (lrea at nekls.org)
Date: Thu, 15 Dec 2011 10:29:13 -0600
Subject: [Koha-patches] =?utf-8?q?=5BPATCH_2/2=5D_Bug_7333_-_Fixing_up_db?=
	=?utf-8?q?=5Fdependent/Search=2Et_to_use_sample_data_Thanks_to_Chr?=
	=?utf-8?q?is_N=2E_for_helping_figure_out_that_it_was_because_there?=
	=?utf-8?q?_were_no_French_stopwords_in_the_DB_that_the_test_was_fa?=
	=?utf-8?q?iling=2E?=
Message-ID: <1323966553-23377-1-git-send-email-lrea@nekls.org>

From: Liz Rea <wizzyrea at gmail.com>

Patch changes the French string (with French stopwords) to an English string with English stopwords, as only English stopwords are installed in the default data.

This patch will allow Search.t to run on the database attached to this bug.
---
 t/db_dependent/Search.t |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/db_dependent/Search.t b/t/db_dependent/Search.t
index 31316f2..17fac6e 100644
--- a/t/db_dependent/Search.t
+++ b/t/db_dependent/Search.t
@@ -23,7 +23,7 @@ foreach my $string ("Le?on","mod?les") {
     ok($results[0] eq $string,"$string is not modified");
 }
 
-foreach my $string ("Les chaussettes de l'archiduchesse") {
+foreach my $string ("A book about the stars") {
     my @results=C4::Search::_remove_stopwords($string,"kw");
     $debug && warn "$string ",Dump(@results);
     ok($results[0] ne $string,"$results[0] from $string");
-- 
1.7.2.5


From oleonard at myacpl.org  Thu Dec 15 19:28:37 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 15 Dec 2011 13:28:37 -0500
Subject: [Koha-patches] [PATCH] Bug 6933 [REVISED] Add a view of titles with
	a particular tag to the staff client
Message-ID: <1323973717-32715-1-git-send-email-oleonard@myacpl.org>

- Adds a new page to the tags moderation section for viewing all the
  titles tagged with a particular term.
- Adds display of approved tags to the catalog detail page matching the opac
  view. Adding tags from the detail view not implemented.

Follow-up adds tags display to XSLT detail view

Areas for improvement:

- I think it would be better to show "Also tagged with:" and exclude
  the current tag from the list of titles tagged with a particular tag.
- It would be nice to be able to show unapproved tags (and some idication of
  their status) along with approved tags on the detail page if the user had
  TagsModeration permission.
---
 catalogue/detail.pl                                |   13 +++
 .../prog/en/modules/catalogue/detail.tt            |   27 +++++
 .../intranet-tmpl/prog/en/modules/tags/list.tt     |  103 ++++++++++++++++++++
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |    2 +-
 tags/list.pl                                       |   81 +++++++++++++++
 5 files changed, 225 insertions(+), 1 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
 create mode 100755 tags/list.pl

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 580949d..c9b8321 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -35,6 +35,7 @@ use C4::Serials;
 use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn);
 use C4::External::Amazon;
 use C4::Search;		# enabled_staff_search_views
+use C4::Tags qw(get_tags);
 use C4::VirtualShelves;
 use C4::XSLT;
 
@@ -384,4 +385,16 @@ if (C4::Context->preference('OPACBaseURL')){
      $template->param( OpacUrl => C4::Context->preference('OPACBaseURL') );
 }
 
+# Displaying tags
+
+my $tag_quantity;
+if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) {
+    $template->param(
+        TagsEnabled => 1,
+        TagsShowOnDetail => $tag_quantity
+    );
+    $template->param(TagLoop => get_tags({biblionumber=>$biblionumber, approved=>1,
+                                'sort'=>'-weight', limit=>$tag_quantity}));
+}
+
 output_html_with_http_headers $query, $cookie, $template->output;
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 019fa10..ad013f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -97,6 +97,18 @@ function verify_images() {
             [% END %]
             </span>
         [% END %]
+        [% IF ( TagsEnabled &&  TagsShowOnDetail &&  TagLoop ) %]
+                <span class="results_summary"><span class="label">Tags:</span>
+                    [% FOREACH TagLoo IN TagLoop %]
+                        [% IF ( CAN_user_tools_moderate_tags ) %]
+                        <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term |url %]">[% TagLoo.term |html %]</a>
+                        [% ELSE %]
+                        [% TagLoo.term |html %]
+                        [% END %]
+                        <span class="weight">([% TagLoo.weight_total %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %]
+                    [% END %]
+                    </span>
+        [% END %]
         [% IF ( holdcount ) %]<span class="results_summary"><span class="label">Holds:</span> <span class="holdcount"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">[% holdcount %]</a></span></span>[% ELSE %][% END %]
 
         [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]</div><div class="yui-u" id="bookcoverimg">
@@ -215,9 +227,24 @@ function verify_images() {
 	        </ul>
 	        </li>
         [% END %]
+        [% IF ( TagsEnabled &&  TagsShowOnDetail &&  TagLoop ) %]
+                <li><strong>Tags:</strong>
+                    <ul id="tagslist">
+                    [% FOREACH TagLoo IN TagLoop %]
+                        <li>
+                        [% IF ( CAN_user_tools_moderate_tags ) %]
+                        <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term |url %]">[% TagLoo.term |html %]</a>
+                        [% ELSE %]
+                        [% TagLoo.term |html %]
+                        [% END %]
+                        <span class="weight">([% TagLoo.weight_total %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %]</li>
+                    [% END %]
+                    </ul></li>
+        [% END %]
             [% IF ( holdcount ) %]<li><strong>Holds:</strong> <span class="holdcount"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">[% holdcount %]</a></span></li>[% ELSE %][% END %]
         </ul>
 		[% END %]
+
 </div>
 </div>
 <div id="bibliodetails" class="toptabs">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
new file mode 100644
index 0000000..05fd452
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
@@ -0,0 +1,103 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Tools &rsaquo; Tags &rsaquo; [% IF ( do_it ) %]Review &rsaquo; [% ELSE %]Review Tags[% END %]</title>
+[% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+    $.tablesorter.addParser({
+        id: 'articles',
+        is: function(s) {return false;  },
+        format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+        type: 'text'
+    });
+    $(document).ready(function() {
+        $(".delete").click(function (event) {
+            $(this).parent().parent().parent().addClass("selected");
+            var answer = confirm(_("Are you sure you want to remove the tag from this title?"));
+                if (!answer){
+                    $("tr").removeClass("selected");
+                    event.preventDefault();
+                }
+        });
+        $("#itemst").tablesorter({
+            sortList: [[0,0]],
+            headers: { 0: { sorter: 'articles' },1: { sorter: false },2:{sorter:false}}
+        });
+    });
+//]]>
+</script>
+<style type="text/css">
+tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : transparent; }</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/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/tags/review.pl">Tags</a> &rsaquo; Results for tag <i>[% tag %]</i></div>
+
+<div id="doc3" class="yui-t2">
+ <div id="bd">
+  <div id="yui-main">
+  <div class="yui-b">
+[% IF ( titles ) %]
+<h3>Titles tagged with the term <i>[% tag %]</i></h3>
+<table id="itemst">
+	<thead><tr>
+	    <th>Title</th>
+	    <th>Location</th>
+	    <th>&nbsp;</th>
+        </tr></thead>
+
+        [% FOREACH title IN titles %]
+            [% IF ( title.even ) %]
+                <tr class="highlight">
+            [% ELSE %]
+                <tr>
+            [% END %]
+            <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = title.biblionumber %][% title.title |html %][% FOREACH subtitl IN title.subtitle %] [% subtitl.subfield %][% END %]</a>
+            [% title.author %]
+            <p>[% IF ( title.publishercode ) %]- [% title.publishercode|html %]
+            [% IF ( title.place ) %] [% title.place %][% END %][% END %]
+            [% IF ( title.pages ) %] - [% title.pages %][% IF ( title.size ) %] [% title.size %]
+            [% END %]
+            [% END %]</p>
+            [% IF ( title.notes ) %]
+            <p>[% title.notes |html%]</p>[% END %]
+            [% IF ( title.TagLoop ) %]<p style="font-size:90%"><strong>Tagged with:</strong> [% FOREACH TagLoo IN title.TagLoop %]
+            <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term %]">[% TagLoo.term |html %]</a> <span class="weight">([% TagLoo.weight_total %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %]
+            [% END %]</p>
+            [% END %]
+            </td>
+            <td>[% IF ( title.items ) %]<ul style="font-size:80%">[% FOREACH item IN title.items %]
+                <li>
+                    [% item.branchname %] [% item.location_description %]
+                    [% IF ( item.itemcallnumber ) %]
+                        ([% item.itemcallnumber %])
+                    [% END %]
+                </li>
+                [% END %]</ul>[% ELSE %]This record has no items.[% END %]
+             </td>
+             <td><form method="post" action="/cgi-bin/koha/tags/list.pl"><input type="hidden" name="op" value="del" /><input type="hidden" name="tag" value="[% tag %]" /><input type="hidden" name="tag_id" value="[% title.tag_id %]" /><input type="submit" class="delete" value="Remove tag" /></form></td>
+            </tr>
+        [% END %]
+    </table>
+[% ELSE %]
+	<div class="dialog message">There are no titles tagged with the term <i>[% tag %]</i></div>
+[% END %]
+</form>
+ </div>
+ </div>
+ <div class="yui-b">
+  <ul>
+    <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved tags</a>
+    </li>
+    <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected tags</a>
+    </li>
+    <li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending tags</a>
+    </li>
+    <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">All tags</a>
+    </li>
+  </ul>
+ </div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
index 5d025af..843f7ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -217,7 +217,7 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 		[% ELSE %]<td class="pending">
 		[% END %]
 	    </td>
-	    <td>[% tagloo.term %]
+	    <td><a href="/cgi-bin/koha/tags/list.pl?tag=[% tagloo.term %]">[% tagloo.term %]</a>
 	    </td>
 		<td>[% tagloo.weight_total %]
 	    </td>
diff --git a/tags/list.pl b/tags/list.pl
new file mode 100755
index 0000000..7b16ce5
--- /dev/null
+++ b/tags/list.pl
@@ -0,0 +1,81 @@
+#!/usr/bin/perl
+
+# Copyright 2011 Athens County Public Libraries
+#
+# 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 warnings;
+use strict;
+use CGI;
+
+use C4::Auth qw(:DEFAULT check_cookie_auth);
+use C4::Biblio;
+use C4::Context;
+use C4::Dates qw(format_date);
+use C4::Items;
+use C4::Koha;
+use C4::Tags 0.03 qw(get_tags remove_tag get_tag_rows);
+use C4::Output;
+
+my $needed_flags = { tools => 'moderate_tags' }; # FIXME: replace when more specific permission is created.
+
+my $query        = CGI->new;
+my $op           = $query->param('op') || '';
+my $biblionumber = $query->param('biblionumber');
+my $tag          = $query->param('tag');
+my $tag_id       = $query->param('tag_id');
+
+my ($template, $borrowernumber, $cookie) = get_template_and_user({
+        template_name => "tags/list.tmpl",
+        query => $query,
+        type => "intranet",
+        debug => 1,
+        authnotrequired => 0,
+        flagsrequired => $needed_flags,
+});
+
+if( $op eq "del" ){
+        remove_tag($tag_id);
+        print $query->redirect("/cgi-bin/koha/tags/list.pl?tag=$tag");
+} else {
+
+my $marcflavour = C4::Context->preference('marcflavour');
+my @results;
+
+if ($tag) {
+        my $taglist = get_tag_rows({term=>$tag});
+        for ( @{$taglist} ) {
+        my $dat                 = &GetBiblioData($_->{biblionumber});
+        my $record              = &GetMarcBiblio($_->{biblionumber});
+        $dat->{'subtitle'}      = GetRecordValue('subtitle', $record, GetFrameworkCode($_->{biblionumber}));
+        my @items               = GetItemsInfo( $_->{biblionumber} );
+        $dat->{biblionumber}    = $_->{biblionumber};
+        $dat->{tag_id}          = $_->{tag_id};
+        $dat->{items}           = \@items;
+        $dat->{TagLoop}         = get_tags({biblionumber=>$_->{biblionumber}, 'sort'=>'-weight',limit=>10 });
+        push( @results, $dat );
+    }
+
+my $resultsarray = \@results;
+
+$template->param(
+    tag => $tag,
+    titles => $resultsarray,
+);
+}
+}
+
+output_html_with_http_headers $query, $cookie, $template->output;
-- 
1.7.3


From adrien.saurat at biblibre.com  Fri Dec 16 16:54:37 2011
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Fri, 16 Dec 2011 16:54:37 +0100
Subject: [Koha-patches] [PATCH] Bug 7363: allows downloading of lists in CSV
	format
Message-ID: <1324050877-11958-1-git-send-email-adrien.saurat@biblibre.com>

Getting a list in CSV format was impossible because the
shelfid parameter was empty in the URL.
---
 .../prog/en/includes/virtualshelves-toolbar.inc    |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
index 3f14e51..18304a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
@@ -38,7 +38,7 @@
 		{ text: _("RIS"), url: "/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&shelfid=[% shelfnumber %]" },
 		{ text: _("BibTex"), url: "/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&shelfid=[% shelfnumber %]" },
 [% FOREACH csv_profile IN csv_profiles %]
-		{ text: _("CSV - [% csv_profile.profile %]"), url: "/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=[% csv_profile.export_format_id %]&shelfid=[% csv_profile.shelfnumber %]" },
+		{ text: _("CSV - [% csv_profile.profile %]"), url: "/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=[% csv_profile.export_format_id %]&shelfid=[% shelfnumber %]" },
 [% END %]
 		];
 
@@ -96,4 +96,4 @@
 	[% END %]
 </ul>
 </div>
- 
\ No newline at end of file
+ 
-- 
1.7.4.1


From oleonard at myacpl.org  Fri Dec 16 22:37:30 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 16 Dec 2011 16:37:30 -0500
Subject: [Koha-patches] [PATCH] Bug 5503 - comments shouldn't show patron's
	full name
Message-ID: <1324071450-28388-1-git-send-email-oleonard@myacpl.org>

Adding a few choices for what information can be displayed
alongside comments in the OPAC:

- nothing
- full name
- first name
- last name
- first name and last name first initial
- username
---
 installer/data/mysql/sysprefs.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl             |    8 +++++
 .../prog/en/modules/admin/preferences/opac.pref    |   11 +++++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   30 ++++++++++++-------
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |   16 +++++++++-
 opac/opac-showreviews.pl                           |    2 +
 6 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 128c9b2..1f603f5 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -103,7 +103,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReturnBeforeExpiry',0,'If ON, checkout will be prevented if returndate is after patron card expiry',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReturnLog',1,'If ON, enables the circulation (returns) log',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('reviewson',1,'If ON, enables patron reviews of bibliographic records in the OPAC','','YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewer',1,'If ON, name of reviewer will be shown above comments in OPAC','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewer','full','Choose how a commenter\'s identity is presented alongside comments in the OPAC','none|full|first|surname|firstandinitial|username','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewerPhoto',1,'If ON, photo of reviewer will be shown beside comments in OPAC','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SpecifyDueDate',1,'Define whether to display \"Specify Due Date\" form in Circulation','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SubscriptionHistory','simplified','Define the display preference for serials issue history in OPAC','simplified|full','Choice');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 0063a75..e4266b0 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4578,6 +4578,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.02.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do(" UPDATE  `koha`.`systempreferences` SET  `value` =  'none', `options` =  'none|full|first|surname|firstandinitial|username', `explanation` =  'Choose how a commenter\'s identity is presented alongside comments in the OPAC', `type` =  'Choice' WHERE  `systempreferences`.`variable` =  'ShowReviewer' AND `systempreferences`.`variable` = 0");
+    $dbh->do(" UPDATE  `koha`.`systempreferences` SET  `value` =  'full', `options` =  'none|full|first|surname|firstandinitial|username', `explanation` =  'Choose how a commenter\'s identity is presented alongside comments in the OPAC', `type` =  'Choice' WHERE  `systempreferences`.`variable` =  'ShowReviewer' AND `systempreferences`.`variable` = 1");
+    print "Adding additional options for the display of commenter's identity in the OPAC: Full name, first name, last name, first name and last name first initial, username, or no information\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..cd051de 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
@@ -270,11 +270,16 @@ OPAC:
                   no: "Don't allow"
             - patrons to make comments on items on the OPAC.
         -
+            - Show
             - pref: ShowReviewer
               choices:
-                  yes: Show
-                  no: Hide
-            - reviewer's name above comments in OPAC.
+                  none: no name
+                  full: full name
+                  first: first name
+                  surname: last name
+                  firstandinitial: first name and last name initial
+                  username: username
+            - of commenter with comments in OPAC.
         -
             - pref: ShowReviewerPhoto
               choices:
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index d1b6570..ba987c9 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -865,18 +865,26 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         </p></div>
             [% ELSE %]
             <div class="commentline">
-            [% IF ( ShowReviewer ) %]
-                [% IF ( review.avatarurl ) %]
-            <img class="avatar" src="[% review.avatarurl %]" height="80" width="80"/>
-                [% END %]
-            <h5>
-                Comment by
-                [% review.title %]
-                [% review.firstname %]
-                [% review.surname %]
-            </h5>
+            [% IF ( ShowReviewer != "none" ) %]
+                    [% IF ( review.avatarurl ) %]
+                <img class="avatar" src="[% review.avatarurl %]" height="80" width="80"/>
+                    [% END %]
+                    [% SWITCH ShowReviewer %]
+                    [% CASE 'full' %]
+                        <h5>Comment by [% review.title %] [% review.firstname %] [% review.surname %]</h5>
+                    [% CASE 'first' %]
+                        <h5>Comment by [% review.firstname %]</h5>
+                    [% CASE 'surname' %]
+                        <h5>Comment by [% review.surname %]</h5>
+                    [% CASE 'firstandinitial' %]
+                        <h5>Comment by [% review.firstname %] [% review.surname|truncate(2,'.') %]</h5>
+                    [% CASE 'username' %]
+                        <h5>Comment by [% review.userid %]</h5>
+                    [% END %]
+                <small>[% review.datereviewed %]</small>
+            [% ELSIF ( ShowReviewer == "none") %]
+                <h5>Patron comment on [% review.datereviewed %]</h5>
             [% END %]
-            <small>[% review.datereviewed %]</small>
         <p>
           [% review.review %]
         </p></div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
index d9a630f..9370767 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
@@ -52,8 +52,20 @@ $(document).ready(function(){
             [% END %]
             [% review.review |html %]
             <span style="font-size:87%;font-color:#CCC;">Added [% review.datereviewed %] [% IF ( review.your_comment ) %] by <strong>you</strong>[% ELSE %]
-            [% IF ( ShowReviewer ) %] by
-            [% review.firstname %] [% review.surname %][% END %][% END %]</span></p>
+            [% IF ( ShowReviewer != "none" ) %] by
+                [% SWITCH ShowReviewer %]
+                [% CASE 'full' %]
+                    [% review.borrtitle %] [% review.firstname %] [% review.surname %]
+                [% CASE 'first' %]
+                    [% review.firstname %]
+                [% CASE 'surname' %]
+                    [% review.surname %]
+                [% CASE 'firstandinitial' %]
+                    [% review.firstname %] [% review.surname|truncate(2,'.') %]
+                [% CASE 'username' %]
+                    [% review.userid %]
+                [% END %]
+            [% END %][% END %]</span></p>
         </td>
         <td>
             <a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]">
diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl
index 74f4684..449ffcd 100755
--- a/opac/opac-showreviews.pl
+++ b/opac/opac-showreviews.pl
@@ -101,8 +101,10 @@ for my $result (@$reviews){
 	$result->{size} = $bib->{'size'};
 	$result->{notes} = $bib->{'notes'};
 	$result->{timestamp} = $bib->{'timestamp'};
+    $result->{borrtitle} = $borr->{'title'};
 	$result->{firstname} = $borr->{'firstname'};
 	$result->{surname} = $borr->{'surname'};
+    $result->{userid} = $borr->{'userid'};
         if ($libravatar_enabled and $borr->{'email'}) {
             $result->{avatarurl} = libravatar_url(email => $borr->{'email'}, size => 40, https => $ENV{HTTPS});
         }
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Mon Dec 19 02:56:01 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Mon, 19 Dec 2011 14:56:01 +1300
Subject: [Koha-patches] [PATCH] bug_7001: Issue and Reserve slips are
	notices.
In-Reply-To: <bug 7001>
References: <bug 7001>
Message-ID: <1324259761-30801-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.
GetPreparedletter() is the interface for compiling letters (notices).
Sysprefs for notice and slips stylesheets.
---
 C4/Circulation.pm                                  |   20 +-
 C4/Letters.pm                                      |  583 +++++++++++++-------
 C4/Members.pm                                      |   81 +++-
 C4/Message.pm                                      |   12 +-
 C4/Print.pm                                        |  139 ++----
 C4/Reserves.pm                                     |  103 +++--
 C4/Suggestions.pm                                  |   22 +-
 acqui/booksellers.pl                               |    7 +-
 circ/circulation.pl                                |    3 +-
 circ/hold-transfer-slip.pl                         |   27 +-
 .../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             |    4 +-
 .../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                  |    3 +
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    2 +-
 installer/data/mysql/updatedatabase.pl             |   98 ++++-
 .../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 +
 .../prog/en/modules/members/moremember-receipt.tt  |   76 ---
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |  113 +++-
 members/memberentry.pl                             |    5 +-
 members/moremember.pl                              |   10 -
 members/printslip.pl                               |   89 +++
 misc/cronjobs/advance_notices.pl                   |   78 ++--
 misc/cronjobs/gather_print_notices.pl              |   14 +-
 misc/cronjobs/overdue_notices.pl                   |   84 ++--
 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                                    |  214 +++++---
 42 files changed, 1260 insertions(+), 742 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
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
 create mode 100755 members/printslip.pl

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9a6f4f2..cff3fa7 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2655,11 +2655,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) {
@@ -2674,7 +2681,8 @@ sub SendCirculationAlert {
             $message->update;
         }
     }
-    $letter;
+
+    return $letter;
 }
 
 =head2 updateWrongTransfer
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 2420e4a..7f195d6 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -26,6 +26,7 @@ use Encode;
 use Carp;
 
 use C4::Members;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Branch;
 use C4::Log;
 use C4::SMS;
@@ -42,7 +43,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
 	);
 }
 
@@ -117,13 +118,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)
@@ -178,7 +192,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 ";
@@ -234,70 +248,65 @@ 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;
     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;
 # warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
-            }
         }
     }
     elsif ( $type eq 'claimacquisition' ) {
 
         # 		warn "sending issues...";
-        my $letter = getletter( 'claimacquisition', $letter );
 
         # prepare the letter...
         # search the biblionumber
@@ -307,52 +316,43 @@ sub SendAlerts {
         my $sthorders = $dbh->prepare($strsth);
         $sthorders->execute;
         my $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{booksellerid} );
+
         my $sthbookseller =
           $dbh->prepare("select * from aqbooksellers where id=?");
         $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
         my $databookseller = $sthbookseller->fetchrow_hashref;
 
-        # 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;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
-                }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
-            }
+        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;
         }
-        $letter->{content} =~ s/<<[^>]*>>//g;
-        my $innerletter = $letter;
+
+        my $userenv = C4::Context->userenv;
+        my $letter = GetPreparedLetter (
+            module => 'claimacquisition',
+            letter_code => $letter_code,
+            branchcode => $userenv->{branch},
+            tables => {
+                'branches'    => $userenv->{branch},
+                'aqbooksellers' => $databookseller,
+            },
+            repeat => $dataorders,
+            want_librarian => 1,
+        ) or return;
 
         # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} )
-        {
-            my %mail = (
-                To => $databookseller->{bookselleremail}
-                  . (
-                    $databookseller->{contemail}
-                    ? "," . $databookseller->{contemail}
-                    : ""
-                  ),
-                From           => $userenv->{emailaddress},
-                Subject        => "" . $innerletter->{title},
-                Message        => "" . $innerletter->{content},
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-        }
+        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;
+
         if ( C4::Context->preference("LetterLog") ) {
             logaction(
                 "ACQUISITION",
@@ -360,16 +360,13 @@ sub SendAlerts {
                 "",
                 "order list : "
                   . join( ",", @$externalid )
-                  . "\n$innerletter->{title}\n$innerletter->{content}"
+                  . "\n$letter->{title}\n$letter->{content}"
             );
         }
     }
     elsif ( $type eq 'claimissues' ) {
 
         # 		warn "sending issues...";
-        my $letter = getletter( 'claimissues', $letter );
-
-        # prepare the letter...
         # search the biblionumber
         my $strsth =
 "select serial.*,subscription.*, biblio.* from serial LEFT JOIN subscription on serial.subscriptionid=subscription.subscriptionid LEFT JOIN biblio on serial.biblionumber=biblio.biblionumber where serial.serialid IN ("
@@ -377,81 +374,76 @@ sub SendAlerts {
         my $sthorders = $dbh->prepare($strsth);
         $sthorders->execute;
         my $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{aqbooksellerid} );
+
         my $sthbookseller =
           $dbh->prepare("select * from aqbooksellers where id=?");
         $sthbookseller->execute( $dataorders->[0]->{aqbooksellerid} );
         my $databookseller = $sthbookseller->fetchrow_hashref;
 
-        # 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;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
-                }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
-            }
+        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;
         }
-        $letter->{content} =~ s/<<[^>]*>>//g;
-        my $innerletter = $letter;
+
+        # prepare the letter...
+        my $userenv = C4::Context->userenv;
+        my $letter = GetPreparedLetter (
+            module => 'claimissues',
+            letter_code => $letter_code,
+            branchcode => $userenv->{branch},
+            tables => {
+                'branches'    => $userenv->{branch},
+                'aqbooksellers' => $databookseller,
+            },
+            repeat => $dataorders,
+            want_librarian => 1,
+        ) or return;
 
         # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} ) {
-            my $mail_to = $databookseller->{bookselleremail};
-            if ($databookseller->{contemail}) {
-                if (!$mail_to) {
-                    $mail_to = $databookseller->{contemail};
-                } else {
-                    $mail_to .= q|,|;
-                    $mail_to .= $databookseller->{contemail};
-                }
-            }
-            my $mail_subj = $innerletter->{title};
-            my $mail_msg  = $innerletter->{content};
-            $mail_msg  ||= q{};
-            $mail_subj ||= q{};
+        my $mail_subj = $letter->{title};
+        my $mail_msg  = $letter->{content};
+        $mail_msg  ||= q{};
+        $mail_subj ||= q{};
 
-            my %mail = (
-                To => $mail_to,
-                From    => $userenv->{emailaddress},
-                Subject => $mail_subj,
-                Message => $mail_msg,
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-            logaction(
-                "ACQUISITION",
-                "CLAIM ISSUE",
-                undef,
-                "To="
-                  . $databookseller->{contemail}
-                  . " Title="
-                  . $innerletter->{title}
-                  . " Content="
-                  . $innerletter->{content}
-            ) if C4::Context->preference("LetterLog");
-        }
+        my %mail = (
+            To => join( ','. @email),
+            From    => $userenv->{emailaddress},
+            Subject => $mail_subj,
+            Message => $mail_msg,
+            'Content-Type' => 'text/plain; charset="utf8"',
+        );
+        sendmail(%mail) or carp $Mail::Sendmail::error;
+
+        logaction(
+            "ACQUISITION",
+            "CLAIM ISSUE",
+            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"),
@@ -463,24 +455,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;
+
+    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;
 
-sub parseletter_sth {
+        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
@@ -494,9 +610,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)) {
@@ -506,25 +625,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'};
@@ -538,16 +653,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;
 }
@@ -732,31 +882,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;
 
 }
 
@@ -823,14 +974,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') ) {
@@ -850,6 +1004,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 1d7bc42..9f42cea 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
@@ -2227,7 +2231,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/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 2ba7584..2343fa4 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'}
+
+COLLECT AT: $branchname
 
-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.
+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
@@ -93,100 +111,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 {
-    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 ($) {
-    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 ccc0c8e..6c10fdf 100644
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -371,20 +371,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 634eb93..745d040 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 c95e59b..f5d6cb6 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($branch, $borrowernumber);
     $query->param( 'borrowernumber', '' );
     $borrowernumber = '';
 }
diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl
index f581464..492dac7 100755
--- a/circ/hold-transfer-slip.pl
+++ b/circ/hold-transfer-slip.pl
@@ -25,8 +25,6 @@ use C4::Output;
 use CGI;
 use C4::Auth;
 use C4::Reserves;
-use C4::Branch;
-use C4::Dates qw/format_date format_date_in_iso/;
 
 use vars qw($debug);
 
@@ -41,7 +39,7 @@ 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 +48,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 ($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 166c36d..efdad91 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 689fa0f..8c9f4bd 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 689fa0f..bf3324d 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 977e59d..acffe73 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 689fa0f..bf3324d 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 a03bd23..00ff188 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1168,10 +1168,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;
 
 --
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 cdb5529..08b452e 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 6be2eb8..f0844f3 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 689fa0f..bf3324d 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 128c9b2..e9aac60 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -328,4 +328,7 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
 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('NoticeCSS','','Notices CSS url.',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free');
+
 
diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
index 358205b..b637343 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 0063a75..9082fc2 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";
@@ -4578,6 +4577,103 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.02.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $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 `letter` ADD `is_html` tinyint(1) default 0 AFTER `name`");
+    print "Added branchcode and is_html to letter table\n";
+
+    $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; 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 913076f..6fdd720 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 f4946b5..b3b279c 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
@@ -91,6 +91,11 @@ Circulation:
                   yes: Record
                   no: "Don't record"
             - local use when an unissued item is checked in.
+        -
+            - 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/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
deleted file mode 100644
index 4a85ccb..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ /dev/null
@@ -1,76 +0,0 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Print Receipt for [% cardnumber %]</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" />
-
-<script language="javascript">
-    function printThenClose() {
-        window.print();
-        window.close();
-    }
-</script>
-</head>
-<body onload="printThenClose();">
-
-<div id="receipt">
-
-<h3>[% LibraryName %]</h3>
-[% IF ( branchname ) %][% branchname %]<br />[% END %]
-Checked out to [% firstname %] [% surname %] <br />
-(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">[% cardnumber %]</a>)<br />
-
-[% todaysdate %]<br />
-
-[% IF ( quickslip ) %]
-<h4>Checked Out Today</h4>
-[% FOREACH issueloo IN issueloop %]
-[% IF ( issueloo.red ) %][% ELSE %]
-[% IF ( issueloo.today ) %]
-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&amp;biblionumber=[% issueloo.biblionumber %]&amp;bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br />
-Barcode: [% issueloo.barcode %]<br />
-Date due: [% issueloo.date_due %]<br /></p>
-    [% END %]
-    [% END %]
-    [% END %]
-
-[% ELSE %]
-<h4>Checked Out</h4>
-[% FOREACH issueloo IN issueloop %]
-[% IF ( issueloo.red ) %][% ELSE %]
-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&amp;biblionumber=[% issueloo.biblionumber %]&amp;bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br />
-Barcode: [% issueloo.barcode %]<br />
-Date due: [% issueloo.date_due %]<br /></p>
-    [% END %]
-    [% END %]
-
-[% END %]
-
-[% IF ( quickslip ) %]
-[% ELSE %]
-[% IF ( overdues_exist ) %]
-<h4>Overdues</h4>
-    [% FOREACH issueloo IN issueloop %]
-    [% IF ( issueloo.red ) %]
-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&amp;biblionumber=[% issueloo.biblionumber %]&amp;bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br />
-Barcode: [% issueloo.barcode %]<br />
-Date due: [% issueloo.date_due %]</p>
-[% END %]
-[% END %]
-[% END %]
-[% END %]
-
-[% IF ( koha_news_count ) %]
-            <hr><h4 style="text-align: center; font-style:italic;">News</h4>
-                       <!-- [% koha_news_count %] recent news item(s) -->
-            [% FOREACH koha_new IN koha_news %]
-                    <div class="newsitem" id="news[% koha_new.idnew %]"><h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% koha_new.title %]</b></h5>
-                                        <p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.new %]</p>
-                                       <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px"> Posted on [% koha_new.newdate %]
-
-</p><hr /></div>
-            [% END %]
-[% 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..b64477e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -10,6 +10,10 @@ $(document).ready(function() {
 		sortList: [[0,0]],
 		headers: { 3: {sorter:false},4: { sorter: false }}
 	}); 
+
+    $('#branch').change(function() {
+            $('#selectlibrary').submit();
+    });
 }); 
 [% IF ( add_form ) %]
 	
@@ -114,7 +118,7 @@ $(document).ready(function() {
 	<div id="yui-main">
 	<div class="yui-b">
 
-	[% IF ( no_op_set ) %]
+[% IF ( no_op_set ) %]
 <div id="toolbar">
 	<script type="text/javascript">
 	//<![CDATA[
@@ -128,6 +132,22 @@ $(document).ready(function() {
 	}
 	//]]>
 	</script>
+
+    [% UNLESS independant_branch %]        
+      <p>
+        <form method="get" action="?" id="selectlibrary">
+            <input type="hidden" name="searchfield" value="[% searchfield %]" />
+        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>
+        </form>
+      </p>
+    [% END %]        
+
 	<ul class="toolbar">
 	<li><a id="newnotice" href="/cgi-bin/koha/tools/letter.pl?op=add_form">New Notice</a></li>
 </ul></div>
@@ -135,41 +155,71 @@ $(document).ready(function() {
 		[% 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 ( 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 !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 && 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" />
@@ -182,6 +232,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 +299,9 @@ $(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><input type="checkbox" id="is_html" name="is_html" value="1"[% IF is_html %] checked[% END %] />
+		</li>
+		<li>
 			<label for="title">Message Subject:</label><input type="text" id="title" name="title" size="60" value="[% title %]" />
 		</li>
 		<li>
@@ -253,16 +320,16 @@ $(document).ready(function() {
 		</fieldset>
 		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></fieldset>
 		</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>
@@ -290,14 +357,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/members/memberentry.pl b/members/memberentry.pl
index c047873..f345351 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -338,10 +338,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 6e5407c..9277deb 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);
 
@@ -483,13 +482,4 @@ $template->param(
     quickslip		  => $quickslip,
 );
 
-#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..eba8d68
--- /dev/null
+++ b/members/printslip.pl
@@ -0,0 +1,89 @@
+#!/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;
+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;
+$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 ($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 27941da..c991baf 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,53 +641,55 @@ 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'}->{'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,
+            };
         }
     }
-    $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 f5dc0c6..7cfca55 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -46,14 +46,34 @@ use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
+use C4::Branch; # GetBranches
 
-# 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,14 +87,12 @@ 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(
     {
@@ -87,32 +105,38 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-if (!defined $op) {
-    $op = q{}; # silence errors from eq
-}
+my $my_branch = C4::Context->preference("IndependantBranches")
+  ?  C4::Context->userenv()->{'branch'}
+  : undef;
 # we show only the TMPL_VAR names $op
 
 $template->param(
+    independant_branch => $my_branch,
 	script_name => $script_name,
 	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 +149,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 +195,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 +216,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 );
     $template->param( code => $code );
     $template->param( module => $module);
     $template->param( name => $letter->{name});
@@ -226,40 +273,54 @@ 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 +328,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 {
-- 
1.6.5


From srdjan at catalyst.net.nz  Mon Dec 19 05:59:45 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Mon, 19 Dec 2011 17:59:45 +1300
Subject: [Koha-patches] [PATCH] bug_5473: Update items when receiving
	shipments
In-Reply-To: <bug 5473>
References: <bug 5473>
Message-ID: <1324270785-25666-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Items.pm            |    3 +--
 acqui/finishreceive.pl |   26 +++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 8802a4c..a3616eb 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -458,8 +458,7 @@ sub ModItemFromMarc {
 
 =head2 ModItem
 
-  ModItem({ column => $newvalue }, $biblionumber, 
-                  $itemnumber[, $original_item_marc]);
+  ModItem({ column => $newvalue }, $biblionumber, $itemnumber);
 
 Change one or more columns in an item record and update
 the MARC representation of the item.
diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 71b13d6..641932f 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -76,6 +76,7 @@ if ( any { $order->{$_} ne $tplorder{$_} } qw(quantity quantityreceived notes rr
 if ($quantityrec > $origquantityrec ) {
     # now, add items if applicable
     if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
+
         my @tags         = $input->param('tag');
         my @subfields    = $input->param('subfield');
         my @field_values = $input->param('field_value');
@@ -105,13 +106,28 @@ if ($quantityrec > $origquantityrec ) {
                                     $itemhash{$item}->{'ind_tag'},
                                     $itemhash{$item}->{'indicator'},'ITEM');
             my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
-            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
+            my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
         }
     }
     
     # save the quantity received.
-	if( $quantityrec > 0 ) {
-    	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
-	}
+   	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$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");
+
+################################ End of script ################################
+
+sub update_item {
+    my ( $itemnumber ) = @_;
+
+    ModItem( {
+        booksellerid         => $supplierid,
+        dateaccessioned      => $datereceived,
+        price                => $unitprice,
+        replacementprice     => $replacement,
+        replacementpricedate => $datereceived,
+    }, $biblionumber, $itemnumber );
 }
-    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
-- 
1.6.5


From srdjan at catalyst.net.nz  Mon Dec 19 07:24:35 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Mon, 19 Dec 2011 19:24:35 +1300
Subject: [Koha-patches] [PATCH] bug_6210: Select framework if merging two
	records with different frameworks
In-Reply-To: <bug 6210>
References: <bug 6210>
Message-ID: <1324275875-28499-1-git-send-email-srdjan@catalyst.net.nz>

ModBiblio() - set framework to "" if "Default"
---
 C4/Biblio.pm                                       |   41 ++++---
 cataloguing/merge.pl                               |  136 +++++++++++--------
 .../prog/en/modules/cataloguing/merge.tt           |   39 +++++-
 3 files changed, 136 insertions(+), 80 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index ac78ae3..7df8412 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -320,7 +320,7 @@ sub ModBiblio {
     SetUTF8Flag($record);
     my $dbh = C4::Context->dbh;
 
-    $frameworkcode = "" unless $frameworkcode;
+    $frameworkcode = "" if !$frameworkcode || $frameworkcode eq "Default"; # XXX
 
     _strip_item_fields($record, $frameworkcode);
 
@@ -1043,9 +1043,13 @@ for the given frameworkcode
 
 sub GetMarcFromKohaField {
     my ( $kohafield, $frameworkcode ) = @_;
-    return 0, 0 unless $kohafield and defined $frameworkcode;
+    return (0, undef) unless $kohafield and defined $frameworkcode;
     my $relations = C4::Context->marcfromkohafield;
-    return ( $relations->{$frameworkcode}->{$kohafield}->[0], $relations->{$frameworkcode}->{$kohafield}->[1] );
+    if ( my $mf = $relations->{$frameworkcode}->{$kohafield} ) {
+        return @$mf;
+    }
+    warn qq{No marc tags for framework "$frameworkcode" field $kohafield};
+    return (0, undef);
 }
 
 =head2 GetMarcBiblio
@@ -3179,9 +3183,24 @@ sub _koha_marc_update_bib_ids {
     # we drop the original field
     # we add the new builded field.
     my ( $biblio_tag,     $biblio_subfield )     = GetMarcFromKohaField( "biblio.biblionumber",          $frameworkcode );
+    die qq{No biblionumber tag for framework "$frameworkcode"} unless $biblio_tag;
     my ( $biblioitem_tag, $biblioitem_subfield ) = GetMarcFromKohaField( "biblioitems.biblioitemnumber", $frameworkcode );
+    die qq{No biblioitemnumber tag for framework "$frameworkcode"} unless $biblio_tag;
 
-    if ( $biblio_tag != $biblioitem_tag ) {
+    if ( $biblio_tag == $biblioitem_tag ) {
+
+        # biblionumber & biblioitemnumber are in the same field (can't be <10 as fields <10 have only 1 value)
+        my $new_field = MARC::Field->new(
+            $biblio_tag, '', '',
+            "$biblio_subfield"     => $biblionumber,
+            "$biblioitem_subfield" => $biblioitemnumber
+        );
+
+        # drop old field and create new one...
+        my $old_field = $record->field($biblio_tag);
+        $record->delete_field($old_field) if $old_field;
+        $record->insert_fields_ordered($new_field);
+    } else {
 
         # biblionumber & biblioitemnumber are in different fields
 
@@ -3209,20 +3228,6 @@ sub _koha_marc_update_bib_ids {
         $old_field = $record->field($biblioitem_tag);
         $record->delete_field($old_field) if $old_field;
         $record->insert_fields_ordered($new_field);
-
-    } else {
-
-        # biblionumber & biblioitemnumber are in the same field (can't be <10 as fields <10 have only 1 value)
-        my $new_field = MARC::Field->new(
-            $biblio_tag, '', '',
-            "$biblio_subfield"     => $biblionumber,
-            "$biblioitem_subfield" => $biblioitemnumber
-        );
-
-        # drop old field and create new one...
-        my $old_field = $record->field($biblio_tag);
-        $record->delete_field($old_field) if $old_field;
-        $record->insert_fields_ordered($new_field);
     }
 }
 
diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl
index 0b881f1..1aed8fa 100755
--- a/cataloguing/merge.pl
+++ b/cataloguing/merge.pl
@@ -27,6 +27,7 @@ use C4::Auth;
 use C4::Items;
 use C4::Biblio;
 use C4::Serials;
+use C4::Koha;
 use C4::Reserves qw/MergeHolds/;
 
 my $input = new CGI;
@@ -61,7 +62,7 @@ if ($merge) {
     # Rewriting the leader
     $record->leader(GetMarcBiblio($tobiblio)->leader());
 
-    my $frameworkcode = &GetFrameworkCode($tobiblio);
+    my $frameworkcode = $input->param('frameworkcode');
     my @notmoveditems;
 
     # Modifying the reference record
@@ -108,77 +109,98 @@ if ($merge) {
 	push @errors, $error if ($error); 
     }
 
-    # Errors
-    my @errors_loop  = map{{error => $_}}@errors;
-
     # Parameters
     $template->param(
-	errors  => \@errors_loop,
 	result => 1,
 	biblio1 => $input->param('biblio1')
     );
 
-
 #-------------------------
 # Show records to merge
 #-------------------------
 } else {
-
     my $mergereference = $input->param('mergereference');
     my $biblionumber = $input->param('biblionumber');
 
-    my $data1 = GetBiblioData($biblionumber[0]);
-    my $data2 = GetBiblioData($biblionumber[1]);
-
-    # Ask the user to choose which record will be the kept
-    if (not $mergereference) {
-	$template->param(
-	    choosereference => 1,	
-	    biblio1 => $biblionumber[0],
-	    biblio2 => $biblionumber[1],
-	    title1 => $data1->{'title'},
-	    title2 => $data2->{'title'}
-	    );
-    } else {
-
-	if (scalar(@biblionumber) != 2) {
-	    push @errors, "An unexpected number of records was provided for merging. Currently only two records at a time can be merged.";
-	}
-
-	# Checks if both records use the same framework
-	my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]);
-	my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]);
-	my $framework;
-	if ($frameworkcode1 ne $frameworkcode2) {
-	    push @errors, "The records selected for merging are using different frameworks. Currently merging is only available for records using the same framework.";
-	} else {
-	    $framework = $frameworkcode1;	
-	}
-
-	# Getting MARC Structure
-	my $tagslib = GetMarcStructure(1, $framework);
-
-	my $notreference = ($biblionumber[0] == $mergereference) ? $biblionumber[1] : $biblionumber[0];
-
-	# Creating a loop for display
-	my @record1 = _createMarcHash(GetMarcBiblio($mergereference), $tagslib);
-	my @record2 = _createMarcHash(GetMarcBiblio($notreference), $tagslib);
-
-	# Errors
-	my @errors_loop  = map{{error => $_}}@errors;
-
-	# Parameters
-	$template->param(
-	    errors  => \@errors_loop,
-	    biblio1 => $mergereference,
-	    biblio2 => $notreference,
-	    mergereference => $mergereference,
-	    record1 => @record1,
-	    record2 => @record2,
-	    framework => $framework
-	    );
+    if (scalar(@biblionumber) != 2) {
+        push @errors, "An unexpected number of records was provided for merging. Currently only two records at a time can be merged.";
+    }
+    else {
+        my $data1 = GetBiblioData($biblionumber[0]);
+        my $data2 = GetBiblioData($biblionumber[1]);
+
+        # Checks if both records use the same framework
+        my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]);
+        my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]);
+
+        if ($mergereference) {
+
+            my $framework;
+            if ($frameworkcode1 ne $frameworkcode2) {
+                $framework = $input->param('frameworkcode')
+                  or push @errors, "Famework not selected.";
+            } else {
+                $framework = $frameworkcode1;	
+            }
+
+            # Getting MARC Structure
+            my $tagslib = GetMarcStructure(1, $framework);
+
+            my $notreference = ($biblionumber[0] == $mergereference) ? $biblionumber[1] : $biblionumber[0];
+
+            # Creating a loop for display
+            my @record1 = _createMarcHash(GetMarcBiblio($mergereference), $tagslib);
+            my @record2 = _createMarcHash(GetMarcBiblio($notreference), $tagslib);
+
+            # Parameters
+            $template->param(
+                biblio1 => $mergereference,
+                biblio2 => $notreference,
+                mergereference => $mergereference,
+                record1 => @record1,
+                record2 => @record2,
+                framework => $framework,
+            );
+        }
+        else {
+
+        # Ask the user to choose which record will be the kept
+            $template->param(
+                choosereference => 1,	
+                biblio1 => $biblionumber[0],
+                biblio2 => $biblionumber[1],
+                title1 => $data1->{'title'},
+                title2 => $data2->{'title'}
+            );
+            if ($frameworkcode1 ne $frameworkcode2) {
+                my $frameworks = getframeworks;
+                my @frameworkselect;
+                foreach my $thisframeworkcode ( keys %$frameworks ) {
+                    my %row = (
+                        value         => $thisframeworkcode,
+                        frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
+                    );
+                    if ($frameworkcode1 eq $thisframeworkcode){
+                        $row{'selected'} = 1;
+                        }
+                    push @frameworkselect, \%row;
+                }
+                $template->param(
+                    frameworkselect => \@frameworkselect,
+                    frameworkcode1 => $frameworkcode1,
+                    frameworkcode2 => $frameworkcode2,
+                );
+            }
+        }
     }
 }
+
+if (@errors) {
+    # Errors
+    my @errors_loop  = map{{error => $_}}@errors;
+    $template->param( errors  => \@errors_loop );
+}
+
 output_html_with_http_headers $input, $cookie, $template->output;
 exit;
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
index 0d8a84c..3300f78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -161,6 +161,10 @@ $(document).ready(function(){
 
 });
 
+function changeFramework(fw) {
+    $("#Frameworks").val(fw);
+}
+
 //]]>
 </script>
 </head>
@@ -194,10 +198,34 @@ $(document).ready(function(){
 <form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post">
     <fieldset class="rows">
 	<legend>Merge reference</legend>
+    <table>
+      <tr>
+        <td style="border-width: 0px; text-align: left">
 	<ol>
-	<li class="radio"><input type="radio" value="[% biblio1 %]" checked="checked" id="mergereference1" name="mergereference" /><label style="float:none" for="mergereference1">[% title1 %] ([% biblio1 %])</label></li>
-	<li class="radio"><input type="radio" value="[% biblio2 %]" id="mergereference2" name="mergereference" /><label style="float:none" for="mergereference2">[% title2 %] ([% biblio2 %])</label></li>
+	<li class="radio"><input type="radio" value="[% biblio1 %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 %]')" /><label style="float:none" for="mergereference1">[% title1 %] ([% biblio1 %])</label></li>
+	<li class="radio"><input type="radio" value="[% biblio2 %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 %]')" /><label style="float:none" for="mergereference2">[% title2 %] ([% biblio2 %])</label></li>
 </ol>
+        </td>
+        <td style="border-width: 0px">
+    [% IF frameworkselect %]
+          <label style="float:none" for="frameworkcode">Framework:</label><br>
+            <select name="frameworkcode" id="Frameworks">
+                            <option value="Default">Default</option>
+                            [% FOREACH frameworkcodeloo IN frameworkselect %]
+                                [% IF ( frameworkcodeloo.selected ) %]
+                                    <option value="[% frameworkcodeloo.value %]" selected="selected">
+                                [% ELSE %]
+                                    <option value="[% frameworkcodeloo.value %]">
+                                [% END %]
+                                 [% frameworkcodeloo.frameworktext %]                              
+                                 </option>
+                            [% END %]
+            </select>
+    [% END %]
+        </td>
+      </tr>
+    </table>
+
 	<input type="hidden" name="biblionumber" value="[% biblio1 %]" />
 	<input type="hidden" name="biblionumber" value="[% biblio2 %]" />
 	<fieldset class="action"><input type="submit" value="Next" /></fieldset>
@@ -332,14 +360,15 @@ $(document).ready(function(){
 		[% END %]
 
 	    </ul>
+</div>
+</div> <!-- // #result -->
+</div> <!-- .yui-u -->
 
 <input type="hidden" name="biblio1" value="[% biblio1 %]" />
 <input type="hidden" name="biblio2" value="[% biblio2 %]" />
 <input type="hidden" name="mergereference" value="[% mergereference %]" />
+<input type="hidden" name="frameworkcode" value="[% framework %]" />
 
-</div>
-</div> <!-- // #result -->
-</div> <!-- .yui-u -->
 <fieldset class="action"><input type="submit" name="merge" value="Merge" /></fieldset>
 </div>
 </form>
-- 
1.6.5


From srdjan at catalyst.net.nz  Tue Dec 20 02:58:12 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Tue, 20 Dec 2011 14:58:12 +1300
Subject: [Koha-patches] [PATCH] bug_5473: Update items when receiving
	shipments
In-Reply-To: <bug 5473>
References: <bug 5473>
Message-ID: <1324346292-16584-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Acquisition.pm      |    1 -
 C4/Items.pm            |    3 +--
 acqui/finishreceive.pl |   46 +++++++++++++++++++++++-----------------------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 7127f24..ef95ead 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -923,7 +923,6 @@ sub NewOrder {
 =cut
 
 sub NewOrderItem {
-    #my ($biblioitemnumber,$ordernumber, $biblionumber) = @_;
     my ($itemnumber, $ordernumber)  = @_;
     my $dbh = C4::Context->dbh;
     my $query = qq|
diff --git a/C4/Items.pm b/C4/Items.pm
index 8802a4c..a3616eb 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -458,8 +458,7 @@ sub ModItemFromMarc {
 
 =head2 ModItem
 
-  ModItem({ column => $newvalue }, $biblionumber, 
-                  $itemnumber[, $original_item_marc]);
+  ModItem({ column => $newvalue }, $biblionumber, $itemnumber);
 
 Change one or more columns in an item record and update
 the MARC representation of the item.
diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 71b13d6..55a9977 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -54,28 +54,11 @@ my $error_url_str;
 my $ecost = $input->param('ecost');
 my $note = $input->param("note");
 
-my %tplorder = ( 'quantity'                  =>     $input->param('quantity') || '',
-                             'quantityreceived'   =>     $input->param('quantityrec') || '',
-                             'notes'                      =>      $input->param("note") || '',
-                             'rrp'                          =>      $input->param('rrp') || '',
-                             'ecost'                      =>      $input->param('ecost') || '',
-                             'unitprice'                =>      $input->param('cost') || '',
-                     );
-my $order = GetOrder($ordernumber);
-if ( any { $order->{$_} ne $tplorder{$_} } qw(quantity quantityreceived notes rrp ecost unitprice) ) {
-    $order->{quantity} = $tplorder{quantity} if $tplorder{quantity};
-    $order->{quantityreceived} = $tplorder{quantityreceived} if $tplorder{quantityreceived};
-    $order->{notes} = $tplorder{notes} if $tplorder{notes};
-    $order->{rrp} = $tplorder{rrp} if $tplorder{rrp};
-    $order->{ecost} = $tplorder{ecost} if $tplorder{ecost};
-    $order->{unitprice} = $tplorder{unitprice} if $tplorder{unitprice};
-    ModOrder($order);
-}
-
 #need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
 if ($quantityrec > $origquantityrec ) {
     # now, add items if applicable
     if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
+
         my @tags         = $input->param('tag');
         my @subfields    = $input->param('subfield');
         my @field_values = $input->param('field_value');
@@ -105,13 +88,30 @@ if ($quantityrec > $origquantityrec ) {
                                     $itemhash{$item}->{'ind_tag'},
                                     $itemhash{$item}->{'indicator'},'ITEM');
             my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
-            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
+            my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
+            NewOrderItem($itemnumber, $ordernumber);
         }
     }
     
     # save the quantity received.
-	if( $quantityrec > 0 ) {
-    	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
-	}
+   	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$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");
+
+################################ End of script ################################
+
+sub update_item {
+    my ( $itemnumber ) = @_;
+    warn "AAA $itemnumber";
+
+    ModItem( {
+        booksellerid         => $supplierid,
+        dateaccessioned      => $datereceived,
+        price                => $unitprice,
+        replacementprice     => $replacement,
+        replacementpricedate => $datereceived,
+    }, $biblionumber, $itemnumber );
 }
-    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
-- 
1.6.5


From srdjan at catalyst.net.nz  Tue Dec 20 06:42:21 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Tue, 20 Dec 2011 18:42:21 +1300
Subject: [Koha-patches] [PATCH] bug_7235: Adding invoice number and vendor
	name to the moredetail page
In-Reply-To: <bug 7235>
References: <bug 7235>
Message-ID: <1324359741-385-1-git-send-email-srdjan@catalyst.net.nz>

---
 catalogue/moredetail.pl                            |    8 +++++++-
 .../prog/en/modules/catalogue/moredetail.tt        |   14 ++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index f5bb904..d75e36f 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -27,7 +27,8 @@ use C4::Biblio;
 use C4::Items;
 use C4::Branch;
 use C4::Acquisition;
-use C4::Output;
+use C4::Bookseller qw(GetBookSellerFromId);
+use C4::Output;             # contains gettemplate
 use C4::Auth;
 use C4::Serials;
 use C4::Dates qw/format_date/;
@@ -147,6 +148,11 @@ foreach my $item (@items){
     $item->{'ordernumber'}             = $order->{'ordernumber'};
     $item->{'basketno'}                = $order->{'basketno'};
     $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
+    if ($item->{'basketno'}){
+	    my $basket = GetBasket($item->{'basketno'});
+	    my $bookseller = GetBookSellerFromId($basket->{'booksellerid'});
+	    $item->{'vendor'} = $bookseller->{'name'};
+    }
     $item->{'datereceived'}            = $order->{'datereceived'};
 
     if ($item->{notforloantext} or $item->{itemlost} or $item->{damaged} or $item->{wthdrawn}) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index e79e9e8..0d06dba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -163,8 +163,18 @@
                     [% END %]
                 [% ELSE %]
                     [% ITEM_DAT.dateaccessioned %]
-                [% END %] </li>
-
+                [% END %]
+                </li>
+                [% IF ITEM_DAT.vendor %]
+                <li><span class="label">Vendor</span>
+                  [% ITEM_DAT.vendor %]
+                </li>
+                    [% IF ITEM_DAT.booksellerinvoicenumber %]
+                <li><span class="label">Invoice number</span>
+                  [% ITEM_DAT.booksellerinvoicenumber %]
+                </li>
+                    [% END %]
+                [% END %]
                 
                 <li><span class="label">Total Checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues %][% ELSE %]0[% END %]  (<a href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=[% ITEM_DAT.biblionumber %]&amp;bi=[% ITEM_DAT.biblioitemnumber %]&amp;itm=[% ITEM_DAT.itemnumber %]">View item's checkout history</a>)</li>
 
-- 
1.6.5


From dpavlin at rot13.org  Tue Dec 20 13:05:57 2011
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Tue, 20 Dec 2011 13:05:57 +0100
Subject: [Koha-patches] [PATCH] Bug 7247 - rebuild_zebra.pl -v should show
	all Zebra log output
Message-ID: <1324382757-5112-1-git-send-email-dpavlin@rot13.org>

Currently, -v option resets Zebra log output to default system values.

This produce amount of log specified in system defaults which is usually
too low for debugging.

This change explicitly forces all Zebra log output which create much more
chatter so it triggers with verbosity level 2

Test scenario:
1. pick koha site to reindex
2. use -v -v options to rebuild_zebra.pl to see additional output
---
 misc/migration_tools/rebuild_zebra.pl |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 6fa6501..5168fc4 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -34,7 +34,7 @@ my $want_help;
 my $as_xml;
 my $process_zebraqueue;
 my $do_not_clear_zebraqueue;
-my $verbose_logging;
+my $verbose_logging = 0;
 my $zebraidx_log_opt = " -v none,fatal,warn ";
 my $result = GetOptions(
     'd:s'           => \$directory,
@@ -51,7 +51,7 @@ my $result = GetOptions(
 	'x'				=> \$as_xml,
     'y'             => \$do_not_clear_zebraqueue,
     'z'             => \$process_zebraqueue,
-    'v'             => \$verbose_logging,
+    'v+'            => \$verbose_logging,
 );
 
 
@@ -96,8 +96,8 @@ if ($noshadow) {
 
 #  -v is for verbose, which seems backwards here because of how logging is set
 #    on the CLI of zebraidx.  It works this way.  The default is to not log much
-if ($verbose_logging) {
-    $zebraidx_log_opt = '';
+if ($verbose_logging >= 2) {
+    $zebraidx_log_opt = '-v none,fatal,warn,all';
 }
 
 my $use_tempdir = 0;
@@ -639,6 +639,7 @@ Parameters:
 
     -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
                             to fix Zebra config files.
-- 
1.7.2.5


From henridamien.laurent at biblibre.com  Tue Dec 20 14:06:24 2011
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Tue, 20 Dec 2011 14:06:24 +0100
Subject: [Koha-patches] [PATCH] Bug 7247 - rebuild_zebra.pl -v should
 show	all Zebra log output
In-Reply-To: <1324382757-5112-1-git-send-email-dpavlin@rot13.org>
References: <1324382757-5112-1-git-send-email-dpavlin@rot13.org>
Message-ID: <4EF08850.4050906@biblibre.com>

Le 20/12/2011 13:05, Dobrica Pavlinusic a ?crit :
> Currently, -v option resets Zebra log output to default system values.
> 
> This produce amount of log specified in system defaults which is usually
> too low for debugging.
> 
> This change explicitly forces all Zebra log output which create much more
> chatter so it triggers with verbosity level 2
> 
> Test scenario:
> 1. pick koha site to reindex
> 2. use -v -v options to rebuild_zebra.pl to see additional output
> ---
>  misc/migration_tools/rebuild_zebra.pl |    9 +++++----
>  1 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
> index 6fa6501..5168fc4 100755
> --- a/misc/migration_tools/rebuild_zebra.pl
> +++ b/misc/migration_tools/rebuild_zebra.pl
> @@ -34,7 +34,7 @@ my $want_help;
>  my $as_xml;
>  my $process_zebraqueue;
>  my $do_not_clear_zebraqueue;
> -my $verbose_logging;
> +my $verbose_logging = 0;
>  my $zebraidx_log_opt = " -v none,fatal,warn ";
>  my $result = GetOptions(
>      'd:s'           => \$directory,
> @@ -51,7 +51,7 @@ my $result = GetOptions(
>  	'x'				=> \$as_xml,
>      'y'             => \$do_not_clear_zebraqueue,
>      'z'             => \$process_zebraqueue,
> -    'v'             => \$verbose_logging,
> +    'v+'            => \$verbose_logging,
>  );
>  
>  
> @@ -96,8 +96,8 @@ if ($noshadow) {
>  
>  #  -v is for verbose, which seems backwards here because of how logging is set
>  #    on the CLI of zebraidx.  It works this way.  The default is to not log much
> -if ($verbose_logging) {
> -    $zebraidx_log_opt = '';
> +if ($verbose_logging >= 2) {
> +    $zebraidx_log_opt = '-v none,fatal,warn,all';
>  }
mmm... in my opinion, all would be WAY too verbose.
request,log are enough to debug the search query.
my two cents.

>  
>  my $use_tempdir = 0;
> @@ -639,6 +639,7 @@ Parameters:
>  
>      -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
>                              to fix Zebra config files.


From dpavlin at rot13.org  Tue Dec 20 15:52:17 2011
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Tue, 20 Dec 2011 15:52:17 +0100
Subject: [Koha-patches] [PATCH] Bug 7247 - rebuild_zebra.pl -v should
 show	all Zebra log output
In-Reply-To: <4EF08850.4050906@biblibre.com>
References: <1324382757-5112-1-git-send-email-dpavlin@rot13.org>
	<4EF08850.4050906@biblibre.com>
Message-ID: <20111220145217.GC12086@rot13.org>

On Tue, Dec 20, 2011 at 02:06:24PM +0100, LAURENT Henri-Damien wrote:
> > -if ($verbose_logging) {
> > -    $zebraidx_log_opt = '';
> > +if ($verbose_logging >= 2) {
> > +    $zebraidx_log_opt = '-v none,fatal,warn,all';
> >  }
> mmm... in my opinion, all would be WAY too verbose.
> request,log are enough to debug the search query.
> my two cents.

all is very verbose, but does provide additional information about Zebra
progress (I must admit I'm leaning towards too much information as
opposed to too little).

Should I move all to verbose level 3 (-v -v -v) or just remove it all
together?

-- 
Dobrica Pavlinusic               2share!2flame            dpavlin at rot13.org
Unix addict. Internet consultant.             http://www.rot13.org/~dpavlin

From henridamien.laurent at biblibre.com  Tue Dec 20 16:54:17 2011
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Tue, 20 Dec 2011 16:54:17 +0100
Subject: [Koha-patches] [PATCH] Bug 7247 - rebuild_zebra.pl -v should
 show	all Zebra log output
In-Reply-To: <20111220145217.GC12086@rot13.org>
References: <1324382757-5112-1-git-send-email-dpavlin@rot13.org>
	<4EF08850.4050906@biblibre.com> <20111220145217.GC12086@rot13.org>
Message-ID: <4EF0AFA9.1060802@biblibre.com>

Le 20/12/2011 15:52, Dobrica Pavlinusic a ?crit :
> On Tue, Dec 20, 2011 at 02:06:24PM +0100, LAURENT Henri-Damien wrote:
>>> -if ($verbose_logging) {
>>> -    $zebraidx_log_opt = '';
>>> +if ($verbose_logging >= 2) {
>>> +    $zebraidx_log_opt = '-v none,fatal,warn,all';
>>>  }
>> mmm... in my opinion, all would be WAY too verbose.
>> request,log are enough to debug the search query.
>> my two cents.
> 
> all is very verbose, but does provide additional information about Zebra
> progress (I must admit I'm leaning towards too much information as
> opposed to too little).
> 
> Should I move all to verbose level 3 (-v -v -v) or just remove it all
> together?
> 
I would leave that to -vvv
When I looked at logs when all is set, I found it quite useless, but if
you need that. I would say let's keep it for -vvv

From srdjan at catalyst.net.nz  Wed Dec 21 08:59:31 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed, 21 Dec 2011 20:59:31 +1300
Subject: [Koha-patches] [PATCH] bug_6489: Do not raise WrongTransfer if it
	is transrerring to reserve branch
In-Reply-To: <bug 6489>
References: <bug 6489>
Message-ID: <1324454371-14683-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Circulation.pm |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9a6f4f2..f1b54d0 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1574,6 +1574,14 @@ sub AddReturn {
     # check if we have a transfer for this document
     my ($datesent,$frombranch,$tobranch) = GetTransfers( $item->{'itemnumber'} );
 
+    # find reserves.....
+    # if we don't have a reserve with the status W, we launch the Checkreserves routine
+    my ($resfound, $resrec) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
+    if ($resfound) {
+          $resrec->{'ResFound'} = $resfound;
+        $messages->{'ResFound'} = $resrec;
+    }
+
     # if we have a transfer to do, we update the line of transfers with the datearrived
     if ($datesent) {
         if ( $tobranch eq $branch ) {
@@ -1583,7 +1591,8 @@ sub AddReturn {
             $sth->execute( $item->{'itemnumber'} );
             # if we have a reservation with valid transfer, we can set it's status to 'W'
             C4::Reserves::ModReserveStatus($item->{'itemnumber'}, 'W');
-        } else {
+        } elsif ( !($resrec && $resrec->{branchcode} eq $tobranch) ) {
+            # Do not raise WrongTransfer if it is transrerring to reserve branch
             $messages->{'WrongTransfer'}     = $tobranch;
             $messages->{'WrongTransferItem'} = $item->{'itemnumber'};
         }
@@ -1606,14 +1615,6 @@ sub AddReturn {
         $messages->{'Debarred'} = $debardate if ($debardate);
     }
 
-    # find reserves.....
-    # if we don't have a reserve with the status W, we launch the Checkreserves routine
-    my ($resfound, $resrec, undef) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
-    if ($resfound) {
-          $resrec->{'ResFound'} = $resfound;
-        $messages->{'ResFound'} = $resrec;
-    }
-
     # update stats?
     # Record the fact that this book was returned.
     UpdateStats(
-- 
1.6.5


From srdjan at catalyst.net.nz  Wed Dec 21 09:29:50 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed, 21 Dec 2011 21:29:50 +1300
Subject: [Koha-patches] [PATCH] bug_7090: AllowItemsOnHoldCheckout syspref
In-Reply-To: <bug 7090>
References: <bug 7090>
Message-ID: <1324456190-15624-1-git-send-email-srdjan@catalyst.net.nz>

Observe AllowItemsOnHandCheckout syspref when using self checkout
---
 C4/Circulation.pm                                  |   68 ++++++++++---------
 C4/SIP/ILS/Transaction/Checkout.pm                 |    8 ++-
 installer/data/mysql/sysprefs.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl             |    7 ++
 .../en/modules/admin/preferences/circulation.pref  |    6 ++
 opac/sco/sco-main.pl                               |   16 ++++-
 6 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9a6f4f2..5b03b37 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -570,7 +570,7 @@ sub itemissues {
 =head2 CanBookBeIssued
 
   ( $issuingimpossible, $needsconfirmation ) =  CanBookBeIssued( $borrower, 
-                                      $barcode, $duedatespec, $inprocess );
+                      $barcode, $duedatespec, $inprocess, $ignore_reserves );
 
 Check if a book can be issued.
 
@@ -584,7 +584,8 @@ C<$issuingimpossible> and C<$needsconfirmation> are some hashref.
 
 =item C<$duedatespec> is a C4::Dates object.
 
-=item C<$inprocess>
+=item C<$inprocess> boolean switch
+=item C<$ignore_reserves> boolean switch
 
 =back
 
@@ -661,7 +662,7 @@ if the borrower borrows to much things
 =cut
 
 sub CanBookBeIssued {
-    my ( $borrower, $barcode, $duedate, $inprocess ) = @_;
+    my ( $borrower, $barcode, $duedate, $inprocess, $ignore_reserves ) = @_;
     my %needsconfirmation;    # filled with problems that needs confirmations
     my %issuingimpossible;    # filled with problems that causes the issue to be IMPOSSIBLE
     my $item = GetItem(GetItemnumberFromBarcode( $barcode ));
@@ -868,37 +869,40 @@ sub CanBookBeIssued {
         $needsconfirmation{issued_borrowernumber} = $currborinfo->{'borrowernumber'};
     }
 
-    # See if the item is on reserve.
-    my ( $restype, $res, undef ) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
-    if ($restype) {
-		my $resbor = $res->{'borrowernumber'};
-		my ( $resborrower ) = C4::Members::GetMember( borrowernumber => $resbor );
-		my $branches  = GetBranches();
-		my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
-        if ( $resbor ne $borrower->{'borrowernumber'} && $restype eq "Waiting" )
-        {
-            # The item is on reserve and waiting, but has been
-            # reserved by some other patron.
-            $needsconfirmation{RESERVE_WAITING} = 1;
-            $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
-            $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
-            $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
-            $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
-            $needsconfirmation{'resbranchname'} = $branchname;
-            $needsconfirmation{'reswaitingdate'} = format_date($res->{'waitingdate'});
-        }
-        elsif ( $restype eq "Reserved" ) {
-            # The item is on reserve for someone else.
-            $needsconfirmation{RESERVED} = 1;
-            $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
-            $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
-            $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
-            $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
-            $needsconfirmation{'resbranchname'} = $branchname;
-            $needsconfirmation{'resreservedate'} = format_date($res->{'reservedate'});
+    unless ( $ignore_reserves ) {
+        # See if the item is on reserve.
+        my ( $restype, $res ) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
+        if ($restype) {
+            my $resbor = $res->{'borrowernumber'};
+            if ( $resbor ne $borrower->{'borrowernumber'} ) {
+                my ( $resborrower ) = C4::Members::GetMember( borrowernumber => $resbor );
+                my $branchname = GetBranchName( $res->{'branchcode'} );
+                if ( $restype eq "Waiting" )
+                {
+                    # The item is on reserve and waiting, but has been
+                    # reserved by some other patron.
+                    $needsconfirmation{RESERVE_WAITING} = 1;
+                    $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
+                    $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
+                    $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
+                    $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
+                    $needsconfirmation{'resbranchname'} = $branchname;
+                    $needsconfirmation{'reswaitingdate'} = format_date($res->{'waitingdate'});
+                }
+                elsif ( $restype eq "Reserved" ) {
+                    # The item is on reserve for someone else.
+                    $needsconfirmation{RESERVED} = 1;
+                    $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
+                    $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
+                    $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
+                    $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
+                    $needsconfirmation{'resbranchname'} = $branchname;
+                    $needsconfirmation{'resreservedate'} = format_date($res->{'reservedate'});
+                }
+            }
         }
     }
-	return ( \%issuingimpossible, \%needsconfirmation );
+    return ( \%issuingimpossible, \%needsconfirmation );
 }
 
 =head2 AddIssue
diff --git a/C4/SIP/ILS/Transaction/Checkout.pm b/C4/SIP/ILS/Transaction/Checkout.pm
index 8a14877..617a4eb 100644
--- a/C4/SIP/ILS/Transaction/Checkout.pm
+++ b/C4/SIP/ILS/Transaction/Checkout.pm
@@ -58,7 +58,13 @@ sub do_checkout {
 	$debug and warn "do_checkout: patron (" . $patron_barcode . ")";
 	my $borrower = $self->{patron}->getmemberdetails_object();
 	$debug and warn "do_checkout borrower: . " . Dumper $borrower;
-	my ($issuingimpossible,$needsconfirmation) = CanBookBeIssued( $borrower, $barcode );
+	my ($issuingimpossible,$needsconfirmation) = CanBookBeIssued(
+        $borrower,
+        $barcode,
+        undef,
+        0,
+        C4::Context->preference("AllowItemsOnHoldCheckout")
+    );
 	my $noerror=1;
     if (scalar keys %$issuingimpossible) {
         foreach (keys %$issuingimpossible) {
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 128c9b2..ca82713 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -328,4 +328,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
 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,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');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 0063a75..242f868 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4578,6 +4578,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.02.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+	$dbh->do("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')");
+    print "Upgrade to $DBversion add 'AllowItemsOnHoldCheckout' syspref \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 f4946b5..f4fd721 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
@@ -105,6 +105,12 @@ Circulation:
                   no: "Don't allow"
             - staff to manually override the renewal limit and renew a checkout when it would go over the renewal limit.
         -
+            - pref: AllowItemsOnHoldCheckout
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - checkouts of items items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items.
+        -
             - pref: AllFinesNeedOverride
               choices:
                   yes: Require
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index a1a3ce6..7e4f810 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -132,7 +132,13 @@ elsif ( $op eq "checkout" ) {
     my $impossible  = {};
     my $needconfirm = {};
     if ( !$confirmed ) {
-        ( $impossible, $needconfirm ) = CanBookBeIssued( $borrower, $barcode );
+        ( $impossible, $needconfirm ) = CanBookBeIssuedCheckout(
+            $borrower,
+            $barcode,
+            undef,
+            0,
+            C4::Context->preference("AllowItemsOnHoldCheckout")
+        );
     }
     $confirm_required = scalar keys %$needconfirm;
 
@@ -213,7 +219,13 @@ if ($borrower->{cardnumber}) {
     my ($issueslist) = GetPendingIssues( $borrower->{'borrowernumber'} );
     foreach my $it (@$issueslist) {
         $it->{date_due_display} = format_date($it->{date_due});
-        my ($renewokay, $renewerror) = CanBookBeIssued($borrower, $it->{'barcode'},'','');
+        my ($renewokay, $renewerror) = CanBookBeIssued(
+            $borrower,
+            $it->{'barcode'},
+            undef,
+            0,
+            C4::Context->preference("AllowItemsOnHoldCheckout")
+        );
         $it->{'norenew'} = 1 if $renewokay->{'NO_MORE_RENEWALS'};
         push @issues, $it;
     }
-- 
1.6.5


From marc at msys.ch  Wed Dec 21 14:21:12 2011
From: marc at msys.ch (Marc Balmer)
Date: Wed, 21 Dec 2011 14:21:12 +0100
Subject: [Koha-patches] [PATCH] bug_7090: AllowItemsOnHoldCheckout
	syspref
In-Reply-To: <1324456190-15624-1-git-send-email-srdjan@catalyst.net.nz>
References: <bug 7090>
	<1324456190-15624-1-git-send-email-srdjan@catalyst.net.nz>
Message-ID: <4EF1DD48.6000802@msys.ch>

Am 21.12.11 09:29, schrieb Srdjan Jankovic:
> Observe AllowItemsOnHandCheckout syspref when using self checkout
> ---
>  C4/Circulation.pm                                  |   68 ++++++++++---------
>  C4/SIP/ILS/Transaction/Checkout.pm                 |    8 ++-
>  installer/data/mysql/sysprefs.sql                  |    2 +-
>  installer/data/mysql/updatedatabase.pl             |    7 ++
>  .../en/modules/admin/preferences/circulation.pref  |    6 ++
>  opac/sco/sco-main.pl                               |   16 ++++-
>  6 files changed, 71 insertions(+), 36 deletions(-)
> 
> diff --git a/C4/Circulation.pm b/C4/Circulation.pm
> index 9a6f4f2..5b03b37 100644
> --- a/C4/Circulation.pm
> +++ b/C4/Circulation.pm
> @@ -570,7 +570,7 @@ sub itemissues {
>  =head2 CanBookBeIssued
>  
>    ( $issuingimpossible, $needsconfirmation ) =  CanBookBeIssued( $borrower, 
> -                                      $barcode, $duedatespec, $inprocess );
> +                      $barcode, $duedatespec, $inprocess, $ignore_reserves );
>  
>  Check if a book can be issued.
>  
> @@ -584,7 +584,8 @@ C<$issuingimpossible> and C<$needsconfirmation> are some hashref.
>  
>  =item C<$duedatespec> is a C4::Dates object.
>  
> -=item C<$inprocess>
> +=item C<$inprocess> boolean switch
> +=item C<$ignore_reserves> boolean switch
>  
>  =back
>  
> @@ -661,7 +662,7 @@ if the borrower borrows to much things
>  =cut
>  
>  sub CanBookBeIssued {
> -    my ( $borrower, $barcode, $duedate, $inprocess ) = @_;
> +    my ( $borrower, $barcode, $duedate, $inprocess, $ignore_reserves ) = @_;
>      my %needsconfirmation;    # filled with problems that needs confirmations
>      my %issuingimpossible;    # filled with problems that causes the issue to be IMPOSSIBLE
>      my $item = GetItem(GetItemnumberFromBarcode( $barcode ));
> @@ -868,37 +869,40 @@ sub CanBookBeIssued {
>          $needsconfirmation{issued_borrowernumber} = $currborinfo->{'borrowernumber'};
>      }
>  
> -    # See if the item is on reserve.
> -    my ( $restype, $res, undef ) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
> -    if ($restype) {
> -		my $resbor = $res->{'borrowernumber'};
> -		my ( $resborrower ) = C4::Members::GetMember( borrowernumber => $resbor );
> -		my $branches  = GetBranches();
> -		my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
> -        if ( $resbor ne $borrower->{'borrowernumber'} && $restype eq "Waiting" )
> -        {
> -            # The item is on reserve and waiting, but has been
> -            # reserved by some other patron.
> -            $needsconfirmation{RESERVE_WAITING} = 1;
> -            $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
> -            $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
> -            $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
> -            $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
> -            $needsconfirmation{'resbranchname'} = $branchname;
> -            $needsconfirmation{'reswaitingdate'} = format_date($res->{'waitingdate'});
> -        }
> -        elsif ( $restype eq "Reserved" ) {
> -            # The item is on reserve for someone else.
> -            $needsconfirmation{RESERVED} = 1;
> -            $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
> -            $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
> -            $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
> -            $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
> -            $needsconfirmation{'resbranchname'} = $branchname;
> -            $needsconfirmation{'resreservedate'} = format_date($res->{'reservedate'});
> +    unless ( $ignore_reserves ) {
> +        # See if the item is on reserve.
> +        my ( $restype, $res ) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
> +        if ($restype) {
> +            my $resbor = $res->{'borrowernumber'};
> +            if ( $resbor ne $borrower->{'borrowernumber'} ) {
> +                my ( $resborrower ) = C4::Members::GetMember( borrowernumber => $resbor );
> +                my $branchname = GetBranchName( $res->{'branchcode'} );
> +                if ( $restype eq "Waiting" )
> +                {
> +                    # The item is on reserve and waiting, but has been
> +                    # reserved by some other patron.
> +                    $needsconfirmation{RESERVE_WAITING} = 1;
> +                    $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
> +                    $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
> +                    $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
> +                    $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
> +                    $needsconfirmation{'resbranchname'} = $branchname;
> +                    $needsconfirmation{'reswaitingdate'} = format_date($res->{'waitingdate'});
> +                }
> +                elsif ( $restype eq "Reserved" ) {
> +                    # The item is on reserve for someone else.
> +                    $needsconfirmation{RESERVED} = 1;
> +                    $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
> +                    $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
> +                    $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
> +                    $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
> +                    $needsconfirmation{'resbranchname'} = $branchname;
> +                    $needsconfirmation{'resreservedate'} = format_date($res->{'reservedate'});
> +                }
> +            }
>          }
>      }
> -	return ( \%issuingimpossible, \%needsconfirmation );
> +    return ( \%issuingimpossible, \%needsconfirmation );
>  }
>  
>  =head2 AddIssue
> diff --git a/C4/SIP/ILS/Transaction/Checkout.pm b/C4/SIP/ILS/Transaction/Checkout.pm
> index 8a14877..617a4eb 100644
> --- a/C4/SIP/ILS/Transaction/Checkout.pm
> +++ b/C4/SIP/ILS/Transaction/Checkout.pm
> @@ -58,7 +58,13 @@ sub do_checkout {
>  	$debug and warn "do_checkout: patron (" . $patron_barcode . ")";
>  	my $borrower = $self->{patron}->getmemberdetails_object();
>  	$debug and warn "do_checkout borrower: . " . Dumper $borrower;
> -	my ($issuingimpossible,$needsconfirmation) = CanBookBeIssued( $borrower, $barcode );
> +	my ($issuingimpossible,$needsconfirmation) = CanBookBeIssued(
> +        $borrower,
> +        $barcode,
> +        undef,
> +        0,
> +        C4::Context->preference("AllowItemsOnHoldCheckout")
> +    );
>  	my $noerror=1;
>      if (scalar keys %$issuingimpossible) {
>          foreach (keys %$issuingimpossible) {
> diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
> index 128c9b2..ca82713 100755
> --- a/installer/data/mysql/sysprefs.sql
> +++ b/installer/data/mysql/sysprefs.sql
> @@ -328,4 +328,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
>  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
>  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,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');
> diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl

Please don't use backquotes around the table name.  They are not needed
and in fact lead to a syntax error in PostgreSQL.

Granted, this is part of the MySQL installation procedure, but don't
make it harder than needed to shared code with PostgreSQL.

> index 0063a75..242f868 100755
> --- a/installer/data/mysql/updatedatabase.pl
> +++ b/installer/data/mysql/updatedatabase.pl
> @@ -4578,6 +4578,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>      SetVersion($DBversion);
>  }
>  
> +$DBversion = "3.06.02.XXX";
> +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
> +	$dbh->do("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')");
> +    print "Upgrade to $DBversion add 'AllowItemsOnHoldCheckout' syspref \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 f4946b5..f4fd721 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
> @@ -105,6 +105,12 @@ Circulation:
>                    no: "Don't allow"
>              - staff to manually override the renewal limit and renew a checkout when it would go over the renewal limit.
>          -
> +            - pref: AllowItemsOnHoldCheckout
> +              choices:
> +                  yes: Allow
> +                  no: "Don't allow"
> +            - checkouts of items items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items.
> +        -
>              - pref: AllFinesNeedOverride
>                choices:
>                    yes: Require
> diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
> index a1a3ce6..7e4f810 100755
> --- a/opac/sco/sco-main.pl
> +++ b/opac/sco/sco-main.pl
> @@ -132,7 +132,13 @@ elsif ( $op eq "checkout" ) {
>      my $impossible  = {};
>      my $needconfirm = {};
>      if ( !$confirmed ) {
> -        ( $impossible, $needconfirm ) = CanBookBeIssued( $borrower, $barcode );
> +        ( $impossible, $needconfirm ) = CanBookBeIssuedCheckout(
> +            $borrower,
> +            $barcode,
> +            undef,
> +            0,
> +            C4::Context->preference("AllowItemsOnHoldCheckout")
> +        );
>      }
>      $confirm_required = scalar keys %$needconfirm;
>  
> @@ -213,7 +219,13 @@ if ($borrower->{cardnumber}) {
>      my ($issueslist) = GetPendingIssues( $borrower->{'borrowernumber'} );
>      foreach my $it (@$issueslist) {
>          $it->{date_due_display} = format_date($it->{date_due});
> -        my ($renewokay, $renewerror) = CanBookBeIssued($borrower, $it->{'barcode'},'','');
> +        my ($renewokay, $renewerror) = CanBookBeIssued(
> +            $borrower,
> +            $it->{'barcode'},
> +            undef,
> +            0,
> +            C4::Context->preference("AllowItemsOnHoldCheckout")
> +        );
>          $it->{'norenew'} = 1 if $renewokay->{'NO_MORE_RENEWALS'};
>          push @issues, $it;
>      }


From srdjan at catalyst.net.nz  Wed Dec 21 04:28:03 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed, 21 Dec 2011 16:28:03 +1300
Subject: [Koha-patches] [PATCH] bug_5786: moved AllowOnShelfHolds to circ
	matrix (issuingrules)
In-Reply-To: <bug 5786>
References: <bug 5786>
Message-ID: <1324438083-21189-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Circulation.pm                                  |    3 +-
 C4/Items.pm                                        |    2 +
 C4/Reserves.pm                                     |   72 ++++++++++++++++---
 C4/VirtualShelves/Page.pm                          |    1 -
 admin/smart-rules.pl                               |    9 ++-
 admin/systempreferences.pl                         |    1 -
 .../mysql/it-IT/necessari/system_preferences.sql   |    1 -
 installer/data/mysql/kohastructure.sql             |    3 +-
 installer/data/mysql/sysprefs.sql                  |    1 -
 installer/data/mysql/updatedatabase.pl             |   19 +++++
 installer/html-template-to-template-toolkit.pl     |    2 +-
 .../en/modules/admin/preferences/circulation.pref  |    6 --
 .../prog/en/modules/admin/preferences/opac.pref    |    6 --
 .../prog/en/modules/admin/smart-rules.tt           |   25 +++++--
 .../prog/en/modules/help/reserve/request.tt        |    2 +-
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt   |    6 --
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt   |    6 --
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   12 +---
 .../prog/en/modules/opac-results-grouped.tt        |    6 --
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    8 +--
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    6 --
 opac/opac-ISBDdetail.pl                            |    2 -
 opac/opac-MARCdetail.pl                            |    1 -
 opac/opac-detail.pl                                |    2 -
 opac/opac-reserve.pl                               |    2 +-
 opac/opac-search.pl                                |    2 +-
 26 files changed, 115 insertions(+), 91 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9a6f4f2..df202e1 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2200,7 +2200,8 @@ sub CanBookBeRenewed {
                    LEFT JOIN biblioitems USING (biblioitemnumber)
                    
                    WHERE
-                    (issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')
+                    (issuingrules.categorycode = borrowers.categorycode 
+			OR issuingrules.categorycode = '*')
                    AND
                     (issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
                    AND
diff --git a/C4/Items.pm b/C4/Items.pm
index 8802a4c..7c3a26f 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -160,6 +160,8 @@ sub GetItem {
         ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
     }
 	#if we don't have an items.itype, use biblioitems.itemtype.
+    # FIXME this should respect the itypes systempreference
+    # if (C4::Context->preference('item-level_itypes')) {
 	if( ! $data->{'itype'} ) {
 		my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems  WHERE biblionumber = ?");
 		$sth->execute($data->{'biblionumber'});
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 359bbad..5a2d819 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -479,7 +479,6 @@ sub CanItemBeReserved{
     if(my $rowcount = $sthcount->fetchrow_hashref()){
         $reservecount = $rowcount->{count};
     }
-    
     # we check if it's ok or not
     if( $reservecount < $allowedreserves ){
         return 1;
@@ -1321,7 +1320,7 @@ sub GetReserveInfo {
 
 =head2 IsAvailableForItemLevelRequest
 
-  my $is_available = IsAvailableForItemLevelRequest($itemnumber);
+  my $is_available = IsAvailableForItemLevelRequest($itemnumber,$borrowernumber,$branchcode);
 
 Checks whether a given item record is available for an
 item-level hold request.  An item is available if
@@ -1331,12 +1330,8 @@ item-level hold request.  An item is available if
 * it is not withdrawn AND 
 * does not have a not for loan value > 0
 
-Whether or not the item is currently on loan is 
-also checked - if the AllowOnShelfHolds system preference
-is ON, an item can be requested even if it is currently
-on loan to somebody else.  If the system preference
-is OFF, an item that is currently checked out cannot
-be the target of an item-level hold request.
+Need to check the issuingrules onshelfholds column, 
+if this is set items on the shelf can be placed on hold
 
 Note that IsAvailableForItemLevelRequest() does not
 check if the staff operator is authorized to place
@@ -1348,9 +1343,9 @@ and canreservefromotherbranches.
 
 sub IsAvailableForItemLevelRequest {
     my $itemnumber = shift;
-   
+    my $borrowernumber = shift;
+    my $branchcode = shift;
     my $item = GetItem($itemnumber);
-
     # must check the notforloan setting of the itemtype
     # FIXME - a lot of places in the code do this
     #         or something similar - need to be
@@ -1383,14 +1378,67 @@ sub IsAvailableForItemLevelRequest {
                                $item->{wthdrawn} or
                                $notforloan_per_itemtype;
 
-
-    if (C4::Context->preference('AllowOnShelfHolds')) {
+    # check issuingrules
+    
+    if (OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode)) {
         return $available_per_item;
     } else {
         return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W")); 
     }
 }
 
+=head2 OnShelfHoldsAllowed
+
+  OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode);
+
+Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see if onshelf
+holds are allowed, returns true if so. 
+
+=cut
+
+sub OnShelfHoldsAllowed {
+    my ($itemnumber,$borrowernumber,$branchcode) = @_;
+    my $item = GetItem($itemnumber);
+    my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
+    my $itype;
+    my $dbh = C4::Context->dbh;
+    if (C4::Context->preference('item-level_itypes')) {
+	# We cant trust GetItem to honour the syspref, so safest to do it ourselves
+	# When GetItem is fixed, we can remove this
+	$itype = $item->{itype};
+    } 
+    else {
+	my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
+	my $sth = $dbh->prepare($query);	
+	$sth->execute($item->{biblioitemnumber});
+	if (my $data = $sth->fetchrow_hashref()){
+	    $itype = $data->{itemtype};
+	}
+    }
+
+    my $query = "SELECT onshelfholds,categorycode,itemtype,branchcode FROM issuingrules WHERE
+          (issuingrules.categorycode = ? OR issuingrules.categorycode = '*')
+        AND
+          (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
+        AND
+          (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')
+        ORDER BY
+          issuingrules.categorycode desc,
+          issuingrules.itemtype desc,
+          issuingrules.branchcode desc
+       LIMIT 1";
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($borrower->{categorycode},$itype,$branchcode);
+    my $data = $sth->fetchrow_hashref;
+    if ($data->{onshelfholds}){
+	return 1;
+    }
+    else {
+	return 0;
+    }
+}
+
 =head2 AlterPriority
 
   AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate );
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 523527e..ff55dc0 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -183,7 +183,6 @@ sub shelfpage ($$$$$) {
             # explicitly fetch this shelf
             my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
 
-            $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
             if (C4::Context->preference('TagsEnabled')) {
                 $template->param(TagsEnabled => 1);
                     foreach (qw(TagsShowOnList TagsInputOnList)) {
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index f290934..5bfdc7d 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -101,8 +101,8 @@ elsif ($op eq 'delete-branch-item') {
 # save the values entered
 elsif ($op eq 'add') {
     my $sth_search = $dbh->prepare("SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?");
-    my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
+    my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod, rentaldiscount, onshelfholds) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, onshelfholds=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
     
     my $br = $branch; # branch
     my $bor  = $input->param('categorycode'); # borrower category
@@ -114,6 +114,7 @@ elsif ($op eq 'add') {
     my $maxissueqty  = $input->param('maxissueqty');
     my $renewalsallowed  = $input->param('renewalsallowed');
     my $reservesallowed  = $input->param('reservesallowed');
+    my $onshelfholds     = $input->param('onshelfholds');
     $maxissueqty =~ s/\s//g;
     $maxissueqty = undef if $maxissueqty !~ /^\d+/;
     my $issuelength  = $input->param('issuelength');
@@ -126,9 +127,9 @@ elsif ($op eq 'add') {
     $sth_search->execute($br,$bor,$cat);
     my $res = $sth_search->fetchrow_hashref();
     if ($res->{total}) {
-        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $br,$bor,$cat);
+        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $onshelfholds, $br,$bor,$cat);
     } else {
-        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount);
+        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$onshelfholds);
     }
 } 
 elsif ($op eq "set-branch-defaults") {
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 78d0768..6bd68ee 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -186,7 +186,6 @@ $tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
 $tabsysprefs{HomeOrHoldingBranchReturn}      = "Circulation";
 $tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
 $tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
-$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
 $tabsysprefs{AllowHoldsOnDamagedItems}       = "Circulation";
 $tabsysprefs{UseBranchTransferLimits}        = "Circulation";
 $tabsysprefs{AllowHoldPolicyOverride}        = "Circulation";
diff --git a/installer/data/mysql/it-IT/necessari/system_preferences.sql b/installer/data/mysql/it-IT/necessari/system_preferences.sql
index b4ddfa0..7aaa066 100644
--- a/installer/data/mysql/it-IT/necessari/system_preferences.sql
+++ b/installer/data/mysql/it-IT/necessari/system_preferences.sql
@@ -17,7 +17,6 @@
 -- 51 Franklin Street' WHERE variable = ' Fifth Floor' WHERE variable = ' Boston' WHERE variable = ' MA 02110-1301 USA.
 
 UPDATE systempreferences SET value = 'cataloguing' WHERE variable = 'AcqCreateItem';
-UPDATE systempreferences SET value = '1' WHERE variable = 'AllowOnShelfHolds';
 UPDATE systempreferences SET value = '1' WHERE variable = 'AllowRenewalLimitOverride';
 UPDATE systempreferences SET value = 'annual' WHERE variable = 'autoBarcode';
 UPDATE systempreferences SET value = 'email' WHERE variable = 'AutoEmailPrimaryAddress';
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index a03bd23..b6adbd6 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -970,6 +970,7 @@ CREATE TABLE `issues` ( -- information related to check outs or issues
 
 DROP TABLE IF EXISTS `issuingrules`;
 CREATE TABLE `issuingrules` (
+  `branchcode` varchar(10) NOT NULL default '',
   `categorycode` varchar(10) NOT NULL default '',
   `itemtype` varchar(10) NOT NULL default '',
   `restrictedtype` tinyint(1) default NULL,
@@ -987,7 +988,7 @@ CREATE TABLE `issuingrules` (
   `hardduedatecompare` tinyint NOT NULL default "0",
   `renewalsallowed` smallint(6) NOT NULL default "0",
   `reservesallowed` smallint(6) NOT NULL default "0",
-  `branchcode` varchar(10) NOT NULL default '',
+  `onshelfholds` tinyint(1) NOT NULL default 0,
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
   KEY `itemtype` (`itemtype`)
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 128c9b2..a1a913a 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -223,7 +223,6 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
 ('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');
 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');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
 -- FIXME: add FrameworksLoaded, noOPACUserLogin?
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 0063a75..e039407 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4578,6 +4578,25 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = '3.06.02.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    print "Upgrade to $DBversion done (Bug 5786 move AllowOnShelfHolds to circulation matrix)\n";
+    # First create the column
+    $dbh->do("ALTER TABLE issuingrules ADD onshelfholds tinyint(1) default 0");
+    # Now update the column    
+    if (C4::Context->preference("AllowOnShelfHolds")){
+	      # Pref is on, set allow for all rules
+	      $dbh->do("UPDATE issuingrules SET onshelfholds=1");
+    } else {
+        # If the preference is not set, leave off
+	      $dbh->do("UPDATE issuingrules SET onshelfholds=0");
+    }
+    $dbh->do("ALTER TABLE issuingrules MODIFY onshelfholds tinyint(1) default 0 NOT NULL");
+    # Remove from the systempreferences table
+    $dbh->do("DELETE FROM systempreferences WHERE variable = 'AllowOnShelfHolds'");	
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl
index e99b195..5f0e0ac 100755
--- a/installer/html-template-to-template-toolkit.pl
+++ b/installer/html-template-to-template-toolkit.pl
@@ -32,7 +32,7 @@ my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets
 "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
 "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
 "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
-"TagsShowOnList", "TagsInputOnList","loggedinusername","AllowOnShelfHolds","opacbookbag",
+"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
 "OPACAmazonEnabled", "SyndeticsCoverImages","using_https");
 
 # Arguments:
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 f4946b5..4cb60ae 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
@@ -236,12 +236,6 @@ Circulation:
                   no: "Don't allow"
             - hold requests to be placed on damaged items.
         -
-            - pref: AllowOnShelfHolds
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - hold requests to be placed on items that are not checked out.
-        -
             - pref: AllowHoldDateInFuture
               choices:
                   yes: Allow
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..0b076ca 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
@@ -319,12 +319,6 @@ OPAC:
 #              choices:
 #            - If ON, enables subject cloud on OPAC
         -
-            - pref: OPACItemHolds
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item.
-        -
             - pref: OpacRenewalAllowed
               choices:
                   yes: Allow
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index d2f314f..e38e446 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -80,7 +80,8 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                 <th>Suspension in Days (day)</th>
                 <th>Renewals Allowed (count)</th>
                 <th>Holds Allowed (count)</th>
-		        <th>Rental Discount (%)</th>
+		<th>On Shelf Holds Allowed</th>
+		<th>Rental Discount (%)</th>
 				<th>&nbsp;</th>
             </tr>
 				[% FOREACH rule IN rules %]
@@ -108,19 +109,26 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
 								[% END %]
 							</td>
 							<td>[% rule.issuelength %]</td>
-                                                        <td>[% IF ( rule.hardduedate ) %]
-                                                               [% IF ( rule.hardduedatebefore ) %]before [% rule.hardduedate %]</td>
-                                                               [% ELSE %][% IF ( rule.hardduedateexact ) %]on [% rule.hardduedate %]</td>
-                                                                                 [% ELSE %][% IF ( rule.hardduedateafter ) %]after [% rule.hardduedate %]</td>[% END %]
-                                                                                 [% END %]
-                                                               [% END %]
-                                                            [% ELSE %]None defined[% END %]   
+                            <td>[% IF ( rule.hardduedate ) %]
+                                    [% IF ( rule.hardduedatebefore ) %]
+                                        before
+                                    [% ELSIF ( rule.hardduedateexact ) %]
+                                        on
+                                    [% ELSIF ( rule.hardduedateafter ) %]
+                                        after
+                                    [% END %]
+                                    [% rule.hardduedate %]
+                                [% ELSE %]
+                                    None defined
+                                [% END %]   
+                            </td>
 							<td>[% rule.fine %]</td>
 							<td>[% rule.chargeperiod %]</td>
 							<td>[% rule.firstremind %]</td>
 							<td>[% rule.finedays %]</td>
 							<td>[% rule.renewalsallowed %]</td>
 							<td>[% rule.reservesallowed %]</td>
+							<td>[% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %]</td>
 							<td>[% rule.rentaldiscount %]</td>
 							<td>
 								<a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]">Delete</a>
@@ -175,6 +183,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                     <td><input name="finedays" size="3" /> </td>
                     <td><input name="renewalsallowed" size="2" /></td>
                     <td><input name="reservesallowed" size="2" /></td>
+		    <td><input type="radio" name="onshelfholds" value="1">Yes <input type="radio" name="onshelfholds" value="0">No</td>
 		    <td><input name="rentaldiscount" size="2" /></td>
                     <td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>
                 </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
index 3d7381b..a5a5cd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
@@ -72,4 +72,4 @@
 
 <p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.6/en/holds.html">manual</a> (online).</strong></p>
 
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
index f9984a7..d04e7b1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
@@ -51,13 +51,7 @@
 [% UNLESS ( norequests ) %]
         [% IF ( opacuserlogin ) %]
 		[% IF ( RequestOnOpac ) %]
-			[% IF ( AllowOnShelfHolds ) %]
 				<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
-			[% ELSE %]
-				[% IF ( ItemsIssued ) %]
-					<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
-				[% END %]
-			[% END %]
 
         	[% END %]
 	[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
index 284154e..200c0ed 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
@@ -206,13 +206,7 @@ $(document).ready(function(){
 [% UNLESS ( norequests ) %]
         [% IF ( opacuserlogin ) %]
         [% IF ( RequestOnOpac ) %]
-            [% IF ( AllowOnShelfHolds ) %]
                 <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
-            [% ELSE %]
-                [% IF ( ItemsIssued ) %]
-                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
-                [% END %]
-            [% END %]
 
             [% END %]
     [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index d1b6570..fb367ca 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -1016,16 +1016,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <ul id="action">
 
 [% UNLESS ( norequests ) %]
-        [% IF ( opacuserlogin ) %]
+    [% IF ( opacuserlogin ) %]
 		[% IF ( RequestOnOpac ) %]
-			[% IF ( AllowOnShelfHolds ) %]
-	            		<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
-			[% ELSE %]
-				[% IF ( ItemsIssued ) %]
-		            		<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
-				[% END %]
-			[% END %]
-        	[% END %]
+            <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
+       	[% END %]
 	[% END %]
 [% END %]
         <li><a class="print" href="#" onclick="window.print();">Print</a></li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
index 9e1b855..e08f7f9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
@@ -260,13 +260,7 @@ function highlightOn() {
                                 [% IF ( RequestOnOpac ) %]
 					[% UNLESS ( GROUP_RESULT.norequests ) %]
 						[% IF ( opacuserlogin ) %]
-							[% IF ( AllowOnShelfHolds ) %]
 								<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
-							[% ELSE %]
-								[% IF ( GROUP_RESULT.itemsissued ) %]
-									<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
-								[% END %]
-							[% END %]
 						[% END %]
 					[% END %]
 				[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 798e0d8..2256b3e 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -510,13 +510,7 @@ $(document).ready(function(){
                                 [% IF ( RequestOnOpac ) %]
 					[% UNLESS ( SEARCH_RESULT.norequests ) %]
 						[% IF ( opacuserlogin ) %]
-							[% IF ( AllowOnShelfHolds ) %]
-								<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
-							[% ELSE %]
-								[% IF ( SEARCH_RESULT.itemsissued ) %]
-									<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
-								[% END %]
-							[% END %]
+							<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
 						[% END %]
 					[% END %]
 				[% END %]
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 391037f..b9e2ed4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -308,13 +308,7 @@ $(function() {
       [% IF ( RequestOnOpac ) %]
           [% UNLESS ( itemsloo.norequests ) %]
             [% IF ( opacuserlogin ) %]
-              [% IF ( AllowOnShelfHolds ) %]
                 <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
-              [% ELSE %]
-                [% IF ( itemsloo.itemsissued ) %]
-                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
-                [% END %]
-              [% END %]
             [% END %]
           [% END %]
         [% END %]
diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index c80d41c..d978357 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -69,7 +69,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 my $biblionumber = $query->param('biblionumber');
 
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
 my $marcflavour      = C4::Context->preference("marcflavour");
@@ -152,7 +151,6 @@ foreach ( @$reviews ) {
 
 $template->param(
     RequestOnOpac       => C4::Context->preference("RequestOnOpac"),
-    AllowOnShelfHolds   => C4::Context->preference('AllowOnShelfHolds'),
     norequests   => $norequests,
     ISBD         => $res,
     biblionumber => $biblionumber,
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index ffa0a6d..476fe50 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -81,7 +81,6 @@ $template->param(
     bibliotitle => $biblio->{title},
 );
 
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
 # adding the $RequestOnOpac param
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index f82dde2..8111e9d 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -347,8 +347,6 @@ if ($session->param('busc')) {
 }
 
 
-
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
 my $record       = GetMarcBiblio($biblionumber);
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index b2144a9..3e573fc 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -471,7 +471,7 @@ foreach my $biblioNum (@biblionumbers) {
             $policy_holdallowed = 0;
         }
 
-        if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and ($itemLoopIter->{already_reserved} ne 1)) {
+        if (IsAvailableForItemLevelRequest($itemNum,$borr->{'borrowernumber'},$itemInfo->{'homebranch'}) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and !$itemLoopIter->{already_reserved}) {
             $itemLoopIter->{available} = 1;
             $numCopiesAvailable++;
         }
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index aba23a8..081bc81 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -100,7 +100,7 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
 elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
     $template->param('usmarc' => 1);
 }
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+
 $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
 
 if (C4::Context->preference('BakerTaylorEnabled')) {
-- 
1.6.5


From marc at msys.ch  Wed Dec 21 15:22:24 2011
From: marc at msys.ch (Marc Balmer)
Date: Wed, 21 Dec 2011 15:22:24 +0100
Subject: [Koha-patches] [PATCH] bug_5786: moved AllowOnShelfHolds to
	circ matrix (issuingrules)
In-Reply-To: <1324438083-21189-1-git-send-email-srdjan@catalyst.net.nz>
References: <bug 5786>
	<1324438083-21189-1-git-send-email-srdjan@catalyst.net.nz>
Message-ID: <BB7AE2C1-2108-4306-940F-7563DC3E4FB1@msys.ch>

Please stop putting column names in backquotes, it is a MySQLism and hinders my efforts to run Koha on PostgreSQL,



Am 21.12.2011 um 04:28 schrieb Srdjan Jankovic <srdjan at catalyst.net.nz>:

> ---
> C4/Circulation.pm                                  |    3 +-
> C4/Items.pm                                        |    2 +
> C4/Reserves.pm                                     |   72 ++++++++++++++++---
> C4/VirtualShelves/Page.pm                          |    1 -
> admin/smart-rules.pl                               |    9 ++-
> admin/systempreferences.pl                         |    1 -
> .../mysql/it-IT/necessari/system_preferences.sql   |    1 -
> installer/data/mysql/kohastructure.sql             |    3 +-
> installer/data/mysql/sysprefs.sql                  |    1 -
> installer/data/mysql/updatedatabase.pl             |   19 +++++
> installer/html-template-to-template-toolkit.pl     |    2 +-
> .../en/modules/admin/preferences/circulation.pref  |    6 --
> .../prog/en/modules/admin/preferences/opac.pref    |    6 --
> .../prog/en/modules/admin/smart-rules.tt           |   25 +++++--
> .../prog/en/modules/help/reserve/request.tt        |    2 +-
> .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt   |    6 --
> .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt   |    6 --
> koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   12 +---
> .../prog/en/modules/opac-results-grouped.tt        |    6 --
> .../opac-tmpl/prog/en/modules/opac-results.tt      |    8 +--
> .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    6 --
> opac/opac-ISBDdetail.pl                            |    2 -
> opac/opac-MARCdetail.pl                            |    1 -
> opac/opac-detail.pl                                |    2 -
> opac/opac-reserve.pl                               |    2 +-
> opac/opac-search.pl                                |    2 +-
> 26 files changed, 115 insertions(+), 91 deletions(-)
> 
> diff --git a/C4/Circulation.pm b/C4/Circulation.pm
> index 9a6f4f2..df202e1 100644
> --- a/C4/Circulation.pm
> +++ b/C4/Circulation.pm
> @@ -2200,7 +2200,8 @@ sub CanBookBeRenewed {
>                    LEFT JOIN biblioitems USING (biblioitemnumber)
> 
>                    WHERE
> -                    (issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')
> +                    (issuingrules.categorycode = borrowers.categorycode 
> +            OR issuingrules.categorycode = '*')
>                    AND
>                     (issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
>                    AND
> diff --git a/C4/Items.pm b/C4/Items.pm
> index 8802a4c..7c3a26f 100644
> --- a/C4/Items.pm
> +++ b/C4/Items.pm
> @@ -160,6 +160,8 @@ sub GetItem {
>         ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
>     }
>    #if we don't have an items.itype, use biblioitems.itemtype.
> +    # FIXME this should respect the itypes systempreference
> +    # if (C4::Context->preference('item-level_itypes')) {
>    if( ! $data->{'itype'} ) {
>        my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems  WHERE biblionumber = ?");
>        $sth->execute($data->{'biblionumber'});
> diff --git a/C4/Reserves.pm b/C4/Reserves.pm
> index 359bbad..5a2d819 100644
> --- a/C4/Reserves.pm
> +++ b/C4/Reserves.pm
> @@ -479,7 +479,6 @@ sub CanItemBeReserved{
>     if(my $rowcount = $sthcount->fetchrow_hashref()){
>         $reservecount = $rowcount->{count};
>     }
> -    
>     # we check if it's ok or not
>     if( $reservecount < $allowedreserves ){
>         return 1;
> @@ -1321,7 +1320,7 @@ sub GetReserveInfo {
> 
> =head2 IsAvailableForItemLevelRequest
> 
> -  my $is_available = IsAvailableForItemLevelRequest($itemnumber);
> +  my $is_available = IsAvailableForItemLevelRequest($itemnumber,$borrowernumber,$branchcode);
> 
> Checks whether a given item record is available for an
> item-level hold request.  An item is available if
> @@ -1331,12 +1330,8 @@ item-level hold request.  An item is available if
> * it is not withdrawn AND 
> * does not have a not for loan value > 0
> 
> -Whether or not the item is currently on loan is 
> -also checked - if the AllowOnShelfHolds system preference
> -is ON, an item can be requested even if it is currently
> -on loan to somebody else.  If the system preference
> -is OFF, an item that is currently checked out cannot
> -be the target of an item-level hold request.
> +Need to check the issuingrules onshelfholds column, 
> +if this is set items on the shelf can be placed on hold
> 
> Note that IsAvailableForItemLevelRequest() does not
> check if the staff operator is authorized to place
> @@ -1348,9 +1343,9 @@ and canreservefromotherbranches.
> 
> sub IsAvailableForItemLevelRequest {
>     my $itemnumber = shift;
> -   
> +    my $borrowernumber = shift;
> +    my $branchcode = shift;
>     my $item = GetItem($itemnumber);
> -
>     # must check the notforloan setting of the itemtype
>     # FIXME - a lot of places in the code do this
>     #         or something similar - need to be
> @@ -1383,14 +1378,67 @@ sub IsAvailableForItemLevelRequest {
>                                $item->{wthdrawn} or
>                                $notforloan_per_itemtype;
> 
> -
> -    if (C4::Context->preference('AllowOnShelfHolds')) {
> +    # check issuingrules
> +    
> +    if (OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode)) {
>         return $available_per_item;
>     } else {
>         return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W")); 
>     }
> }
> 
> +=head2 OnShelfHoldsAllowed
> +
> +  OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode);
> +
> +Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see if onshelf
> +holds are allowed, returns true if so. 
> +
> +=cut
> +
> +sub OnShelfHoldsAllowed {
> +    my ($itemnumber,$borrowernumber,$branchcode) = @_;
> +    my $item = GetItem($itemnumber);
> +    my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
> +    my $itype;
> +    my $dbh = C4::Context->dbh;
> +    if (C4::Context->preference('item-level_itypes')) {
> +    # We cant trust GetItem to honour the syspref, so safest to do it ourselves
> +    # When GetItem is fixed, we can remove this
> +    $itype = $item->{itype};
> +    } 
> +    else {
> +    my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
> +    my $sth = $dbh->prepare($query);    
> +    $sth->execute($item->{biblioitemnumber});
> +    if (my $data = $sth->fetchrow_hashref()){
> +        $itype = $data->{itemtype};
> +    }
> +    }
> +
> +    my $query = "SELECT onshelfholds,categorycode,itemtype,branchcode FROM issuingrules WHERE
> +          (issuingrules.categorycode = ? OR issuingrules.categorycode = '*')
> +        AND
> +          (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
> +        AND
> +          (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')
> +        ORDER BY
> +          issuingrules.categorycode desc,
> +          issuingrules.itemtype desc,
> +          issuingrules.branchcode desc
> +       LIMIT 1";
> +    my $dbh = C4::Context->dbh;
> +    my $sth = $dbh->prepare($query);
> +    $sth->execute($borrower->{categorycode},$itype,$branchcode);
> +    my $data = $sth->fetchrow_hashref;
> +    if ($data->{onshelfholds}){
> +    return 1;
> +    }
> +    else {
> +    return 0;
> +    }
> +}
> +
> =head2 AlterPriority
> 
>   AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate );
> diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
> index 523527e..ff55dc0 100644
> --- a/C4/VirtualShelves/Page.pm
> +++ b/C4/VirtualShelves/Page.pm
> @@ -183,7 +183,6 @@ sub shelfpage ($$$$$) {
>             # explicitly fetch this shelf
>             my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
> 
> -            $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
>             if (C4::Context->preference('TagsEnabled')) {
>                 $template->param(TagsEnabled => 1);
>                     foreach (qw(TagsShowOnList TagsInputOnList)) {
> diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
> index f290934..5bfdc7d 100755
> --- a/admin/smart-rules.pl
> +++ b/admin/smart-rules.pl
> @@ -101,8 +101,8 @@ elsif ($op eq 'delete-branch-item') {
> # save the values entered
> elsif ($op eq 'add') {
>     my $sth_search = $dbh->prepare("SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?");
> -    my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
> -    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
> +    my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod, rentaldiscount, onshelfholds) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
> +    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, onshelfholds=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
> 
>     my $br = $branch; # branch
>     my $bor  = $input->param('categorycode'); # borrower category
> @@ -114,6 +114,7 @@ elsif ($op eq 'add') {
>     my $maxissueqty  = $input->param('maxissueqty');
>     my $renewalsallowed  = $input->param('renewalsallowed');
>     my $reservesallowed  = $input->param('reservesallowed');
> +    my $onshelfholds     = $input->param('onshelfholds');
>     $maxissueqty =~ s/\s//g;
>     $maxissueqty = undef if $maxissueqty !~ /^\d+/;
>     my $issuelength  = $input->param('issuelength');
> @@ -126,9 +127,9 @@ elsif ($op eq 'add') {
>     $sth_search->execute($br,$bor,$cat);
>     my $res = $sth_search->fetchrow_hashref();
>     if ($res->{total}) {
> -        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $br,$bor,$cat);
> +        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $onshelfholds, $br,$bor,$cat);
>     } else {
> -        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount);
> +        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$onshelfholds);
>     }
> } 
> elsif ($op eq "set-branch-defaults") {
> diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
> index 78d0768..6bd68ee 100755
> --- a/admin/systempreferences.pl
> +++ b/admin/systempreferences.pl
> @@ -186,7 +186,6 @@ $tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
> $tabsysprefs{HomeOrHoldingBranchReturn}      = "Circulation";
> $tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
> $tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
> -$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
> $tabsysprefs{AllowHoldsOnDamagedItems}       = "Circulation";
> $tabsysprefs{UseBranchTransferLimits}        = "Circulation";
> $tabsysprefs{AllowHoldPolicyOverride}        = "Circulation";
> diff --git a/installer/data/mysql/it-IT/necessari/system_preferences.sql b/installer/data/mysql/it-IT/necessari/system_preferences.sql
> index b4ddfa0..7aaa066 100644
> --- a/installer/data/mysql/it-IT/necessari/system_preferences.sql
> +++ b/installer/data/mysql/it-IT/necessari/system_preferences.sql
> @@ -17,7 +17,6 @@
> -- 51 Franklin Street' WHERE variable = ' Fifth Floor' WHERE variable = ' Boston' WHERE variable = ' MA 02110-1301 USA.
> 
> UPDATE systempreferences SET value = 'cataloguing' WHERE variable = 'AcqCreateItem';
> -UPDATE systempreferences SET value = '1' WHERE variable = 'AllowOnShelfHolds';
> UPDATE systempreferences SET value = '1' WHERE variable = 'AllowRenewalLimitOverride';
> UPDATE systempreferences SET value = 'annual' WHERE variable = 'autoBarcode';
> UPDATE systempreferences SET value = 'email' WHERE variable = 'AutoEmailPrimaryAddress';
> diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
> index a03bd23..b6adbd6 100644
> --- a/installer/data/mysql/kohastructure.sql
> +++ b/installer/data/mysql/kohastructure.sql
> @@ -970,6 +970,7 @@ CREATE TABLE `issues` ( -- information related to check outs or issues
> 
> DROP TABLE IF EXISTS `issuingrules`;
> CREATE TABLE `issuingrules` (
> +  `branchcode` varchar(10) NOT NULL default '',
>   `categorycode` varchar(10) NOT NULL default '',
>   `itemtype` varchar(10) NOT NULL default '',
>   `restrictedtype` tinyint(1) default NULL,
> @@ -987,7 +988,7 @@ CREATE TABLE `issuingrules` (
>   `hardduedatecompare` tinyint NOT NULL default "0",
>   `renewalsallowed` smallint(6) NOT NULL default "0",
>   `reservesallowed` smallint(6) NOT NULL default "0",
> -  `branchcode` varchar(10) NOT NULL default '',
> +  `onshelfholds` tinyint(1) NOT NULL default 0,
>   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
>   KEY `categorycode` (`categorycode`),
>   KEY `itemtype` (`itemtype`)
> diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
> index 128c9b2..a1a913a 100755
> --- a/installer/data/mysql/sysprefs.sql
> +++ b/installer/data/mysql/sysprefs.sql
> @@ -223,7 +223,6 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
> ('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');
> 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');
> INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
> -- FIXME: add FrameworksLoaded, noOPACUserLogin?
> diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
> index 0063a75..e039407 100755
> --- a/installer/data/mysql/updatedatabase.pl
> +++ b/installer/data/mysql/updatedatabase.pl
> @@ -4578,6 +4578,25 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>     SetVersion($DBversion);
> }
> 
> +$DBversion = '3.06.02.XXX';
> +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
> +    print "Upgrade to $DBversion done (Bug 5786 move AllowOnShelfHolds to circulation matrix)\n";
> +    # First create the column
> +    $dbh->do("ALTER TABLE issuingrules ADD onshelfholds tinyint(1) default 0");
> +    # Now update the column    
> +    if (C4::Context->preference("AllowOnShelfHolds")){
> +          # Pref is on, set allow for all rules
> +          $dbh->do("UPDATE issuingrules SET onshelfholds=1");
> +    } else {
> +        # If the preference is not set, leave off
> +          $dbh->do("UPDATE issuingrules SET onshelfholds=0");
> +    }
> +    $dbh->do("ALTER TABLE issuingrules MODIFY onshelfholds tinyint(1) default 0 NOT NULL");
> +    # Remove from the systempreferences table
> +    $dbh->do("DELETE FROM systempreferences WHERE variable = 'AllowOnShelfHolds'");    
> +    SetVersion ($DBversion);
> +}
> +
> =head1 FUNCTIONS
> 
> =head2 DropAllForeignKeys($table)
> diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl
> index e99b195..5f0e0ac 100755
> --- a/installer/html-template-to-template-toolkit.pl
> +++ b/installer/html-template-to-template-toolkit.pl
> @@ -32,7 +32,7 @@ my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets
> "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
> "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
> "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
> -"TagsShowOnList", "TagsInputOnList","loggedinusername","AllowOnShelfHolds","opacbookbag",
> +"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
> "OPACAmazonEnabled", "SyndeticsCoverImages","using_https");
> 
> # Arguments:
> 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 f4946b5..4cb60ae 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
> @@ -236,12 +236,6 @@ Circulation:
>                   no: "Don't allow"
>             - hold requests to be placed on damaged items.
>         -
> -            - pref: AllowOnShelfHolds
> -              choices:
> -                  yes: Allow
> -                  no: "Don't allow"
> -            - hold requests to be placed on items that are not checked out.
> -        -
>             - pref: AllowHoldDateInFuture
>               choices:
>                   yes: Allow
> 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..0b076ca 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
> @@ -319,12 +319,6 @@ OPAC:
> #              choices:
> #            - If ON, enables subject cloud on OPAC
>         -
> -            - pref: OPACItemHolds
> -              choices:
> -                  yes: Allow
> -                  no: "Don't allow"
> -            - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item.
> -        -
>             - pref: OpacRenewalAllowed
>               choices:
>                   yes: Allow
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
> index d2f314f..e38e446 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
> @@ -80,7 +80,8 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                 <th>Suspension in Days (day)</th>
>                 <th>Renewals Allowed (count)</th>
>                 <th>Holds Allowed (count)</th>
> -                <th>Rental Discount (%)</th>
> +        <th>On Shelf Holds Allowed</th>
> +        <th>Rental Discount (%)</th>
>                <th>&nbsp;</th>
>             </tr>
>                [% FOREACH rule IN rules %]
> @@ -108,19 +109,26 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                                [% END %]
>                            </td>
>                            <td>[% rule.issuelength %]</td>
> -                                                        <td>[% IF ( rule.hardduedate ) %]
> -                                                               [% IF ( rule.hardduedatebefore ) %]before [% rule.hardduedate %]</td>
> -                                                               [% ELSE %][% IF ( rule.hardduedateexact ) %]on [% rule.hardduedate %]</td>
> -                                                                                 [% ELSE %][% IF ( rule.hardduedateafter ) %]after [% rule.hardduedate %]</td>[% END %]
> -                                                                                 [% END %]
> -                                                               [% END %]
> -                                                            [% ELSE %]None defined[% END %]   
> +                            <td>[% IF ( rule.hardduedate ) %]
> +                                    [% IF ( rule.hardduedatebefore ) %]
> +                                        before
> +                                    [% ELSIF ( rule.hardduedateexact ) %]
> +                                        on
> +                                    [% ELSIF ( rule.hardduedateafter ) %]
> +                                        after
> +                                    [% END %]
> +                                    [% rule.hardduedate %]
> +                                [% ELSE %]
> +                                    None defined
> +                                [% END %]   
> +                            </td>
>                            <td>[% rule.fine %]</td>
>                            <td>[% rule.chargeperiod %]</td>
>                            <td>[% rule.firstremind %]</td>
>                            <td>[% rule.finedays %]</td>
>                            <td>[% rule.renewalsallowed %]</td>
>                            <td>[% rule.reservesallowed %]</td>
> +                            <td>[% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %]</td>
>                            <td>[% rule.rentaldiscount %]</td>
>                            <td>
>                                <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]">Delete</a>
> @@ -175,6 +183,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                     <td><input name="finedays" size="3" /> </td>
>                     <td><input name="renewalsallowed" size="2" /></td>
>                     <td><input name="reservesallowed" size="2" /></td>
> +            <td><input type="radio" name="onshelfholds" value="1">Yes <input type="radio" name="onshelfholds" value="0">No</td>
>            <td><input name="rentaldiscount" size="2" /></td>
>                     <td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>
>                 </tr>
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
> index 3d7381b..a5a5cd0 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
> @@ -72,4 +72,4 @@
> 
> <p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.6/en/holds.html">manual</a> (online).</strong></p>
> 
> -[% INCLUDE 'help-bottom.inc' %]
> \ No newline at end of file
> +[% INCLUDE 'help-bottom.inc' %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
> index f9984a7..d04e7b1 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
> @@ -51,13 +51,7 @@
> [% UNLESS ( norequests ) %]
>         [% IF ( opacuserlogin ) %]
>        [% IF ( RequestOnOpac ) %]
> -            [% IF ( AllowOnShelfHolds ) %]
>                <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
> -            [% ELSE %]
> -                [% IF ( ItemsIssued ) %]
> -                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
> -                [% END %]
> -            [% END %]
> 
>             [% END %]
>    [% END %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
> index 284154e..200c0ed 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
> @@ -206,13 +206,7 @@ $(document).ready(function(){
> [% UNLESS ( norequests ) %]
>         [% IF ( opacuserlogin ) %]
>         [% IF ( RequestOnOpac ) %]
> -            [% IF ( AllowOnShelfHolds ) %]
>                 <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
> -            [% ELSE %]
> -                [% IF ( ItemsIssued ) %]
> -                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
> -                [% END %]
> -            [% END %]
> 
>             [% END %]
>     [% END %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
> index d1b6570..fb367ca 100755
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
> @@ -1016,16 +1016,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
> <ul id="action">
> 
> [% UNLESS ( norequests ) %]
> -        [% IF ( opacuserlogin ) %]
> +    [% IF ( opacuserlogin ) %]
>        [% IF ( RequestOnOpac ) %]
> -            [% IF ( AllowOnShelfHolds ) %]
> -                        <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
> -            [% ELSE %]
> -                [% IF ( ItemsIssued ) %]
> -                            <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
> -                [% END %]
> -            [% END %]
> -            [% END %]
> +            <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
> +           [% END %]
>    [% END %]
> [% END %]
>         <li><a class="print" href="#" onclick="window.print();">Print</a></li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
> index 9e1b855..e08f7f9 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
> @@ -260,13 +260,7 @@ function highlightOn() {
>                                 [% IF ( RequestOnOpac ) %]
>                    [% UNLESS ( GROUP_RESULT.norequests ) %]
>                        [% IF ( opacuserlogin ) %]
> -                            [% IF ( AllowOnShelfHolds ) %]
>                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> -                            [% ELSE %]
> -                                [% IF ( GROUP_RESULT.itemsissued ) %]
> -                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> -                                [% END %]
> -                            [% END %]
>                        [% END %]
>                    [% END %]
>                [% END %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
> index 798e0d8..2256b3e 100755
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
> @@ -510,13 +510,7 @@ $(document).ready(function(){
>                                 [% IF ( RequestOnOpac ) %]
>                    [% UNLESS ( SEARCH_RESULT.norequests ) %]
>                        [% IF ( opacuserlogin ) %]
> -                            [% IF ( AllowOnShelfHolds ) %]
> -                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> -                            [% ELSE %]
> -                                [% IF ( SEARCH_RESULT.itemsissued ) %]
> -                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> -                                [% END %]
> -                            [% END %]
> +                            <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
>                        [% END %]
>                    [% END %]
>                [% END %]
> 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 391037f..b9e2ed4 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
> @@ -308,13 +308,7 @@ $(function() {
>       [% IF ( RequestOnOpac ) %]
>           [% UNLESS ( itemsloo.norequests ) %]
>             [% IF ( opacuserlogin ) %]
> -              [% IF ( AllowOnShelfHolds ) %]
>                 <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> -              [% ELSE %]
> -                [% IF ( itemsloo.itemsissued ) %]
> -                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> -                [% END %]
> -              [% END %]
>             [% END %]
>           [% END %]
>         [% END %]
> diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
> index c80d41c..d978357 100755
> --- a/opac/opac-ISBDdetail.pl
> +++ b/opac/opac-ISBDdetail.pl
> @@ -69,7 +69,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
> 
> my $biblionumber = $query->param('biblionumber');
> 
> -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
> $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
> 
> my $marcflavour      = C4::Context->preference("marcflavour");
> @@ -152,7 +151,6 @@ foreach ( @$reviews ) {
> 
> $template->param(
>     RequestOnOpac       => C4::Context->preference("RequestOnOpac"),
> -    AllowOnShelfHolds   => C4::Context->preference('AllowOnShelfHolds'),
>     norequests   => $norequests,
>     ISBD         => $res,
>     biblionumber => $biblionumber,
> diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
> index ffa0a6d..476fe50 100755
> --- a/opac/opac-MARCdetail.pl
> +++ b/opac/opac-MARCdetail.pl
> @@ -81,7 +81,6 @@ $template->param(
>     bibliotitle => $biblio->{title},
> );
> 
> -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
> $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
> 
> # adding the $RequestOnOpac param
> diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
> index f82dde2..8111e9d 100755
> --- a/opac/opac-detail.pl
> +++ b/opac/opac-detail.pl
> @@ -347,8 +347,6 @@ if ($session->param('busc')) {
> }
> 
> 
> -
> -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
> $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
> 
> my $record       = GetMarcBiblio($biblionumber);
> diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
> index b2144a9..3e573fc 100755
> --- a/opac/opac-reserve.pl
> +++ b/opac/opac-reserve.pl
> @@ -471,7 +471,7 @@ foreach my $biblioNum (@biblionumbers) {
>             $policy_holdallowed = 0;
>         }
> 
> -        if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and ($itemLoopIter->{already_reserved} ne 1)) {
> +        if (IsAvailableForItemLevelRequest($itemNum,$borr->{'borrowernumber'},$itemInfo->{'homebranch'}) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and !$itemLoopIter->{already_reserved}) {
>             $itemLoopIter->{available} = 1;
>             $numCopiesAvailable++;
>         }
> diff --git a/opac/opac-search.pl b/opac/opac-search.pl
> index aba23a8..081bc81 100755
> --- a/opac/opac-search.pl
> +++ b/opac/opac-search.pl
> @@ -100,7 +100,7 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
> elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
>     $template->param('usmarc' => 1);
> }
> -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
> +
> $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
> 
> if (C4::Context->preference('BakerTaylorEnabled')) {
> -- 
> 1.6.5
> 
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

From oleonard at myacpl.org  Wed Dec 21 15:39:01 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 21 Dec 2011 09:39:01 -0500
Subject: [Koha-patches] [PATCH] bug_5786: moved AllowOnShelfHolds to
	circ matrix (issuingrules)
In-Reply-To: <BB7AE2C1-2108-4306-940F-7563DC3E4FB1@msys.ch>
References: <bug 5786>
	<1324438083-21189-1-git-send-email-srdjan@catalyst.net.nz>
	<BB7AE2C1-2108-4306-940F-7563DC3E4FB1@msys.ch>
Message-ID: <EDB86C83-9DA4-4595-8B48-8E61FF01BE9D@myacpl.org>

I don't think it's appropriate to request this change in practice in a reply on the patches list.  I'm sure your request would be considered by all, but it should be raised in the devel list or at the next IRC meeting. 

  -- Owen



On Dec 21, 2011, at 9:22 AM, Marc Balmer <marc at msys.ch> wrote:

> Please stop putting column names in backquotes, it is a MySQLism and hinders my efforts to run Koha on PostgreSQL,
> 
> 
> 
> Am 21.12.2011 um 04:28 schrieb Srdjan Jankovic <srdjan at catalyst.net.nz>:
> 
>> ---
>> C4/Circulation.pm                                  |    3 +-
>> C4/Items.pm                                        |    2 +
>> C4/Reserves.pm                                     |   72 ++++++++++++++++---
>> C4/VirtualShelves/Page.pm                          |    1 -
>> admin/smart-rules.pl                               |    9 ++-
>> admin/systempreferences.pl                         |    1 -
>> .../mysql/it-IT/necessari/system_preferences.sql |    1 -
>> installer/data/mysql/kohastructure.sql |    3 +-
>> installer/data/mysql/sysprefs.sql                  |    1 -
>> installer/data/mysql/updatedatabase.pl             |   19 +++++
>> installer/html-template-to-template-toolkit.pl     |    2 +-
>> .../en/modules/admin/preferences/circulation.pref  |    6 --
>> .../prog/en/modules/admin/preferences/opac.pref    |    6 --
>> .../prog/en/modules/admin/smart-rules.tt           |   25 +++++--
>> .../prog/en/modules/help/reserve/request.tt        |    2 +-
>> .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt   |    6 --
>> .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt   |    6 --
>> koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   12 +---
>> .../prog/en/modules/opac-results-grouped.tt        |    6 --
>> .../opac-tmpl/prog/en/modules/opac-results.tt      |    8 +--
>> .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    6 --
>> opac/opac-ISBDdetail.pl                            |    2 -
>> opac/opac-MARCdetail.pl                            |    1 -
>> opac/opac-detail.pl                                |    2 -
>> opac/opac-reserve.pl                               |    2 +-
>> opac/opac-search.pl                                |    2 +-
>> 26 files changed, 115 insertions(+), 91 deletions(-)
>> 
>> diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>> index 9a6f4f2..df202e1 100644
>> --- a/C4/Circulation.pm
>> +++ b/C4/Circulation.pm
>> @@ -2200,7 +2200,8 @@ sub CanBookBeRenewed {
>>                   LEFT JOIN biblioitems USING (biblioitemnumber)
>> 
>>                   WHERE
>> -                    (issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')
>> +                    (issuingrules.categorycode = borrowers.categorycode 
>> +            OR issuingrules.categorycode = '*')
>>                   AND
>>                    (issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
>>                   AND
>> diff --git a/C4/Items.pm b/C4/Items.pm
>> index 8802a4c..7c3a26f 100644
>> --- a/C4/Items.pm
>> +++ b/C4/Items.pm
>> @@ -160,6 +160,8 @@ sub GetItem {
>>        ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
>>    }
>>   #if we don't have an items.itype, use biblioitems.itemtype.
>> +    # FIXME this should respect the itypes systempreference
>> +    # if (C4::Context->preference('item-level_itypes')) {
>>   if( ! $data->{'itype'} ) {
>>       my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems  WHERE biblionumber = ?");
>>       $sth->execute($data->{'biblionumber'});
>> diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>> index 359bbad..5a2d819 100644
>> --- a/C4/Reserves.pm
>> +++ b/C4/Reserves.pm
>> @@ -479,7 +479,6 @@ sub CanItemBeReserved{
>>    if(my $rowcount = $sthcount->fetchrow_hashref()){
>>        $reservecount = $rowcount->{count};
>>    }
>> -    
>>    # we check if it's ok or not
>>    if( $reservecount < $allowedreserves ){
>>        return 1;
>> @@ -1321,7 +1320,7 @@ sub GetReserveInfo {
>> 
>> =head2 IsAvailableForItemLevelRequest
>> 
>> -  my $is_available = IsAvailableForItemLevelRequest($itemnumber);
>> +  my $is_available = IsAvailableForItemLevelRequest($itemnumber,$borrowernumber,$branchcode);
>> 
>> Checks whether a given item record is available for an
>> item-level hold request.  An item is available if
>> @@ -1331,12 +1330,8 @@ item-level hold request.  An item is available if
>> * it is not withdrawn AND 
>> * does not have a not for loan value > 0
>> 
>> -Whether or not the item is currently on loan is 
>> -also checked - if the AllowOnShelfHolds system preference
>> -is ON, an item can be requested even if it is currently
>> -on loan to somebody else.  If the system preference
>> -is OFF, an item that is currently checked out cannot
>> -be the target of an item-level hold request.
>> +Need to check the issuingrules onshelfholds column, 
>> +if this is set items on the shelf can be placed on hold
>> 
>> Note that IsAvailableForItemLevelRequest() does not
>> check if the staff operator is authorized to place
>> @@ -1348,9 +1343,9 @@ and canreservefromotherbranches.
>> 
>> sub IsAvailableForItemLevelRequest {
>>    my $itemnumber = shift;
>> -   
>> +    my $borrowernumber = shift;
>> +    my $branchcode = shift;
>>    my $item = GetItem($itemnumber);
>> -
>>    # must check the notforloan setting of the itemtype
>>    # FIXME - a lot of places in the code do this
>>    #         or something similar - need to be
>> @@ -1383,14 +1378,67 @@ sub IsAvailableForItemLevelRequest {
>>                               $item->{wthdrawn} or
>>                               $notforloan_per_itemtype;
>> 
>> -
>> -    if (C4::Context->preference('AllowOnShelfHolds')) {
>> +    # check issuingrules
>> +    
>> +    if (OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode)) {
>>        return $available_per_item;
>>    } else {
>>        return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W")); 
>>    }
>> }
>> 
>> +=head2 OnShelfHoldsAllowed
>> +
>> +  OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode);
>> +
>> +Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see if onshelf
>> +holds are allowed, returns true if so. 
>> +
>> +=cut
>> +
>> +sub OnShelfHoldsAllowed {
>> +    my ($itemnumber,$borrowernumber,$branchcode) = @_;
>> +    my $item = GetItem($itemnumber);
>> +    my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
>> +    my $itype;
>> +    my $dbh = C4::Context->dbh;
>> +    if (C4::Context->preference('item-level_itypes')) {
>> +    # We cant trust GetItem to honour the syspref, so safest to do it ourselves
>> +    # When GetItem is fixed, we can remove this
>> +    $itype = $item->{itype};
>> +    } 
>> +    else {
>> +    my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
>> +    my $sth = $dbh->prepare($query);    
>> +    $sth->execute($item->{biblioitemnumber});
>> +    if (my $data = $sth->fetchrow_hashref()){
>> +        $itype = $data->{itemtype};
>> +    }
>> +    }
>> +
>> +    my $query = "SELECT onshelfholds,categorycode,itemtype,branchcode FROM issuingrules WHERE
>> +          (issuingrules.categorycode = ? OR issuingrules.categorycode = '*')
>> +        AND
>> +          (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
>> +        AND
>> +          (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')
>> +        ORDER BY
>> +          issuingrules.categorycode desc,
>> +          issuingrules.itemtype desc,
>> +          issuingrules.branchcode desc
>> +       LIMIT 1";
>> +    my $dbh = C4::Context->dbh;
>> +    my $sth = $dbh->prepare($query);
>> +    $sth->execute($borrower->{categorycode},$itype,$branchcode);
>> +    my $data = $sth->fetchrow_hashref;
>> +    if ($data->{onshelfholds}){
>> +    return 1;
>> +    }
>> +    else {
>> +    return 0;
>> +    }
>> +}
>> +
>> =head2 AlterPriority
>> 
>>  AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate );
>> diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
>> index 523527e..ff55dc0 100644
>> --- a/C4/VirtualShelves/Page.pm
>> +++ b/C4/VirtualShelves/Page.pm
>> @@ -183,7 +183,6 @@ sub shelfpage ($$$$$) {
>>            # explicitly fetch this shelf
>>            my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
>> 
>> -            $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
>>            if (C4::Context->preference('TagsEnabled')) {
>>                $template->param(TagsEnabled => 1);
>>                    foreach (qw(TagsShowOnList TagsInputOnList)) {
>> diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
>> index f290934..5bfdc7d 100755
>> --- a/admin/smart-rules.pl
>> +++ b/admin/smart-rules.pl
>> @@ -101,8 +101,8 @@ elsif ($op eq 'delete-branch-item') {
>> # save the values entered
>> elsif ($op eq 'add') {
>>    my $sth_search = $dbh->prepare("SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?");
>> -    my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
>> -    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
>> +    my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod, rentaldiscount, onshelfholds) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
>> +    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, onshelfholds=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
>> 
>>    my $br = $branch; # branch
>>    my $bor  = $input->param('categorycode'); # borrower category
>> @@ -114,6 +114,7 @@ elsif ($op eq 'add') {
>>    my $maxissueqty  = $input->param('maxissueqty');
>>    my $renewalsallowed  = $input->param('renewalsallowed');
>>    my $reservesallowed  = $input->param('reservesallowed');
>> +    my $onshelfholds     = $input->param('onshelfholds');
>>    $maxissueqty =~ s/\s//g;
>>    $maxissueqty = undef if $maxissueqty !~ /^\d+/;
>>    my $issuelength  = $input->param('issuelength');
>> @@ -126,9 +127,9 @@ elsif ($op eq 'add') {
>>    $sth_search->execute($br,$bor,$cat);
>>    my $res = $sth_search->fetchrow_hashref();
>>    if ($res->{total}) {
>> -        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $br,$bor,$cat);
>> +        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $onshelfholds, $br,$bor,$cat);
>>    } else {
>> -        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount);
>> +        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$onshelfholds);
>>    }
>> } 
>> elsif ($op eq "set-branch-defaults") {
>> diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
>> index 78d0768..6bd68ee 100755
>> --- a/admin/systempreferences.pl
>> +++ b/admin/systempreferences.pl
>> @@ -186,7 +186,6 @@ $tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
>> $tabsysprefs{HomeOrHoldingBranchReturn}      = "Circulation";
>> $tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
>> $tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
>> -$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
>> $tabsysprefs{AllowHoldsOnDamagedItems}       = "Circulation";
>> $tabsysprefs{UseBranchTransferLimits}        = "Circulation";
>> $tabsysprefs{AllowHoldPolicyOverride}        = "Circulation";
>> diff --git a/installer/data/mysql/it-IT/necessari/system_preferences.sql b/installer/data/mysql/it-IT/necessari/system_preferences.sql
>> index b4ddfa0..7aaa066 100644
>> --- a/installer/data/mysql/it-IT/necessari/system_preferences.sql
>> +++ b/installer/data/mysql/it-IT/necessari/system_preferences.sql
>> @@ -17,7 +17,6 @@
>> -- 51 Franklin Street' WHERE variable = ' Fifth Floor' WHERE variable = ' Boston' WHERE variable = ' MA 02110-1301 USA.
>> 
>> UPDATE systempreferences SET value = 'cataloguing' WHERE variable = 'AcqCreateItem';
>> -UPDATE systempreferences SET value = '1' WHERE variable = 'AllowOnShelfHolds';
>> UPDATE systempreferences SET value = '1' WHERE variable = 'AllowRenewalLimitOverride';
>> UPDATE systempreferences SET value = 'annual' WHERE variable = 'autoBarcode';
>> UPDATE systempreferences SET value = 'email' WHERE variable = 'AutoEmailPrimaryAddress';
>> diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>> index a03bd23..b6adbd6 100644
>> --- a/installer/data/mysql/kohastructure.sql
>> +++ b/installer/data/mysql/kohastructure.sql
>> @@ -970,6 +970,7 @@ CREATE TABLE `issues` ( -- information related to check outs or issues
>> 
>> DROP TABLE IF EXISTS `issuingrules`;
>> CREATE TABLE `issuingrules` (
>> +  `branchcode` varchar(10) NOT NULL default '',
>>  `categorycode` varchar(10) NOT NULL default '',
>>  `itemtype` varchar(10) NOT NULL default '',
>>  `restrictedtype` tinyint(1) default NULL,
>> @@ -987,7 +988,7 @@ CREATE TABLE `issuingrules` (
>>  `hardduedatecompare` tinyint NOT NULL default "0",
>>  `renewalsallowed` smallint(6) NOT NULL default "0",
>>  `reservesallowed` smallint(6) NOT NULL default "0",
>> -  `branchcode` varchar(10) NOT NULL default '',
>> +  `onshelfholds` tinyint(1) NOT NULL default 0,
>>  PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
>>  KEY `categorycode` (`categorycode`),
>>  KEY `itemtype` (`itemtype`)
>> diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>> index 128c9b2..a1a913a 100755
>> --- a/installer/data/mysql/sysprefs.sql
>> +++ b/installer/data/mysql/sysprefs.sql
>> @@ -223,7 +223,6 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
>> ('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');
>> 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');
>> INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
>> -- FIXME: add FrameworksLoaded, noOPACUserLogin?
>> diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>> index 0063a75..e039407 100755
>> --- a/installer/data/mysql/updatedatabase.pl
>> +++ b/installer/data/mysql/updatedatabase.pl
>> @@ -4578,6 +4578,25 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>>    SetVersion($DBversion);
>> }
>> 
>> +$DBversion = '3.06.02.XXX';
>> +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>> +    print "Upgrade to $DBversion done (Bug 5786 move AllowOnShelfHolds to circulation matrix)\n";
>> +    # First create the column
>> +    $dbh->do("ALTER TABLE issuingrules ADD onshelfholds tinyint(1) default 0");
>> +    # Now update the column    
>> +    if (C4::Context->preference("AllowOnShelfHolds")){
>> +          # Pref is on, set allow for all rules
>> +          $dbh->do("UPDATE issuingrules SET onshelfholds=1");
>> +    } else {
>> +        # If the preference is not set, leave off
>> +          $dbh->do("UPDATE issuingrules SET onshelfholds=0");
>> +    }
>> +    $dbh->do("ALTER TABLE issuingrules MODIFY onshelfholds tinyint(1) default 0 NOT NULL");
>> +    # Remove from the systempreferences table
>> +    $dbh->do("DELETE FROM systempreferences WHERE variable = 'AllowOnShelfHolds'");    
>> +    SetVersion ($DBversion);
>> +}
>> +
>> =head1 FUNCTIONS
>> 
>> =head2 DropAllForeignKeys($table)
>> diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl
>> index e99b195..5f0e0ac 100755
>> --- a/installer/html-template-to-template-toolkit.pl
>> +++ b/installer/html-template-to-template-toolkit.pl
>> @@ -32,7 +32,7 @@ my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets
>> "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
>> "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
>> "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
>> -"TagsShowOnList", "TagsInputOnList","loggedinusername","AllowOnShelfHolds","opacbookbag",
>> +"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
>> "OPACAmazonEnabled", "SyndeticsCoverImages","using_https");
>> 
>> # Arguments:
>> 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 f4946b5..4cb60ae 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
>> @@ -236,12 +236,6 @@ Circulation:
>>                  no: "Don't allow"
>>            - hold requests to be placed on damaged items.
>>        -
>> -            - pref: AllowOnShelfHolds
>> -              choices:
>> -                  yes: Allow
>> -                  no: "Don't allow"
>> -            - hold requests to be placed on items that are not checked out.
>> -        -
>>            - pref: AllowHoldDateInFuture
>>              choices:
>>                  yes: Allow
>> 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..0b076ca 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
>> @@ -319,12 +319,6 @@ OPAC:
>> #              choices:
>> #            - If ON, enables subject cloud on OPAC
>>        -
>> -            - pref: OPACItemHolds
>> -              choices:
>> -                  yes: Allow
>> -                  no: "Don't allow"
>> -            - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item.
>> -        -
>>            - pref: OpacRenewalAllowed
>>              choices:
>>                  yes: Allow
>> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>> index d2f314f..e38e446 100644
>> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>> @@ -80,7 +80,8 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>>                <th>Suspension in Days (day)</th>
>>                <th>Renewals Allowed (count)</th>
>>                <th>Holds Allowed (count)</th>
>> -                <th>Rental Discount (%)</th>
>> +        <th>On Shelf Holds Allowed</th>
>> +        <th>Rental Discount (%)</th>
>>               <th>&nbsp;</th>
>>            </tr>
>>               [% FOREACH rule IN rules %]
>> @@ -108,19 +109,26 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>>                               [% END %]
>>                           </td>
>>                           <td>[% rule.issuelength %]</td>
>> -                                                        <td>[% IF ( rule.hardduedate ) %]
>> -                                                               [% IF ( rule.hardduedatebefore ) %]before [% rule.hardduedate %]</td>
>> -                                                               [% ELSE %][% IF ( rule.hardduedateexact ) %]on [% rule.hardduedate %]</td>
>> -                                                                                 [% ELSE %][% IF ( rule.hardduedateafter ) %]after [% rule.hardduedate %]</td>[% END %]
>> -                                                                                 [% END %]
>> -                                                               [% END %]
>> -                                                            [% ELSE %]None defined[% END %]   
>> +                            <td>[% IF ( rule.hardduedate ) %]
>> +                                    [% IF ( rule.hardduedatebefore ) %]
>> +                                        before
>> +                                    [% ELSIF ( rule.hardduedateexact ) %]
>> +                                        on
>> +                                    [% ELSIF ( rule.hardduedateafter ) %]
>> +                                        after
>> +                                    [% END %]
>> +                                    [% rule.hardduedate %]
>> +                                [% ELSE %]
>> +                                    None defined
>> +                                [% END %]   
>> +                            </td>
>>                           <td>[% rule.fine %]</td>
>>                           <td>[% rule.chargeperiod %]</td>
>>                           <td>[% rule.firstremind %]</td>
>>                           <td>[% rule.finedays %]</td>
>>                           <td>[% rule.renewalsallowed %]</td>
>>                           <td>[% rule.reservesallowed %]</td>
>> +                            <td>[% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %]</td>
>>                           <td>[% rule.rentaldiscount %]</td>
>>                           <td>
>>                               <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]">Delete</a>
>> @@ -175,6 +183,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>>                    <td><input name="finedays" size="3" /> </td>
>>                    <td><input name="renewalsallowed" size="2" /></td>
>>                    <td><input name="reservesallowed" size="2" /></td>
>> +            <td><input type="radio" name="onshelfholds" value="1">Yes <input type="radio" name="onshelfholds" value="0">No</td>
>>           <td><input name="rentaldiscount" size="2" /></td>
>>                    <td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>
>>                </tr>
>> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
>> index 3d7381b..a5a5cd0 100644
>> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
>> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
>> @@ -72,4 +72,4 @@
>> 
>> <p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.6/en/holds.html">manual</a> (online).</strong></p>
>> 
>> -[% INCLUDE 'help-bottom.inc' %]
>> \ No newline at end of file
>> +[% INCLUDE 'help-bottom.inc' %]
>> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
>> index f9984a7..d04e7b1 100644
>> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
>> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
>> @@ -51,13 +51,7 @@
>> [% UNLESS ( norequests ) %]
>>        [% IF ( opacuserlogin ) %]
>>       [% IF ( RequestOnOpac ) %]
>> -            [% IF ( AllowOnShelfHolds ) %]
>>               <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
>> -            [% ELSE %]
>> -                [% IF ( ItemsIssued ) %]
>> -                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
>> -                [% END %]
>> -            [% END %]
>> 
>>            [% END %]
>>   [% END %]
>> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
>> index 284154e..200c0ed 100644
>> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
>> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
>> @@ -206,13 +206,7 @@ $(document).ready(function(){
>> [% UNLESS ( norequests ) %]
>>        [% IF ( opacuserlogin ) %]
>>        [% IF ( RequestOnOpac ) %]
>> -            [% IF ( AllowOnShelfHolds ) %]
>>                <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
>> -            [% ELSE %]
>> -                [% IF ( ItemsIssued ) %]
>> -                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
>> -                [% END %]
>> -            [% END %]
>> 
>>            [% END %]
>>    [% END %]
>> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
>> index d1b6570..fb367ca 100755
>> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
>> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
>> @@ -1016,16 +1016,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>> <ul id="action">
>> 
>> [% UNLESS ( norequests ) %]
>> -        [% IF ( opacuserlogin ) %]
>> +    [% IF ( opacuserlogin ) %]
>>       [% IF ( RequestOnOpac ) %]
>> -            [% IF ( AllowOnShelfHolds ) %]
>> -                        <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
>> -            [% ELSE %]
>> -                [% IF ( ItemsIssued ) %]
>> -                            <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
>> -                [% END %]
>> -            [% END %]
>> -            [% END %]
>> +            <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
>> +           [% END %]
>>   [% END %]
>> [% END %]
>>        <li><a class="print" href="#" onclick="window.print();">Print</a></li>
>> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
>> index 9e1b855..e08f7f9 100644
>> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
>> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
>> @@ -260,13 +260,7 @@ function highlightOn() {
>>                                [% IF ( RequestOnOpac ) %]
>>                   [% UNLESS ( GROUP_RESULT.norequests ) %]
>>                       [% IF ( opacuserlogin ) %]
>> -                            [% IF ( AllowOnShelfHolds ) %]
>>                               <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
>> -                            [% ELSE %]
>> -                                [% IF ( GROUP_RESULT.itemsissued ) %]
>> -                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
>> -                                [% END %]
>> -                            [% END %]
>>                       [% END %]
>>                   [% END %]
>>               [% END %]
>> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>> index 798e0d8..2256b3e 100755
>> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>> @@ -510,13 +510,7 @@ $(document).ready(function(){
>>                                [% IF ( RequestOnOpac ) %]
>>                   [% UNLESS ( SEARCH_RESULT.norequests ) %]
>>                       [% IF ( opacuserlogin ) %]
>> -                            [% IF ( AllowOnShelfHolds ) %]
>> -                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
>> -                            [% ELSE %]
>> -                                [% IF ( SEARCH_RESULT.itemsissued ) %]
>> -                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
>> -                                [% END %]
>> -                            [% END %]
>> +                            <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
>>                       [% END %]
>>                   [% END %]
>>               [% END %]
>> 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 391037f..b9e2ed4 100644
>> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
>> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
>> @@ -308,13 +308,7 @@ $(function() {
>>      [% IF ( RequestOnOpac ) %]
>>          [% UNLESS ( itemsloo.norequests ) %]
>>            [% IF ( opacuserlogin ) %]
>> -              [% IF ( AllowOnShelfHolds ) %]
>>                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
>> -              [% ELSE %]
>> -                [% IF ( itemsloo.itemsissued ) %]
>> -                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
>> -                [% END %]
>> -              [% END %]
>>            [% END %]
>>          [% END %]
>>        [% END %]
>> diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
>> index c80d41c..d978357 100755
>> --- a/opac/opac-ISBDdetail.pl
>> +++ b/opac/opac-ISBDdetail.pl
>> @@ -69,7 +69,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>> 
>> my $biblionumber = $query->param('biblionumber');
>> 
>> -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
>> $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
>> 
>> my $marcflavour      = C4::Context->preference("marcflavour");
>> @@ -152,7 +151,6 @@ foreach ( @$reviews ) {
>> 
>> $template->param(
>>    RequestOnOpac       => C4::Context->preference("RequestOnOpac"),
>> -    AllowOnShelfHolds   => C4::Context->preference('AllowOnShelfHolds'),
>>    norequests   => $norequests,
>>    ISBD         => $res,
>>    biblionumber => $biblionumber,
>> diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
>> index ffa0a6d..476fe50 100755
>> --- a/opac/opac-MARCdetail.pl
>> +++ b/opac/opac-MARCdetail.pl
>> @@ -81,7 +81,6 @@ $template->param(
>>    bibliotitle => $biblio->{title},
>> );
>> 
>> -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
>> $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
>> 
>> # adding the $RequestOnOpac param
>> diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
>> index f82dde2..8111e9d 100755
>> --- a/opac/opac-detail.pl
>> +++ b/opac/opac-detail.pl
>> @@ -347,8 +347,6 @@ if ($session->param('busc')) {
>> }
>> 
>> 
>> -
>> -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
>> $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
>> 
>> my $record       = GetMarcBiblio($biblionumber);
>> diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
>> index b2144a9..3e573fc 100755
>> --- a/opac/opac-reserve.pl
>> +++ b/opac/opac-reserve.pl
>> @@ -471,7 +471,7 @@ foreach my $biblioNum (@biblionumbers) {
>>            $policy_holdallowed = 0;
>>        }
>> 
>> -        if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and ($itemLoopIter->{already_reserved} ne 1)) {
>> +        if (IsAvailableForItemLevelRequest($itemNum,$borr->{'borrowernumber'},$itemInfo->{'homebranch'}) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and !$itemLoopIter->{already_reserved}) {
>>            $itemLoopIter->{available} = 1;
>>            $numCopiesAvailable++;
>>        }
>> diff --git a/opac/opac-search.pl b/opac/opac-search.pl
>> index aba23a8..081bc81 100755
>> --- a/opac/opac-search.pl
>> +++ b/opac/opac-search.pl
>> @@ -100,7 +100,7 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
>> elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
>>    $template->param('usmarc' => 1);
>> }
>> -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
>> +
>> $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
>> 
>> if (C4::Context->preference('BakerTaylorEnabled')) {
>> -- 
>> 1.6.5
>> 
>> _______________________________________________
>> Koha-patches mailing list
>> Koha-patches at lists.koha-community.org
>> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>> website : http://www.koha-community.org/
>> git : http://git.koha-community.org/
>> bugs : http://bugs.koha-community.org/
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

From marc at msys.ch  Wed Dec 21 15:42:49 2011
From: marc at msys.ch (Marc Balmer)
Date: Wed, 21 Dec 2011 15:42:49 +0100
Subject: [Koha-patches] [PATCH] bug_5786: moved AllowOnShelfHolds to
 circ matrix (issuingrules)
In-Reply-To: <EDB86C83-9DA4-4595-8B48-8E61FF01BE9D@myacpl.org>
References: <bug 5786>
	<1324438083-21189-1-git-send-email-srdjan@catalyst.net.nz>
	<BB7AE2C1-2108-4306-940F-7563DC3E4FB1@msys.ch>
	<EDB86C83-9DA4-4595-8B48-8E61FF01BE9D@myacpl.org>
Message-ID: <4EF1F069.40106@msys.ch>

Am 21.12.11 15:39, schrieb Owen Leonard:
> I don't think it's appropriate to request this change in practice in a reply on the patches list.  I'm sure your request would be considered by all, but it should be raised in the devel list or at the next IRC meeting. 
> 
>   -- Owen

Well, a copy always went to the patch author, so I assume it gets due
attention.

[...]

From dpavlin at rot13.org  Wed Dec 21 16:33:18 2011
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Wed, 21 Dec 2011 16:33:18 +0100
Subject: [Koha-patches] [PATCH] Bug 7247 - rebuild_zebra.pl -v should
 show	all Zebra log output
In-Reply-To: <4EF0AFA9.1060802@biblibre.com>
References: <1324382757-5112-1-git-send-email-dpavlin@rot13.org>
	<4EF08850.4050906@biblibre.com> <20111220145217.GC12086@rot13.org>
	<4EF0AFA9.1060802@biblibre.com>
Message-ID: <20111221153318.GC22066@rot13.org>

On Tue, Dec 20, 2011 at 04:54:17PM +0100, LAURENT Henri-Damien wrote:
> Le 20/12/2011 15:52, Dobrica Pavlinusic a ?crit :
> > On Tue, Dec 20, 2011 at 02:06:24PM +0100, LAURENT Henri-Damien wrote:
> >>> -if ($verbose_logging) {
> >>> -    $zebraidx_log_opt = '';
> >>> +if ($verbose_logging >= 2) {
> >>> +    $zebraidx_log_opt = '-v none,fatal,warn,all';
> >>>  }
> >> mmm... in my opinion, all would be WAY too verbose.
> >> request,log are enough to debug the search query.
> >> my two cents.
> > 
> > all is very verbose, but does provide additional information about Zebra
> > progress (I must admit I'm leaning towards too much information as
> > opposed to too little).
> > 
> > Should I move all to verbose level 3 (-v -v -v) or just remove it all
> > together?
> > 
> I would leave that to -vvv
> When I looked at logs when all is set, I found it quite useless, but if
> you need that. I would say let's keep it for -vvv

I re-examined $zebraidx_log_opt handling with my changes, and default option
(without -v parameter or with single -v) is now "none,fatal,warn".

Only thing which is affected by -v -v is adding "all" to Zebra logs so I
think that moving it to -v -v -v isn't needed: it has same effect as -v -v
does now (and would leave -v -v doing nothing).

However, it does fixes behaviour with -v which used to reset Zebra log
options to '' and thus system defaults as opposed to leaving zebra log
flags at "none,fatal,warn".

Existing code does produce different logs without -v ("none,fatal,wran") and
with single -v (whatever is system default, which is usually just fatal),
but I think new behaviour is improvement in this regard.

Does this address your concernes with this patch?

-- 
Dobrica Pavlinusic               2share!2flame            dpavlin at rot13.org
Unix addict. Internet consultant.             http://www.rot13.org/~dpavlin

From srdjan at catalyst.net.nz  Thu Dec 22 01:39:00 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu, 22 Dec 2011 13:39:00 +1300
Subject: [Koha-patches] [PATCH] bug_4530: Rework issuing rules
In-Reply-To: <bug 4530>
References: <bug 4530>
Message-ID: <1324514340-28574-1-git-send-email-srdjan@catalyst.net.nz>

Use only one set of functions
Database efficient rules fetch - only one query
---
 C4/Circulation.pm                          |  318 +++++++++-------------------
 C4/Members.pm                              |    1 -
 C4/Overdues.pm                             |   42 +----
 C4/Reserves.pm                             |   15 +--
 t/db_dependent/lib/KohaTest/Circulation.pm |    4 +-
 t/db_dependent/lib/KohaTest/Overdues.pm    |    1 -
 6 files changed, 109 insertions(+), 272 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9a6f4f2..4e98ad1 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -74,7 +74,6 @@ BEGIN {
 		&GetItemIssue
 		&GetItemIssues
 		&GetIssuingCharges
-		&GetIssuingRule
         &GetBranchBorrowerCircRule
         &GetBranchItemRule
 		&GetBiblioIssues
@@ -356,12 +355,12 @@ sub TooMany {
  
     # given branch, patron category, and item type, determine
     # applicable issuing rule
-    my $issuing_rule = GetIssuingRule($cat_borrower, $type, $branch);
+    my $issuing_rule = GetIssuingRuleRecord($cat_borrower, $type, $branch, 'maxissueqty');
 
     # if a rule is found and has a loan limit set, count
     # how many loans the patron already has that meet that
     # rule
-    if (defined($issuing_rule) and defined($issuing_rule->{'maxissueqty'})) {
+    if ( $issuing_rule ) {
         my @bind_params;
         my $count_query = "SELECT COUNT(*) FROM issues
                            JOIN items USING (itemnumber) ";
@@ -1087,56 +1086,8 @@ Get loan length for an itemtype, a borrower type and a branch
 
 sub GetLoanLength {
     my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-"select issuelength from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"
-      );
-# warn "in get loan lenght $borrowertype $itemtype $branchcode ";
-# try to find issuelength & return the 1st available.
-# check with borrowertype, itemtype and branchcode, then without one of those parameters
-    $sth->execute( $borrowertype, $itemtype, $branchcode );
-    my $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", "*", $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", "*", "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
     # if no rule is set => 21 days (hardcoded)
-    return 21;
+    return GetIssuingRuleValue( $borrowertype, $itemtype, $branchcode, 'issuelength' ) || 21;
 }
 
 
@@ -1150,108 +1101,100 @@ Get the Hard Due Date and it's comparison for an itemtype, a borrower type and a
 
 sub GetHardDueDate {
     my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-"select hardduedate, hardduedatecompare from issuingrules where categorycode=? and itemtype=? and branchcode=?"
-      );
-    $sth->execute( $borrowertype, $itemtype, $branchcode );
-    my $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, $branchcode );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( "*", "*", $branchcode );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", "*" );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, "*" );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    $sth->execute( "*", "*", "*" );
-    $results = $sth->fetchrow_hashref;
-    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
-      if defined($results) && $results->{hardduedate} ne 'NULL';
-
-    # if no rule is set => return undefined
-    return (undef, undef);
+    my $issuing_rule = GetIssuingRuleRecord($borrowertype, $itemtype, $branchcode, 'hardduedate')
+      or return;
+    return (C4::Dates->new($issuing_rule->{hardduedate}, 'iso'),$issuing_rule->{hardduedatecompare});
 }
+   
+
+=head2 GetIssuingRuleValue
+
+  my $irule = &GetIssuingRuleValue($borrowertype,$itemtype,$branchcode, $rule_name)
+
+Get the most specific non-null value issuing rule for an itemtype, a borrower type and a branch
 
-=head2 GetIssuingRule
+=cut
+
+sub GetIssuingRuleValue {
+    my ( $borrowertype, $itemtype, $branchcode, $rule ) = @_;
+    my $irule = GetIssuingRuleRecord( $borrowertype, $itemtype, $branchcode, $rule )
+      or return;
+    return $irule->{$rule};
+}
 
-  my $irule = &GetIssuingRule($borrowertype,$itemtype,branchcode)
+=head2 GetIssuingRuleRecord
 
-FIXME - This is a copy-paste of GetLoanLength
-as a stop-gap.  Do not wish to change API for GetLoanLength 
-this close to release, however, Overdues::GetIssuingRules is broken.
+  my $irule = &GetIssuingRuleRecord($borrowertype,$itemtype,$branchcode, $rule_name)
 
-Get the issuing rule for an itemtype, a borrower type and a branch
-Returns a hashref from the issuingrules table.
+Get the most specific non-null value issuing rule for an itemtype, a borrower type and a branch
+If $rule_name is specified, only records with $rule_name not null are taken in account
+
+Order of preference is $branchcode, $borrowertype, $itemtype
 
 =cut
 
-sub GetIssuingRule {
-    my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =  $dbh->prepare( "select * from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"  );
-    my $irule;
+sub GetIssuingRuleRecord {
+    my ( $borrowertype, $itemtype, $branchcode, $rule ) = @_;
 
-	$sth->execute( $borrowertype, $itemtype, $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    my $irules = GetIssuingRules($borrowertype,$itemtype,$branchcode)
+      or return;
 
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    return unless @$irules;
 
-    $sth->execute( "*", $itemtype, $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    return $irules->[0] unless $rule;
 
-    $sth->execute( "*", "*", $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    die qq{Invalid rule (field) "$rule"} unless exists $irules->[0]->{$rule};
 
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    foreach (@$irules) {
+        return $_ if $_->{$rule}; # XXX defined $_->{$rule}
+    }
+
+    return;
+}
 
-    $sth->execute( $borrowertype, "*", "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+=head2 GetIssuingRules
 
-    $sth->execute( "*", $itemtype, "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+  my $irules = &GetIssuingRules($borrowertype,$itemtype,$branchcode)
+
+Get issuing all rule records for an itemtype, a borrower type and a branch
+in order of preference
+
+Order of preference is $branchcode, $borrowertype, $itemtype
+
+=cut
+
+sub GetIssuingRules {
+    my ( $borrowertype, $itemtype, $branchcode ) = @_;
 
-    $sth->execute( "*", "*", "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    my (@where, @params);
 
-    # if no rule matches,
-    return undef;
+    if ( $borrowertype ) {
+        push @where, "categorycode=? OR categorycode='*'";
+        push @params, $borrowertype;
+    } else {
+        push @where, "categorycode='*'";
+    }
+
+    if ( $itemtype ) {
+        push @where, "itemtype=? OR itemtype='*'";
+        push @params, $itemtype;
+    } else {
+        push @where, "itemtype='*'";
+    }
+
+    if ( $branchcode ) {
+        push @where, "branchcode=? OR branchcode='*'";
+        push @params, $branchcode;
+    } else {
+        push @where, "branchcode='*'";
+    }
+
+    my $qry = "select * from issuingrules where "
+            .join( ' AND ', map "($_)", @where )
+            ." order by branchcode desc, categorycode desc, itemtype desc";
+
+    my $dbh = C4::Context->dbh;
+    return  $dbh->selectall_arrayref($qry, { Slice => {} }, @params);
 }
 
 =head2 GetBranchBorrowerCircRule
@@ -1751,18 +1694,16 @@ sub _FixFineDaysOnReturn {
     }
 
     my $branchcode = _GetCircControlBranch( $item, $borrower );
+
+    my $finedays = GetIssuingRuleValue( $borrower->{categorycode}, $item->{itype}, $branchcode, 'finedays' )
+      or return;
+    my $grace = GetIssuingRuleValue( $borrower->{categorycode}, $item->{itype}, $branchcode, 'firstremind' );
+
     my $calendar = C4::Calendar->new( branchcode => $branchcode );
     my $today = C4::Dates->new();
-
-    my $deltadays = $calendar->daysBetween( $datedue, C4::Dates->new() );
+    my $deltadays = $calendar->daysBetween( $datedue, $today );
 
     my $circcontrol = C4::Context::preference('CircControl');
-    my $issuingrule = GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branchcode );
-    my $finedays    = $issuingrule->{finedays};
-
-    # exit if no finedays defined
-    return unless $finedays;
-    my $grace = $issuingrule->{firstremind};
 
     if ( $deltadays - $grace > 0 ) {
         my @newdate = Add_Delta_Days( Today(), $deltadays * $finedays );
@@ -2192,27 +2133,16 @@ sub CanBookBeRenewed {
     
     my $sthcount = $dbh->prepare("
                    SELECT 
-                    borrowers.categorycode, biblioitems.itemtype, issues.renewals, renewalsallowed, $controlbranch
-                   FROM  issuingrules, 
-                   issues 
+                    borrowers.categorycode, biblioitems.itemtype, issues.renewals, $controlbranch
+                   FROM issues 
                    LEFT JOIN items USING (itemnumber) 
                    LEFT JOIN borrowers USING (borrowernumber) 
                    LEFT JOIN biblioitems USING (biblioitemnumber)
                    
                    WHERE
-                    (issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')
-                   AND
-                    (issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
-                   AND
-                    (issuingrules.branchcode = $controlbranch OR issuingrules.branchcode = '*') 
-                   AND 
                     borrowernumber = ? 
                    AND
                     itemnumber = ?
-                   ORDER BY
-                    issuingrules.categorycode desc,
-                    issuingrules.itemtype desc,
-                    issuingrules.branchcode desc
                    LIMIT 1;
                   ");
 
@@ -2231,8 +2161,17 @@ sub CanBookBeRenewed {
             $renewokay = 0;
 			$error="on_reserve"
         }
+        elsif ( $override_limit ) {
+            $renewokay = 1;
+        }
+        elsif ( my $renewalsallowed = GetIssuingRuleValue($data1->{categorycode}, $itype, $data1->{$controlbranch}, 'renewalsallowed') ) {
+            if ( $renewalsallowed > $data1->{renewals} || $override_limit ) {
+                $renewokay = 1;
+            }
+        }
+	    $error="too_many" unless $renewokay;
+	}
 
-    }
     return ($renewokay,$error);
 }
 
@@ -2339,8 +2278,6 @@ sub GetRenewCount {
     my ( $bornum, $itemno ) = @_;
     my $dbh           = C4::Context->dbh;
     my $renewcount    = 0;
-    my $renewsallowed = 0;
-    my $renewsleft    = 0;
 
     my $borrower = C4::Members::GetMember( borrowernumber => $bornum);
     my $item     = GetItem($itemno); 
@@ -2361,10 +2298,8 @@ sub GetRenewCount {
     # $item and $borrower should be calculated
     my $branchcode = _GetCircControlBranch($item, $borrower);
     
-    my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{itype}, $branchcode);
-    
-    $renewsallowed = $issuingrule->{'renewalsallowed'};
-    $renewsleft    = $renewsallowed - $renewcount;
+    my $renewsallowed = GetIssuingRuleValue($borrower->{categorycode}, $item->{itype}, $branchcode, 'renewalsallowed') || 0;
+    my $renewsleft    = $renewsallowed - $renewcount;
     if($renewsleft < 0){ $renewsleft = 0; }
     return ( $renewcount, $renewsallowed, $renewsleft );
 }
@@ -2409,19 +2344,11 @@ sub GetIssuingCharges {
         $item_type = $item_data->{itemtype};
         $charge    = $item_data->{rentalcharge};
         my $branch = C4::Branch::mybranch();
-        my $discount_query = q|SELECT rentaldiscount,
-            issuingrules.itemtype, issuingrules.branchcode
+        my $borr_query = q|SELECT borrowers.categorycode
             FROM borrowers
-            LEFT JOIN issuingrules ON borrowers.categorycode = issuingrules.categorycode
-            WHERE borrowers.borrowernumber = ?
-            AND (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
-            AND (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')|;
-        my $discount_sth = $dbh->prepare($discount_query);
-        $discount_sth->execute( $borrowernumber, $item_type, $branch );
-        my $discount_rules = $discount_sth->fetchall_arrayref({});
-        if (@{$discount_rules}) {
-            # We may have multiple rules so get the most specific
-            my $discount = _get_discount_from_rule($discount_rules, $branch, $item_type);
+            WHERE borrowers.borrowernumber = ?|;
+        my $borr_cat = $dbh->selectrow_array($borr_query, undef, $borrowernumber);
+        if ( my $discount = GetIssuingRuleValue($borr_cat, $item_type, $branch, 'rentaldiscount') ) {
             $charge = ( $charge * ( 100 - $discount ) ) / 100;
         }
     }
@@ -2430,43 +2357,6 @@ sub GetIssuingCharges {
     return ( $charge, $item_type );
 }
 
-# Select most appropriate discount rule from those returned
-sub _get_discount_from_rule {
-    my ($rules_ref, $branch, $itemtype) = @_;
-    my $discount;
-
-    if (@{$rules_ref} == 1) { # only 1 applicable rule use it
-        $discount = $rules_ref->[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # could have up to 4 does one match $branch and $itemtype
-    my @d = grep { $_->{branchcode} eq $branch && $_->{itemtype} eq $itemtype } @{$rules_ref};
-    if (@d) {
-        $discount = $d[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # do we have item type + all branches
-    @d = grep { $_->{branchcode} eq q{*} && $_->{itemtype} eq $itemtype } @{$rules_ref};
-    if (@d) {
-        $discount = $d[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # do we all item types + this branch
-    @d = grep { $_->{branchcode} eq $branch && $_->{itemtype} eq q{*} } @{$rules_ref};
-    if (@d) {
-        $discount = $d[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # so all and all (surely we wont get here)
-    @d = grep { $_->{branchcode} eq q{*} && $_->{itemtype} eq q{*} } @{$rules_ref};
-    if (@d) {
-        $discount = $d[0]->{rentaldiscount};
-        return (defined $discount) ? $discount : 0;
-    }
-    # none of the above
-    return 0;
-}
-
 =head2 AddIssuingCharge
 
   &AddIssuingCharge( $itemno, $borrowernumber, $charge )
diff --git a/C4/Members.pm b/C4/Members.pm
index 1d7bc42..191b977 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -626,7 +626,6 @@ sub IsMemberBlocked {
     my $dbh            = C4::Context->dbh;
 
     my $blockeddate = CheckBorrowerDebarred($borrowernumber);
-
     return ( 1, $blockeddate ) if $blockeddate;
 
     # if he have late issues
diff --git a/C4/Overdues.pm b/C4/Overdues.pm
index 660e10b..ef97f87 100644
--- a/C4/Overdues.pm
+++ b/C4/Overdues.pm
@@ -72,9 +72,6 @@ BEGIN {
 	push @EXPORT, qw(
         &GetIssuesIteminfo
 	);
-    #
-	# &GetIssuingRules - delete.
-	# use C4::Circulation::GetIssuingRule instead.
 	
 	# subs to move to Members.pm
 	push @EXPORT, qw(
@@ -272,9 +269,6 @@ sub CalcFine {
     my $dbh = C4::Context->dbh;
     my $amount = 0;
 	my $daystocharge;
-	# get issuingrules (fines part will be used)
-    $debug and warn sprintf("CalcFine calling GetIssuingRule(%s, %s, %s)", $bortype, $item->{'itemtype'}, $branchcode);
-    my $data = C4::Circulation::GetIssuingRule($bortype, $item->{'itemtype'}, $branchcode);
 	if($difference) {
 		# if $difference is supplied, the difference has already been calculated, but we still need to adjust for the calendar.
     	# use copy-pasted functions from calendar module.  (deprecated -- these functions will be removed from C4::Overdues ).
@@ -292,6 +286,7 @@ sub CalcFine {
 		}
 	}
 	# correct for grace period.
+    my $data = C4::Circulation::GetIssuingRuleRecord($bortype, $item->{'itemtype'}, $branchcode);
 	my $days_minus_grace = $daystocharge - $data->{'firstremind'};
     if ($data->{'chargeperiod'} > 0 && $days_minus_grace > 0 ) { 
         $amount = int($daystocharge / $data->{'chargeperiod'}) * $data->{'fine'};
@@ -655,41 +650,6 @@ sub GetFine {
     return 0;
 }
 
-
-=head2 GetIssuingRules
-
-FIXME - This sub should be deprecated and removed.
-It ignores branch and defaults.
-
-    $data = &GetIssuingRules($itemtype,$categorycode);
-
-Looks up for all issuingrules an item info 
-
-C<$itemnumber> is a reference-to-hash whose keys are all of the fields
-from the borrowers and categories tables of the Koha database. Thus,
-
-C<$categorycode> contains  information about borrowers category 
-
-C<$data> contains all information about both the borrower and
-category he or she belongs to.
-=cut 
-
-sub GetIssuingRules {
-	warn "GetIssuingRules is deprecated: use GetIssuingRule from C4::Circulation instead.";
-   my ($itemtype,$categorycode)=@_;
-   my $dbh   = C4::Context->dbh();    
-   my $query=qq|SELECT *
-        FROM issuingrules
-        WHERE issuingrules.itemtype=?
-            AND issuingrules.categorycode=?
-        |;
-    my $sth = $dbh->prepare($query);
-    #  print $query;
-    $sth->execute($itemtype,$categorycode);
-    return $sth->fetchrow_hashref;
-}
-
-
 sub ReplacementCost2 {
     my ( $itemnum, $borrowernumber ) = @_;
     my $dbh   = C4::Context->dbh();
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 359bbad..f23d63a 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -418,18 +418,6 @@ sub CanItemBeReserved{
     my $item     = GetItem($itemnumber);
     my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);     
     
-    # we retrieve user rights on this itemtype and branchcode
-    my $sth = $dbh->prepare("SELECT categorycode, itemtype, branchcode, reservesallowed 
-                             FROM issuingrules 
-                             WHERE (categorycode in (?,'*') ) 
-                             AND (itemtype IN (?,'*')) 
-                             AND (branchcode IN (?,'*')) 
-                             ORDER BY 
-                               categorycode DESC, 
-                               itemtype     DESC, 
-                               branchcode   DESC;"
-                           );
-                           
     my $querycount ="SELECT 
                             count(*) as count
                             FROM reserves
@@ -454,8 +442,7 @@ sub CanItemBeReserved{
     }
     
     # we retrieve rights 
-    $sth->execute($categorycode, $itemtype, $branchcode);
-    if(my $rights = $sth->fetchrow_hashref()){
+    if(my $rights = C4::Circulation::GetIssuingRuleRecord($categorycode, $itemtype, $branchcode, 'reservesallowed')){
         $itemtype        = $rights->{itemtype};
         $allowedreserves = $rights->{reservesallowed}; 
     }else{
diff --git a/t/db_dependent/lib/KohaTest/Circulation.pm b/t/db_dependent/lib/KohaTest/Circulation.pm
index b3a1ff8..106c1ba 100644
--- a/t/db_dependent/lib/KohaTest/Circulation.pm
+++ b/t/db_dependent/lib/KohaTest/Circulation.pm
@@ -20,7 +20,9 @@ sub methods : Test( 1 ) {
                       CanBookBeIssued 
                       AddIssue 
                       GetLoanLength 
-                      GetIssuingRule 
+                      GetIssuingRules
+                      GetIssuingRuleRecord
+                      GetIssuingRuleValue
                       GetBranchBorrowerCircRule
                       AddReturn 
                       MarkIssueReturned 
diff --git a/t/db_dependent/lib/KohaTest/Overdues.pm b/t/db_dependent/lib/KohaTest/Overdues.pm
index 13eb1f2..07d9d41 100644
--- a/t/db_dependent/lib/KohaTest/Overdues.pm
+++ b/t/db_dependent/lib/KohaTest/Overdues.pm
@@ -23,7 +23,6 @@ sub methods : Test( 1 ) {
                        BorType 
                        ReplacementCost 
                        GetFine 
-                       GetIssuingRules 
                        ReplacementCost2 
                        GetNextIdNotify 
                        NumberNotifyId
-- 
1.6.5


From srdjan at catalyst.net.nz  Thu Dec 22 02:36:02 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Thu, 22 Dec 2011 14:36:02 +1300
Subject: [Koha-patches] [PATCH] Bug 6129 - [master] this adds an ISSN to
	serialssolutions URLs
In-Reply-To: <bug 6129>
References: <bug 6129>
Message-ID: <1324517762-6943-1-git-send-email-srdjan@catalyst.net.nz>

If a URL is a serialssolutions URLs that doesn't already have an ISSN
parameter, this adds one on the OPAC.
---
 C4/Biblio.pm                                       |    6 ++++--
 basket/basket.pl                                   |    4 ++--
 catalogue/detail.pl                                |   11 +++++++++--
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    5 ++++-
 opac/opac-basket.pl                                |    2 +-
 opac/opac-detail.pl                                |   14 +++++++-------
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index ac78ae3..2f97710 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1627,7 +1627,7 @@ sub GetMarcAuthors {
 
 =head2 GetMarcUrls
 
-  $marcurls = GetMarcUrls($record,$marcflavour);
+  $marcurls = GetMarcUrls($record,$marcflavour,$issn);
 
 Returns arrayref of URLs from MARC data, suitable to pass to tmpl loop.
 Assumes web resources (not uncommon in MARC21 to omit resource type ind) 
@@ -1635,7 +1635,7 @@ Assumes web resources (not uncommon in MARC21 to omit resource type ind)
 =cut
 
 sub GetMarcUrls {
-    my ( $record, $marcflavour ) = @_;
+    my ( $record, $marcflavour, $issn ) = @_;
 
     my @marcurls;
     for my $field ( $record->field('856') ) {
@@ -1645,6 +1645,8 @@ sub GetMarcUrls {
         }
         my @urls = $field->subfield('u');
         foreach my $url (@urls) {
+            $url .= "?sid=&ISSN=$issn"
+              if $issn && ($url =~ m/\bserialssolutions\b/o) && ($url !~ m/\bISSN=/o);
             my $marcurl;
             if ( $marcflavour eq 'MARC21' ) {
                 my $s3   = $field->subfield('3');
diff --git a/basket/basket.pl b/basket/basket.pl
index 8fc15e4..90c4cf8 100755
--- a/basket/basket.pl
+++ b/basket/basket.pl
@@ -65,8 +65,8 @@ foreach my $biblionumber ( @bibs ) {
     my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
     my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
     my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
-    my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
-    my @items            = GetItemsInfo( $biblionumber );
+    my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour,$dat->{issn});
+    my @items            = GetItemsInfo( $biblionumber, 'opac' );
 
     my $hasauthors = 0;
     if($dat->{'author'} || @$marcauthorsarray) {
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 580949d..0af8727 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -102,13 +102,20 @@ $template->param(
     normalized_isbn => $isbn,
 );
 
+unless (defined($record)) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+	exit;
+}
+
+my $dat = &GetBiblioData($biblionumber);
+
 my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
 my $marcisbnsarray   = GetMarcISBN( $record, $marcflavour );
 my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
 my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
 my $marcseriesarray  = GetMarcSeries($record,$marcflavour);
-my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
-my $marchostsarray  = GetMarcHosts($record,$marcflavour);
+my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour,$dat->{issn});
+my $marchostsarray   = GetMarcHosts($record,$marcflavour);
 my $subtitle         = GetRecordValue('subtitle', $record, $fw);
 
 # Get Branches, Itemtypes and Locations
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 2d88880..52a692d 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -436,6 +436,7 @@
         </xsl:for-each>
         </span>
         </xsl:if>
+        <xsl:variable name="issn"><xsl:if test="marc:datafield[@tag=022]"><xsl:value-of select="marc:datafield[@tag=022]/marc:subfield[@code='a']"/></xsl:if></xsl:variable>
 
         <!-- Other Title  Statement: Alternate Graphic Representation (MARC 880) -->
         <xsl:if test="$display880">
@@ -539,7 +540,9 @@
         <span class="results_summary online_resources"><span class="label">Online Resources: </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:variable name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:variable>
+            <!--        <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/><xsl:if test="$issn and matches(marc:subfield[@code='u'], 'serialssolutions') and not matches(marc:subfield[@code='u'], 'ISSN')">?ISSN=<xsl:value-of select="$issn"/></xsl:if></xsl:attribute> -->
+            <a><xsl:attribute name="href"><xsl:value-of select="$href"/><xsl:if test="$issn and contains($href, 'serialssolutions') and not(contains($href, 'ISSN'))">?sid=&amp;ISSN=<xsl:value-of select="$issn"/></xsl:if></xsl:attribute>
             <xsl:if test="$OPACURLOpenInNewWindow='1'">
                 <xsl:attribute name="target">_blank</xsl:attribute>
             </xsl:if>
diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index 5e92d15..e56509e 100755
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -67,7 +67,7 @@ foreach my $biblionumber ( @bibs ) {
     my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
     my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
     my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
-    my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
+    my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour,$dat->{issn});
     my @items            = &GetItemsLocationInfo( $biblionumber );
     my $subtitle         = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
 
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index f82dde2..1b71c13 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -400,12 +400,12 @@ my $hideitems = 1 if C4::Context->preference('hidelostitems') or scalar(@hiddeni
 # Hide items
 if ($hideitems) {
     for my $itm (@all_items) {
-	if  ( C4::Context->preference('hidelostitems') ) {
-	    push @items, $itm unless $itm->{itemlost} or any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
-	} else {
-	    push @items, $itm unless any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
+        if  ( C4::Context->preference('hidelostitems') ) {
+            push @items, $itm unless $itm->{itemlost} or any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
+        } else {
+            push @items, $itm unless any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
+        }
     }
-}
 } else {
     # Or not
     @items = @all_items;
@@ -525,8 +525,8 @@ my $marcisbnsarray   = GetMarcISBN    ($record,$marcflavour);
 my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);
 my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);
 my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
-my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
-my $marchostsarray  = GetMarcHosts($record,$marcflavour);
+my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour,$dat->{issn});
+my $marchostsarray   = GetMarcHosts($record,$marcflavour);
 my $subtitle         = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
 
     $template->param(
-- 
1.6.5


From magnus at enger.priv.no  Thu Dec 22 11:02:52 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu, 22 Dec 2011 11:02:52 +0100
Subject: [Koha-patches] [PATCH] Bug 7375 - Update minimum version of Perl to
	5.10
Message-ID: <1324548172-5519-1-git-send-email-magnus@enger.priv.no>

- Change the installer script to look for at least 5.10/5.010000
- Change the template to ask for the correct version

To test:
- Run through the webinstaller on 5.10 or newer and check that there are
no errors.
- Ideally: Run through the webinstaller on an older version than 5.10 and
check that there *is* an error, asking for 5.10 or newer.
---
 installer/install.pl                               |    2 +-
 .../prog/en/modules/installer/step1.tt             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer/install.pl b/installer/install.pl
index ae478b6..1619f50 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -59,7 +59,7 @@ if ( $step && $step == 1 ) {
     $template->param( language => 1 );
     $template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are
 
-    unless ( $] >= 5.008008 ) {    # Bug 4505
+    unless ( $] >= 5.010000 ) {    # Bug 7375
         $template->param( problems => 1, perlversion => 1, checkmodule => 0 );
     }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
index dbc3736..52c52c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
@@ -49,8 +49,8 @@ listed, please inform your systems administrator.</p>
   <p>I encountered some problems.</p>
    <ul>
     [% IF ( perlversion ) %]
-    <li>Your perl version seems to be obsolete.
-      Please upgrade to a newer version of Perl (at least Version 5.006001).</li>
+    <li>Your Perl version seems to be obsolete.
+      Please upgrade to a newer version of Perl (at least Version 5.10).</li>
     [% END %]
    </ul>
   [% END %]
-- 
1.7.5.4


From henridamien.laurent at biblibre.com  Thu Dec 22 17:11:39 2011
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Thu, 22 Dec 2011 17:11:39 +0100
Subject: [Koha-patches] [PATCH] Bug 6842 FU : library transfer limits edits
	not stored
Message-ID: <1324570299-22866-1-git-send-email-henridamien.laurent@biblibre.com>

Followup :
Changes the DeleteBranchTransferLimits signature :
one now needs to delete only the limits for ONE branch
---
 C4/Circulation.pm               |   11 +++++++----
 admin/branch_transfer_limits.pl |    3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 02e13c0..efd7dc0 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2938,14 +2938,17 @@ sub CreateBranchTransferLimit {
 
 =head2 DeleteBranchTransferLimits
 
-  DeleteBranchTransferLimits();
+DeleteBranchTransferLimits($frombranch);
+
+Deletes all the branch transfer limits for one branch
 
 =cut
 
 sub DeleteBranchTransferLimits {
-   my $dbh = C4::Context->dbh;
-   my $sth = $dbh->prepare("TRUNCATE TABLE branch_transfer_limits");
-   $sth->execute();
+    my $branch = shift;
+    my $dbh    = C4::Context->dbh;
+    my $sth    = $dbh->prepare("DELETE FROM branch_transfer_limits WHERE fromBranch = ?");
+    $sth->execute($branch);
 }
 
 sub ReturnLostItem{
diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index 8c6f42e..e7422a6 100755
--- a/admin/branch_transfer_limits.pl
+++ b/admin/branch_transfer_limits.pl
@@ -93,7 +93,8 @@ while ( my $row = $sth->fetchrow_hashref ) {
 
 ## If Form Data Passed, Update the Database
 if ( $input->param('updateLimits') ) {
-	DeleteBranchTransferLimits();
+    DeleteBranchTransferLimits($branchcode);
+
 
 	foreach my $code ( @codes ) {
 		foreach my $toBranch ( @branchcodes ) {
-- 
1.7.7.3


From henridamien.laurent at biblibre.com  Thu Dec 22 17:12:13 2011
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Thu, 22 Dec 2011 17:12:13 +0100
Subject: [Koha-patches] [PATCH] Bug 6842 library transfer limits edits not
	stored
Message-ID: <1324570333-22929-1-git-send-email-henridamien.laurent@biblibre.com>

This was owed to the bug 6689 Table sorter.
It would embed a form in an other form, which is not licit in xhtml.
This solution relies on the dataTables patches (bug 6836)
and fixes the edit problem with keeping the pagination.
---
 .../en/modules/admin/branch_transfer_limits.tt     |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index 5e4e58f..7c10e9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -1,8 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Library Checkin and Transfer Policy</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -50,10 +51,7 @@
 			$("#"+tid).unCheckCheckboxes();
 			return false;
 		});
-		$(".sorted").tablesorter({
-			sortList: [[0,0]],
-			headers: { 1: { sorter: false}}
-		}).tablesorterPager({container: $(".pager"),positionFixed: false,size: 10});
+        $(".sorted").dataTable($.extend(true, {}, dataTablesDefaults, { } ) );
 	});
 //]]>
 </script>
@@ -102,9 +100,6 @@
 		<h4>Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]</h4>
 	<p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#">Check All</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#">Uncheck All</a></p>
 	
-	<div id="pager[% codes_loo.code %]table" class="pager">
-	[% INCLUDE 'table-pager.inc' perpage='20' %]
-	</div>
 		<table id="[% codes_loo.code %]table" class="sorted">
 			<thead>
 				<tr>
-- 
1.7.7.3


From judit at calyx.net.au  Mon Dec 19 12:16:50 2011
From: judit at calyx.net.au (Judit)
Date: Mon, 19 Dec 2011 06:16:50 -0500
Subject: [Koha-patches] [PATCH] [ENH] Add --disabled to koha-list command
Message-ID: <1324293410-1934-1-git-send-email-judit@calyx.net.au>

Add --disabled to koha-list command
---
 debian/scripts/koha-list |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/scripts/koha-list b/debian/scripts/koha-list
index 1e19f1a..459e5ca 100755
--- a/debian/scripts/koha-list
+++ b/debian/scripts/koha-list
@@ -34,9 +34,10 @@ help() {
 Lists Koha instances, optionally only those that are enabled or have
 email turned on.
     
-Usage: $0 [--enabled] [--email] [-h]
+Usage: $0 [--enabled|--disabled] [--email|--noemail] [-h]
 Options:
     --enabled       only show instances that are enabled
+    --disabled      only show instances that are disabled
     --email         only show instances that have email enabled
     --noemail       only show instances that do not have email enabled
     -h              this help
@@ -47,9 +48,10 @@ eoh
 }
 
 enabled=no
+disabled=no
 email=no
 noemail=no
-args=$(getopt -l enabled,email,noemail -o h -n $0 -- "$@")
+args=$(getopt -l enabled,disabled,email,noemail -o h -n $0 -- "$@")
 set -- $args
 while [ ! -z "$1" ]
 do
@@ -57,6 +59,7 @@ do
          -h) help; exit;;
     --email) email=yes;;
   --enabled) enabled=yes;;
+  --disabled) disabled=yes;;
   --noemail) noemail=yes;;
           *) break;;
     esac
@@ -68,6 +71,7 @@ sort |
 while read name
 do
     [ "$enabled" = yes ] && ! is_enabled "$name" && continue
+    [ "$disabled" = yes ] && is_enabled "$name" && continue
     [ "$email" = yes ] && [ ! -e /var/lib/koha/$name/email.enabled ] && continue
     [ "$noemail" = yes ] && [ -e /var/lib/koha/$name/email.enabled ] && continue
     echo "$name"
-- 
1.7.4.1


From oleonard at myacpl.org  Tue Dec 27 17:27:38 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 27 Dec 2011 11:27:38 -0500
Subject: [Koha-patches] [PATCH] Bug 7031 Follow-up,
	More options for AdvancedSearchTypes
Message-ID: <1325003258-27678-1-git-send-email-oleonard@myacpl.org>

This follow-up patch corrects some markup errors and removes some
markup which I think is superfluous:

- Using template FILTER command to remove invalid punctuation from
  ID attributes (to quiet the HTML validator)
- Removing <fieldset> since options are bordered by the tab box now
- Correcting the conditional which controls the table markup
  to prevent extra/missing </tr>
- Adding missing ID attribute in the OPAC template
---
 .../prog/en/modules/catalogue/advsearch.tt         |   10 ++++------
 .../opac-tmpl/prog/en/modules/opac-advsearch.tt    |    7 +++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index acf133d..28f445c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -112,18 +112,15 @@
       </ul>
     [% FOREACH advsearchloo IN advancedsearchesloop %]
     <div id="advsearch-[% advsearchloo.advanced_search_type %]" class="advsearch">
-    <fieldset>
-    <legend>Limit to any of the following:</legend>
+    <h4>Limit to any of the following:</h4>
     <table>
         <tr>
     [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
-        <td><input type="checkbox" id="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
+        <td><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
         [% itemtypeloo.description %]</label></td>
-        [% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %]
+        [% IF ( loop.last ) %]</tr>[% ELSE %][% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %][% END %]
     [% END %]
-        </tr>
     </table>
-    </fieldset>
     </div>
     [% END %]
 <!-- /MC-TYPE LIMIT -->
@@ -283,6 +280,7 @@
             </fieldset>
 <!-- /SEARCH BUTTONS -->
 </div>
+</div>
 </form>
 </div>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
index 4847ae3..d4e92b4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -158,11 +158,10 @@
     <table>
         <tr>
     [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
-        <td><input type="checkbox" id="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
+        <td><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
         [% itemtypeloo.description %]</label></td>
-        [% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %]
+        [% IF ( loop.last ) %]</tr>[% ELSE %][% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %][% END %]
     [% END %]
-        </tr>
     </table>
     </fieldset>
     </div>
@@ -172,7 +171,7 @@
     <fieldset><legend>Language</legend>
     <!-- LANGUAGE LIMIT -->
                 <p><label for="language-limit">Language: </label>                                        
-                <select name="limit">
+                <select id="language-limit" name="limit">
                 <option value="">No Limit</option>
                 [% FOREACH search_languages_loo IN search_languages_loop %]
                     [% IF ( search_languages_loo.selected ) %]
-- 
1.7.3


From oleonard at myacpl.org  Tue Dec 27 20:59:24 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 27 Dec 2011 14:59:24 -0500
Subject: [Koha-patches] [PATCH] Bug 7381 - wrong isbn showing on the staff
	search results
Message-ID: <1325015964-29968-1-git-send-email-oleonard@myacpl.org>

Outputting the "raw" ISBN. In the case of multiples, ISBNs
are concatenated with " | " Using a T:T filter to make these
a comma-separated list.
---
 .../prog/en/modules/catalogue/results.tt           |    2 +-
 1 files changed, 1 insertions(+), 1 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 4b4e088..52969f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -493,7 +493,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                         [% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode %][% END %] [% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear %] [% ELSIF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate %][% END %]</span>
 										[% IF ( SEARCH_RESULT.edition ) %]<span class="results_edition">Edition: [% SEARCH_RESULT.edition %]</span>[% END %]
                                         <span class="results_physicaldesc">[% IF ( SEARCH_RESULT.pages ) %]: [% SEARCH_RESULT.pages %][% END %]
-                                        [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %]</span> [% IF ( SEARCH_RESULT.normalized_isbn ) %]<span class="results_isbn">ISBN: [% SEARCH_RESULT.normalized_isbn %]</span>[% END %]
+                                        [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %]</span> [% IF ( SEARCH_RESULT.isbn ) %]<span class="results_isbn">ISBN: [% SEARCH_RESULT.isbn | replace('\s\|', ', ')%]</span>[% END %]
                                         <span class="results_itemtype">[% SEARCH_RESULT.description %]</span>
                                         [% IF ( SEARCH_RESULT.timestamp ) %] <i>(modified on [% SEARCH_RESULT.timestamp %])</i>[% END %]
                                         [% IF ( SEARCH_RESULT.cn_class ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% SEARCH_RESULT.cn_class |url %]">[% SEARCH_RESULT.cn_class %]</a>][% END %]
-- 
1.7.3


From magnus at enger.priv.no  Tue Dec 27 22:59:18 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Tue, 27 Dec 2011 22:59:18 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_6787_-_Fast_Add_framewor?=
	=?utf-8?q?k_for_NORMARC?=
Message-ID: <1325023158-7112-1-git-send-email-magnus@enger.priv.no>

The new framework will be called "Hurtigkatalogisering".

To test:
- Make sure the nb-NO translation is installed
- Run through the web installer on an empty database
- Select nb-NO as the installation language
- Select NORMARC as the marcflavour
- Include normarc_fastadd_framework in the installed data
- Check that the framework looks ok in:
-- More > Cataloguing
-- More > Administration > MARC framework
---
 .../Valgfritt/normarc_fastadd_framework.sql        |  127 ++++++++++++++++++++
 .../Valgfritt/normarc_fastadd_framework.txt        |    1 +
 2 files changed, 128 insertions(+), 0 deletions(-)
 create mode 100644 installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.sql
 create mode 100644 installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.txt

diff --git a/installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.sql b/installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.sql
new file mode 100644
index 0000000..279d6db
--- /dev/null
+++ b/installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.sql
@@ -0,0 +1,127 @@
+-- This file is part of Koha.
+--
+-- Copyright 2011 Magnus Enger Libriotech
+--
+-- 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 this program; if not, write to the Free Software Foundation, Inc.,
+-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+INSERT IGNORE INTO biblio_framework VALUES ( 'FA','Hurtigkatalogisering' );
+
+DELETE FROM marc_tag_structure WHERE frameworkcode='FA';
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('000','Postens hode','Postens hode','0','1','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('001','Identifikasjonsnummer','Identifikasjonsnummer','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('008','Informasjonskoder','Informasjonskoder','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('015','Andre bibliografiske kontrollnummer (R)','Andre bibliografiske kontrollnummer (R)','1','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('020','Internasjonalt standard boknummer (ISBN)','Internasjonalt standard boknummer (ISBN)','1','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('024','Andre standardnumre','Andre standardnumre','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('025','Europeisk artikkelnummer (EAN)','Europeisk artikkelnummer (EAN)','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('100','Hovedordningsord personnavn','Hovedordningsord personnavn','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('245','Tittel og ansvarsopplysninger','Tittel og ansvarsopplysninger','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('250','Utgave','Utgave','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('260','Utgivelse, distribusjon osv','Utgivelse, distribusjon osv','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('300','Fysisk beskrivelse','Fysisk beskrivelse','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('500','Generell note (R)','Generell note (R)','1','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('942','Andre opplysninger (Koha)','Andre opplysninger (Koha)','0','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('952','Eksemplarinformasjon (Koha)','Eksemplarinformasjon (Koha)','1','0','','FA');
+INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) VALUES ('999','Kontrollnummer (Koha)','Kontrollnummer (Koha)','1','0','','FA');
+
+
+DELETE FROM marc_subfield_structure WHERE frameworkcode='FA';
+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 ('000','@','Postens hode','Postens hode','0','1','','0','','','normarc_leader.pl','0','-1','FA','','','');
+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 ('001','@','Identifikasjonsnummer','Identifikasjonsnummer','0','0','','0','','','','0','-1','FA','','','');
+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 ('008','@','Informasjonskoder','Informasjonskoder','0','0','','0','','','normarc_field_008.pl','0','-1','FA','','','');
+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 ('015','a','Nummer','Nummer','0','0','0','0','','','','0','-1','FA','','','');
+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 ('015','b','Kilde','Kilde','0','0','0','0','','','','0','-1','FA','','','');
+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 ('020','a','ISBN','ISBN','0','0','biblioitems.isbn','0','','','','0','-1','FA','','','');
+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 ('020','b','Innbindingsinformasjon','Innbindingsinformasjon','0','0','0','0','','','','0','-1','FA','','','');
+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 ('020','c','Leveringsbetingelser','Leveringsbetingelser','0','0','0','0','','','','0','-1','FA','','','');
+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 ('020','g','Andre tilf','Andre tilf','0','0','0','0','','','','0','-1','FA','','','');
+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 ('020','z','Feil ISBN','Feil ISBN','0','0','0','0','','','','0','-1','FA','','','');
+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 ('024','a','Standardnummer','Standardnummer','0','0','0','0','','','','0','-1','FA','','','');
+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 ('024','c','Leveringsbetingelser','Leveringsbetingelser','0','0','0','0','','','','0','-1','FA','','','');
+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 ('024','g','Andre tilf?yelser','Andre tilf?yelser','0','0','0','0','','','','0','-1','FA','','','');
+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 ('024','z','Feil standardnummer','Feil standardnummer','0','0','0','0','','','','0','-1','FA','','','');
+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 ('025','a','Nummer','Nummer','0','0','0','0','','','','0','-1','FA','','','');
+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 ('100','8','Andre karakteristika forbundet med navn','Andre karakteristika forbundet med navn','0','0','0','1','','','','0','0','FA','','','');
+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 ('100','a','Navn','Navn','0','0','biblio.author','1','','','','0','0','FA','','','');
+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 ('100','b','Nummer','Nummer','0','0','0','1','','','','0','0','FA','','','');
+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 ('100','c','Andre tilf?yelser','Andre tilf?yelser','0','0','0','1','','','','0','0','FA','','','');
+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 ('100','d','?rstall forbundet med navn','?rstall forbundet med navn','0','0','0','1','','','','0','0','FA','','','');
+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 ('100','e','Betegnelse for funksjon','Betegnelse for funksjon','0','0','0','1','','','','0','0','FA','','','');
+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 ('100','j','Nasjonalitet','Nasjonalitet','0','0','0','1','','','','0','0','FA','','','');
+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 ('100','q','Mer fullstendig navneform','Mer fullstendig navneform','0','0','0','1','','','','0','0','FA','','','');
+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 ('100','w','Sorteringsdelfelt for delfelt $a','Sorteringsdelfelt for delfelt $a','0','0','0','1','','','','0','0','FA','','','');
+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 ('245','a','Tittel','Tittel','0','0','biblio.title','2','','','','0','0','FA','','','');
+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 ('245','b','Annen tittelinformasjon','Annen tittelinformasjon','0','0','bibliosubtitle.subtitle','2','','','','0','0','FA','','','');
+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 ('245','c','Ansvarsangivelse','Ansvarsangivelse','0','0','0','2','','','','0','0','FA','','','');
+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 ('245','h','Generell materialbetegnelse','Generell materialbetegnelse','0','0','0','2','','','','0','0','FA','','','');
+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 ('250','a','Utgave, opplag etc','Utgave, opplag etc','0','0','0','2','','','','0','-1','FA','','','');
+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 ('250','b','Ansvarshavende','Ansvarshavende','0','0','0','2','','','','0','-1','FA','','','');
+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 ('260','a','Sted (R)','Sted (R)','1','0','biblioitems.place','2','','','','0','-1','FA','','','');
+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 ('260','b','Navn p','Navn p','0','0','biblioitems.publishercode','2','','','','0','-1','FA','','','');
+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 ('260','c','?r','?r','0','0','biblio.copyrightdate','2','','','','0','-1','FA','','','');
+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 ('260','e','Trykkested eller produksjonssted','Trykkested eller produksjonssted','0','0','0','2','','','','0','-1','FA','','','');
+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 ('260','f','Trykkeriets eller produsentens navn','Trykkeriets eller produsentens navn','0','0','0','2','','','','0','-1','FA','','','');
+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 ('260','g','Trykke?r eller produksjons?r','Trykke?r eller produksjons?r','0','0','0','2','','','','0','-1','FA','','','');
+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 ('300','a','Omfang','Omfang','0','0','biblioitems.pages','3','','','','0','0','FA','','','');
+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 ('300','b','Illustrasjonsmateriale og andre fysiske detaljer','Illustrasjonsmateriale og andre fysiske detaljer','0','0','biblioitems.illus','3','','','','0','0','FA','','','');
+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 ('300','c','Format','Format','0','0','biblioitems.size','3','','','','0','0','FA','','','');
+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 ('300','e','Bilag','Bilag','0','0','0','3','','','','0','0','FA','','','');
+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 ('500','a','Notens tekst','Notens tekst','0','0','biblio.notes','5','','','','0','0','FA','','','');
+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 ('942','0','Antall utl?n','Antall utl?n','0','0','biblioitems.totalissues','9','','','','0','-5','FA','','','');
+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 ('942','2','Kilde for klassifikasjon','Kilde for klassifikasjon','0','0','biblioitems.cn_source','9','','','','0','-1','FA','','','');
+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 ('942','6','Koha normalisert klassifikasjon for sortering','Koha normalisert klassifikasjon for sortering','0','0','biblioitems.cn_sort','-1','','','','0','7','FA','','','');
+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 ('942','c','Koha [standard] dokumenttype','Koha dokumenttype','0','1','biblioitems.itemtype','9','itemtypes','','','0','-1','FA','','','');
+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 ('942','e','Utgave','Utgave','0','0','','9','','','','0','-1','FA','','','');
+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 ('942','h','Klassifikasjon del','Klassifikasjon del','0','0','biblioitems.cn_class','9','','','','0','-1','FA','','','');
+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 ('942','i','Eksemplar del','Eksemplar del','1','0','biblioitems.cn_item','9','','','','0','-1','FA','','','');
+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 ('942','k','Hyllesignatur prefiks','Hyllesignatur prefiks','0','0','','9','','','','0','-1','FA','','','');
+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 ('942','m','Hyllesignatur postfiks','Hyllesignatur postfiks','0','0','biblioitems.cn_suffix','9','','','','0','-1','FA','','','');
+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 ('942','n','Skjul i OPAC','Skjul i OPAC','0','0','','9','','','','0','-1','FA','','','');
+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 ('942','s','Periodikamark','Periodikamark','0','0','biblio.serial','9','','','','0','-5','FA','','','');
+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 ('952','0','Trukket tilbake','Trukket tilbake','0','0','items.wthdrawn','10','WITHDRAWN','','','0','-1','FA','','','');
+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 ('952','1','Tapt','Tapt','0','0','items.itemlost','10','LOST','','','0','-1','FA','','','');
+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 ('952','2','Kilde for klassifikasjon','Kilde for klassifikasjon','0','0','items.cn_source','10','cn_source','','','0','-1','FA','','','');
+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 ('952','3','Materialespesifikasjon (innbundet ','Materialespesifikasjon (innbundet ','0','0','items.materials','10','','','','0','-1','FA','','','');
+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 ('952','4','Skadet','Skadet','0','0','items.damaged','10','DAMAGED','','','0','-1','FA','','','');
+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 ('952','5','Begrensninger p','Begrensninger p','0','0','items.restricted','10','RESTRICTED','','','0','-1','FA','','','');
+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 ('952','6','Koha normalisert klassifikasjon for sortering','Koha normalisert klassifikasjon for sortering','0','0','items.cn_sort','-1','','','','0','7','FA','','','');
+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 ('952','7','Ikke til utl?n','Ikke til utl?n','0','0','items.notforloan','10','NOT_LOAN','','','0','-1','FA','','','');
+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 ('952','8','Koha samling','Koha samling','0','0','items.ccode','10','CCODE','','','0','-1','FA','','','');
+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 ('952','9','Koha eksemplarnummer (autogenerert)','Koha eksemplarnummer','0','0','items.itemnumber','-1','','','','0','7','FA','','','');
+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 ('952','a','Plassering (eiende filial)','Plassering (eiende filial)','0','0','items.homebranch','10','branches','','','0','-1','FA','','','');
+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 ('952','b','Annen plassering (midlertidig filial)','Annen plassering (midlertidig filial)','0','0','items.holdingbranch','10','branches','','','0','-1','FA','','','');
+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 ('952','c','Hylleplassering','Hylleplassering','0','0','items.location','10','LOC','','','0','-1','FA','','','');
+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 ('952','d','Anskaffelsesdato','Anskaffelsesdato','0','0','items.dateaccessioned','10','','','dateaccessioned.pl','0','-1','FA','','','');
+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 ('952','e','Kilde for anskaffelse','Kilde for anskaffelse','0','0','items.booksellerid','10','','','','0','-1','FA','','','');
+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 ('952','f','Kodet plasseringskvalifikator','Kodet plasseringskvalifikator','0','0','items.coded_location_qualifier','10','','','','0','-1','FA','','','');
+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 ('952','g','Pris (normal innkj?pspris)','Pris (normal innkj?pspris)','0','0','items.price','10','','','','0','-1','FA','','','');
+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 ('952','h','Serienummerering / kronologi','Serienummerering / kronologi','0','0','items.enumchron','10','','','','0','-1','FA','','','');
+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 ('952','j','Samling','Samling','0','0','items.stack','10','STACK','','','0','-1','FA','','','');
+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 ('952','l','Koha utl?n','Koha utl?n','0','0','items.issues','10','','','','0','-5','FA','','','');
+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 ('952','m','Koha fornyinger','Koha fornyinger','0','0','items.renewals','10','','','','0','-5','FA','','','');
+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 ('952','n','Koha reserveringer','Koha reserveringer','0','0','items.reserves','10','','','','0','-5','FA','','','');
+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 ('952','o','Koha hyllesignatur','Koha hyllesignatur','0','0','items.itemcallnumber','10','','','','0','-1','FA','','','');
+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 ('952','p','Strekkode','Strekkode','0','0','items.barcode','10','','','barcode.pl','0','-1','FA','','','');
+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 ('952','q','Koha utl?nt','Koha utl?nt','0','0','items.onloan','10','','','','0','-5','FA','','','');
+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 ('952','r','Koha dato sist sett','Koha dato sist sett','0','0','items.datelastseen','10','','','','0','-5','FA','','','');
+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 ('952','s','Koha dato sist utl?nt','Koha dato sist utl?nt','0','0','items.datelastborrowed','10','','','','0','-5','FA','','','');
+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 ('952','t','Eksemplarnummer','Eksemplarnummer','0','0','items.copynumber','10','','','','0','-1','FA','','','');
+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 ('952','u','Uniform Resource Identifier (URI)','Uniform Resource Identifier (URI)','0','0','items.uri','10','','','','1','-1','FA','','','');
+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 ('952','v','Pris (erstatningspris)','Pris (erstatningspris)','0','0','items.replacementprice','10','','','','0','-1','FA','','','');
+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 ('952','w','Pris gjelder fra','Pris gjelder fra','0','0','items.replacementpricedate','10','','','','0','-1','FA','','','');
+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 ('952','x','Intern note','Intern note','1','0','items.paidfor','10','','','','0','7','FA','','','');
+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 ('952','y','Koha dokumenttype','Koha dokumenttype','0','0','items.itype','10','itemtypes','','','0','-1','FA','','','');
+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 ('952','z','Synlig note','Synlig note','0','0','items.itemnotes','10','','','','0','-1','FA','','','');
+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 ('999','c','Koha biblionummer','Koha biblionummer','0','0','biblio.biblionumber','-1','','','','0','-5','FA','','','');
+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 ('999','d','Koha biblioitemnummer','Koha biblioitemnummer','0','0','biblioitems.biblioitemnumber','-1','','','','0','-5','FA','','','');
diff --git a/installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.txt b/installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.txt
new file mode 100644
index 0000000..e7a0dcb
--- /dev/null
+++ b/installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.txt
@@ -0,0 +1 @@
+Rammeverk for hurtigkatalogisering i NORMARC. Inneholder et begrenset utvalg felter.
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Wed Dec 28 04:15:02 2011
From: srdjan at catalyst.net.nz (Srdjan Jankovic)
Date: Wed, 28 Dec 2011 16:15:02 +1300
Subject: [Koha-patches] [PATCH] bug_7001: Issue and Reserve slips are
	notices.
In-Reply-To: <bug 7001>
References: <bug 7001>
Message-ID: <1325042102-18267-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.
GetPreparedletter() is the interface for compiling letters (notices).
Sysprefs for notice and slips stylesheets.
---
 C4/Circulation.pm                                  |   20 +-
 C4/Letters.pm                                      |  583 +++++++++++++-------
 C4/Members.pm                                      |   81 +++-
 C4/Message.pm                                      |   12 +-
 C4/Print.pm                                        |  139 ++----
 C4/Reserves.pm                                     |  103 +++--
 C4/Suggestions.pm                                  |   22 +-
 acqui/booksellers.pl                               |    7 +-
 circ/circulation.pl                                |    3 +-
 circ/hold-transfer-slip.pl                         |   27 +-
 .../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             |    4 +-
 .../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                  |    3 +
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    2 +-
 installer/data/mysql/updatedatabase.pl             |   98 ++++-
 .../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 +
 .../prog/en/modules/members/moremember-receipt.tt  |   76 ---
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |  113 +++-
 members/memberentry.pl                             |    5 +-
 members/moremember.pl                              |   10 -
 members/printslip.pl                               |   89 +++
 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                                    |  214 +++++---
 42 files changed, 1261 insertions(+), 743 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
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
 create mode 100755 members/printslip.pl

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9a6f4f2..cff3fa7 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2655,11 +2655,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) {
@@ -2674,7 +2681,8 @@ sub SendCirculationAlert {
             $message->update;
         }
     }
-    $letter;
+
+    return $letter;
 }
 
 =head2 updateWrongTransfer
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 2420e4a..7f195d6 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -26,6 +26,7 @@ use Encode;
 use Carp;
 
 use C4::Members;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Branch;
 use C4::Log;
 use C4::SMS;
@@ -42,7 +43,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
 	);
 }
 
@@ -117,13 +118,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)
@@ -178,7 +192,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 ";
@@ -234,70 +248,65 @@ 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;
     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;
 # warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
-            }
         }
     }
     elsif ( $type eq 'claimacquisition' ) {
 
         # 		warn "sending issues...";
-        my $letter = getletter( 'claimacquisition', $letter );
 
         # prepare the letter...
         # search the biblionumber
@@ -307,52 +316,43 @@ sub SendAlerts {
         my $sthorders = $dbh->prepare($strsth);
         $sthorders->execute;
         my $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{booksellerid} );
+
         my $sthbookseller =
           $dbh->prepare("select * from aqbooksellers where id=?");
         $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
         my $databookseller = $sthbookseller->fetchrow_hashref;
 
-        # 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;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
-                }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
-            }
+        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;
         }
-        $letter->{content} =~ s/<<[^>]*>>//g;
-        my $innerletter = $letter;
+
+        my $userenv = C4::Context->userenv;
+        my $letter = GetPreparedLetter (
+            module => 'claimacquisition',
+            letter_code => $letter_code,
+            branchcode => $userenv->{branch},
+            tables => {
+                'branches'    => $userenv->{branch},
+                'aqbooksellers' => $databookseller,
+            },
+            repeat => $dataorders,
+            want_librarian => 1,
+        ) or return;
 
         # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} )
-        {
-            my %mail = (
-                To => $databookseller->{bookselleremail}
-                  . (
-                    $databookseller->{contemail}
-                    ? "," . $databookseller->{contemail}
-                    : ""
-                  ),
-                From           => $userenv->{emailaddress},
-                Subject        => "" . $innerletter->{title},
-                Message        => "" . $innerletter->{content},
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-        }
+        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;
+
         if ( C4::Context->preference("LetterLog") ) {
             logaction(
                 "ACQUISITION",
@@ -360,16 +360,13 @@ sub SendAlerts {
                 "",
                 "order list : "
                   . join( ",", @$externalid )
-                  . "\n$innerletter->{title}\n$innerletter->{content}"
+                  . "\n$letter->{title}\n$letter->{content}"
             );
         }
     }
     elsif ( $type eq 'claimissues' ) {
 
         # 		warn "sending issues...";
-        my $letter = getletter( 'claimissues', $letter );
-
-        # prepare the letter...
         # search the biblionumber
         my $strsth =
 "select serial.*,subscription.*, biblio.* from serial LEFT JOIN subscription on serial.subscriptionid=subscription.subscriptionid LEFT JOIN biblio on serial.biblionumber=biblio.biblionumber where serial.serialid IN ("
@@ -377,81 +374,76 @@ sub SendAlerts {
         my $sthorders = $dbh->prepare($strsth);
         $sthorders->execute;
         my $dataorders = $sthorders->fetchall_arrayref( {} );
-        parseletter( $letter, 'aqbooksellers',
-            $dataorders->[0]->{aqbooksellerid} );
+
         my $sthbookseller =
           $dbh->prepare("select * from aqbooksellers where id=?");
         $sthbookseller->execute( $dataorders->[0]->{aqbooksellerid} );
         my $databookseller = $sthbookseller->fetchrow_hashref;
 
-        # 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;
-        foreach my $data ( @{$dataorders} ) {
-            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
-                my $line = $1;
-                foreach my $field ( keys %{$data} ) {
-                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
-                }
-                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
-            }
+        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;
         }
-        $letter->{content} =~ s/<<[^>]*>>//g;
-        my $innerletter = $letter;
+
+        # prepare the letter...
+        my $userenv = C4::Context->userenv;
+        my $letter = GetPreparedLetter (
+            module => 'claimissues',
+            letter_code => $letter_code,
+            branchcode => $userenv->{branch},
+            tables => {
+                'branches'    => $userenv->{branch},
+                'aqbooksellers' => $databookseller,
+            },
+            repeat => $dataorders,
+            want_librarian => 1,
+        ) or return;
 
         # ... then send mail
-        if (   $databookseller->{bookselleremail}
-            || $databookseller->{contemail} ) {
-            my $mail_to = $databookseller->{bookselleremail};
-            if ($databookseller->{contemail}) {
-                if (!$mail_to) {
-                    $mail_to = $databookseller->{contemail};
-                } else {
-                    $mail_to .= q|,|;
-                    $mail_to .= $databookseller->{contemail};
-                }
-            }
-            my $mail_subj = $innerletter->{title};
-            my $mail_msg  = $innerletter->{content};
-            $mail_msg  ||= q{};
-            $mail_subj ||= q{};
+        my $mail_subj = $letter->{title};
+        my $mail_msg  = $letter->{content};
+        $mail_msg  ||= q{};
+        $mail_subj ||= q{};
 
-            my %mail = (
-                To => $mail_to,
-                From    => $userenv->{emailaddress},
-                Subject => $mail_subj,
-                Message => $mail_msg,
-                'Content-Type' => 'text/plain; charset="utf8"',
-            );
-            sendmail(%mail) or carp $Mail::Sendmail::error;
-            logaction(
-                "ACQUISITION",
-                "CLAIM ISSUE",
-                undef,
-                "To="
-                  . $databookseller->{contemail}
-                  . " Title="
-                  . $innerletter->{title}
-                  . " Content="
-                  . $innerletter->{content}
-            ) if C4::Context->preference("LetterLog");
-        }
+        my %mail = (
+            To => join( ','. @email),
+            From    => $userenv->{emailaddress},
+            Subject => $mail_subj,
+            Message => $mail_msg,
+            'Content-Type' => 'text/plain; charset="utf8"',
+        );
+        sendmail(%mail) or carp $Mail::Sendmail::error;
+
+        logaction(
+            "ACQUISITION",
+            "CLAIM ISSUE",
+            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"),
@@ -463,24 +455,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;
+
+    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;
 
-sub parseletter_sth {
+        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
@@ -494,9 +610,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)) {
@@ -506,25 +625,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'};
@@ -538,16 +653,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;
 }
@@ -732,31 +882,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;
 
 }
 
@@ -823,14 +974,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') ) {
@@ -850,6 +1004,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 1d7bc42..9f42cea 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
@@ -2227,7 +2231,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/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 2ba7584..2343fa4 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'}
+
+COLLECT AT: $branchname
 
-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.
+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
@@ -93,100 +111,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 {
-    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 ($) {
-    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 ccc0c8e..6c10fdf 100644
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -371,20 +371,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 634eb93..745d040 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 c95e59b..f5d6cb6 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($branch, $borrowernumber);
     $query->param( 'borrowernumber', '' );
     $borrowernumber = '';
 }
diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl
index f581464..492dac7 100755
--- a/circ/hold-transfer-slip.pl
+++ b/circ/hold-transfer-slip.pl
@@ -25,8 +25,6 @@ use C4::Output;
 use CGI;
 use C4::Auth;
 use C4::Reserves;
-use C4::Branch;
-use C4::Dates qw/format_date format_date_in_iso/;
 
 use vars qw($debug);
 
@@ -41,7 +39,7 @@ 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 +48,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 ($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 166c36d..efdad91 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 689fa0f..8c9f4bd 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 689fa0f..bf3324d 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 977e59d..acffe73 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 689fa0f..bf3324d 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 5287d9f..0c2a3f5 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1168,10 +1168,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;
 
 --
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 cdb5529..08b452e 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 6be2eb8..f0844f3 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 689fa0f..bf3324d 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 128c9b2..e9aac60 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -328,4 +328,7 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
 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('NoticeCSS','','Notices CSS url.',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free');
+
 
diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
index 358205b..b637343 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 67708fa..f136b70 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";
@@ -4585,6 +4584,103 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.06.03.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $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 `letter` ADD `is_html` tinyint(1) default 0 AFTER `name`");
+    print "Added branchcode and is_html to letter table\n";
+
+    $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; 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 913076f..6fdd720 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 f4946b5..b3b279c 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
@@ -91,6 +91,11 @@ Circulation:
                   yes: Record
                   no: "Don't record"
             - local use when an unissued item is checked in.
+        -
+            - 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/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
deleted file mode 100644
index 4a85ccb..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ /dev/null
@@ -1,76 +0,0 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Print Receipt for [% cardnumber %]</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" />
-
-<script language="javascript">
-    function printThenClose() {
-        window.print();
-        window.close();
-    }
-</script>
-</head>
-<body onload="printThenClose();">
-
-<div id="receipt">
-
-<h3>[% LibraryName %]</h3>
-[% IF ( branchname ) %][% branchname %]<br />[% END %]
-Checked out to [% firstname %] [% surname %] <br />
-(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">[% cardnumber %]</a>)<br />
-
-[% todaysdate %]<br />
-
-[% IF ( quickslip ) %]
-<h4>Checked Out Today</h4>
-[% FOREACH issueloo IN issueloop %]
-[% IF ( issueloo.red ) %][% ELSE %]
-[% IF ( issueloo.today ) %]
-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&amp;biblionumber=[% issueloo.biblionumber %]&amp;bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br />
-Barcode: [% issueloo.barcode %]<br />
-Date due: [% issueloo.date_due %]<br /></p>
-    [% END %]
-    [% END %]
-    [% END %]
-
-[% ELSE %]
-<h4>Checked Out</h4>
-[% FOREACH issueloo IN issueloop %]
-[% IF ( issueloo.red ) %][% ELSE %]
-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&amp;biblionumber=[% issueloo.biblionumber %]&amp;bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br />
-Barcode: [% issueloo.barcode %]<br />
-Date due: [% issueloo.date_due %]<br /></p>
-    [% END %]
-    [% END %]
-
-[% END %]
-
-[% IF ( quickslip ) %]
-[% ELSE %]
-[% IF ( overdues_exist ) %]
-<h4>Overdues</h4>
-    [% FOREACH issueloo IN issueloop %]
-    [% IF ( issueloo.red ) %]
-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&amp;biblionumber=[% issueloo.biblionumber %]&amp;bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br />
-Barcode: [% issueloo.barcode %]<br />
-Date due: [% issueloo.date_due %]</p>
-[% END %]
-[% END %]
-[% END %]
-[% END %]
-
-[% IF ( koha_news_count ) %]
-            <hr><h4 style="text-align: center; font-style:italic;">News</h4>
-                       <!-- [% koha_news_count %] recent news item(s) -->
-            [% FOREACH koha_new IN koha_news %]
-                    <div class="newsitem" id="news[% koha_new.idnew %]"><h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% koha_new.title %]</b></h5>
-                                        <p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.new %]</p>
-                                       <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px"> Posted on [% koha_new.newdate %]
-
-</p><hr /></div>
-            [% END %]
-[% 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..b64477e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -10,6 +10,10 @@ $(document).ready(function() {
 		sortList: [[0,0]],
 		headers: { 3: {sorter:false},4: { sorter: false }}
 	}); 
+
+    $('#branch').change(function() {
+            $('#selectlibrary').submit();
+    });
 }); 
 [% IF ( add_form ) %]
 	
@@ -114,7 +118,7 @@ $(document).ready(function() {
 	<div id="yui-main">
 	<div class="yui-b">
 
-	[% IF ( no_op_set ) %]
+[% IF ( no_op_set ) %]
 <div id="toolbar">
 	<script type="text/javascript">
 	//<![CDATA[
@@ -128,6 +132,22 @@ $(document).ready(function() {
 	}
 	//]]>
 	</script>
+
+    [% UNLESS independant_branch %]        
+      <p>
+        <form method="get" action="?" id="selectlibrary">
+            <input type="hidden" name="searchfield" value="[% searchfield %]" />
+        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>
+        </form>
+      </p>
+    [% END %]        
+
 	<ul class="toolbar">
 	<li><a id="newnotice" href="/cgi-bin/koha/tools/letter.pl?op=add_form">New Notice</a></li>
 </ul></div>
@@ -135,41 +155,71 @@ $(document).ready(function() {
 		[% 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 ( 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 !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 && 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" />
@@ -182,6 +232,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 +299,9 @@ $(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><input type="checkbox" id="is_html" name="is_html" value="1"[% IF is_html %] checked[% END %] />
+		</li>
+		<li>
 			<label for="title">Message Subject:</label><input type="text" id="title" name="title" size="60" value="[% title %]" />
 		</li>
 		<li>
@@ -253,16 +320,16 @@ $(document).ready(function() {
 		</fieldset>
 		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></fieldset>
 		</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>
@@ -290,14 +357,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/members/memberentry.pl b/members/memberentry.pl
index c047873..f345351 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -338,10 +338,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 6e5407c..9277deb 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);
 
@@ -483,13 +482,4 @@ $template->param(
     quickslip		  => $quickslip,
 );
 
-#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..eba8d68
--- /dev/null
+++ b/members/printslip.pl
@@ -0,0 +1,89 @@
+#!/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;
+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;
+$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 ($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 71e6a05..93061b4 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 f5dc0c6..7cfca55 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -46,14 +46,34 @@ use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
+use C4::Branch; # GetBranches
 
-# 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,14 +87,12 @@ 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(
     {
@@ -87,32 +105,38 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-if (!defined $op) {
-    $op = q{}; # silence errors from eq
-}
+my $my_branch = C4::Context->preference("IndependantBranches")
+  ?  C4::Context->userenv()->{'branch'}
+  : undef;
 # we show only the TMPL_VAR names $op
 
 $template->param(
+    independant_branch => $my_branch,
 	script_name => $script_name,
 	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 +149,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 +195,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 +216,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 );
     $template->param( code => $code );
     $template->param( module => $module);
     $template->param( name => $letter->{name});
@@ -226,40 +273,54 @@ 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 +328,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 {
-- 
1.6.5


From jonathan.druart at biblibre.com  Wed Dec 28 09:46:29 2011
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Wed, 28 Dec 2011 09:46:29 +0100
Subject: [Koha-patches] [PATCH 1/1] Bug 5347: Followup Adds columns
	claims_count and claimed_date in aqorders
Message-ID: <1325061989-6436-1-git-send-email-jonathan.druart@biblibre.com>

FIX encoding problem
---
 C4/Letters.pm |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 883f706..b4ba478 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -22,8 +22,6 @@ use warnings;
 
 use MIME::Lite;
 use Mail::Sendmail;
-use Encode;
-use Carp;
 
 use C4::Members;
 use C4::Branch;
@@ -390,8 +388,8 @@ sub SendAlerts {
             my %mail = (
                 To             => $to,
                 From           => $userenv->{emailaddress},
-                Subject        => "" . $innerletter->{title},
-                Message        => "" . $innerletter->{content},
+                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;
-- 
1.7.7.3


From magnus at enger.priv.no  Wed Dec 28 11:40:32 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Wed, 28 Dec 2011 11:40:32 +0100
Subject: [Koha-patches] [PATCH] [ENH] Add --disabled to koha-list command
In-Reply-To: <1324293410-1934-1-git-send-email-judit@calyx.net.au>
References: <1324293410-1934-1-git-send-email-judit@calyx.net.au>
Message-ID: <CABg6UYH0qnYYWgtGAP2AY3=oXRqC_DEWrf5VC=WktLfirHys7Q@mail.gmail.com>

Hiya!

Is there a bug for this patch?

Please remember to update debian/docs/koha-list.xml so the manual page
for the command stays in sync with the code.

Best regards,
Magnus Enger
libriotech.no

On 19 December 2011 12:16, Judit <judit at calyx.net.au> wrote:
> Add --disabled to koha-list command
> ---
> ?debian/scripts/koha-list | ? ?8 ++++++--
> ?1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/debian/scripts/koha-list b/debian/scripts/koha-list
> index 1e19f1a..459e5ca 100755
> --- a/debian/scripts/koha-list
> +++ b/debian/scripts/koha-list
> @@ -34,9 +34,10 @@ help() {
> ?Lists Koha instances, optionally only those that are enabled or have
> ?email turned on.
>
> -Usage: $0 [--enabled] [--email] [-h]
> +Usage: $0 [--enabled|--disabled] [--email|--noemail] [-h]
> ?Options:
> ? ? --enabled ? ? ? only show instances that are enabled
> + ? ?--disabled ? ? ?only show instances that are disabled
> ? ? --email ? ? ? ? only show instances that have email enabled
> ? ? --noemail ? ? ? only show instances that do not have email enabled
> ? ? -h ? ? ? ? ? ? ?this help
> @@ -47,9 +48,10 @@ eoh
> ?}
>
> ?enabled=no
> +disabled=no
> ?email=no
> ?noemail=no
> -args=$(getopt -l enabled,email,noemail -o h -n $0 -- "$@")
> +args=$(getopt -l enabled,disabled,email,noemail -o h -n $0 -- "$@")
> ?set -- $args
> ?while [ ! -z "$1" ]
> ?do
> @@ -57,6 +59,7 @@ do
> ? ? ? ? ?-h) help; exit;;
> ? ? --email) email=yes;;
> ? --enabled) enabled=yes;;
> + ?--disabled) disabled=yes;;
> ? --noemail) noemail=yes;;
> ? ? ? ? ? *) break;;
> ? ? esac
> @@ -68,6 +71,7 @@ sort |
> ?while read name
> ?do
> ? ? [ "$enabled" = yes ] && ! is_enabled "$name" && continue
> + ? ?[ "$disabled" = yes ] && is_enabled "$name" && continue
> ? ? [ "$email" = yes ] && [ ! -e /var/lib/koha/$name/email.enabled ] && continue
> ? ? [ "$noemail" = yes ] && [ -e /var/lib/koha/$name/email.enabled ] && continue
> ? ? echo "$name"
> --
> 1.7.4.1
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

From oleonard at myacpl.org  Wed Dec 28 17:45:10 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 28 Dec 2011 11:45:10 -0500
Subject: [Koha-patches] [PATCH] Bug 6842 Alternate fix,
	Branch transfer limits broken
Message-ID: <1325090710-7478-1-git-send-email-oleonard@myacpl.org>

The patch which moved the table pager markup into an
include undid the fix which was previously pushed for
this problem. Re-implementing the fix in the pager
include is a simpler fix which doesn't depend on
the Datatables plugin.

The markup change in table-pager.inc fixes the problem
in branch transfer limits and does not affect functionality
on other pages.

The changes in this patch to branch_transfer_limits.tt and
staff-global.css are for cosmetic reasons only.
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    3 +++
 .../intranet-tmpl/prog/en/includes/table-pager.inc |    4 ++--
 .../en/modules/admin/branch_transfer_limits.tt     |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 9eb7fa2..c61f946 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2133,3 +2133,6 @@ div.pager input.pagedisplay {
 	font-weight: bold;
 	text-align : center;
 }
+div.pager p {
+	margin: 0;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc
index 961c07b..17d43d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc
@@ -1,4 +1,4 @@
-<div class="pager"><form class="formpager" action=""><label>Page(s):
+<div class="pager"><p class="formpager" action=""><label>Page(s):
 	<img src="[% interface %]/prog/img/first.png" alt="" class="first"/>
 	<img src="[% interface %]/prog/img/prev.png" alt="" class="prev"/>
 	<input type="text" size="5" class="pagedisplay"/></label>
@@ -14,4 +14,4 @@
 	[% IF ( perpage == 100) %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
 	[% IF ( perpage == 200) %]<option value="200" selected="selected">200</option>[% ELSE %]<option value="200">200</option>[% END %]
 	</select></label>
-</form></div>
\ No newline at end of file
+</p></div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index 5e4e58f..0e8805e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -102,7 +102,7 @@
 		<h4>Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]</h4>
 	<p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#">Check All</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#">Uncheck All</a></p>
 	
-	<div id="pager[% codes_loo.code %]table" class="pager">
+	<div id="pager[% codes_loo.code %]table">
 	[% INCLUDE 'table-pager.inc' perpage='20' %]
 	</div>
 		<table id="[% codes_loo.code %]table" class="sorted">
-- 
1.7.3


From chrisc at catalyst.net.nz  Wed Dec 28 21:13:31 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 29 Dec 2011 09:13:31 +1300
Subject: [Koha-patches] [PATCH 2/3] Bug 929 : Follow up,
	making some improvements to the spent page   More to come
In-Reply-To: <1325103212-17289-1-git-send-email-chrisc@catalyst.net.nz>
References: <1325103212-17289-1-git-send-email-chrisc@catalyst.net.nz>
Message-ID: <1325103212-17289-2-git-send-email-chrisc@catalyst.net.nz>

---
 acqui/spent.pl                                     |    3 ++-
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |   15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/acqui/spent.pl b/acqui/spent.pl
index f252386..8108401 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -57,7 +57,7 @@ my $query = <<EOQ;
 SELECT
     aqorders.basketno, aqorders.ordernumber, 
     quantity-quantityreceived AS tleft,
-    ecost, budgetdate,
+    ecost, budgetdate, entrydate,
     aqbasket.booksellerid,
     itype,
     title,
@@ -115,6 +115,7 @@ $template->param(
     spent       => \@spent,
     total       => $total
 );
+$template->{VARS}->{'fund'} = $bookfund;
 $sth->finish;
 
 $dbh->disconnect;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index f5f2bdf..bb71cd4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -6,7 +6,7 @@
 [% 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; Spent </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; Spent [% fund %]</div>
 
 <div id="doc3" class="yui-t2">
 
@@ -14,7 +14,7 @@
     <div id="yui-main">
         <div class="yui-b">
 
-<h1>Budgets &amp; Bookfunds</h1>
+<h1>Bookfund [% fund %]</h1>
 <h2>Spent</h2>
 
 
@@ -23,12 +23,13 @@
     <tr>
         <th> Title </th>
 	<th> Order </th>
-	<th> Supplier </th>
+	<th> Vendor </th>
 	<th> Invoice </th>
 	<th> Itemtype </th>
-	<th> Receieved </th>
+	<th> Received </th>
 	<th> Unit Price </th>
 	<th> Freight per Item </th>
+	<th> Date Ordered </th>
 	<th> Date Received </th>
 	<th> Subtotal </th>
     </tr>
@@ -48,7 +49,7 @@
             <a href="/cgi-bin/koha/acqui/orderreceive.pl?ordernumber=[% order.ordernumber %]&biblio=[% order.biblionumber %]&invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&catview=yes">[% order.ordernumber %]</a>
 	</td>
 	<td class="cell">
-	    [% order.booksellerid %]	
+	    <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% order.booksellerid %]">[% order.booksellerid %]</a>
 	</td>
 	<td class="cell">
 	    <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&datereceived=[% order.datereceived %]">[% order.booksellerinvoicenumber %]</a>
@@ -66,6 +67,9 @@
 	    [% order.freight %]		
 	</td>
 	<td class="cell">
+	    [% order.entrydate %]
+	</td>
+	<td class="cell">
 	    [% order.datereceived %]		
 	</td>
 	<td class="cell" align="right">
@@ -84,6 +88,7 @@
         <td> </td>
         <td> </td>
 	<td> </td>
+	<td> </td>
         <td align="right">
 		[% total %]
 	</td>
-- 
1.7.5.4


From chrisc at catalyst.net.nz  Wed Dec 28 21:13:30 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 29 Dec 2011 09:13:30 +1300
Subject: [Koha-patches] [PATCH 1/3] Bug 929 : Reinstating the breakdown of
	budgets
Message-ID: <1325103212-17289-1-git-send-email-chrisc@catalyst.net.nz>

---
 acqui/ordered.pl                                   |  108 +++++++++++++++++
 acqui/spent.pl                                     |  121 ++++++++++++++++++++
 .../prog/en/modules/acqui/acqui-home.tt            |    8 +-
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |   86 ++++++++++++++
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |  101 ++++++++++++++++
 5 files changed, 420 insertions(+), 4 deletions(-)
 create mode 100755 acqui/ordered.pl
 create mode 100755 acqui/spent.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt

diff --git a/acqui/ordered.pl b/acqui/ordered.pl
new file mode 100755
index 0000000..5796f07
--- /dev/null
+++ b/acqui/ordered.pl
@@ -0,0 +1,108 @@
+#!/usr/bin/perl
+
+# Copyright 2008 - 2009 BibLibre SARL
+# Copyright 2010 Catalyst IT Limited
+# 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
+
+committed.pl
+  
+=head1 DESCRIPTION
+
+this script is to show orders ordered but not yet received
+  
+=cut
+
+
+use C4::Context;
+use strict;
+use warnings;
+use CGI;
+use C4::Auth;
+use C4::Output;
+
+my $dbh      = C4::Context->dbh;
+my $input    = new CGI;
+my $fund_id = $input->param('fund');
+my $start    = $input->param('start');
+my $end      = $input->param('end');
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "acqui/ordered.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => 1 },
+        debug           => 1,
+    }
+);
+
+my $query = <<EOQ;
+SELECT
+    aqorders.basketno, aqorders.ordernumber, 
+    quantity-quantityreceived AS tleft,
+    ecost, budgetdate,
+    aqbasket.booksellerid,
+    itype,
+    title
+FROM (aqorders, aqbasket)
+LEFT JOIN biblio ON
+    biblio.biblionumber=aqorders.biblionumber
+LEFT JOIN aqorders_items ON
+    aqorders.ordernumber=aqorders_items.ordernumber
+LEFT JOIN items ON
+    items.itemnumber=aqorders_items.itemnumber  
+WHERE 
+    aqorders.basketno=aqbasket.basketno AND
+    budget_id=? AND
+    (datecancellationprinted IS NULL OR 
+        datecancellationprinted='0000-00-00') AND
+    (quantity > quantityreceived OR quantityreceived IS NULL)
+EOQ
+
+my $sth = $dbh->prepare($query);
+
+$sth->execute( $fund_id);
+if ($sth->err) {
+    die "Error occurred fetching records: ".$sth->errstr;
+}
+my @ordered;
+
+my $total = 0;
+while ( my $data = $sth->fetchrow_hashref ) {
+    my $left = $data->{'tleft'};
+    if ( !$left || $left eq '' ) {
+        $left = $data->{'quantity'};
+    }
+    if ( $left && $left > 0 ) {
+        my $subtotal = $left * $data->{'ecost'};
+        $data->{subtotal} =  sprintf ("%.2f",  $subtotal);
+        $data->{'left'} = $left;
+        push @ordered, $data;
+        $total += $subtotal;
+    }
+}
+$total =   sprintf ("%.2f",  $total);
+$template->param(
+    ordered     => \@ordered,
+    total       => $total
+);
+$sth->finish;
+$dbh->disconnect;
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/spent.pl b/acqui/spent.pl
new file mode 100755
index 0000000..f252386
--- /dev/null
+++ b/acqui/spent.pl
@@ -0,0 +1,121 @@
+#!/usr/bin/perl
+
+# script to show a breakdown of committed and spent budgets
+
+# Copyright 2002-2009 Katipo Communications Limited
+# Copyright 2010 Catalyst IT Limited
+# 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
+
+ spent.pl
+
+=head1 DESCRIPTION
+
+this script is designed to show the spent amount in budges
+
+=cut
+
+
+use C4::Context;
+use C4::Auth;
+use C4::Output;
+use strict;
+use CGI;
+
+my $dbh      = C4::Context->dbh;
+my $input    = new CGI;
+my $bookfund = $input->param('fund');
+my $start    = $input->param('start');
+my $end      = $input->param('end');
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "acqui/spent.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => 1 },
+        debug           => 1,
+    }
+);
+
+my $query = <<EOQ;
+SELECT
+    aqorders.basketno, aqorders.ordernumber, 
+    quantity-quantityreceived AS tleft,
+    ecost, budgetdate,
+    aqbasket.booksellerid,
+    itype,
+    title,
+    aqorders.booksellerinvoicenumber,
+    quantityreceived,
+    unitprice,
+    freight,
+    datereceived,
+    aqorders.biblionumber
+FROM (aqorders, aqbasket)
+LEFT JOIN items ON
+    items.biblioitemnumber=aqorders.biblioitemnumber
+LEFT JOIN biblio ON
+    biblio.biblionumber=aqorders.biblionumber
+LEFT JOIN aqorders_items ON
+    aqorders.ordernumber=aqorders_items.ordernumber
+WHERE 
+    aqorders.basketno=aqbasket.basketno AND
+    budget_id=? AND
+    (datecancellationprinted IS NULL OR 
+        datecancellationprinted='0000-00-00')
+    GROUP BY aqorders.ordernumber
+EOQ
+my $sth = $dbh->prepare($query);
+$sth->execute( $bookfund);
+if ($sth->err) {
+    die "An error occurred fetching records: ".$sth->errstr;
+}
+my $total = 0;
+my $toggle;
+my @spent;
+while ( my $data = $sth->fetchrow_hashref ) {
+    my $recv = $data->{'quantityreceived'};
+    if ( $recv > 0 ) {
+        my $subtotal = $recv * ($data->{'unitprice'} + $data->{'freight'});
+        $data->{'subtotal'}  =   sprintf ("%.2f",  $subtotal); 
+	$data->{'freight'}   =   sprintf ("%.2f", $data->{'freight'});
+        $data->{'unitprice'} =   sprintf ("%.2f",   $data->{'unitprice'}  ); 
+        $total               += $subtotal;
+
+        if ($toggle) {
+            $toggle = 0;
+        }
+        else {
+            $toggle = 1;
+        }
+        $data->{'toggle'} = $toggle;
+        push @spent, $data;
+    }
+
+}
+$total =   sprintf ("%.2f",  $total); 
+
+$template->param(
+    spent       => \@spent,
+    total       => $total
+);
+$sth->finish;
+
+$dbh->disconnect;
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 86650eb..09ec874 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -122,8 +122,8 @@ $(document).ready(function() {
                 <td align="center">[% loop_budge.budget_owner %]</td>
                 <td align="center">[% loop_budge.budget_branchname %]</td>
                 <td align="right" >[% loop_budge.budget_amount %]</td>
-                <td align="right" >[% loop_budge.budget_ordered %]</td>
-                <td align="right" >[% loop_budge.budget_spent %]</td>
+                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
+                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
                 <td align="right" >[% loop_budge.budget_avail %]</td>
             </tr>
             [% ELSE %]
@@ -136,8 +136,8 @@ $(document).ready(function() {
                 <td align="center">[% loop_budge.budget_owner %]</td>
                 <td align="center">[% loop_budge.budget_branchname %]</td>
                 <td align="right" >[% loop_budge.budget_amount %]</td>
-                <td align="right" >[% loop_budge.budget_ordered %]</td>
-                <td align="right" >[% loop_budge.budget_spent %]</td>
+                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
+                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
                 <td align="right" >[% loop_budge.budget_avail %]</td>
             [% END %]
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
new file mode 100644
index 0000000..7c72cb1
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -0,0 +1,86 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
+[% INCLUDE 'doc-head-close.inc' %]
+</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; Ordered </div>
+
+<div id="doc3" class="yui-t2">
+
+<div id="bd">
+    <div id="yui-main">
+        <div class="yui-b">
+
+<h1>Budgets &amp; Bookfunds</h1>
+<h2>Ordered</h2>
+
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+    <thead>
+    <tr>
+        <th> Title </th>
+	<th> Order </th>
+	<th> Itemtype </th>
+	<th> Left on Order </th>
+	<th> Estimated cost per unit </th>
+	<th> Budget Date </th>
+	<th> Subtotal </th>
+    </tr>
+    </thead>
+
+[% FOREACH order IN ordered %]
+    [% IF loop.odd %]
+        <tr class="highlight">
+    [% ELSE %]
+        <tr>
+    [% END %]
+	<td class="cell">
+	    [% order.title %]	
+	</td>
+	<td class="cell">
+	    <a href=/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber %]&booksellerid=[% order.booksellerid %]&basketno=[% order.basketno %]">[% order.ordernumber %]</a>
+	</td>
+	<td class="cell">
+	    [% order.itype %]	
+	</td>
+	<td class="cell">
+	    [% order.left %]	
+	</td>
+	<td class="cell" align="right">
+	    [% order.ecost %]	
+	</td>
+	<td class="cell">
+	    [% order.budgetdate %]	
+	</td>
+	<td class="cell" align="right">
+	    [% order.subtotal %]
+	</td>
+    </tr>
+[% END %]
+
+    <tfoot>
+    <tr>
+        <td> Total </td> 
+        <td> </td> 
+        <td> </td> 
+        <td> </td> 
+        <td> </td> 
+        <td> </td> 
+        <td align="right">
+            [% total %]
+        </td>
+    </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/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
new file mode 100644
index 0000000..f5f2bdf
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -0,0 +1,101 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
+[% INCLUDE 'doc-head-close.inc' %]
+</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; Spent </div>
+
+<div id="doc3" class="yui-t2">
+
+<div id="bd">
+    <div id="yui-main">
+        <div class="yui-b">
+
+<h1>Budgets &amp; Bookfunds</h1>
+<h2>Spent</h2>
+
+
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+    <thead>
+    <tr>
+        <th> Title </th>
+	<th> Order </th>
+	<th> Supplier </th>
+	<th> Invoice </th>
+	<th> Itemtype </th>
+	<th> Receieved </th>
+	<th> Unit Price </th>
+	<th> Freight per Item </th>
+	<th> Date Received </th>
+	<th> Subtotal </th>
+    </tr>
+    </thead>
+
+[% FOREACH order IN spent %]
+    [% IF loop.odd %]
+    <tr class="highlight">
+    [% ELSE %]
+    <tr>
+    [% END %]
+	
+	<td class="cell">
+	    [% order.title %]	
+	</td>
+	<td class="cell">
+            <a href="/cgi-bin/koha/acqui/orderreceive.pl?ordernumber=[% order.ordernumber %]&biblio=[% order.biblionumber %]&invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&catview=yes">[% order.ordernumber %]</a>
+	</td>
+	<td class="cell">
+	    [% order.booksellerid %]	
+	</td>
+	<td class="cell">
+	    <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&datereceived=[% order.datereceived %]">[% order.booksellerinvoicenumber %]</a>
+	</td>
+	<td class="cell">
+	    [% order.itype %]
+	</td>
+	<td class="cell">
+	    [% order.quantityreceived %]	
+	</td>
+	<td class="cell" align="right">
+	    [% order.unitprice %]		
+	</td>
+	<td class="cell" align="right">
+	    [% order.freight %]		
+	</td>
+	<td class="cell">
+	    [% order.datereceived %]		
+	</td>
+	<td class="cell" align="right">
+	    [% order.subtotal %]		
+	</td>
+    </tr>
+[% END %]
+    <tfoot>
+        <tr valign="top">
+        <td> Total </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+	<td> </td>
+        <td align="right">
+		[% total %]
+	</td>
+        </tr>
+    </tfoot>
+
+</table>
+
+</div>
+</div>
+<div class="yui-b">
+[% INCLUDE 'acquisitions-menu.inc' %]
+</div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
-- 
1.7.5.4


From chrisc at catalyst.net.nz  Wed Dec 28 21:13:32 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 29 Dec 2011 09:13:32 +1300
Subject: [Koha-patches] [PATCH 3/3] Bug 929 : Last follow up,
	implementing the last of Katrins suggestions
In-Reply-To: <1325103212-17289-1-git-send-email-chrisc@catalyst.net.nz>
References: <1325103212-17289-1-git-send-email-chrisc@catalyst.net.nz>
Message-ID: <1325103212-17289-3-git-send-email-chrisc@catalyst.net.nz>

Date formatting
Links
Nomenclature changes
---
 acqui/ordered.pl                                   |   37 +++++++++-------
 acqui/spent.pl                                     |   46 +++++++++-----------
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |   15 ++++--
 3 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index 5796f07..97a4da5 100755
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright 2008 - 2009 BibLibre SARL
-# Copyright 2010 Catalyst IT Limited
+# Copyright 2010,2011 Catalyst IT Limited
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -27,19 +27,19 @@ this script is to show orders ordered but not yet received
   
 =cut
 
-
 use C4::Context;
 use strict;
 use warnings;
 use CGI;
 use C4::Auth;
 use C4::Output;
+use C4::Dates;
 
-my $dbh      = C4::Context->dbh;
-my $input    = new CGI;
+my $dbh     = C4::Context->dbh;
+my $input   = new CGI;
 my $fund_id = $input->param('fund');
-my $start    = $input->param('start');
-my $end      = $input->param('end');
+my $start   = $input->param('start');
+my $end     = $input->param('end');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -56,7 +56,7 @@ my $query = <<EOQ;
 SELECT
     aqorders.basketno, aqorders.ordernumber, 
     quantity-quantityreceived AS tleft,
-    ecost, budgetdate,
+    ecost, budgetdate, entrydate,
     aqbasket.booksellerid,
     itype,
     title
@@ -73,13 +73,14 @@ WHERE
     (datecancellationprinted IS NULL OR 
         datecancellationprinted='0000-00-00') AND
     (quantity > quantityreceived OR quantityreceived IS NULL)
+    GROUP BY aqorders.ordernumber
 EOQ
 
 my $sth = $dbh->prepare($query);
 
-$sth->execute( $fund_id);
-if ($sth->err) {
-    die "Error occurred fetching records: ".$sth->errstr;
+$sth->execute($fund_id);
+if ( $sth->err ) {
+    die "Error occurred fetching records: " . $sth->errstr;
 }
 my @ordered;
 
@@ -91,18 +92,20 @@ while ( my $data = $sth->fetchrow_hashref ) {
     }
     if ( $left && $left > 0 ) {
         my $subtotal = $left * $data->{'ecost'};
-        $data->{subtotal} =  sprintf ("%.2f",  $subtotal);
+        $data->{subtotal} = sprintf( "%.2f", $subtotal );
         $data->{'left'} = $left;
         push @ordered, $data;
         $total += $subtotal;
     }
+    my $entrydate = C4::Dates->new( $data->{'entrydate'}, 'iso' );
+    $data->{'entrydate'} = $entrydate->output("syspref");
 }
-$total =   sprintf ("%.2f",  $total);
-$template->param(
-    ordered     => \@ordered,
-    total       => $total
-);
+$total = sprintf( "%.2f", $total );
+
+$template->{VARS}->{'fund'}    = $fund_id;
+$template->{VARS}->{'ordered'} = \@ordered;
+$template->{VARS}->{'total'}   = $total;
+
 $sth->finish;
-$dbh->disconnect;
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/spent.pl b/acqui/spent.pl
index 8108401..4058b59 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -3,7 +3,7 @@
 # script to show a breakdown of committed and spent budgets
 
 # Copyright 2002-2009 Katipo Communications Limited
-# Copyright 2010 Catalyst IT Limited
+# Copyright 2010,2011 Catalyst IT Limited
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -14,7 +14,7 @@
 # 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.
@@ -29,11 +29,12 @@ this script is designed to show the spent amount in budges
 
 =cut
 
-
 use C4::Context;
 use C4::Auth;
 use C4::Output;
+use C4::Dates;
 use strict;
+use warnings;
 use CGI;
 
 my $dbh      = C4::Context->dbh;
@@ -82,9 +83,9 @@ WHERE
     GROUP BY aqorders.ordernumber
 EOQ
 my $sth = $dbh->prepare($query);
-$sth->execute( $bookfund);
-if ($sth->err) {
-    die "An error occurred fetching records: ".$sth->errstr;
+$sth->execute($bookfund);
+if ( $sth->err ) {
+    die "An error occurred fetching records: " . $sth->errstr;
 }
 my $total = 0;
 my $toggle;
@@ -92,31 +93,24 @@ my @spent;
 while ( my $data = $sth->fetchrow_hashref ) {
     my $recv = $data->{'quantityreceived'};
     if ( $recv > 0 ) {
-        my $subtotal = $recv * ($data->{'unitprice'} + $data->{'freight'});
-        $data->{'subtotal'}  =   sprintf ("%.2f",  $subtotal); 
-	$data->{'freight'}   =   sprintf ("%.2f", $data->{'freight'});
-        $data->{'unitprice'} =   sprintf ("%.2f",   $data->{'unitprice'}  ); 
-        $total               += $subtotal;
-
-        if ($toggle) {
-            $toggle = 0;
-        }
-        else {
-            $toggle = 1;
-        }
-        $data->{'toggle'} = $toggle;
+        my $subtotal = $recv * ( $data->{'unitprice'} + $data->{'freight'} );
+        $data->{'subtotal'}  = sprintf( "%.2f", $subtotal );
+        $data->{'freight'}   = sprintf( "%.2f", $data->{'freight'} );
+        $data->{'unitprice'} = sprintf( "%.2f", $data->{'unitprice'} );
+        $total += $subtotal;
+        my $entrydate = C4::Dates->new( $data->{'entrydate'}, 'iso' );
+        $data->{'entrydate'} = $entrydate->output("syspref");
+        my $datereceived = C4::Dates->new( $data->{'datereceived'}, 'iso' );
+        $data->{'datereceived'} = $datereceived->output("syspref");
         push @spent, $data;
     }
 
 }
-$total =   sprintf ("%.2f",  $total); 
+$total = sprintf( "%.2f", $total );
 
-$template->param(
-    spent       => \@spent,
-    total       => $total
-);
-$template->{VARS}->{'fund'} = $bookfund;
+$template->{VARS}->{'fund'}  = $bookfund;
+$template->{VARS}->{'spent'} = \@spent;
+$template->{VARS}->{'total'} = $total;
 $sth->finish;
 
-$dbh->disconnect;
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 7c72cb1..29e78ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -6,7 +6,7 @@
 [% 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; Ordered </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; Ordered - [% fund %]</div>
 
 <div id="doc3" class="yui-t2">
 
@@ -14,18 +14,19 @@
     <div id="yui-main">
         <div class="yui-b">
 
-<h1>Budgets &amp; Bookfunds</h1>
-<h2>Ordered</h2>
+<h1>Bookfunds</h1>
+<h2>Ordered - [% fund %]</h2>
 
 <table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
     <thead>
     <tr>
         <th> Title </th>
 	<th> Order </th>
+	<th> Vendor </th>
 	<th> Itemtype </th>
 	<th> Left on Order </th>
 	<th> Estimated cost per unit </th>
-	<th> Budget Date </th>
+	<th> Date Ordered </th>
 	<th> Subtotal </th>
     </tr>
     </thead>
@@ -43,6 +44,9 @@
 	    <a href=/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber %]&booksellerid=[% order.booksellerid %]&basketno=[% order.basketno %]">[% order.ordernumber %]</a>
 	</td>
 	<td class="cell">
+	    <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% order.booksellerid %]">[% order.booksellerid %]</a>
+	</td>
+	<td class="cell">
 	    [% order.itype %]	
 	</td>
 	<td class="cell">
@@ -52,7 +56,7 @@
 	    [% order.ecost %]	
 	</td>
 	<td class="cell">
-	    [% order.budgetdate %]	
+	    [% order.entrydate %]	
 	</td>
 	<td class="cell" align="right">
 	    [% order.subtotal %]
@@ -68,6 +72,7 @@
         <td> </td> 
         <td> </td> 
         <td> </td> 
+	<td> </td>
         <td align="right">
             [% total %]
         </td>
-- 
1.7.5.4


From chrisc at catalyst.net.nz  Thu Dec 29 10:04:12 2011
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 29 Dec 2011 22:04:12 +1300
Subject: [Koha-patches] [PATCH 4/4] Bug 929 : Followup fixing date formatting
Message-ID: <1325149452-8923-1-git-send-email-chrisc@catalyst.net.nz>

This patch introduces a Filter (KohaDates) for use in templates
[% USE KohaDates %]
[% somevariable | $KohaDates %]

This will format the date in the format specified by the systempreference
---
 C4/Templates.pm                                    |    1 +
 Koha/Template/Plugin/KohaDates.pm                  |   31 ++++++++++++++++++++
 acqui/ordered.pl                                   |    2 -
 acqui/spent.pl                                     |    4 --
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |    5 ++-
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |    5 ++-
 6 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 Koha/Template/Plugin/KohaDates.pm

diff --git a/C4/Templates.pm b/C4/Templates.pm
index 7585727..d150a16 100644
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -58,6 +58,7 @@ sub new {
     my $template = Template->new(
         {   EVAL_PERL    => 1,
             ABSOLUTE     => 1,
+	    PLUGIN_BASE => 'Koha::Template::Plugin',
             INCLUDE_PATH => [
                 "$htdocs/$theme/$lang/includes",
                 "$htdocs/$theme/en/includes"
diff --git a/Koha/Template/Plugin/KohaDates.pm b/Koha/Template/Plugin/KohaDates.pm
new file mode 100644
index 0000000..749f6e2
--- /dev/null
+++ b/Koha/Template/Plugin/KohaDates.pm
@@ -0,0 +1,31 @@
+package Koha::Template::Plugin::KohaDates;
+
+# Copyright Catalyst IT 2011
+
+# 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 Template::Plugin::Filter;
+use base qw( Template::Plugin::Filter );
+
+use C4::Dates;
+
+sub filter {
+    my ($self,$text) = @_;
+    my $date = C4::Dates->new( $text, 'iso' );
+    return $date->output("syspref");
+}
+
+1;
\ No newline at end of file
diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index 97a4da5..c3c4c4e 100755
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -97,8 +97,6 @@ while ( my $data = $sth->fetchrow_hashref ) {
         push @ordered, $data;
         $total += $subtotal;
     }
-    my $entrydate = C4::Dates->new( $data->{'entrydate'}, 'iso' );
-    $data->{'entrydate'} = $entrydate->output("syspref");
 }
 $total = sprintf( "%.2f", $total );
 
diff --git a/acqui/spent.pl b/acqui/spent.pl
index 4058b59..c2f5299 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -98,10 +98,6 @@ while ( my $data = $sth->fetchrow_hashref ) {
         $data->{'freight'}   = sprintf( "%.2f", $data->{'freight'} );
         $data->{'unitprice'} = sprintf( "%.2f", $data->{'unitprice'} );
         $total += $subtotal;
-        my $entrydate = C4::Dates->new( $data->{'entrydate'}, 'iso' );
-        $data->{'entrydate'} = $entrydate->output("syspref");
-        my $datereceived = C4::Dates->new( $data->{'datereceived'}, 'iso' );
-        $data->{'datereceived'} = $datereceived->output("syspref");
         push @spent, $data;
     }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 29e78ba..a95eeae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -41,7 +42,7 @@
 	    [% order.title %]	
 	</td>
 	<td class="cell">
-	    <a href=/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber %]&booksellerid=[% order.booksellerid %]&basketno=[% order.basketno %]">[% order.ordernumber %]</a>
+	    <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber %]&booksellerid=[% order.booksellerid %]&basketno=[% order.basketno %]">[% order.ordernumber %]</a>
 	</td>
 	<td class="cell">
 	    <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% order.booksellerid %]">[% order.booksellerid %]</a>
@@ -56,7 +57,7 @@
 	    [% order.ecost %]	
 	</td>
 	<td class="cell">
-	    [% order.entrydate %]	
+	    [% order.entrydate | $KohaDates %]
 	</td>
 	<td class="cell" align="right">
 	    [% order.subtotal %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index bb71cd4..1c41cc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -67,10 +68,10 @@
 	    [% order.freight %]		
 	</td>
 	<td class="cell">
-	    [% order.entrydate %]
+	    [% order.entrydate | $KohaDates %]
 	</td>
 	<td class="cell">
-	    [% order.datereceived %]		
+	    [% order.datereceived | $KohaDates %]		
 	</td>
 	<td class="cell" align="right">
 	    [% order.subtotal %]		
-- 
1.7.5.4


From oleonard at myacpl.org  Thu Dec 29 18:48:40 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 29 Dec 2011 12:48:40 -0500
Subject: [Koha-patches] [PATCH] Bug 3651 Follow-up,
	Require patron login to send shelves and baskets
Message-ID: <1325180920-16663-1-git-send-email-oleonard@myacpl.org>

The fix for Bug 4289, "Add a syspref 'OpacPublic', to hide OPAC
search-bar and force authentication on all OPAC pages" incorrectly
made some page permissions dependent on the value of the OpacPublic
setting. Some pages should require authentication no matter what.

This patch returns opac-sendbasket.pl to the state it was in before
Bug 4289, Bug 4274 notwithstanding. I have added the authentication
requirement to opac-sendshelf.pl to match.
---
 opac/opac-sendbasket.pl |    2 +-
 opac/opac-sendshelf.pl  |    2 +-
 opac/opac-userupdate.pl |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl
index df1b4c5..6a6e825 100755
--- a/opac/opac-sendbasket.pl
+++ b/opac/opac-sendbasket.pl
@@ -39,7 +39,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "opac-sendbasketform.tmpl",
         query           => $query,
         type            => "opac",
-        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+        authnotrequired => 0,
         flagsrequired   => { borrow => 1 },
     }
 );
diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index 1de95ae..6e60bc9 100755
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -41,7 +41,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "opac-sendshelfform.tmpl",
         query           => $query,
         type            => "opac",
-        authnotrequired => 1,
+        authnotrequired => 0,
         flagsrequired   => { borrow => 1 },
     }
 );
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index f8273ce..86e562a 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -40,7 +40,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-userupdate.tmpl",
         query           => $query,
         type            => "opac",
-        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+        authnotrequired => 0,
         flagsrequired   => { borrow => 1 },
         debug           => 1,
     }
-- 
1.7.3


From Katrin.Fischer.83 at web.de  Fri Dec 30 09:15:39 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 30 Dec 2011 09:15:39 +0100
Subject: [Koha-patches] [PATCH] Bug 5347: Follow up - Fix warnings,
	check/uncheck all and makes error message translatable
Message-ID: <1325232939-4349-1-git-send-email-Katrin.Fischer.83@web.de>

This patch fixes some minor problems found in late order management:

1) Silences 2 warns in Letters.pm
After patch is applied no more warns should show up in the logs.

2) Fixes check/uncheck all
When limiting on one vendor the checkbox in the last header column
was doing nothing. I changed the checkbox to 2 links 'check all' and
'uncheck all' as it's done in other templates.

3) Email has been sent.
The message was hardcoded into the lateorders.pl file and not translatable.
I moved it to the template and changed the wording slightly.

Note: The error message 'The bookseller has no email' comes from
Letters.pm. I didn't change that, because I was not sure where it is
used. The error message as is can not be translated and should be
moved into the templates too.
---
 C4/Letters.pm                                      |    4 ++--
 acqui/lateorders.pl                                |    2 +-
 .../prog/en/modules/acqui/lateorders.tt            |   11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 5cde41d..5e3089b 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -393,7 +393,7 @@ sub SendAlerts {
                 '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}";
+            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';
@@ -402,7 +402,7 @@ sub SendAlerts {
             die "This bookseller has no email\n";
         }
 
-        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}";
+        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug;
     }
 
     # send an "account details" notice to a newly created user
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 2482ffb..998899e 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -85,7 +85,7 @@ if ($op and $op eq "send_alert"){
     if ( $@ ) {
         $template->param(error_claim => $@);
     } else {
-        $template->param(info_claim => "Emails have been sent");
+        $template->{VARS}->{'info_claim'} = 1;
     }
 }
 
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 8227722..5ce1fae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -1,6 +1,7 @@
 [% 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>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
@@ -12,6 +13,8 @@ $(document).ready(function() {
             $("input:checkbox[name=claim_for]").attr('disabled', false);
         }
     });
+    $('#CheckAll').click(function(){ $("#late_orders td").checkCheckboxes();});
+    $('#CheckNone').click(function(){ $("#late_orders td").unCheckCheckboxes();});
 });
 //]]>
 </script>
@@ -35,7 +38,7 @@ $(document).ready(function() {
     <div class="error">[% error_claim %]</div>
 [% END %]
 [% IF info_claim %]
-    <div class="info">[% info_claim %]</div>
+    <div class="info">Email has been sent.</div>
 [% END %]
 [% IF ( lateorders ) %]
 <form action="lateorders.pl" name="claim" method="post">
@@ -50,7 +53,7 @@ $(document).ready(function() {
 	  </select>
 	</p>
 	[% END %]
-    <table>
+    <table id="late_orders">
         <tr>
             <th>Order Date</th>
             <th>Vendor</th>
@@ -61,7 +64,7 @@ $(document).ready(function() {
             <th>Claimed date</th>
             <!-- TMPL_IF name="Supplier" -->
             [% IF Supplier %]
-                <th><input type="checkbox" id="checkAll"></th>
+                <th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
             [% ELSE %]
                 <th></th>
             [% END %]
@@ -103,7 +106,7 @@ $(document).ready(function() {
             <td>[% lateorder.claimed_date %]</td>
             <td>
                 [% UNLESS lateorder.budget_lock %]
-                    <input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]"  supplierid="[% lateorder.supplierid %]"/>
+                    <input type="checkbox" class="checkbox" name="claim_for" value="[% lateorder.ordernumber %]"  supplierid="[% lateorder.supplierid %]"/>
                 [% END %]
              </td>
             </td>
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Fri Dec 30 09:18:43 2011
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 30 Dec 2011 09:18:43 +0100
Subject: [Koha-patches] [PATCH] Bug 929: Follow up - showing fund code
	instead of internal number
Message-ID: <1325233123-4486-1-git-send-email-Katrin.Fischer.83@web.de>

---
 acqui/ordered.pl                                   |    4 ++--
 acqui/spent.pl                                     |    4 ++--
 .../prog/en/modules/acqui/acqui-home.tt            |    8 ++++----
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |    8 ++++----
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |    8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index b681afb..f38264f 100755
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -38,8 +38,7 @@ use C4::Dates;
 my $dbh     = C4::Context->dbh;
 my $input   = new CGI;
 my $fund_id = $input->param('fund');
-my $start   = $input->param('start');
-my $end     = $input->param('end');
+my $fund_code = $input->param('fund_code');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -103,6 +102,7 @@ $total = sprintf( "%.2f", $total );
 $template->{VARS}->{'fund'}    = $fund_id;
 $template->{VARS}->{'ordered'} = \@ordered;
 $template->{VARS}->{'total'}   = $total;
+$template->{VARS}->{'fund_code'} = $fund_code;
 
 $sth->finish;
 
diff --git a/acqui/spent.pl b/acqui/spent.pl
index a50b7ae..12260c0 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -40,8 +40,7 @@ use CGI;
 my $dbh      = C4::Context->dbh;
 my $input    = new CGI;
 my $bookfund = $input->param('fund');
-my $start    = $input->param('start');
-my $end      = $input->param('end');
+my $fund_code = $input->param('fund_code');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -107,6 +106,7 @@ $total = sprintf( "%.2f", $total );
 $template->{VARS}->{'fund'}  = $bookfund;
 $template->{VARS}->{'spent'} = \@spent;
 $template->{VARS}->{'total'} = $total;
+$template->{VARS}->{'fund_code'} = $fund_code;
 $sth->finish;
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 09ec874..03cdc2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -122,8 +122,8 @@ $(document).ready(function() {
                 <td align="center">[% loop_budge.budget_owner %]</td>
                 <td align="center">[% loop_budge.budget_branchname %]</td>
                 <td align="right" >[% loop_budge.budget_amount %]</td>
-                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
-                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
+                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
+                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
                 <td align="right" >[% loop_budge.budget_avail %]</td>
             </tr>
             [% ELSE %]
@@ -136,8 +136,8 @@ $(document).ready(function() {
                 <td align="center">[% loop_budge.budget_owner %]</td>
                 <td align="center">[% loop_budge.budget_branchname %]</td>
                 <td align="right" >[% loop_budge.budget_amount %]</td>
-                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
-                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
+                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
+                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
                 <td align="right" >[% loop_budge.budget_avail %]</td>
             [% END %]
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 018d807..93540c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -7,7 +7,7 @@
 [% 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; Ordered - [% fund %]</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; Ordered - [% fund_code %]</div>
 
 <div id="doc3" class="yui-t2">
 
@@ -15,8 +15,8 @@
     <div id="yui-main">
         <div class="yui-b">
 
-<h1>Bookfunds</h1>
-<h2>Ordered - [% fund %]</h2>
+<h1>Fund: [% fund_code %]</h1>
+<h2>Ordered</h2>
 
 <table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
     <thead>
@@ -56,7 +56,7 @@
 	<td class="cell" align="right">
 	    [% order.ecost %]
 	</td>
-	<td class="cell">
+	<td class="cell" align="right">
 	    [% order.entrydate | $KohaDates %]
 	</td>
 	<td class="cell" align="right">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 49bcedb..c6825c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -7,7 +7,7 @@
 [% 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; Spent [% fund %]</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; Spent - [% fund_code %]</div>
 
 <div id="doc3" class="yui-t2">
 
@@ -15,7 +15,7 @@
     <div id="yui-main">
         <div class="yui-b">
 
-<h1>Bookfund [% fund %]</h1>
+<h1>Fund: [% fund_code %]</h1>
 <h2>Spent</h2>
 
 
@@ -67,10 +67,10 @@
 	<td class="cell" align="right">
 	    [% order.freight %]
 	</td>
-	<td class="cell">
+	<td class="cell" align="right">
 	    [% order.entrydate | $KohaDates %]
 	</td>
-	<td class="cell">
+	<td class="cell" align="right">
 	    [% order.datereceived | $KohaDates %]
 	</td>
 	<td class="cell" align="right">
-- 
1.7.5.4


From tomascohen at gmail.com  Fri Dec 30 13:21:47 2011
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri, 30 Dec 2011 09:21:47 -0300
Subject: [Koha-patches] [PATCH] Bug 6193 - Follow up: use SetEnv and remove
	memcached from koha-conf.xml
Message-ID: <1325247707-31991-1-git-send-email-tomascohen@gmail.com>

---
 C4/Auth.pm        |   17 ++++-------------
 C4/Biblio.pm      |   11 ++++-------
 C4/Context.pm     |   25 +++++++++++++++++++++++++
 C4/Languages.pm   |   14 ++++----------
 etc/koha-conf.xml |    2 --
 5 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index e360e10..7cc3be1 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -35,7 +35,7 @@ use POSIX qw/strftime/;
 use List::MoreUtils qw/ any /;
 
 # use utf8;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout $servers $memcached);
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout);
 
 BEGIN {
     sub psgi_env { any { /^psgi\./ } keys %ENV }
@@ -61,16 +61,7 @@ BEGIN {
     if ($cas) {
         import  C4::Auth_with_cas qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url);
     }
-    $servers = C4::Context->config('memcached_servers');
-    if ($servers) {
-	require Cache::Memcached;
-        $memcached = Cache::Memcached->new({
-					       servers => [ $servers ],
-					       debug   => 0,
-					       compress_threshold => 10_000,
-					       namespace => C4::Context->config('memcached_namespace') || 'koha',
-					   });
-    }
+
 }
 
 =head1 NAME
@@ -1422,8 +1413,8 @@ sub get_session {
     elsif ($storage_method eq 'Pg') {
         $session = new CGI::Session("driver:PostgreSQL;serializer:yaml;id:md5", $sessionID, {Handle=>$dbh});
     }
-    elsif ($storage_method eq 'memcached' && $servers){
-	$session = new CGI::Session("driver:memcached;serializer:yaml;id:md5", $sessionID, { Memcached => $memcached } );
+    elsif ($storage_method eq 'memcached' && C4::Context->ismemcached){
+	$session = new CGI::Session("driver:memcached;serializer:yaml;id:md5", $sessionID, { Memcached => C4::Context->memcached } );
     }
     else {
         # catch all defaults to tmp should work on all systems
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index ac78ae3..74a7483 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -137,16 +137,13 @@ BEGIN {
 }
 
 eval {
-    my $servers = C4::Context->config('memcached_servers');
-    if ($servers) {
+    if (C4::Context->ismemcached) {
         require Memoize::Memcached;
         import Memoize::Memcached qw(memoize_memcached);
 
-        my $memcached = {
-            servers    => [$servers],
-            key_prefix => C4::Context->config('memcached_namespace') || 'koha',
-        };
-        memoize_memcached( 'GetMarcStructure', memcached => $memcached, expire_time => 600 );    #cache for 10 minutes
+        memoize_memcached( 'GetMarcStructure',
+                            memcached => C4::Context->memcached,
+                            expire_time => 600 );    #cache for 10 minutes
     }
 };
 
diff --git a/C4/Context.pm b/C4/Context.pm
index c2ed85c..d6c2e9a 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -253,6 +253,31 @@ sub read_config_file {		# Pass argument naming config file to read
     return $koha;			# Return value: ref-to-hash holding the configuration
 }
 
+=head2 ismemcached
+
+Returns the value of the $ismemcached variable (0/1)
+
+=cut
+
+sub ismemcached {
+    return $ismemcached;
+}
+
+=head2 memcached
+
+If $ismemcached is true, returns the $memcache variable.
+Returns undef otherwise
+
+=cut
+
+sub memcached {
+    if ($ismemcached) {
+      return $memcached;
+    } else {
+      return undef;
+    }
+}
+
 # db_scheme2dbi
 # Translates the full text name of a database into de appropiate dbi name
 # 
diff --git a/C4/Languages.pm b/C4/Languages.pm
index 091d3bb..0cc288e 100644
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -26,19 +26,13 @@ use C4::Context;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
 
 eval {
-    my $servers = C4::Context->config('memcached_servers');
-    if ($servers) {
+    if (C4::Context->ismemcached) {
         require Memoize::Memcached;
         import Memoize::Memcached qw(memoize_memcached);
  
-        my $memcached = {
-            servers    => [ $servers ],
-            key_prefix => C4::Context->config('memcached_namespace') || 'koha',
-        };
-
-        memoize_memcached('getTranslatedLanguages', memcached => $memcached, expire_time => 600); #cache for 10 minutes
-        memoize_memcached('getFrameworkLanguages' , memcached => $memcached, expire_time => 600);
-        memoize_memcached('getAllLanguages',        memcached => $memcached, expire_time => 600);
+        memoize_memcached('getTranslatedLanguages', memcached => C4::Context->memcached, expire_time => 600); #cache for 10 minutes
+        memoize_memcached('getFrameworkLanguages' , memcached => C4::Context->memcached, expire_time => 600);
+        memoize_memcached('getAllLanguages',        memcached => C4::Context->memcached, expire_time => 600);
     }
 };
 
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 686a15b..f5e2c0f 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -275,7 +275,5 @@ __PAZPAR2_TOGGLE_XML_POST__
  <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url>
  <install_log>__MISC_DIR__/koha-install-log</install_log>
  <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
- <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
- <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
 </config>
 </yazgfs>
-- 
1.7.5.4